Petites modifications, ajout de noms-lacs.ps et d'une table de caractères dans la...

diff --git a/cartes/32U/postscript/LISTE.txt b/cartes/32U/postscript/LISTE.txt
index b7178c7..e7375ac 100644 (file)
--- a/cartes/32U/postscript/LISTE.txt
+++ b/cartes/32U/postscript/LISTE.txt
@@ -4,9 +4,10 @@ fleuves.ps
 lacs.ps
 lander.ps
 villes.ps
-== Noms des fleuves et des îles pour placement
+== Noms des fleuves, îles et lacs  pour placement
 noms-fleuves.ps
 noms-iles.ps
+noms-lacs.ps
 == Cartes
 carte1.ps::Allemagne 1 (ps)
 carte1.pdf::Allemagne 1 (pdf)

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

diff --git a/cartes/32U/postscript/carte1.png b/cartes/32U/postscript/carte1.png
index bae7991..259ee8e 100644 (file)
Binary files a/cartes/32U/postscript/carte1.png and b/cartes/32U/postscript/carte1.png differ

diff --git a/cartes/32U/postscript/carte1.ps b/cartes/32U/postscript/carte1.ps
index bbdc7df..62f5557 100644 (file)
--- a/cartes/32U/postscript/carte1.ps
+++ b/cartes/32U/postscript/carte1.ps
@@ -27,6 +27,7 @@ grestore
 (villes.ps)       run
 (noms-iles.ps)    run
 (noms-fleuves.ps) run
+(noms-lacs.ps)    run
 
 % ------------------------------------------------------------------------------
 /Pas 1 def
@@ -215,12 +216,12 @@ I_allemagne {
        PlacePoint PlaceNom
 } forall
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Rivières (Noms) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Rivières et lacs (Noms) %%%%%%%%%%%%%%%%%%%%%%%%
 /Helvetica-Bold   findfont 6 scalefont ISOEncode setfont
 /HauteurCaractere 5 def
 /CouleurNom       {DarkBlue} def       
-R_allemagne {
-       PlacePoint PlaceNom
+[L_allemagne R_allemagne] {
+       { PlacePoint PlaceNom } forall
 } forall
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Autres annotations %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/cartes/32U/postscript/carte1.svg b/cartes/32U/postscript/carte1.svg
index 03133da..8af4928 100644 (file)
--- a/cartes/32U/postscript/carte1.svg
+++ b/cartes/32U/postscript/carte1.svg
@@ -11,11 +11,11 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg3004"
    version="1.1"
+   onload='init(evt)'
    inkscape:version="0.48.2 r9819"
    width="938.75"
    height="1126.25"
    xml:space="preserve"
-   onload='init(evt)'
    sodipodi:docname="carte1.pdf"><metadata
      id="metadata3010"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@@ -24,27 +24,8 @@
        clipPathUnits="userSpaceOnUse"
        id="clipPath3020"><path
          d="M 0,0 750,0 750,900 0,900 0,0 z"
-         id="path3022" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="775"
-     inkscape:window-height="807"
-     id="namedview3006"
-     showgrid="false"
-     inkscape:zoom="0.62064373"
-     inkscape:cx="469.375"
-     inkscape:cy="861.14437"
-     inkscape:window-x="231"
-     inkscape:window-y="36"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g3012" />
-<style>
+         id="path3022" /></clipPath></defs>
+         <style>
     .caption{ font-size: 14px; font-family: Georgia, serif; }
     .tooltip{ font-size: 12px; }
     .tooltip_bg{ fill: white; stroke: black; stroke-width: 1; opacity: 0.85; }
@@ -75,7 +56,27 @@
     }
     ]]>
 </script>
