X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fpictures%2Ftext-input-pop-annotate.svg;h=39126eb5186881e6af0970f93be2453f263d098b;hb=e35f6b6ed4f558839fde8bc47f8f1f6a96fda62d;hp=59159577d9777bf64037dd34eb6639d9bd60d9c4;hpb=a1f9375c70400bc4820921bd2ebbbb387a7dcf98;p=lilypond.git

diff --git a/Documentation/pictures/text-input-pop-annotate.svg b/Documentation/pictures/text-input-pop-annotate.svg
index 59159577d9..39126eb518 100644
--- a/Documentation/pictures/text-input-pop-annotate.svg
+++ b/Documentation/pictures/text-input-pop-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,183 +8,48 @@
    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="594"
+   height="470"
+   id="svg5281"
    sodipodi:version="0.32"
-   width="600.17102"
-   height="437.48563"
-   sodipodi:docname="text-input-pop-annotate.svg"
    inkscape:version="0.46"
-   sodipodi:docbase="/home/hanwen/vc/savannah/lily/newweb/site/graphics"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
+   version="1.0"
+   sodipodi:docname="text-input-pop-annotate.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs550">
+     id="defs5283">
     <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="perspective42" />
+       id="perspective5289" />
   </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="307.46076"
-     inkscape:cy="221.78706"
+     inkscape:cx="295.57647"
+     inkscape:cy="236.58879"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
      inkscape:window-width="719"
      inkscape:window-height="708"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="svg548"
-     showgrid="false" />
-  <text
-     xml:space="preserve"
-     style="font-size:21.81822777px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;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="35.776142"
-     y="13.156391"
-     id="text551"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan1338"
-       x="35.776142"
-       y="13.156391">&lt;&lt;</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1340"
-       x="35.776142"
-       y="40.429176">  \chords {</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1342"
-       x="35.776142"
-       y="67.701965">    c1:m7 f2:7 c2</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1344"
-       x="35.776142"
-       y="94.974747">  }</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1346"
-       x="35.776142"
-       y="122.24753">  \relative c'' {</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1348"
-       x="35.776142"
-       y="149.52031">    g2 es8( c4.)</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1350"
-       x="35.776142"
-       y="176.79311">    f8 f es d c2</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1352"
-       x="35.776142"
-       y="204.06589">  }</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1354"
-       x="35.776142"
-       y="231.33867">  \addlyrics {</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1356"
-       x="35.776142"
-       y="258.61145">    Li ly,</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1358"
-       x="35.776142"
-       y="285.88425">    got me on my knees</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1360"
-       x="35.776142"
-       y="313.15701">  }</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1374"
-       x="35.776142"
-       y="340.42981">&gt;&gt;</tspan></text>
-  <rect
-     style="font-size:12px;fill:#5f8dd3;fill-opacity:0.49019608;fill-rule:evenodd;stroke:none;stroke-width:0.98323898pt"
-     id="rect663"
-     width="249.00218"
-     height="56.99667"
-     x="85.612885"
-     y="237.51135" />
-  <rect
-     style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke:none;stroke-width:0.97302504pt"
-     id="rect664"
-     width="178.76715"
-     height="28.498394"
-     x="85.084633"
-     y="45.7061" />
-  <rect
-     style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke:none;stroke-width:0.94686499pt"
-     id="rect665"
-     width="166.95161"
-     height="53.451401"
-     x="84.689522"
-     y="129.9214" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.86446702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 336.21171,260.32487 C 372.74278,258.05662 483.79388,298.43107 443.66565,321.47977"
-     id="path666"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.86446702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 253.97385,150.62731 C 323.81464,144.95724 362.8713,197.69136 434.96477,184.08028"
-     id="path667"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.86446702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 265.83539,59.998809 C 293.99675,62.267101 434.80768,33.18206 466.45753,72.846626"
-     id="path668"
-     sodipodi:nodetypes="cc" />
-  <text
-     style="font-size:25.78517914px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#af0000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="379.02905"
-     y="99.656807"
-     id="text669">
-    <tspan
-       x="379.02905"
-       y="99.656807"
-       sodipodi:role="line"
-       id="tspan672">Enter chord names</tspan>
-  </text>
-  <text
-     style="font-size:25.78517914px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#008f00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="449.0787"
-     y="194.40211"
-     id="text674">
-    <tspan
-       x="449.0787"
-       y="194.40211"
-       sodipodi:role="line"
-       id="tspan679">Enter melody</tspan>
-  </text>
-  <text
-     style="font-size:25.78517914px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#0000ad;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="374.1586"
-     y="354.33096"
-     id="text681">
-    <tspan
-       id="tspan682">Enter lyrics</tspan>
-  </text>
-  <rect
-     style="font-size:12px;fill:#b25ed5;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
-     id="rect686"
-     width="167.25557"
-     height="27.221554"
-     x="59.018921"
-     y="209.81116" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#531d8a;stroke-width:1.86446702;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 58.196431,223.06456 C -36.730246,254.37145 -11.343499,377.4312 117.33056,411.41079"
-     id="path687"
-     sodipodi:nodetypes="cc" />
-  <text
-     style="font-size:25.78517914px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#531f8a;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="137.84265"
-     y="427.4552"
-     id="text688">
-    <tspan
-       id="tspan689">Combine melody and lyrics</tspan>
-  </text>
+     inkscape:window-y="0" />
   <metadata
