From dfb58bcae295b54dc67f8e22ea42a4b78ba7ccbf Mon Sep 17 00:00:00 2001
From: Patrick McCarty <pnorcks@gmail.com>
Date: Sun, 16 Aug 2009 19:20:32 -0700
Subject: [PATCH] Web: clean up SVG files a little more

---
 .../pictures/text-input-1-annotate.svg        | 125 +++++++++---------
 .../pictures/text-input-2-annotate.svg        |  64 ++++-----
 .../text-input-parts-both-annotate.svg        |  27 ++--
 .../text-input-parts-single-annotate.svg      |  77 ++++++-----
 .../pictures/text-input-pop-annotate.svg      |  46 +++----
 .../pictures/text-input-score-annotate.svg    |  56 ++++----
 6 files changed, 202 insertions(+), 193 deletions(-)

diff --git a/Documentation/pictures/text-input-1-annotate.svg b/Documentation/pictures/text-input-1-annotate.svg
index 1b0fec2b19..c24061df0f 100644
--- a/Documentation/pictures/text-input-1-annotate.svg
+++ b/Documentation/pictures/text-input-1-annotate.svg
@@ -11,8 +11,8 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg548"
    sodipodi:version="0.32"
-   width="643.0827"
-   height="224.57048"
+   width="570.22498"
+   height="215.19048"
    sodipodi:docname="text-input-1-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/usr/src/newweb/site/switch"
@@ -57,9 +57,9 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="324.78146"
-     inkscape:cy="112.28523"
-     inkscape:window-width="749"
+     inkscape:cx="285.11249"
+     inkscape:cy="112.28524"
+     inkscape:window-width="696"
      inkscape:window-height="708"
      inkscape:window-x="248"
      inkscape:window-y="24"
@@ -69,33 +69,33 @@
      xml:space="preserve"
      style="font-size:24px;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="2.1600001"
-     y="57.294365"
+     y="54.354366"
      id="text551"
      sodipodi:linespacing="100%"><tspan
        x="2.1600001"
-       y="57.294365"
+       y="54.354366"
        sodipodi:role="line"
        id="tspan1054">{</tspan><tspan
        x="2.1600001"
-       y="81.294365"
+       y="78.35437"
        sodipodi:role="line"
        id="tspan1056">  \time 2/4</tspan><tspan
        x="2.1600001"
-       y="105.29436"
+       y="102.35437"
        sodipodi:role="line"
        id="tspan1058">  \clef bass</tspan><tspan
        x="2.1600001"
-       y="129.29437"
+       y="126.35437"
        sodipodi:role="line"
        id="tspan1060">  c4 c g g a a g2</tspan><tspan
        x="2.1600001"
-       y="153.29437"
+       y="150.35437"
        sodipodi:role="line"
        id="tspan1062">}</tspan></text>
   <text
      style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:helvetica"
      x="322.38797"
-     y="76.499504"
+     y="73.559502"
      id="text562">
     <tspan
        id="tspan563" />
@@ -104,34 +104,34 @@
      style="font-size:12px;fill:#fa0000;fill-opacity:0.42335803;fill-rule:evenodd;stroke-width:1pt"
      id="rect730"
      width="85.952026"
-     height="47.097027"
+     height="48.847027"
      x="26.993069"
-     y="61.013054" />
+     y="58.073055" />
   <rect
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect731"
-     width="21.193634"
-     height="17.661377"
-     x="24.442631"
-     y="115.17477" />
+     width="14.443634"
+     height="20.661377"
+     x="30.692631"
+     y="107.73476" />
   <rect
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect732"
      width="21.193634"
-     height="17.661377"
+     height="20.536377"
      x="71.539612"
-     y="115.17477" />
+     y="107.73476" />
   <rect
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect733"
      width="21.193634"
-     height="17.661377"
+     height="24.161377"
      x="99.797775"
-     y="115.17477" />
+     y="107.60976" />
   <text
      style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:helvetica"
      x="322.38797"
-     y="76.499504"
+     y="73.559502"
      id="text734">
     <tspan
        id="tspan735" />
@@ -139,7 +139,7 @@
   <text
      style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:helvetica"
      x="381.25925"
-     y="75.322105"
+     y="72.382103"
      id="text739">
     <tspan
        id="tspan740" />
@@ -148,13 +148,13 @@
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect743"
      width="21.193634"
-     height="17.661377"
+     height="21.161377"
      x="158.66905"