-     <g
+
+         <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3006"
+     showgrid="false"
+     inkscape:zoom="0.20954495"
+     inkscape:cx="469.375"
+     inkscape:cy="563.125"
+     inkscape:window-x="452"
+     inkscape:window-y="136"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g3012" /><g
      id="g3012"
      onmousemove="ShowTooltip(evt, '')" onmouseout="HideTooltip(evt)"
      inkscape:groupmode="layer"
@@ -2934,23 +2935,23 @@
 </g><g
                id="g4784"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,497.331,840)"
+                 transform="matrix(1,0,0,-1,497.166,840)"
                  id="text4786"><tspan
                    style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
                    x="0 4.332 7.668 10.002"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4788">Darÿ</tspan></text>
+                   id="tspan4788">DarÃ\9f</tspan></text>
 </g><g
                id="g4790"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,496.682,840.65)"
+                 transform="matrix(1,0,0,-1,496.517,840.65)"
                  id="text4792"><tspan
                    style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
                    x="0 4.332 7.668 10.002"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4794">Darÿ</tspan></text>
+                   id="tspan4794">DarÃ\9f</tspan></text>
 </g><g
                id="g4796"
                transform="scale(10,10)"><text
@@ -3234,127 +3235,127 @@
 </g><g
                id="g4964"
                transform="scale(10,10)"><text
-                 transform="matrix(0.996195,0.0871557,0.0871557,-0.996195,422.921,195.696)"
+                 transform="matrix(1,0,0,-1,305,77.5)"
                  id="text4966"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000178;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.33200129 7.99800238 11.66400346 15.00000446"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.332 7.998 11.664 15 18.666 22.002 25.338"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4968">Donau</tspan></text>
+                   id="tspan4968">Bodensee</tspan></text>
 </g><g
                id="g4970"
                transform="scale(10,10)"><text
-                 transform="matrix(0.996195,0.0871557,0.0871557,-0.996195,422.218,196.287)"
+                 transform="matrix(1,0,0,-1,304.352,78.15)"
                  id="text4972"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000178;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.33200129 7.99800238 11.66400346 15.00000446"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.332 7.998 11.664 15 18.666 22.002 25.338"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4974">Donau</tspan></text>
+                   id="tspan4974">Bodensee</tspan></text>
 </g><g
                id="g4976"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,289,180.5)"
+                 transform="matrix(0.996195,0.0871557,0.0871557,-0.996195,422.921,195.696)"
                  id="text4978"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.332 7.668 11.004 14.34 17.676"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000178;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.33200129 7.99800238 11.66400346 15.00000446"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4980">Neckar</tspan></text>
+                   id="tspan4980">Donau</tspan></text>
 </g><g
                id="g4982"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,288.351,181.15)"
+                 transform="matrix(0.996195,0.0871557,0.0871557,-0.996195,422.218,196.287)"
                  id="text4984"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.332 7.668 11.004 14.34 17.676"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000178;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.33200129 7.99800238 11.66400346 15.00000446"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4986">Neckar</tspan></text>
+                   id="tspan4986">Donau</tspan></text>
 </g><g
                id="g4988"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,129,320.5)"
+                 transform="matrix(0.866025,0.5,0.5,-0.866025,276.586,162.832)"
                  id="text4990"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.998 8.664 12 15.336"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.33199849 7.66799732 11.00399615 14.33999499 17.67599382"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4992">Mosel</tspan></text>
+                   id="tspan4992">Neckar</tspan></text>
 </g><g
                id="g4994"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,128.351,321.15)"
+                 transform="matrix(0.866025,0.5,0.5,-0.866025,275.698,163.071)"
                  id="text4996"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.998 8.664 12 15.336"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.33199849 7.66799732 11.00399615 14.33999499 17.67599382"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan4998">Mosel</tspan></text>
+                   id="tspan4998">Neckar</tspan></text>
 </g><g
                id="g5000"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,155,390.5)"
+                 transform="matrix(0.707107,0.707107,0.707107,-0.707107,119.756,315.221)"
                  id="text5002"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.332 7.998 11.334 13.002"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000186;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.99800155 8.66400268 12.00000371 15.33600475"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5004">Rhein</tspan></text>
