X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fpictures%2Ftext-input-2-annotate.svg;h=132a9b4ab6763d4ef9251cf3ac2b3220743d508f;hb=596761e4a1c62fc2e85fe3396a378b814504e7b1;hp=80b4bb80f9b47e2a1b48948fe3a4e0c5406c5d4e;hpb=dfb58bcae295b54dc67f8e22ea42a4b78ba7ccbf;p=lilypond.git

diff --git a/Documentation/pictures/text-input-2-annotate.svg b/Documentation/pictures/text-input-2-annotate.svg
index 80b4bb80f9..132a9b4ab6 100644
--- a/Documentation/pictures/text-input-2-annotate.svg
+++ b/Documentation/pictures/text-input-2-annotate.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,211 +8,46 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg548"
+   width="588"
+   height="268"
+   id="svg8302"
    sodipodi:version="0.32"
-   width="681.26355"
-   height="300.84195"
-   sodipodi:docname="text-input-2-annotate.svg"
    inkscape:version="0.46"
-   sodipodi:docbase="/home/hanwen/usr/src/savannah/lily/newweb/site/graphics"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
+   version="1.0"
+   sodipodi:docname="text-input-2-annotate.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs550">
+     id="defs8304">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_z="744.09448 : 526.18109 : 1"
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective38" />
+       id="perspective8310" />
   </defs>
   <sodipodi:namedview
      id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="340.63177"
