Version Distiller et quelques modifications avec les noms des fleuves ...

MERCI JMS -- SUPERBE!!!

diff --git a/cartes/32U/postscript/carte1.pdf b/cartes/32U/postscript/carte1.pdf
deleted file mode 100644 (file)
index 9cede90..0000000
Binary files a/cartes/32U/postscript/carte1.pdf and /dev/null differ

diff --git a/cartes/32U/postscript/carte1_JG_Distiller.pdf b/cartes/32U/postscript/carte1_JG_Distiller.pdf
index 5fe081b..b3b51f0 100644 (file)
Binary files a/cartes/32U/postscript/carte1_JG_Distiller.pdf and b/cartes/32U/postscript/carte1_JG_Distiller.pdf differ

diff --git a/cartes/32U/postscript/carte1_JG_Distiller.ps b/cartes/32U/postscript/carte1_JG_Distiller.ps
index a5e43c0..db0d641 100644 (file)
--- a/cartes/32U/postscript/carte1_JG_Distiller.ps
+++ b/cartes/32U/postscript/carte1_JG_Distiller.ps
@@ -1,8 +1,8 @@
-%! PS
+%!PS

 
 << /PageSize [750 900] >> setpagedevice
 % ------------------------------------------------------------------------------
 
 << /PageSize [750 900] >> setpagedevice
 % ------------------------------------------------------------------------------

-% Utilisation de l'encodage latin1 (utf8 ne peut être utilisé directement).
+% Utilisation de l'encodage latin1 (utf8 ne peut être utilisé directement).

 /ISOEncode {
     dup length dict begin
                {1 index /FID ne {def} {pop pop} ifelse} forall
 /ISOEncode {
     dup length dict begin
                {1 index /FID ne {def} {pop pop} ifelse} forall


@@ -13,11 +13,12 @@
 } bind def
 % ------------------------------------------------------------------------------
 (C:/Users/Jürgen/Desktop/carte1/carte1/svgnames.ps) run     %% Utilisation des couleurs SVG                           
 } bind def
 % ------------------------------------------------------------------------------
 (C:/Users/Jürgen/Desktop/carte1/carte1/svgnames.ps) run     %% Utilisation des couleurs SVG                           

-0 450 translate                                             %% Déplacement du point origine
-gsave                                                       %% Couleur du fond
+0 450 translate                                  %% Déplacement du point origine
+gsave                                                         %% Couleur du fond

   0 0 moveto 750 0 rlineto 0 900 rlineto -750 0 rlineto
   closepath DeepSkyBlue fill
 grestore
   0 0 moveto 750 0 rlineto 0 900 rlineto -750 0 rlineto
   closepath DeepSkyBlue fill
 grestore

+

 % ------------------------------------------------------------------------------
 
 (C:/Users/Jürgen/Desktop/carte1/carte1/pays.ps)    run
 % ------------------------------------------------------------------------------
 
 (C:/Users/Jürgen/Desktop/carte1/carte1/pays.ps)    run


@@ -25,7 +26,8 @@ grestore
 (C:/Users/Jürgen/Desktop/carte1/carte1/fleuves.ps) run
 (C:/Users/Jürgen/Desktop/carte1/carte1/lacs.ps)    run
 (C:/Users/Jürgen/Desktop/carte1/carte1/villes.ps)  run
 (C:/Users/Jürgen/Desktop/carte1/carte1/fleuves.ps) run
 (C:/Users/Jürgen/Desktop/carte1/carte1/lacs.ps)    run
 (C:/Users/Jürgen/Desktop/carte1/carte1/villes.ps)  run

-(C:/Users/Jürgen/Desktop/carte1/carte1/iles.ps)  run
+(C:/Users/Jürgen/Desktop/carte1/carte1/noms-iles.ps)  run
+(C:/Users/Jürgen/Desktop/carte1/carte1/noms-fleuves.ps)  run

 
 % ------------------------------------------------------------------------------
 /Pas 1 def
 
 % ------------------------------------------------------------------------------
 /Pas 1 def


@@ -48,21 +50,32 @@ grestore
        } for
 } def
 
        } for
 } def
 

+/concatstrings {
+       exch dup length    
+    2 index length add string    
+    dup dup 4 2 roll copy length
+       4 -1 roll putinterval
+} bind def
+

 %% PlacePoint et PlaceNom ------------------------------------------------------
 %% PlacePoint et PlaceNom ------------------------------------------------------