-     y="115.17471" />
+     y="107.73471" />
   <text
      style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:helvetica"
      x="322.38797"
-     y="76.499504"
+     y="73.559502"
      id="text744">
     <tspan
        id="tspan745" />
@@ -162,7 +162,7 @@
   <text
      style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:helvetica"
      x="436.00946"
-     y="76.499474"
+     y="73.559471"
      id="text749">
     <tspan
        id="tspan750" />
@@ -171,88 +171,83 @@
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect752"
      width="21.193634"
-     height="17.661377"
-     x="182.21758"
-     y="113.40853" />
+     height="21.161377"
+     x="185.59258"
+     y="107.84353" />
   <rect
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect753"
-     width="21.193634"
-     height="17.661377"
-     x="213.4193"
-     y="115.17477" />
+     width="16.443634"
+     height="24.036377"
+     x="216.1693"
+     y="107.73476" />
   <rect
      style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
      id="rect754"
      width="21.193634"
-     height="17.661377"
+     height="24.286377"
      x="129.23344"
-     y="115.17471" />
+     y="107.60971" />
   <rect
      style="font-size:12px;fill:#5974c8;fill-opacity:0.57391298;fill-rule:evenodd;stroke-width:1pt"
      id="rect755"
-     width="22.959778"
-     height="22.959778"
-     x="45.341969"
-     y="109.87618" />
+     width="16.709778"
+     height="20.709778"
+     x="45.841969"
+     y="107.68618" />
   <rect
      style="font-size:12px;fill:#5974c8;fill-opacity:0.57391298;fill-rule:evenodd;stroke-width:1pt"
      id="rect756"
-     width="22.959778"
-     height="22.959778"
+     width="14.256403"
+     height="20.084778"
      x="233.14128"
-     y="109.58175" />
+     y="107.76675" />
   <text
      style="font-size:28px;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="286.23145"
-     y="29.82"
+     y="26.879999"
      id="text763">
     <tspan
        x="286.23145"
-       y="29.82"
+       y="26.879999"
        sodipodi:role="line"
-       id="tspan800">_(&quot;Commands start with \\&quot;)</tspan>
+       id="tspan800">Commands start with \</tspan>
   </text>
   <text
      style="font-size:28px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#008f00;fill-opacity:1;stroke:#00d500;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="244.87318"
-     y="83.25985"
+     x="263.24698"
+     y="68.715347"
      id="text775">
     <tspan
-       x="244.87318"
-       y="83.25985"
+       x="263.24698"
+       y="68.715347"
        sodipodi:role="line"
-       id="tspan806">_(&quot;Letters are notes&quot;)</tspan>
+       id="tspan806">Letters are notes</tspan>
   </text>
   <path
      style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000af;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-     d="M 81.103622,201.07267 C 52.561552,200.05331 32.073652,189.94825 50.931802,133.88348"
+     d="M 81.103622,198.13267 C 52.561552,197.11331 32.073652,187.00825 50.931802,130.94348"
      id="path782"
      sodipodi:nodetypes="cc" />
   <path
      style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000af;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-     d="M 284.60109,188.4178 C 289.96806,163.87485 243.99842,182.09264 245.6851,133.25405"
+     d="M 284.60109,185.4778 C 289.96806,160.93485 237.22913,179.15264 238.91581,130.31405"
      id="path783"
      sodipodi:nodetypes="cc" />
   <text
      style="font-size:28px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#0000b1;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
      x="89.437927"
-     y="211.04648"
+     y="208.10648"
      id="text784">
     <tspan
        x="89.437927"
-       y="211.04648"
-       sodipodi:role="line"
-       id="tspan802">_(&quot;Numbers are durations&quot;)</tspan>
-    <tspan
-       x="89.437927"
-       y="246.04648"
+       y="208.10648"
        sodipodi:role="line"
-       id="tspan804" />
+       id="tspan804">Numbers are durations</tspan>
   </text>
   <path
      style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00af00;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 238.39772,76.784046 C 221.91372,76.784046 184.26793,68.684076 171.01626,113.71269"
+     d="M 256.77151,58.37138 C 240.28751,58.37138 206.14855,60.119077 192.89688,105.14769"
      id="path808"
      sodipodi:nodetypes="cc" />
   <metadata
@@ -268,7 +263,7 @@
   </metadata>
   <path
      style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#a60000;stroke-width:1.33380878;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 83.134232,60.970226 L 83.134222,60.970236 C 115.0175,5.9248072 278.31839,21.393956 278.31839,21.703456"