-     inkscape:cy="145.56815"
-     inkscape:window-width="774"
-     inkscape:window-height="708"
-     inkscape:window-x="191"
-     inkscape:window-y="24"
+     inkscape:cx="311.5"
+     inkscape:cy="100"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:current-layer="svg548" />
-  <text
-     xml:space="preserve"
-     style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Luxi Mono"
-     x="0"
-     y="26.152"
-     id="text554"
-     sodipodi:linespacing="100%"><tspan
-       x="0"
-       y="26.152"
-       sodipodi:role="line"
-       id="tspan954">\relative c'' {</tspan><tspan
-       x="0"
-       y="54.152"
-       sodipodi:role="line"
-       id="tspan956">  \key c \minor</tspan><tspan
-       x="0"
-       y="82.152"
-       sodipodi:role="line"
-       id="tspan958">  g(</tspan><tspan
-       x="0"
-       y="110.152"
-       sodipodi:role="line"
-       id="tspan960">  &lt;ees c'&gt;)</tspan><tspan
-       x="0"
-       y="138.15201"
-       sodipodi:role="line"
-       id="tspan962">  &lt;d f gis b&gt;-.</tspan><tspan
-       x="0"
-       y="166.15201"
-       sodipodi:role="line"
-       id="tspan964">  &lt;ees g bes&gt;-.</tspan><tspan
-       x="0"
-       y="194.15201"
-       sodipodi:role="line"
-       id="tspan966">}</tspan><tspan
-       x="0"
-       y="222.15201"
-       sodipodi:role="line"
-       id="tspan968" /></text>
-  <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-     id="rect626"
-     width="18.366859"
-     height="77.710083"
-     x="32.190498"
-     y="91.468803" />
-  <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-     id="rect628"
-     width="16.250458"
-     height="25.903381"
-     x="201.35558"
-     y="115.45953" />
-  <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.97468004pt"
-     id="rect629"
-     width="16.719164"
-     height="24.725952"
-     x="201.35721"
-     y="144.89482" />
-  <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-     id="rect630"
-     width="36.500156"
-     height="20.016266"
-     x="67.012375"
-     y="91.911186" />
-  <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-     id="rect631"
-     width="34.145306"
-     height="23.548523"
-     x="67.012375"
-     y="146.07246" />
-  <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03682003pt"
-     id="rect632"
-     width="32.49921"
-     height="25.314667"
-     x="167.87041"
-     y="144.52921" />
-  <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-     id="rect633"
-     width="21.674971"
-     height="28.378223"
-     x="51.118736"
-     y="59.06012" />
-  <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.99361296pt"
-     id="rect634"
-     width="37.677589"
-     height="26.735905"
-     x="218.90187"
-     y="115.21575" />
-  <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03922997pt"
-     id="rect635"
-     width="37.677547"
-     height="24.725952"
-     x="219.01862"
-     y="145.00471" />
-  <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03682003pt"
-     id="rect636"
-     width="37.08889"
-     height="25.314667"
-     x="134.59595"
-     y="115.10592" />
-  <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.95553303pt"
-     id="rect638"
-     width="16.719124"
-     height="26.140112"
-     x="169.80193"
-     y="88.378838" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 86.243832,69.907952 C 106.22483,69.907952 213.41043,94.280612 308.32243,72.633612"
-     id="path639"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 264.28466,130.53191 C 297.58766,130.53191 361.60543,114.26261 381.58743,85.955612"
-     id="path640"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b300;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 93.941634,176.82716 C 103.93263,193.47816 220.18163,255.29016 301.77363,218.65716"
-     id="path641"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b300;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 186.11345,180.21915 C 207.76045,208.52615 233.11745,228.42415 300.55545,210.10815"
-     id="path642"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b30000;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 43.12779,172.55803 C 24.811805,222.51203 19.816808,264.14003 99.742784,279.12603"
-     id="path643" />
-  <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#00009e;fill-opacity:1;stroke:none;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="322.47546"
-     y="79.294334"
-     id="text694">
-    <tspan
-       x="322.47546"
-       y="79.294334"
-       sodipodi:role="line"
-       id="tspan648">Add articulations</tspan>
-  </text>
-  <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#00ad00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="307.0423"
-     y="219.60112"
-     id="text699">
-    <tspan
-       x="307.0423"
-       y="219.60112"
-       sodipodi:role="line"
-       id="tspan707">Add -es for flat, -is for sharp</tspan>
-  </text>
-  <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#a60000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="115.56139"
-     y="288.28394"
-     id="text702">
-    <tspan
-       x="115.56139"
-       y="288.28394"
-       sodipodi:role="line"
-       id="tspan625">Enclose pitches in &lt; &gt; for chords</tspan>
-  </text>
+     inkscape:window-width="715"
+     inkscape:window-height="708"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
   <metadata
-     id="metadata56">
+     id="metadata8307">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -222,11 +57,206 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
-     id="rect970"
-     width="16.250458"
-     height="25.903381"
-     x="150.80469"
-     y="88.498466" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#afc6e9;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8370"
+       width="23.5"
+       height="22.5"
+       x="218"
+       y="168" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8368"
+       width="14.5"
+       height="22"
+       x="201"
+       y="168" />
+    <rect
+       style="fill:#87de87;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8360"
+       width="26"
+       height="22.5"
+       x="173"
+       y="167.5" />
+    <rect
+       style="fill:#afc6e9;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8366"
+       width="21.5"
+       height="20.5"
+       x="218.5"
+       y="138" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8364"
+       width="16"
+       height="20.5"
+       x="200.5"
+       y="138" />
+    <rect
+       style="fill:#87de87;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8362"
+       width="28.5"
+       height="25.5"
+       x="145"
+       y="135.5" />
+    <rect
+       style="fill:#87de87;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8358"
+       width="28"
+       height="22.5"
+       x="86"
+       y="168" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8356"
+       width="18"
+       height="24.5"
+       x="53.5"
+       y="166" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8354"
+       width="18.5"
+       height="23.5"
+       x="53"
+       y="136" />
+    <rect
+       style="fill:#afc6e9;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8352"
+       width="14"
+       height="27"
+       x="175.5"
+       y="105" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8350"
+       width="17"
+       height="26"
+       x="156"
+       y="105.5" />
+    <rect
+       style="fill:#87de87;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8348"
+       width="30"
+       height="25"
+       x="86"
+       y="108" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8346"
+       width="20"
+       height="25"
+       x="51.5"
+       y="106" />
+    <rect
+       style="fill:#afc6e9;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8344"
+       width="18"
+       height="29"
+       x="73"
+       y="75" />
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono;-inkscape-font-specification:DejaVu Sans Mono"
+       x="34"
+       y="50"
+       id="text8312"><tspan
+         sodipodi:role="line"
+         id="tspan8314"
+         x="34"
+         y="50" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono;-inkscape-font-specification:DejaVu Sans Mono Bold"
+       x="28"
+       y="36"
+       id="text8316"><tspan
+         sodipodi:role="line"
+         id="tspan8318"
+         x="28"
+         y="36">\relative c'' {</tspan><tspan
+         sodipodi:role="line"
+         x="28"
+         y="66"
+         id="tspan8320">  \key c \minor</tspan><tspan
+         sodipodi:role="line"
+         x="28"
+         y="96"
+         id="tspan8322">  g(</tspan><tspan
+         sodipodi:role="line"
+         x="28"
+         y="126"
+         id="tspan8324">  &lt;ees c'&gt;)</tspan><tspan
+         sodipodi:role="line"
+         x="28"
+         y="156"
+         id="tspan8326">  &lt;d f gis b&gt;-.</tspan><tspan
+         sodipodi:role="line"
+         x="28"
+         y="186"
+         id="tspan8328">  &lt;ees g bes&gt;-.</tspan><tspan
+         sodipodi:role="line"
+         x="28"
+         y="216"
+         id="tspan8330">}</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#0044aa;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="299"
+       y="38"
+       id="text8332"><tspan
+         sodipodi:role="line"
+         id="tspan8334"
+         x="299"
+         y="38">Add articulations</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#217821;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="250"
+       y="140"
+       id="text8336"><tspan
+         sodipodi:role="line"
+         id="tspan8338"
+         x="250"
+         y="140">Add -es for flat, -is for sharp</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#c83737;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
+       x="114"
+       y="253"
+       id="text8340"><tspan
+         sodipodi:role="line"
+         id="tspan8342"
+         x="114"
+         y="253">Enclose pitches in &lt; &gt; for chords</tspan></text>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#0044aa;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 342.49094,46.616703 C 291.87214,101.82991 162.63456,72.131421 101.11627,89.809091"
+       id="path8372"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#0044aa;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 371.50314,45.637518 C 372.91735,75.336 240.84271,89.67052 226.3158,133.37763"
+       id="path8374"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#217821;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 307.54982,148.21825 C 307.69701,196.64466 189.3833,236.168 187.3833,195.168"
+       id="path8376"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#217821;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 409.49957,149.23907 C 380.04015,239.51472 84.53048,227.50252 99.702056,197.28932"
+       id="path8378"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#c83737;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 107.48023,246.07969 C 58.689862,262.34315 41.012194,228.40202 62.225397,197.99643"
+       id="path8380"
+       sodipodi:nodetypes="cc" />
+  </g>
 </svg>