-%% [e n (nom) angle] PlacePoint ensuite PlaceNom récupére ce qu'il lui faut dans
-%% dictionnaire disquedict
-/disquedict 10 dict def
-disquedict /mtrx matrix put
-
-/Nom (Ville) def
-/Position -1 def
-/PlacePoint {  
-       aload pop
-       /Position exch def
-       /Nom exch def
-       newpath
-       disquedict begin
+%% [e n (nom) angle] PlacePoint ensuite PlaceNom récupère ce qu'il lui faut dans
+%% dictionnaire placedict
+%%
+%% Usage : [e n (nom) pos (proc)] PlacePoint .... PlaceNom
+%% Le cinquième argument est facultatif....
+
+/placedict 10 dict def
+placedict /mtrx matrix put
+
+/PlacePoint {
+       placedict begin
+               /argv exch def /argn argv length def
+               argv aload pop
+               /proc (Place_Defaut) def
+               argn 4 gt { (Place_) exch concatstrings /proc exch def } if
+               /pos exch def /nom exch def

                /Y exch def /X exch def
                /Y exch def /X exch def

+               newpath

                /savematrix mtrx currentmatrix def
                X Y translate RayonDisque dup scale
                0 0 1 0 360 arc
                /savematrix mtrx currentmatrix def
                X Y translate RayonDisque dup scale
                0 0 1 0 360 arc


@@ -71,77 +84,80 @@ disquedict /mtrx matrix put
 } def
 
 /PlaceNom {
 } def
 
 /PlaceNom {

-       Position -1 gt {
-               disquedict begin
+       placedict begin
+               pos -1 gt {

                        /savematrix mtrx currentmatrix def                      
                        X Y translate
                        %% Dimension (largeur) du nom -------------------------                 
                        /savematrix mtrx currentmatrix def                      
                        X Y translate
                        %% Dimension (largeur) du nom -------------------------                 

-                       Nom stringwidth pop /WX exch def
+                       nom stringwidth pop /wx exch def

                        %% ----------------------------------------------------
                        %% ----------------------------------------------------

-                       Position cos LabelOffset mul /X exch def
-                       Position sin LabelOffset mul /Y exch def
-                       X 0 gt {
-                               %% Nom à droite
-                               X Y HauteurCaractere 2 sub moveto
-                       } {
-                               X 0 lt {
-                                       %% Nom à gauche
-                                       X WX sub Y HauteurCaractere 2 div  sub moveto
-                               } {
-                                       Y 0 gt {
-                                               %% Nom au dessus
-                                               X WX 2 div sub Y moveto
-                                       } {
-                                               %% Nom en dessous
-                                               X WX 2 div sub Y HauteurCaractere sub moveto
-                                       } ifelse
-                               } ifelse                
-                       } ifelse
-                       %% Présentation du nom --------------------------------                        
-                       0.5 setgray Nom show
-                       CouleurNom WX neg 0.35 sub 0.25 rmoveto Nom show
+                       proc cvx exec

                        %% ----------------------------------------------------
                        savematrix setmatrix
                        %% ----------------------------------------------------
                        savematrix setmatrix

-               end
-       } if
+               } if
+       end

 } def
 } def

-% ------------------------------------------------------------------------------

 
 