+     d="M 67.134222,55.530237 C 99.0175,0.48480815 278.31839,18.453957 278.31839,18.763457"
      id="path1014"
-     sodipodi:nodetypes="ccc" />
+     sodipodi:nodetypes="cc" />
 </svg>
diff --git a/Documentation/pictures/text-input-2-annotate.svg b/Documentation/pictures/text-input-2-annotate.svg
index c93078d95d..80b4bb80f9 100644
--- a/Documentation/pictures/text-input-2-annotate.svg
+++ b/Documentation/pictures/text-input-2-annotate.svg
@@ -30,10 +30,10 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="342.24913"
-     inkscape:cy="150.42096"
-     inkscape:window-width="791"
-     inkscape:window-height="709"
+     inkscape:cx="340.63177"
+     inkscape:cy="145.56815"
+     inkscape:window-width="774"
+     inkscape:window-height="708"
      inkscape:window-x="191"
      inkscape:window-y="24"
      showgrid="false"
@@ -48,7 +48,7 @@
        x="0"
        y="26.152"
        sodipodi:role="line"
-       id="tspan954">\relative c''  {</tspan><tspan
+       id="tspan954">\relative c'' {</tspan><tspan
        x="0"
        y="54.152"
        sodipodi:role="line"
@@ -80,52 +80,52 @@
   <rect
      style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect626"
-     width="19.427519"
+     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="14.129138"
+     width="16.250458"
      height="25.903381"
-     x="204.18401"
+     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="17.072718"
+     width="16.719164"
      height="24.725952"
-     x="202.41786"
+     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="68.780144"
+     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="68.780144"
+     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="30.024336"
+     width="32.49921"
      height="25.314667"
-     x="170.69884"
-     y="146.65053" />
+     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="24.856951"
-     height="25.903351"
+     width="21.674971"
+     height="28.378223"
      x="51.118736"
-     y="60.120781" />
+     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"
@@ -138,30 +138,30 @@
      id="rect635"
      width="37.677547"
      height="24.725952"
-     x="220.07927"
-     y="144.65117" />
+     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="137.07082"
-     y="115.45947" />
+     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="17.072678"
-     height="24.725899"
-     x="171.21614"
+     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 96.850434,70.968612 C 116.83143,70.968612 213.41043,94.280612 308.32243,72.633612"
+     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 266.05243,125.22861 C 299.35543,125.22861 361.60543,114.26261 381.58743,85.955612"
+     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
@@ -187,7 +187,7 @@
        x="322.47546"
        y="79.294334"
        sodipodi:role="line"
-       id="tspan648">_(&quot;Add articulations&quot;)</tspan>
+       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"
@@ -198,7 +198,7 @@
        x="307.0423"
        y="219.60112"
        sodipodi:role="line"
-       id="tspan707">_(&quot;Add -es for flat, -is for sharp&quot;)</tspan>
+       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"
@@ -209,7 +209,7 @@
        x="115.56139"
        y="288.28394"
        sodipodi:role="line"
-       id="tspan625">_(&quot;Enclose pitches in &lt; &gt; for chords&quot;)</tspan>
+       id="tspan625">Enclose pitches in &lt; &gt; for chords</tspan>
   </text>
   <metadata
      id="metadata56">
@@ -225,8 +225,8 @@
   <rect
      style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect970"
-     width="14.129138"
+     width="16.250458"
      height="25.903381"
-     x="151.86534"
+     x="150.80469"
      y="88.498466" />
 </svg>
diff --git a/Documentation/pictures/text-input-parts-both-annotate.svg b/Documentation/pictures/text-input-parts-both-annotate.svg
index 0005e80b11..b366995da6 100644
--- a/Documentation/pictures/text-input-parts-both-annotate.svg
+++ b/Documentation/pictures/text-input-parts-both-annotate.svg
@@ -28,8 +28,8 @@
      id="perspective35" /></defs>
 
   <sodipodi:namedview
-   inkscape:window-y="0"
-   inkscape:window-x="0"
+   inkscape:window-y="5"
+   inkscape:window-x="157"
    inkscape:window-height="708"
    inkscape:window-width="818"
    inkscape:cy="186.63953"
@@ -48,7 +48,7 @@
      id="tspan1190"
      sodipodi:role="line"
      y="28.739059"
-     x="7.7990665">_(&quot;hornNotes&quot;) =</tspan><tspan
+     x="7.7990665">hornNotes =</tspan><tspan
      id="tspan1192"
      sodipodi:role="line"
      y="56.739059"
@@ -76,7 +76,7 @@
      id="tspan1204"
      sodipodi:role="line"
      y="224.73906"
-     x="7.7990665">_(&quot;bassoonNotes&quot;) =</tspan><tspan
+     x="7.7990665">bassoonNotes =</tspan><tspan
      id="tspan1206"
      sodipodi:role="line"
      y="252.73906"
@@ -88,11 +88,11 @@
      id="tspan1210"
      sodipodi:role="line"
      y="308.73907"
-     x="7.7990665">  r4 d,8 f  gis4 c   b bes</tspan><tspan
+     x="7.7990665">  r4 d,8 f gis4 c b bes</tspan><tspan
      id="tspan1212"
      sodipodi:role="line"
      y="336.73907"
-     x="7.7990665">  a8 e f4   g d  gis f</tspan><tspan
+     x="7.7990665">  a8 e f4 g d gis f</tspan><tspan
      id="tspan1226"
      sodipodi:role="line"
      y="364.73907"
@@ -102,6 +102,7 @@
 
 
 
+
   <rect
    y="89.084488"
    x="37.881714"
@@ -119,9 +120,9 @@
    style="font-size:12px;fill:#af3738;fill-opacity:0.56521702;fill-rule:evenodd;stroke-width:1pt" />
 
   <rect
-   y="201.48082"
-   x="4.5791035"
-   height="25.80954"
+   y="200.48082"
+   x="0.57910347"
+   height="27.80954"
    width="246.43933"
    id="rect664"
    style="font-size:12px;fill:#af3738;fill-opacity:0.56521702;fill-rule:evenodd;stroke-width:1pt" />
@@ -134,7 +135,7 @@
   <path
    sodipodi:nodetypes="cc"
    id="path666"
-   d="M 250.34912,221.8364 C 308.04212,194.7554 436.97112,237.1434 439.32512,199.4654"
+   d="M 247.34912,218.8364 C 305.04212,191.7554 436.97112,237.1434 439.32512,199.4654"
    style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b10000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
 
   <text
@@ -146,7 +147,8 @@
      y="91.711288"
      x="399.36646"
      id="tspan1315"
-     sodipodi:role="line">  _(&quot;Enter multi-rest&quot;)   </tspan></text>
+     sodipodi:role="line">Enter multi-rest</tspan></text>
+
 
 
 
@@ -161,7 +163,8 @@
      y="189.8231"
      x="373.74023"
      id="tspan1317"
-     sodipodi:role="line">  _(&quot;Store notes in variable&quot;)   </tspan></text>
+     sodipodi:role="line">Store notes in variable</tspan></text>
+
 
 
 
diff --git a/Documentation/pictures/text-input-parts-single-annotate.svg b/Documentation/pictures/text-input-parts-single-annotate.svg
index 6f14cb499c..ca92ffa299 100644
--- a/Documentation/pictures/text-input-parts-single-annotate.svg
+++ b/Documentation/pictures/text-input-parts-single-annotate.svg
@@ -30,12 +30,12 @@
 
   <sodipodi:namedview
    inkscape:current-layer="svg682"
-   inkscape:window-y="0"
-   inkscape:window-x="0"
+   inkscape:window-y="33"
+   inkscape:window-x="233"
    inkscape:window-height="708"
    inkscape:window-width="734"
-   inkscape:cy="153.11353"
-   inkscape:cx="305.15144"
+   inkscape:cy="145.83431"
+   inkscape:cx="305.1514"
    inkscape:zoom="1"
    id="base"
    showgrid="false" />
@@ -58,15 +58,13 @@
      id="tspan1164"
      sodipodi:role="line"
      y="149.54193"
-     x="2.52">  \transpose f c'  \_(&quot;hornNotes&quot;)</tspan><tspan
-     id="tspan1166"
-     sodipodi:role="line"
-     y="177.54193"
-     x="2.52">}</tspan><tspan
+     x="2.52">  \transpose f c'  \hornNotes</tspan><tspan
      id="tspan1168"
      sodipodi:role="line"
-     y="205.54193"
-     x="2.52">  </tspan></text>
+     y="177.54193"
+     x="2.52">}</tspan></text>
+
+
 
 
 
