sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2652 from mapycz/add-text-upright-auto-down

Browse source 
add text upright auto-down
This commit is contained in:
Jiri Drbalek 2015-02-04 07:44:27 +01:00
commit e14fc117fd
10 changed files with 502 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/symbolizer_enumerations.hpp
View file

@ -179,6 +179,7 @@ DEFINE_ENUM(justify_alignment_e, justify_alignment_enum);
enum text_upright_enum : std::uint8_t
{
UPRIGHT_AUTO,
UPRIGHT_AUTO_DOWN,
UPRIGHT_LEFT,
UPRIGHT_RIGHT,
UPRIGHT_LEFT_ONLY,

1
src/symbolizer_enumerations.cpp
View file

@ -168,6 +168,7 @@ IMPLEMENT_ENUM( text_transform_e, text_transform_strings )
static const char * text_upright_strings[] = {
"auto",
"auto-down",
"left",
"right",
"left_only",

10
src/text/placement_finder.cpp
View file

@ -97,6 +97,10 @@ text_upright_e placement_finder::simplify_upright(text_upright_e upright, double
{
return (std::fabs(normalize_angle(angle)) > 0.5*M_PI) ? UPRIGHT_LEFT : UPRIGHT_RIGHT;
}
if (upright == UPRIGHT_AUTO_DOWN)
{
return (std::fabs(normalize_angle(angle)) < 0.5*M_PI) ? UPRIGHT_LEFT : UPRIGHT_RIGHT;
}
if (upright == UPRIGHT_LEFT_ONLY)
{
return UPRIGHT_LEFT;
@ -302,6 +306,12 @@ bool placement_finder::single_line_placement(vertex_cache &pp, text_upright_e or
return false;
}
}
else if (orientation == UPRIGHT_AUTO_DOWN)
{
// Try again with opposite orientation
begin.restore();
return single_line_placement(pp, real_orientation == UPRIGHT_RIGHT ? UPRIGHT_LEFT : UPRIGHT_RIGHT);
}
for (box2d<double> const& box : bboxes)
{

215
tests/visual_tests/grids/text-upright-800-800-1.0-grid-reference.json Normal file
View file

@ -0,0 +1,215 @@
{
"keys": [
"",
"1",
"2",
"3",
"4",
"5",
"6",
"7"
],
"data": {},
"grid": [
" ",
" ",
" ",
" ! ",
" !!! ",
" !!!!! ",
" !!!!!!! ",
" !!!!!!!!! ",
" !!!! !!!!! ",
" !!!! !!!!! ",
" !!!! !!!!! ",
" !!!! !!!!! ",
" !!!! # !!!!! ",
" !!!! ### !!!!! ",
" !!!! ##### !!!!! ",
" !!!! ####### !!!!! ",
" !!!!! ######### !!!!! ",
" !!!!!! ##### ##### !!!!! ",
" !!!! ##### ##### !!!!! ",
" !!!!! ##### ##### !!!!! ",
" !!!!! ##### ##### !!!!! ",
" !!!!! ##### ##### !!!!! ",
" !!!! ##### $ ##### !!!!! ",
" !!!!! ##### $$$ ##### !!!!! ",
" !!!!! ##### $$$$$ ##### !!!!! ",
" !!!! ##### $$$$$$$ ##### !!!!! ",
" !!!!! ##### $$$$$$$$$ ##### !!!!! ",
" !!!! ##### $$$$ $$$$$ ##### !!!!! ",
" !!!! ! ##### $$$$ $$$$$ ##### !!!!!! ",
" !!!! ##### $$$$ $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ % $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%%%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% & %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&&&&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& &&&&& %%%%% $$$$$ ##### !!!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& & '' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& '''''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& '''''''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((((( '''' &&&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& & ''''' (((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( (((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' (((((( (((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' (((((( (((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' (((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' ((((( (((((( '''' &&&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%%% $$$$$ ##### !!!!! ",
" !!!! ##### $$$$ %%%%% &&&& ''''' ((((( ((((( '''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((( ''' &&& %% $$$ ## !!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( '''''' &&&&& %%%% $$$$$ #### !!!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& ' '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& ' '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' ' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' ' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& ' '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((((((( ''''' &&&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ((( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ( ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& '''' ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& '''' ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& ''''''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& ''''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& ''''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& ' ''' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& ' ' &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&&& &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$ %%%%% &&&&& &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&&&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&&&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% &&& %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% & %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%% %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%%%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %%%% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ %% $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$ $$$$$ #### !!!!! ",
" !!!!! ##### $$$$$$$$$ #### !!!!! ",
" !!!!!! ##### $$$$$$$ #### !!!!!! ",
" !!!!! ##### $$$$$ #### !!!!! ",
" !!!!!! ##### $$$ #### !!!!! ",
" !!!!! ##### $ #### !!!!! ",
" !!!!! ##### #### !!!!! ",
" !!!!! ##### #### !!!!! ",
" !!!!!! ##### #### !!!!! ",
" !!!!! ##### #### !!!!! ",
" !!!!! ##### #### !!!!! ",
" !!!!!! ######## !!!!! ",
" !!!!! ###### !!!!! ",
" !!!!!! #### !!!!!! ",
" !!!!! ## !!!!! ",
" !!!!! !!!!! ",
" !!!!! !!!!! ",
" !!!!! !!!!! ",
" !!!!! !!!!! ",
" !!!!! !!!!! ",
" !!!!!!!!! ",
" !!!!!!! ",
" !!!!! ",
" !!! ",
" ! ",
" ",
" "
]
}

215
tests/visual_tests/grids/text-upright-800-800-2.0-grid-reference.json Normal file
View file

@ -0,0 +1,215 @@
{
"keys": [
"",
"1",
"2",
"3",
"4",
"5",
"6",
"7"
],
"data": {},
"grid": [
" ",
" ! ",
" !!! ",
" !!!!! ",
" !!!!!!! ",
" !!!!!!!!! ",
" !!!!!!!!!!! ",
" !!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!!!!!! ",
" !!!!!!!!!###!!!!!!!!! ",
" !!!!!!!!!####!!!!!!!!!! ",
" !!!!!!!!!#######!!!!!!!!! ",
" !!!!!!!!!#########!!!!!!!!! ",
" !!!!!!!!!##########!!!!!!!!!! ",
" !!!!!!!!!#############!!!!!!!!! ",
" !!!!!!!!!##############!!!!!!!!!! ",
" !!!!!!!!!#################!!!!!!!!! ",
" !!!!!!!!!!!####### #######!#!!!!!!!!! ",
" !!!!!!!!!######### $ #######!#!!!!!!!!! ",
" !!!!!!!!!######### $$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% & %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#!####### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #######!#!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&'''''''' ((((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'&''''''' ((((((((( ((((((((( '''''''&'&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&''''''' ((((((((( ((((((((( '''''''&&&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ ########!!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!!!#######$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #######!!!!!!!!!!! ",
" !!!!!!!!!#!####### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #######!#!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!#########$$$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''''&&&&&&&&& %%%%%%%%%$$$$$$$$$ #########!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((((( '''''''' &&&&&&&&& %%%%%%%% $$$$$$$$$ ######## !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((( '''''' &&&&&&& %%%%%% $$$$$$$ ###### !!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((( ''''' &&&&& %%%%% $$$$$ ###### !!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( ((((((( ''''''' &&&&&&& %%%%%%% $$$$$$$ ######## !!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&'''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&''''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%%%$$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" ! !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!!! ",
" !! !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''& &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''& &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&''''''' ((((((((( ((((((((('''''''''&&&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'&''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' ((((((((( (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((((((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((((((((''''''''' '&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((((((''''''''' ''&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (((''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&''''''''' (''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" ! !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !! !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''''' &'&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''''' &'&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''''' &'&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'''' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&'' &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&& &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &&&%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%% &%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%%%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$%% $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$ $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$$$######### !!!!!!!!! ",
" !!!!!!!!!######### $$$######### !!!!!!!!! ",
" !!!!!!!!!######### $######### !!!!!!!!! ",
" !!!!!!!!!################## !!!!!!!!! ",
" !!!!!!!!!################ !!!!!!!!! ",
" !!!!!!!!!############## !!!!!!!!! ",
" !!!!!!!!!############ !!!!!!!!! ",
" !!!!!!!!!########## !!!!!!!!! ",
" !!!!!!!!!!######## !!!!!!!!! ! ",
" !! !!!!!!!!!###### !!!!!!!!!! ",
" ! !!!!!!!!!#### !!!!!!!!!! ",
" !!!!!!!!!!## !!!!!!!!! ",
" !!!!!!!!!! !!!!!!!!!! ",
" !!!!!!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!!!! ",
" !!!!!!!!!!!!!!! ",
" !!!!!!!!!!!! ",
" !!!!!!!!! ",
" !!!!!!! ",
" !!!!! ",
" !!! ",
" ! "
]
}

BIN
tests/visual_tests/images/text-upright-800-800-1.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 36 KiB

BIN
tests/visual_tests/images/text-upright-800-800-1.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
tests/visual_tests/images/text-upright-800-800-2.0-agg-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
tests/visual_tests/images/text-upright-800-800-2.0-cairo-reference.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 37 KiB

60
tests/visual_tests/styles/text-upright.xml Normal file
View file

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=latlong +datum=WGS84">
<Parameters>
<Parameter name="sizes">800, 800</Parameter>
<Parameter name="bbox">-1.05, -1.05, 1.05, 1.05</Parameter>
</Parameters>
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>lines</StyleName>
<StyleName>text</StyleName>
<Datasource>
<Parameter name="type">csv</Parameter>
<Parameter name="inline">
id, wkt, upright
0, "LINESTRING(1 0, 0 -1, -1 0, 0 1, 1 0)", "[default]"
1, "LINESTRING(0.9 0, 0 -0.9, -0.9 0, 0 0.9, 0.9 0)", "auto"
2, "LINESTRING(0.8 0, 0 -0.8, -0.8 0, 0 0.8, 0.8 0)", "auto-down"
3, "LINESTRING(0.7 0, 0 -0.7, -0.7 0, 0 0.7, 0.7 0)", "left"
4, "LINESTRING(0.6 0, 0 -0.6, -0.6 0, 0 0.6, 0.6 0)", "right"
5, "LINESTRING(0.5 0, 0 -0.5, -0.5 0, 0 0.5, 0.5 0)", "left_only"
6, "LINESTRING(0.4 0, 0 -0.4, -0.4 0, 0 0.4, 0.4 0)", "right_only"
</Parameter>
</Datasource>
</Layer>
<Style name="lines">
<Rule>
<LineSymbolizer
stroke-width="12"
stroke="rgb(255, 100, 100)"
/>
</Rule>
</Style>
<Style name="text">
<Rule>
<Filter>[id] = 0</Filter>
<TextSymbolizer
face-name="DejaVu Sans Book"
size="16"
placement="line"
spacing="100"
max-char-angle-delta="0"
>[upright]</TextSymbolizer>
</Rule>
<Rule>
<ElseFilter />
<TextSymbolizer
face-name="DejaVu Sans Book"
size="16"
placement="line"
spacing="100"
upright="[upright]"
max-char-angle-delta="0"
>[upright]</TextSymbolizer>
</Rule>
</Style>
</Map>