X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fpictures%2Ftext-input-pop-annotate.svg;h=39126eb5186881e6af0970f93be2453f263d098b;hb=05514c83a49dd3dfabd1fa7774c69c3038ecde6b;hp=7d518b30e3b6ba1e0f05febc7826f822f285c13f;hpb=dfb58bcae295b54dc67f8e22ea42a4b78ba7ccbf;p=lilypond.git

diff --git a/Documentation/pictures/text-input-pop-annotate.svg b/Documentation/pictures/text-input-pop-annotate.svg
index 7d518b30e3..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="665.10199"
-   height="443.57413"
-   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="335.52737"
-     inkscape:cy="221.78706"
-     inkscape:window-width="760"
-     inkscape:window-height="711"
-     inkscape:window-x="451"
-     inkscape:window-y="29"
-     inkscape:current-layer="svg548"
-     showgrid="false" />
-  <text
-     xml:space="preserve"
-     style="font-size:22px;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="40.748211"
-     y="13.266"
-     id="text551"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan1338"
-       x="40.748211"
-       y="13.266">&lt;&lt;</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1340"
-       x="40.748211"
-       y="40.765999">  \chords {</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1342"
-       x="40.748211"
-       y="68.265999">    c1:m7 f2:7 c2</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1344"
-       x="40.748211"
-       y="95.765999">  }</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1346"
-       x="40.748211"
-       y="123.266">  \relative c'' {</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1348"
-       x="40.748211"
-       y="150.76601">    g2 es8( c4.)</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1350"
-       x="40.748211"
-       y="178.26601">    f8 f es d c2</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1352"
-       x="40.748211"
-       y="205.76601">  }</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1354"
-       x="40.748211"
-       y="233.26601">  \addlyrics {</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1356"
-       x="40.748211"
-       y="260.76599">    Li ly,</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1358"
-       x="40.748211"
-       y="288.26599">    got me on my knees</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1360"
-       x="40.748211"
-       y="315.76599">  }</tspan><tspan
-       sodipodi:role="line"
-       id="tspan1374"
-       x="40.748211"
-       y="343.26599">&gt;&gt;</tspan></text>
-  <rect
-     style="font-size:12px;fill:#0900ad;fill-opacity:0.54744502;fill-rule:evenodd;stroke:none;stroke-width:0.98323898pt"
-     id="rect663"
-     width="251.07663"
-     height="57.471516"
-     x="91.000175"
-     y="239.49001" />
-  <rect
-     style="font-size:12px;fill:#b00000;fill-opacity:0.40875896;fill-rule:evenodd;stroke:none;stroke-width:0.97302504pt"
-     id="rect664"
-     width="180.25644"
-     height="28.735817"
-     x="90.467461"
-     y="46.086891" />
-  <rect
-     style="font-size:12px;fill:#009400;fill-opacity:0.306569;fill-rule:evenodd;stroke:none;stroke-width:0.94686499pt"
-     id="rect665"
-     width="168.34248"
-     height="53.896721"
-     x="90.069099"
-     y="131.00386" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:2.56682277;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 343.68669,262.49363 C 380.52213,260.20645 492.49836,300.91729 452.03583,324.158"
-     id="path666"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b100;stroke-width:2.56682277;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 260.76375,151.88217 C 331.1863,146.16489 370.56838,199.33836 443.26245,185.61387"
-     id="path667"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#aa0000;stroke-width:2.56682277;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 272.72403,60.498658 C 301.12007,62.785848 443.10409,33.458498 475.01758,73.453508"
-     id="path668"
-     sodipodi:nodetypes="cc" />
-  <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#b00000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="386.86063"
-     y="100.48704"
-     id="text669">
-    <tspan
-       x="386.86063"
-       y="100.48704"
-       sodipodi:role="line"
-       id="tspan672">Enter chord names</tspan>
-  </text>
-  <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#00b700;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="457.49405"
-     y="196.02174"
-     id="text674">
-    <tspan
-       x="457.49405"
-       y="196.02174"
-       sodipodi:role="line"
-       id="tspan679">Enter melody</tspan>
-  </text>
-  <text
-     style="font-size:26px;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="381.9498"
-     y="357.28284"
-     id="text681">
-    <tspan
-       id="tspan682">Enter lyrics</tspan>
-  </text>
-  <rect
-     style="font-size:12px;fill:#b25ed5;fill-opacity:0.64347797;fill-rule:evenodd;stroke-width:1pt"
-     id="rect686"
-     width="168.6489"
-     height="27.448336"
-     x="64.184616"
-     y="211.5591" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#531d8a;stroke-width:2.56682277;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 63.35527,224.92288 C -32.362236,256.49057 -6.7639974,380.5755 122.98206,414.83831"
-     id="path687"
-     sodipodi:nodetypes="cc" />
-  <text
-     style="font-size:26px;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="143.66495"
-     y="431.01611"
-     id="text688">
-    <tspan
-       id="tspan689">Combine melody and lyrics</tspan>
-  </text>
+     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" />
   <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>