@@ -75,35 +73,36 @@
 
   <rect
    y="96.397034"
-   x="33.022778"
-   height="30.066223"
-   width="429.67987"
+   x="34.790546"
+   height="31.066223"
+   width="425.08368"
    id="rect705"
    style="font-size:12px;fill:#ee9797;fill-opacity:0.73913;fill-rule:evenodd;stroke-width:1pt" />
 
 
   <rect
-   y="127.84262"
-   x="32.820759"
-   height="26.248253"
-   width="249.95901"
+   y="127.48907"
+   x="34.588528"
+   height="28.01602"
+   width="250.31258"
    id="rect706"
    style="font-size:12px;fill:#23e023;fill-opacity:0.49634998;fill-rule:evenodd;stroke-width:1pt" />
 
 
   <rect
-   y="128.43146"
-   x="338.08612"
-   height="22.573122"
-   width="169.54926"
+   y="127.3708"
+   x="320.40845"
+   height="27.169315"
+   width="171.67058"
    id="rect707"
    style="font-size:12px;fill:#6165d3;fill-opacity:0.6;fill-rule:evenodd;stroke-width:1pt" />
 
 
   <path
    id="path708"
-   d="M 164.89389,98.163671 C 170.78189,39.291671 222.58789,32.227671 250.84589,27.517671"
-   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b10000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+   d="M 163.83323,95.335244 C 169.72123,36.463244 222.58789,32.227671 250.84589,27.517671"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b10000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   sodipodi:nodetypes="cc" />
 
 
   <path