-     id="metadata77">
+     id="metadata5286">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -194,4 +59,168 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <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="rect5345"
+       width="324"
+       height="60"
+       x="66"
+       y="290" />
+    <rect
+       style="fill:#b380ff;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5343"
+       width="206"
+       height="28"
+       x="52"
+       y="258" />
+    <rect
+       style="fill:#87de87;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5341"
+       width="232"
+       height="62"
+       x="90"
+       y="168" />
+    <rect
+       style="fill:#ff8080;stroke:none;stroke-width:1.79999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5339"
+       width="222"
+       height="32"
+       x="78"
+       y="76" />
+    <text
+       xml:space="preserve"
+       style="font-size:28px;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="38"
+       y="40"
+       id="text5291"><tspan
+         sodipodi:role="line"
+         x="38"
+         y="40"
+         id="tspan5295"
+         style="font-size:24px">&lt;&lt;</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="70"
+         id="tspan5299"
+         style="font-size:24px">  \chords {</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="100"
+         id="tspan5301"
+         style="font-size:24px">    c1:m7 f2:7 c2</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="130"
+         id="tspan5303"
+         style="font-size:24px">  }</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="160"
+         id="tspan5305"
+         style="font-size:24px">  \relative c'' {</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="190"
+         id="tspan5307"
+         style="font-size:24px">    g2 es8( c4) es8</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="220"
+         id="tspan5309"
+         style="font-size:24px">    f8 es d c~ c2</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="250"
+         id="tspan5311"
+         style="font-size:24px">  }</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="280"
+         id="tspan5313"
+         style="font-size:24px">  \addlyrics {</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="310"
+         id="tspan5315"
+         style="font-size:24px">    You are</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="340"
+         id="tspan5317"
+         style="font-size:24px">    the sky and my rain,</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="370"
+         id="tspan5319"
+         style="font-size:24px">  }</tspan><tspan
+         sodipodi:role="line"
+         x="38"
+         y="400"
+         id="tspan5321"
+         style="font-size:24px">&gt;&gt;</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="333"
+       y="139"
+       id="text5323"><tspan
+         sodipodi:role="line"
+         id="tspan5325"
+         x="333"
+         y="139">Enter chord names</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="415"
+       y="218"
+       id="text5327"><tspan
+         sodipodi:role="line"
+         id="tspan5329"
+         x="415"
+         y="218">Enter melody</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="403"
+       y="403"
+       id="text5331"><tspan
+         sodipodi:role="line"
+         id="tspan5333"
+         x="403"
+         y="403">Enter lyrics</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:22px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#5500d4;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="108"
+       y="446"
+       id="text5335"><tspan
+         sodipodi:role="line"
+         id="tspan5337"
+         x="108"
+         y="446">Combine melody and lyrics</tspan></text>
+    <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 434,113 C 399,65 376,99 308,93"
+       id="path5856"
+       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,217 C 341,247 377,194 327,194"
+       id="path5858"
+       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 469,378 C 525,347 440,310 398,318"
+       id="path5860"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#5500d4;stroke-width:1.99090564;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 97.90455,438.90455 C 10.90455,445.90455 -10.904547,285.09545 46.095453,272.09545"
+       id="path5862"
+       sodipodi:nodetypes="cc" />
+  </g>
 </svg>