-1 setlinejoin
+/Place_Defaut_Position {
+       pos cos LabelOffset mul /X exch def
+       pos sin LabelOffset mul /Y exch def
+       X 0 gt {
+               %% Nom à droite
+               X Y HauteurCaractere 2 div sub moveto
+       } {
+               X 0 lt {
+                       %% Nom à gauche
+                       X wx sub Y HauteurCaractere 2 div sub moveto
+               } {
+                       Y 0 gt {
+                               %% Nom au dessus
+                               X wx 2 div sub Y moveto
+                       } {
+                               %% Nom en dessous
+                               X wx 2 div sub Y HauteurCaractere sub moveto
+                       } ifelse
+               } ifelse                
+       } ifelse
+} def

 
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Pays (fond) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-allemagne { Construction closepath gsave LightGoldenrod fill grestore} forall
-[hollande france italie suisse tchequie pologne belgique autriche
-  luxembourg liechtenstein danemark] {
-       { Construction closepath gsave MediumSeaGreen fill grestore} forall 
-} forall
+/Place_Defaut {
+       Place_Defaut_Position
+       %% Présentation du nom --------------------------------                        
+       0.7 setgray nom show
+       CouleurNom wx neg 0.65 sub 0.65 rmoveto nom show        
+} def

 
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Lacs (fond) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-[leman constance] {
-       { Construction closepath gsave DarkBlue fill grestore} forall
-} forall
+/Place_Centering {
+       wx 2 div neg wx 2 div neg rmoveto
+       %% Présentation du nom --------------------------------                        
+       0.7 setgray nom show
+       CouleurNom wx neg 0.65 sub 0.65 rmoveto nom show
+} def

 
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Pays (frontières) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-[allemagne hollande france suisse tchequie pologne belgique autriche
-  luxembourg liechtenstein danemark] {
-       { Construction closepath DarkGray stroke } forall 
-} forall
+/Place_Rotate {
+       pos cos 0 ge {
+               pos rotate 
+               LabelOffset HauteurCaractere 2 div neg moveto
+       } {
+               pos 180 sub rotate
+               LabelOffset wx add neg HauteurCaractere 2 div neg moveto
+       } ifelse
+       %% Présentation du nom --------------------------------                        
+       0.7 setgray nom show
+       CouleurNom wx neg 0.65 sub 0.65 rmoveto nom show
+} def

 
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Länder (frontières) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-lander { Construction closepath WhiteSmoke 0.5 setlinewidth stroke} forall
+/Place_RotateCentering {
+       pos rotate wx 2 div neg HauteurCaractere 2 div neg moveto
+       %% Présentation du nom --------------------------------                        
+       0.7 setgray nom show
+       CouleurNom wx neg 0.65 sub 0.65 rmoveto nom show
+} def

 
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Fleuves et rivières %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-[rhin saone elbe neckar rhone doubs danube oder weser ems main mosel saale] {
-       { Construction DarkBlue 0.25 setlinewidth stroke} forall
-} forall

 
 

+% ------------------------------------------------------------------------------

 
 

-%% Les océans
-/mo /moveto load def
-/Helvetica-Bold findfont 20 scalefont setfont 
-/shm { gsave DarkBlue show grestore } def
-90.412 368.266 mo (Nordsee)shm
-630.412 418.266 mo (Ostsee)shm
+1 setlinejoin

 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Pays (fond) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 allemagne { Construction closepath gsave LightGoldenrod fill grestore} forall
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Pays (fond) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 allemagne { Construction closepath gsave LightGoldenrod fill grestore} forall


@@ -164,53 +180,65 @@ allemagne { Construction closepath gsave LightGoldenrod fill grestore} forall
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Länder (frontières) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 lander { Construction closepath WhiteSmoke 0.5 setlinewidth stroke} forall
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Länder (frontières) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 lander { Construction closepath WhiteSmoke 0.5 setlinewidth stroke} forall
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Fleuves et rivières %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Fleuves et riviÃ\83¨res %%%%%%%%%%%%%%%%%%%%%%%%%%%%%

 [rhin saone elbe neckar rhone doubs danube oder saale mosel weser ems main] {
        { Construction DarkBlue 0.25 setlinewidth stroke} forall
 } forall
 
 [rhin saone elbe neckar rhone doubs danube oder saale mosel weser ems main] {
        { Construction DarkBlue 0.25 setlinewidth stroke} forall
 } forall
 

+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+/Helvetica-Bold   findfont 8 scalefont ISOEncode setfont
+/HauteurCaractere 6 def
+/CouleurNom       {DarkGreen} def
+/RayonDisque      2 def
+/LabelOffset      5 def
+[V_hollande V_belgique V_luxembourg V_france V_suisse V_autriche
+V_tchequie V_pologne] {
+       { PlacePoint gsave DarkGreen fill grestore PlaceNom} forall
+} forall
+

 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 /Helvetica-Bold   findfont 8 scalefont ISOEncode setfont
 /HauteurCaractere 6 def
 /CouleurNom       {DarkRed} def
 /RayonDisque      2 def
 /LabelOffset      5 def
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 /Helvetica-Bold   findfont 8 scalefont ISOEncode setfont
 /HauteurCaractere 6 def
 /CouleurNom       {DarkRed} def
 /RayonDisque      2 def
 /LabelOffset      5 def

-V_allemagne { PlacePoint gsave DarkRed fill grestore PlaceNom } forall
+V_allemagne { PlacePoint gsave DarkRed fill grestore PlaceNom} forall
+

 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Capitales %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 /Helvetica-Bold   findfont 14 scalefont ISOEncode setfont
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Capitales %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 /Helvetica-Bold   findfont 14 scalefont ISOEncode setfont

-/HauteurCaractere 7 def
+/HauteurCaractere 10 def

 /CouleurNom       {Orange} def
 /CouleurNom       {Orange} def