@@ -114,20 +113,23 @@
 
   <path
    id="path710"
-   d="M 361.63499,153.50267 C 309.82799,205.30867 331.02199,228.85767 363.98999,250.05067"
-   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+   d="M 360.92788,155.62399 C 309.12088,207.42999 331.02199,228.85767 363.98999,250.05067"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   sodipodi:nodetypes="cc" />
 
 
   <text
    sodipodi:linespacing="100%"
    id="text711"
-   y="27.690001"
-   x="262.63382"
+   y="35.11462"
+   x="258.03763"
    style="font-size:26px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;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"><tspan
-     y="27.690001"
-     x="262.63382"
+     y="35.11462"
+     x="258.03763"
      id="tspan1306"
-     sodipodi:role="line"> _(&quot;Condense multi-rests&quot;)   </tspan></text>
+     sodipodi:role="line">Condense multi-rests</tspan></text>
+
+
 
 
 
@@ -143,7 +145,9 @@
      y="293.66904"
      x="28.926991"
      id="tspan1304"
-     sodipodi:role="line"> _(&quot;Transpose for F instrument&quot;)   </tspan></text>
+     sodipodi:role="line">Transpose for F instrument</tspan></text>
+
+
 
 
 
@@ -152,10 +156,11 @@
 
   <text
    id="text723"
-   y="260.64755"
-   x="342.68558"
-   style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#0000ab;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter">     <tspan
-   id="tspan724">_(&quot;Reuse variable&quot;)</tspan>   </text>
+   y="255.64755"
+   x="373.68558"
+   style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#0000ab;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter">Reuse variable</text>
+
+
 
 
 
diff --git a/Documentation/pictures/text-input-pop-annotate.svg b/Documentation/pictures/text-input-pop-annotate.svg
index 46e18421b9..7d518b30e3 100644
--- a/Documentation/pictures/text-input-pop-annotate.svg
+++ b/Documentation/pictures/text-input-pop-annotate.svg
@@ -30,12 +30,12 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="334.13931"
+     inkscape:cx="335.52737"
      inkscape:cy="221.78706"
-     inkscape:window-width="761"
-     inkscape:window-height="708"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="760"
+     inkscape:window-height="711"
+     inkscape:window-x="451"
+     inkscape:window-y="29"
      inkscape:current-layer="svg548"
      showgrid="false" />
   <text
@@ -100,37 +100,37 @@
   <rect
      style="font-size:12px;fill:#0900ad;fill-opacity:0.54744502;fill-rule:evenodd;stroke:none;stroke-width:0.98323898pt"
      id="rect663"
-     width="303.07663"
-     height="59.471516"
+     width="251.07663"
+     height="57.471516"
      x="91.000175"
-     y="241.49001" />
+     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="236.25644"
-     height="29.735817"
+     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="207.34248"
-     height="54.896721"
+     width="168.34248"
+     height="53.896721"
      x="90.069099"
-     y="133.00386" />
+     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 393.68669,268.49363 C 430.52213,266.20645 492.49836,300.91729 452.03583,324.158"
+     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 292.76375,163.88217 C 363.1863,158.16489 370.56838,199.33836 443.26245,185.61387"
+     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 326.72403,61.498658 C 355.12007,63.785848 443.10409,33.458498 475.01758,73.453508"
+     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
@@ -142,7 +142,7 @@
        x="386.86063"
        y="100.48704"
        sodipodi:role="line"
