Actualisation comme décrit dans mon email

diff --git a/cartes/32U/postscript/carte1_JG_Distiller.pdf b/cartes/32U/postscript/carte1_JG_Distiller.pdf
index 345b6d0..5fe081b 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 69cd1be..475d086 100644 (file)
--- a/cartes/32U/postscript/carte1_JG_Distiller.ps
+++ b/cartes/32U/postscript/carte1_JG_Distiller.ps
@@ -25,6 +25,7 @@ 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

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


@@ -142,35 +143,148 @@ lander { Construction closepath WhiteSmoke 0.5 setlinewidth stroke} forall
 90.412 368.266 mo (Nordsee)shm
 630.412 418.266 mo (Ostsee)shm
 
 90.412 368.266 mo (Nordsee)shm
 630.412 418.266 mo (Ostsee)shm
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Capitales de Länder (points et noms) %%%%%%%%%%%%%%%%%%%%%%%%%
-/CouleurNom {Orange} def
-/RayonVille 2 def               % Des points un peu plus gros pour les capitales
-V_allemagne_capitales_lander {
-       PlacePoint gsave Orange fill grestore PlaceNom
+% ------------------------------------------------------------------------------
+/Pas 1 def
+% ------------------------------------------------------------------------------
+/Construction {
+       /region exch def
+       newpath
+       /nbr region length def
+       region 0 get aload pop
+       /Y exch def /X exch def
+       X Y moveto
+       /ncount 0 def
+       0 1 nbr 1 sub {
+               /ncount ncount 1 add def
+               region exch get aload pop
+               ncount Pas mod 0 eq nbr ncount sub 0 lt or {
+                       /Y exch def /X exch def
+                       X  Y lineto
+               }{ pop pop } ifelse
+       } for
+} def
+
+%% 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
+               /Y exch def /X exch def
+               /savematrix mtrx currentmatrix def
+               X Y translate RayonDisque dup scale
+               0 0 1 0 360 arc
+               savematrix setmatrix
+       end
+} def
+
+/PlaceNom {
+       Position -1 gt {
+               disquedict begin
+                       /savematrix mtrx currentmatrix def                      
+                       X Y translate
+                       %% Dimension (largeur) du nom -------------------------                 
+                       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.7 setgray Nom show
+                       CouleurNom WX neg 0.65 sub 0.65 rmoveto Nom show
+                       %% ----------------------------------------------------
+                       savematrix setmatrix
+               end
+       } if
+} def
+% ------------------------------------------------------------------------------
+
+1 setlinejoin
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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
 
 } forall
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villes allemandes (points et noms) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-/CouleurNom {DarkRed} def
-/RayonVille 1.5 def
-/fontfacteur 8 def
-V_allemagne {
-     PlacePoint gsave DarkRed fill grestore PlaceNom 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Lacs (fond) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+[leman constance] {
+       { Construction closepath gsave DarkBlue fill grestore} forall

 } forall
 
 } forall
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Villes autres pays (points et noms) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-/CouleurNom {DarkGreen} def
-/RayonVille 1.5 def
-/fontfacteur 8 def
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Pays (frontières) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+[allemagne hollande france suisse tchequie pologne belgique autriche
+  luxembourg liechtenstein danemark] {
+       { Construction closepath DarkGray stroke } forall 
+} forall
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Länder (frontières) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+lander { Construction closepath WhiteSmoke 0.5 setlinewidth stroke} forall
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Fleuves et rivières %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+[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       {DarkRed} def
+/RayonDisque      2 def
+/LabelOffset      5 def
+V_allemagne { PlacePoint gsave DarkRed fill grestore PlaceNom } forall
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Capitales %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+/Helvetica-Bold   findfont 14 scalefont ISOEncode setfont
+/HauteurCaractere 10 def
+/CouleurNom       {Orange} 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
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Autres Villes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+/Helvetica-Bold   findfont 8 scalefont ISOEncode setfont
+/HauteurCaractere 10 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
 [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
+ } forall

 
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Iles (points et noms) %%%%%%%%%%%%%%%%%%%%%%%%%
-/CouleurNom {DarkBlue} def
-/RayonVille 0 def
-/fontfacteur 6 def
-V_allemagne_iles {
-       PlacePoint gsave DeepSkyBlue fill grestore PlaceNom
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Iles %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+/Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
+/HauteurCaractere 5 def
+/CouleurNom       {DarkBlue} def
+/RayonDisque      3 def         
+/LabelOffset      5 def
+I_allemagne {
+       PlacePoint pop PlaceNom

 } forall
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Rivières (points et noms) %%%%%%%%%%%%%%%%%%%%%%%%%
 } forall
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Rivières (points et noms) %%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/cartes/32U/postscript/iles.ps b/cartes/32U/postscript/iles.ps
index 88741b5..6772387 100644 (file)
--- a/cartes/32U/postscript/iles.ps
+++ b/cartes/32U/postscript/iles.ps
@@ -1,10 +1,20 @@
 /I_allemagne[
 [604 347 (Usedom) 90]
 /I_allemagne[
 [604 347 (Usedom) 90]

-[584 383 (Rügen) 90]
-[430 395 (Fehmarn) 180]
-[214 430 (Sylt) 0]
-[204 400 (Amrum) 0]
-[244 395 (Föhr) 90]
-[220 385 (Pellworm) 0]
-[140 300 (Borkum) 270]
-] def
\ No newline at end of file
+[584 383 (Rügen) 90]
+[555 405 (Hiddensee) 180]
+[504 385 (Darß) 90]
+[414 384 (Fehmarn) 90]
+[234 427 (Sylt) 180]
+[237 400 (Amrum) 180]
+[260 404 (Föhr) 270]
+[255 383 (Pellworm) 180]
+[274 375 (Nordstrand) 180]
+[102 285 (Borkum) 90]
+[134 282 (Juist) 90]
+[170 305 (Norderney) 270] 
+[175 297 (Baltrum) 0]
+[192 302 (Langeoog) 0]  
+[200 295 (Spiekeroog) 0] 
+[210 303 (Wangerooge) 90] 
+[209 348 (Helgoland) 180] 
+] def