+                   id="tspan5004">Mosel</tspan></text>
 </g><g
                id="g5006"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,154.351,391.15)"
+                 transform="matrix(0.707107,0.707107,0.707107,-0.707107,118.838,315.221)"
                  id="text5008"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.332 7.998 11.334 13.002"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000186;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.99800155 8.66400268 12.00000371 15.33600475"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5010">Rhein</tspan></text>
+                   id="tspan5010">Mosel</tspan></text>
 </g><g
                id="g5012"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,325,337.5)"
+                 transform="matrix(0.5,-0.866025,-0.866025,-0.5,158.668,398.967)"
                  id="text5014"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.998 8.334 10.002"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.33199849 7.9979972 11.33399604 13.00199545"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5016">Main</tspan></text>
+                   id="tspan5016">Rhein</tspan></text>
 </g><g
                id="g5018"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,324.351,338.15)"
+                 transform="matrix(0.5,-0.866025,-0.866025,-0.5,158.907,399.854)"
                  id="text5020"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.998 8.334 10.002"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.33199849 7.9979972 11.33399604 13.00199545"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5022">Main</tspan></text>
+                   id="tspan5022">Rhein</tspan></text>
 </g><g
                id="g5024"
                transform="scale(10,10)"><text
-                 transform="matrix(0.866025,-0.5,-0.5,-0.866025,458.263,674.003)"
+                 transform="matrix(1,0,0,-1,325,337.5)"
                  id="text5026"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.0019986 5.66999802 9.33599674"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.998 8.334 10.002"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5028">Elbe</tspan></text>
+                   id="tspan5028">Main</tspan></text>
 </g><g
                id="g5030"
                transform="scale(10,10)"><text
-                 transform="matrix(0.866025,-0.5,-0.5,-0.866025,458.026,674.89)"
+                 transform="matrix(1,0,0,-1,324.351,338.15)"
                  id="text5032"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.0019986 5.66999802 9.33599674"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.998 8.334 10.002"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5034">Elbe</tspan></text>
+                   id="tspan5034">Main</tspan></text>
 </g><g
                id="g5036"
                transform="scale(10,10)"><text
-                 transform="matrix(0.5,-0.866025,-0.866025,-0.5,571.667,505.237)"
+                 transform="matrix(0.866025,-0.5,-0.5,-0.866025,458.263,674.003)"
                  id="text5038"><tspan
                    style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
                    x="0 4.0019986 5.66999802 9.33599674"
@@ -3364,7 +3365,7 @@
 </g><g
                id="g5042"
                transform="scale(10,10)"><text
-                 transform="matrix(0.5,-0.866025,-0.866025,-0.5,571.905,506.124)"
+                 transform="matrix(0.866025,-0.5,-0.5,-0.866025,458.026,674.89)"
                  id="text5044"><tspan
                    style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
                    x="0 4.0019986 5.66999802 9.33599674"
@@ -3374,96 +3375,116 @@
 </g><g
                id="g5048"
                transform="scale(10,10)"><text
-                 transform="matrix(0.866025,0.5,0.5,-0.866025,477.461,468.416)"
+                 transform="matrix(0.5,-0.866025,-0.866025,-0.5,571.667,505.237)"
                  id="text5050"><tspan
                    style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.0019986 7.33799743 10.67399627 12.34199568"
+                   x="0 4.0019986 5.66999802 9.33599674"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5052">Saale</tspan></text>
+                   id="tspan5052">Elbe</tspan></text>
 </g><g
                id="g5054"
                transform="scale(10,10)"><text
-                 transform="matrix(0.866025,0.5,0.5,-0.866025,476.574,468.654)"
+                 transform="matrix(0.5,-0.866025,-0.866025,-0.5,571.905,506.124)"
                  id="text5056"><tspan
                    style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.0019986 7.33799743 10.67399627 12.34199568"