-       id="tspan672">_(&quot;Enter chord names&quot;)</tspan>
+       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"
@@ -153,7 +153,7 @@
        x="457.49405"
        y="196.02174"
        sodipodi:role="line"
-       id="tspan679">_(&quot;Enter melody&quot;)</tspan>
+       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"
@@ -161,18 +161,18 @@
      y="357.28284"
      id="text681">
     <tspan
-       id="tspan682">_(&quot;Enter lyrics&quot;)</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="172.6489"
+     width="168.6489"
      height="27.448336"
-     x="68.184616"
+     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 69.35527,234.92288 C -45.362236,255.49057 -6.7639974,380.5755 122.98206,414.83831"
+     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
@@ -181,7 +181,7 @@
      y="431.01611"
      id="text688">
     <tspan
-       id="tspan689">_(&quot;Combine melody and lyrics&quot;)</tspan>
+       id="tspan689">Combine melody and lyrics</tspan>
   </text>
   <metadata
      id="metadata77">
diff --git a/Documentation/pictures/text-input-score-annotate.svg b/Documentation/pictures/text-input-score-annotate.svg
index d6e028905a..f7ce366dfd 100644
--- a/Documentation/pictures/text-input-score-annotate.svg
+++ b/Documentation/pictures/text-input-score-annotate.svg
@@ -31,8 +31,8 @@
   <sodipodi:namedview
    id="base"
    inkscape:zoom="1"
-   inkscape:cx="269.77125"
-   inkscape:cy="132.21057"
+   inkscape:cx="268.18073"
+   inkscape:cy="132.21059"
    inkscape:window-width="640"
    inkscape:window-height="708"
    inkscape:window-x="163"
@@ -76,51 +76,56 @@
 
 
 
+
+
   <rect
    style="font-size:12px;fill:#c12b28;fill-opacity:0.53658495;fill-rule:evenodd;stroke-width:1pt"
    id="rect758"
-   width="393.38718"
-   height="22.479324"
-   x="40.379456"
-   y="105.53474" />
+   width="403.33691"
+   height="24.600643"
+   x="34.672348"
+   y="104.47408" />
 
 
   <rect
    style="font-size:12px;fill:#c12b28;fill-opacity:0.53658495;fill-rule:evenodd;stroke-width:1pt"
    id="rect759"
-   width="392.55447"
-   height="22.479324"
-   x="41.398796"
-   y="132.3636" />
+   width="450.18369"
+   height="24.600645"
+   x="34.681282"
+   y="130.94939" />
 
 
   <rect
    style="font-size:12px;fill:#23ca22;fill-opacity:0.58841505;fill-rule:evenodd;stroke-width:1pt"
    id="rect760"
-   width="38.440845"
-   height="101.57295"
+   width="34.380184"
+   height="100.57295"
    x="0"
-   y="82.436127" />
+   y="80.436127" />
 
 
   <path
    style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-   d="M 18.945781,186.09094 C 17.280681,241.03994 67.234672,244.36994 113.85866,244.36994"
-   id="path761" />
+   d="M 15.410247,181.8483 C 13.745147,236.7973 67.234672,244.36994 113.85866,244.36994"
+   id="path761"
+   sodipodi:nodetypes="cc" />
 
 
   <path
    style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-   d="M 123.63635,107.61663 C 121.97035,44.341354 143.61735,29.355154 193.57135,27.690054"
-   id="path762" />
+   d="M 122.92925,103.37399 C 121.26325,40.098713 143.61735,29.355154 193.57135,27.690054"
+   id="path762"
+   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="212.72046"
-   y="27.690001"
-   id="text763">     <tspan
-   id="tspan764"> _(&quot;Create staff&quot;)</tspan>   </text>
+   x="207.41716"
+   y="35.468174"
+   id="text763">Create staff</text>
+
+
 
 
 
@@ -128,10 +133,11 @@
 
   <text
    style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#00b000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-   x="137.17007"
-   y="251.86316"
-   id="text766">     <tspan
-   id="tspan767"> _(&quot;Combine staffs in parallel&quot;)</tspan>   </text>
+   x="127.97768"
+   y="252.57027"
+   id="text766">Combine staffs in parallel</text>
+
+
 
 
 
-- 
2.39.5