-/RayonDisque      3.5 def         % Des points un peu plus gros pour les capitales
-/LabelOffset      3.5 def
+/RayonDisque      3 def         % Des points un peu plus gros pour les capitales
+/LabelOffset      6 def

 V_allemagne_capitales_lander {
        PlacePoint gsave Orange fill grestore PlaceNom
 } forall
 
 V_allemagne_capitales_lander {
        PlacePoint gsave Orange fill grestore PlaceNom
 } forall
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Autres Villes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-/Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
-/HauteurCaractere 5 def
-/RayonDisque      1 def
-/LabelOffset      1 def
-/CouleurNom       {DarkGreen} def
-[V_autriche V_suisse V_france V_tchequie V_tchequie V_belgique V_hollande V_luxembourg V_pologne] { 
-    { PlacePoint gsave DarkGreen fill grestore PlaceNom } forall
- } forall
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Iles (Noms) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Iles (Noms) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

 /Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
 /HauteurCaractere 5 def
 /Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
 /HauteurCaractere 5 def

-/CouleurNom       {DarkBlue} def        
+/CouleurNom       {DarkBlue} def
+/RayonDisque      3 def         
+/LabelOffset      5 def

 I_allemagne {
 I_allemagne {

-       PlacePoint pop PlaceNom 
+       PlacePoint PlaceNom

 } forall
 
 } forall
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Rivières (Noms) %%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Rivières (Noms) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

 /Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
 /HauteurCaractere 5 def
 /CouleurNom       {DarkBlue} def       
 /Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
 /HauteurCaractere 5 def
 /CouleurNom       {DarkBlue} def       

-V_allemagne_rivers {
-       PlacePoint pop PlaceNom
+R_allemagne {
+       PlacePoint PlaceNom

 } forall
 
 } forall
 

+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Autres annotations %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+/mo /moveto load def
+/Helvetica-Bold findfont 20 scalefont setfont 
+/shm { gsave DarkBlue show grestore } def
+90.412 368.266 mo (Nordsee)shm
+630.412 418.266 mo (Ostsee)shm
+
+

 showpage
 showpage

diff --git a/cartes/32U/postscript/noms-fleuves.ps b/cartes/32U/postscript/noms-fleuves.ps
index be7d579..3c310e4 100644 (file)
--- a/cartes/32U/postscript/noms-fleuves.ps
+++ b/cartes/32U/postscript/noms-fleuves.ps
@@ -1,14 +1,14 @@
 /R_allemagne[
 [432 -251 (Donau) 5 (RotateCentering)]
 /R_allemagne[
 [432 -251 (Donau) 5 (RotateCentering)]

-[284 -267 (Neckar) 0]
-[124 -127 (Mosel) 0]
-[150 -57 (Rhein) 0]
+[284 -280 (Neckar) 30 (RotateCentering)]
+[124 -127 (Mosel) 45 (RotateCentering)]
+[165 -57 (Rhein) 300 (RotateCentering)]

 [320 -110 (Main) 0]
 [465 223 (Elbe) 330 (RotateCentering)]
 [577 51 (Elbe) 300 (RotateCentering)]
 [483 24.5 (Saale) 30 (RotateCentering)]
 [320 -110 (Main) 0]
 [465 223 (Elbe) 330 (RotateCentering)]
 [577 51 (Elbe) 300 (RotateCentering)]
 [483 24.5 (Saale) 30 (RotateCentering)]

-[273 185 (Weser) 0]
-[629 200 (Oder) 0]
-[160 155 (Ems) 0]
+[298 185 (Weser) 280 (RotateCentering)]
+[629 200 (Oder) 330 (RotateCentering)]
+[170 155 (Ems) 290 (RotateCentering)]

 ] def
 
 ] def
 

diff --git a/cartes/32U/postscript/noms-iles.ps b/cartes/32U/postscript/noms-iles.ps
index c89caae..9fdae1d 100644 (file)
--- a/cartes/32U/postscript/noms-iles.ps
+++ b/cartes/32U/postscript/noms-iles.ps
@@ -2,7 +2,7 @@
 [604 347 (Usedom) 90]
 [584 383 (R\374gen) 90]
 [555 405 (Hiddensee) 180]
 [604 347 (Usedom) 90]
 [584 383 (R\374gen) 90]
 [555 405 (Hiddensee) 180]

-[504 385 (Dar\377) 90]
+[504 385 (Darß) 90]

 [414 384 (Fehmarn) 90]
 [234 427 (Sylt) 180]
 [237 400 (Amrum) 180]
 [414 384 (Fehmarn) 90]
 [234 427 (Sylt) 180]
 [237 400 (Amrum) 180]