+                   x="0 4.0019986 5.66999802 9.33599674"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5058">Saale</tspan></text>
+                   id="tspan5058">Elbe</tspan></text>
 </g><g
                id="g5060"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,278,632.5)"
+                 transform="matrix(0.866025,0.5,0.5,-0.866025,477.461,468.416)"
                  id="text5062"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 5.664 9 12.336 15.672"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.0019986 7.33799743 10.67399627 12.34199568"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5064">Weser</tspan></text>
+                   id="tspan5064">Saale</tspan></text>
 </g><g
                id="g5066"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,277.35,633.15)"
+                 transform="matrix(0.866025,0.5,0.5,-0.866025,476.574,468.654)"
                  id="text5068"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 5.664 9 12.336 15.672"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.0019986 7.33799743 10.67399627 12.34199568"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5070">Weser</tspan></text>
+                   id="tspan5070">Saale</tspan></text>
 </g><g
                id="g5072"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,634,647.5)"
+                 transform="matrix(0.173648,-0.984808,-0.984808,-0.173648,293.975,643.432)"
                  id="text5074"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.668 8.334 11.67"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000127;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 5.6640012 9.00000191 12.33600262 15.67200333"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5076">Oder</tspan></text>
+                   id="tspan5076">Weser</tspan></text>
 </g><g
                id="g5078"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,633.35,648.15)"
+                 transform="matrix(0.173648,-0.984808,-0.984808,-0.173648,294.502,644.184)"
                  id="text5080"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.668 8.334 11.67"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000127;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 5.6640012 9.00000191 12.33600262 15.67200333"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5082">Oder</tspan></text>
+                   id="tspan5082">Weser</tspan></text>
 </g><g
                id="g5084"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,165,602.5)"
+                 transform="matrix(0.866025,-0.5,-0.5,-0.866025,621.686,651.336)"
                  id="text5086"><tspan
-                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.002 9.336"
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.66799837 8.33399709 11.66999592"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5088">Ems</tspan></text>
+                   id="tspan5088">Oder</tspan></text>
 </g><g
                id="g5090"
                transform="scale(10,10)"><text
-                 transform="matrix(1,0,0,-1,164.35,603.15)"
+                 transform="matrix(0.866025,-0.5,-0.5,-0.866025,621.449,652.223)"
                  id="text5092"><tspan
-                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
-                   x="0 4.002 9.336"
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:5.9999979;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.66799837 8.33399709 11.66999592"
+                   y="0"
+                   sodipodi:role="line"
+                   id="tspan5094">Oder</tspan></text>
+</g><g
+               id="g5096"
+               transform="scale(10,10)"><text
+                 transform="matrix(0.34202,-0.939693,-0.939693,-0.34202,165.484,610.099)"
+                 id="text5098"><tspan
+                   style="fill:#b2b2b2;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000184;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.00200123 9.33600287"
+                   y="0"
+                   sodipodi:role="line"
+                   id="tspan5100">Ems</tspan></text>
+</g><g
+               id="g5102"
+               transform="scale(10,10)"><text
+                 transform="matrix(0.34202,-0.939693,-0.939693,-0.34202,165.872,610.932)"
+                 id="text5104"><tspan
+                   style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:6.00000184;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
+                   x="0 4.00200123 9.33600287"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5094">Ems</tspan></text>
+                   id="tspan5106">Ems</tspan></text>
 <text
                  transform="matrix(1,0,0,-1,90.4121,818.266)"
-                 id="text5096"><tspan
+                 id="text5108"><tspan
                    style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:20;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
                    x="0 14.44 26.66 34.44 46.66 57.78 68.9"
                    y="0"
                    sodipodi:role="line"
-                   id="tspan5098">Nordsee</tspan><tspan
+                   id="tspan5110">Nordsee</tspan><tspan
                    style="fill:#00008b;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Helvetica;font-variant:normal;font-weight:bold;font-size:20;writing-mode:lr;-inkscape-font-specification:Helvetica-Bold"
                    x="540 555.56 566.68 573.34 584.46 595.58"
                    y="-50"
                    sodipodi:role="line"
-                   id="tspan5100">Ostsee</tspan></text>
+                   id="tspan5112">Ostsee</tspan></text>
 </g></g></g></g></g></g>
 <rect class="tooltip_bg" id="tooltip_bg" x="0" y="0" rx="4" ry="4" width="55" height="17" visibility="hidden"/>
 <text class="tooltip" id="tooltip" x="0" y="0" visibility="hidden">Tooltip</text>

diff --git a/cartes/32U/postscript/noms-fleuves.ps b/cartes/32U/postscript/noms-fleuves.ps
index dc7d0b0..3c310e4 100644 (file)
--- a/cartes/32U/postscript/noms-fleuves.ps
+++ b/cartes/32U/postscript/noms-fleuves.ps
@@ -10,6 +10,5 @@
 [298 185 (Weser) 280 (RotateCentering)]
 [629 200 (Oder) 330 (RotateCentering)]
 [170 155 (Ems) 290 (RotateCentering)]
-[300 -370 (Bodensee) 0]
 ] def
 

diff --git a/cartes/32U/postscript/noms-iles.ps b/cartes/32U/postscript/noms-iles.ps
index 9fdae1d..fb50c71 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]
-[504 385 (Darß) 90]
+[504 385 (Dar\337) 90]
 [414 384 (Fehmarn) 90]
 [234 427 (Sylt) 180]
 [237 400 (Amrum) 180]

diff --git a/cartes/32U/postscript/noms-lacs.ps b/cartes/32U/postscript/noms-lacs.ps
new file mode 100644 (file)
index 0000000..d27ddd0
--- /dev/null
+++ b/cartes/32U/postscript/noms-lacs.ps
@@ -0,0 +1,3 @@
+/L_allemagne[
+[300 -370 (Bodensee) 0]
+] def
\ No newline at end of file

diff --git a/extras/table.pdf b/extras/table.pdf
new file mode 100644 (file)
index 0000000..e2ec447
Binary files /dev/null and b/extras/table.pdf differ

diff --git a/extras/table.ps b/extras/table.ps
new file mode 100644 (file)
index 0000000..5ffe5b5
--- /dev/null
+++ b/extras/table.ps
@@ -0,0 +1,154 @@
+%!PS
+
+<< /PageSize [842 595] >> setpagedevice
+% 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
+               /Encoding ISOLatin1Encoding def
+               currentdict
+       end
+       /Temporary exch definefont
+} bind def
+/sf {/t0 exch def findfont t0 scalefont ISOEncode setfont} def
+/m {moveto} def /l {lineto} def /rm {rmoveto} def /rl {rlineto} def
+/BlanchedAlmond {1 .92 .804 setrgbcolor} def
+/Crimson {.864 .08 .235 setrgbcolor} def
+/SaddleBrown {.545 .27 .075 setrgbcolor} def
+newpath 10 10 m 832 10 l 832 585 l 10 585 l closepath gsave BlanchedAlmond fill grestore .5 setgray stroke
+Crimson
+/Helvetica 24 sf
+40 540 m (Table des caract\350res sp\351ciaux \(latin 1\)) show
+newpath 40 530 m 802 530 l stroke
+SaddleBrown
+/Times 16 sf
+30 0 translate
+10 450 m (\\200) show 60 450 m (\200) show 
+110 450 m (\\201) show 160 450 m (\201) show 
+210 450 m (\\202) show 260 450 m (\202) show 
+310 450 m (\\203) show 360 450 m (\203) show 
+410 450 m (\\204) show 460 450 m (\204) show 
+510 450 m (\\205) show 560 450 m (\205) show 
+610 450 m (\\206) show 660 450 m (\206) show 
+710 450 m (\\207) show 760 450 m (\207) show 
+10 426 m (\\210) show 60 430 m (\210) show 
+110 426 m (\\211) show 160 430 m (\211) show 
+210 426 m (\\212) show 260 430 m (\212) show 
+310 426 m (\\213) show 360 430 m (\213) show 
+410 426 m (\\214) show 460 430 m (\214) show 
+510 426 m (\\215) show 560 430 m (\215) show 
+610 426 m (\\216) show 660 430 m (\216) show 
+710 426 m (\\217) show 760 430 m (\217) show 
+10 402 m (\\220) show 60 410 m (\220) show 
+110 402 m (\\221) show 160 410 m (\221) show 
+210 402 m (\\222) show 260 410 m (\222) show 
+310 402 m (\\223) show 360 410 m (\223) show 
+410 402 m (\\224) show 460 410 m (\224) show 
+510 402 m (\\225) show 560 410 m (\225) show 
+610 402 m (\\226) show 660 410 m (\226) show 
+710 402 m (\\227) show 760 410 m (\227) show 
+10 378 m (\\230) show 60 390 m (\230) show 
+110 378 m (\\231) show 160 390 m (\231) show 
+210 378 m (\\232) show 260 390 m (\232) show 
+310 378 m (\\233) show 360 390 m (\233) show 
+410 378 m (\\234) show 460 390 m (\234) show 
+510 378 m (\\235) show 560 390 m (\235) show 
+610 378 m (\\236) show 660 390 m (\236) show 
+710 378 m (\\237) show 760 390 m (\237) show 
+10 354 m (\\240) show 60 370 m (\240) show 
+110 354 m (\\241) show 160 370 m (\241) show 
+210 354 m (\\242) show 260 370 m (\242) show 
+310 354 m (\\243) show 360 370 m (\243) show 
+410 354 m (\\244) show 460 370 m (\244) show 
+510 354 m (\\245) show 560 370 m (\245) show 
+610 354 m (\\246) show 660 370 m (\246) show 
+710 354 m (\\247) show 760 370 m (\247) show 
+10 330 m (\\250) show 60 350 m (\250) show 
+110 330 m (\\251) show 160 350 m (\251) show 
+210 330 m (\\252) show 260 350 m (\252) show 
+310 330 m (\\253) show 360 350 m (\253) show 
+410 330 m (\\254) show 460 350 m (\254) show 
+510 330 m (\\255) show 560 350 m (\255) show 
+610 330 m (\\256) show 660 350 m (\256) show 
+710 330 m (\\257) show 760 350 m (\257) show 
+10 306 m (\\260) show 60 330 m (\260) show 
+110 306 m (\\261) show 160 330 m (\261) show 
+210 306 m (\\262) show 260 330 m (\262) show 
+310 306 m (\\263) show 360 330 m (\263) show 
+410 306 m (\\264) show 460 330 m (\264) show 
+510 306 m (\\265) show 560 330 m (\265) show 
+610 306 m (\\266) show 660 330 m (\266) show 
+710 306 m (\\267) show 760 330 m (\267) show 
+10 282 m (\\270) show 60 310 m (\270) show 
+110 282 m (\\271) show 160 310 m (\271) show 
+210 282 m (\\272) show 260 310 m (\272) show 
+310 282 m (\\273) show 360 310 m (\273) show 
+410 282 m (\\274) show 460 310 m (\274) show 
+510 282 m (\\275) show 560 310 m (\275) show 
+610 282 m (\\276) show 660 310 m (\276) show 
+710 282 m (\\277) show 760 310 m (\277) show 
+10 258 m (\\300) show 60 258 m (\300) show 
+110 258 m (\\301) show 160 258 m (\301) show 
+210 258 m (\\302) show 260 258 m (\302) show 
+310 258 m (\\303) show 360 258 m (\303) show 
+410 258 m (\\304) show 460 258 m (\304) show 
+510 258 m (\\305) show 560 258 m (\305) show 
+610 258 m (\\306) show 660 258 m (\306) show 
+710 258 m (\\307) show 760 258 m (\307) show 
+10 238 m (\\310) show 60 238 m (\310) show 
+110 238 m (\\311) show 160 238 m (\311) show 
+210 238 m (\\312) show 260 238 m (\312) show 
+310 238 m (\\313) show 360 238 m (\313) show 
+410 238 m (\\314) show 460 238 m (\314) show 
+510 238 m (\\315) show 560 238 m (\315) show 
+610 238 m (\\316) show 660 238 m (\316) show 
+710 238 m (\\317) show 760 238 m (\317) show 
+10 218 m (\\320) show 60 218 m (\320) show 
+110 218 m (\\321) show 160 218 m (\321) show 
+210 218 m (\\322) show 260 218 m (\322) show 
+310 218 m (\\323) show 360 218 m (\323) show 
+410 218 m (\\324) show 460 218 m (\324) show 
+510 218 m (\\325) show 560 218 m (\325) show 
+610 218 m (\\326) show 660 218 m (\326) show 
+710 218 m (\\327) show 760 218 m (\327) show 
+10 198 m (\\330) show 60 198 m (\330) show 
+110 198 m (\\331) show 160 198 m (\331) show 
+210 198 m (\\332) show 260 198 m (\332) show 
+310 198 m (\\333) show 360 198 m (\333) show 
+410 198 m (\\334) show 460 198 m (\334) show 
+510 198 m (\\335) show 560 198 m (\335) show 
+610 198 m (\\336) show 660 198 m (\336) show 
+710 198 m (\\337) show 760 198 m (\337) show 
+10 178 m (\\340) show 60 178 m (\340) show 
+110 178 m (\\341) show 160 178 m (\341) show 
+210 178 m (\\342) show 260 178 m (\342) show 
+310 178 m (\\343) show 360 178 m (\343) show 
+410 178 m (\\344) show 460 178 m (\344) show 
+510 178 m (\\345) show 560 178 m (\345) show 
+610 178 m (\\346) show 660 178 m (\346) show 
+710 178 m (\\347) show 760 178 m (\347) show 
+10 158 m (\\350) show 60 158 m (\350) show 
+110 158 m (\\351) show 160 158 m (\351) show 
+210 158 m (\\352) show 260 158 m (\352) show 
+310 158 m (\\353) show 360 158 m (\353) show 
+410 158 m (\\354) show 460 158 m (\354) show 
+510 158 m (\\355) show 560 158 m (\355) show 
+610 158 m (\\356) show 660 158 m (\356) show 
+710 158 m (\\357) show 760 158 m (\357) show 
+10 138 m (\\360) show 60 138 m (\360) show 
+110 138 m (\\361) show 160 138 m (\361) show 
+210 138 m (\\362) show 260 138 m (\362) show 
+310 138 m (\\363) show 360 138 m (\363) show 
+410 138 m (\\364) show 460 138 m (\364) show 
+510 138 m (\\365) show 560 138 m (\365) show 
+610 138 m (\\366) show 660 138 m (\366) show 
+710 138 m (\\367) show 760 138 m (\367) show 
+10 118 m (\\370) show 60 118 m (\370) show 
+110 118 m (\\371) show 160 118 m (\371) show 
+210 118 m (\\372) show 260 118 m (\372) show 
+310 118 m (\\373) show 360 118 m (\373) show 
+410 118 m (\\374) show 460 118 m (\374) show 
+510 118 m (\\375) show 560 118 m (\375) show 
+610 118 m (\\376) show 660 118 m (\376) show 
+710 118 m (\\377) show 760 118 m (\377) show 
+showpage