From: Patrick McCarty <pnorcks@gmail.com>
Date: Mon, 17 Aug 2009 03:58:41 +0000 (-0700)
Subject: Web: shrink the SVG files again
X-Git-Tag: release/2.13.4-1~179^2~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6b12333ef82249971f8d539f4ba4e5ddc1966f29;p=lilypond.git

Web: shrink the SVG files again
---

diff --git a/Documentation/pictures/text-input-1-annotate.svg b/Documentation/pictures/text-input-1-annotate.svg
index 0f5d3319ab..4dae141256 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="549.9397"
-   height="212.76448"
+   width="453.98599"
+   height="175.64128"
    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="271.75797"
+     inkscape:cx="222.88721"
      inkscape:cy="112.28524"
-     inkscape:window-width="647"
+     inkscape:window-width="590"
      inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -67,35 +67,35 @@
      inkscape:current-layer="svg548" />
   <text
      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="52.434368"
+     style="font-size:19.81250572px;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="1.7831255"
+     y="43.285675"
      id="text551"
      sodipodi:linespacing="100%"><tspan
-       x="2.1600001"
-       y="52.434368"
+       x="1.7831255"
+       y="43.285675"
        sodipodi:role="line"
        id="tspan1054">{</tspan><tspan
-       x="2.1600001"
-       y="76.434372"
+       x="1.7831255"
+       y="63.098183"
        sodipodi:role="line"
        id="tspan1056">  \time 2/4</tspan><tspan
-       x="2.1600001"
-       y="100.43437"
+       x="1.7831255"
+       y="82.910683"
        sodipodi:role="line"
        id="tspan1058">  \clef bass</tspan><tspan
-       x="2.1600001"
-       y="124.43437"
+       x="1.7831255"
+       y="102.7232"
        sodipodi:role="line"
        id="tspan1060">  c4 c g g a a g2</tspan><tspan
-       x="2.1600001"
-       y="148.43437"
+       x="1.7831255"
+       y="122.5357"
        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="71.639503"
+     y="34.516357"
      id="text562">
     <tspan
        id="tspan563" />
@@ -103,35 +103,35 @@
   <rect
      style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect730"
-     width="85.952026"
-     height="48.847027"
-     x="26.993069"
-     y="56.153057" />
+     width="70.955132"
+     height="40.324219"
+     x="22.28331"
+     y="46.355522" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect731"
-     width="14.443634"
-     height="20.661377"
-     x="30.692631"
-     y="105.81476" />
+     width="11.923505"
+     height="17.056368"
+     x="25.337383"
+     y="87.352341" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect732"
-     width="21.193634"
-     height="20.536377"
-     x="71.539612"
-     y="105.81476" />
+     width="17.495758"
+     height="16.953175"
+     x="59.057438"
+     y="87.352341" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect733"
-     width="21.193634"
-     height="24.161377"
-     x="99.797775"
-     y="105.68976" />
+     width="17.495758"
+     height="19.9457"
+     x="82.38504"
+     y="87.248993" />
   <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="71.639503"
+     y="34.516357"
      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="70.462105"
+     y="33.338959"
      id="text739">
     <tspan
        id="tspan740" />
@@ -147,14 +147,14 @@
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect743"
-     width="21.193634"
-     height="21.161377"
-     x="158.66905"
-     y="105.81471" />
+     width="17.495758"
+     height="17.469139"
+     x="130.98445"
+     y="87.352173" />
   <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="71.639503"
+     y="34.516357"
      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="71.639473"
+     y="34.516327"
      id="text749">
     <tspan
        id="tspan750" />
@@ -170,87 +170,87 @@
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect752"
-     width="21.193634"
-     height="21.161377"
-     x="185.59258"
-     y="105.92353" />
+     width="17.495758"
+     height="17.469139"
+     x="153.21039"
+     y="87.441925" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect753"
-     width="16.443634"
-     height="24.036377"
-     x="216.1693"
-     y="105.81476" />
+     width="13.574548"
+     height="19.842503"
+     x="178.45215"
+     y="87.352341" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect754"
-     width="21.193634"
-     height="24.286377"
-     x="129.23344"
-     y="105.68971" />
+     width="17.495758"
+     height="20.048889"
+     x="106.68475"
+     y="87.248993" />
   <rect
      style="font-size:12px;fill:#5f8dd3;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect755"
-     width="16.709778"
-     height="20.709778"
-     x="45.841969"
-     y="105.76618" />
+     width="13.794253"
+     height="17.096342"
+     x="37.843483"
+     y="87.312347" />
   <rect
      style="font-size:12px;fill:#5f8dd3;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect756"
-     width="14.256403"
-     height="20.084778"
-     x="233.14128"
-     y="105.84675" />
+     width="11.768957"
+     height="16.580364"
+     x="192.46281"
+     y="87.378677" />
   <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="24.959999"
+     style="font-size:23.11455727px;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="236.28961"
+     y="20.604973"
      id="text763">
     <tspan
-       x="286.23145"
-       y="24.959999"
+       x="236.28961"
+       y="20.604973"
        sodipodi:role="line"
        id="tspan800"
-       style="font-size:26px">Commands start with \</tspan>
+       style="font-size:21.46351433px">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:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="263.24698"
-     y="66.795349"
+     style="font-size:23.11455727px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#008f00;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
+     x="217.31564"
+     y="55.140976"
      id="text775">
     <tspan
-       x="263.24698"
-       y="66.795349"
+       x="217.31564"
+       y="55.140976"
        sodipodi:role="line"
        id="tspan806"
-       style="font-size:26px">Letters are notes</tspan>
+       style="font-size:21.46351433px">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,196.21267 C 52.561552,195.19331 32.073652,185.08825 50.931802,129.02348"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000af;stroke-width:1.54785049;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 66.952655,161.97737 C 43.390613,161.13614 26.47745,152.7941 42.045226,106.51149"
      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,183.5578 C 289.96806,159.01485 237.22913,177.23264 238.91581,128.39405"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000af;stroke-width:1.54785049;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 234.94406,151.53074 C 239.3743,131.26984 195.83733,146.30926 197.22969,105.99185"
      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="206.18648"
+     style="font-size:23.11455727px;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="73.832741"
+     y="170.21101"
      id="text784">
     <tspan
-       x="89.437927"
-       y="206.18648"
+       x="73.832741"
+       y="170.21101"
        sodipodi:role="line"
        id="tspan804"
-       style="font-size:26px">Numbers are durations</tspan>
+       style="font-size:21.46351433px">Numbers are durations</tspan>
   </text>
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 256.77151,56.451381 C 240.28751,56.451381 206.14855,58.199078 192.89688,103.22769"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.54785049;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 211.97006,46.601805 C 198.36207,46.601805 170.17967,48.044544 159.24018,85.216565"
      id="path808"
      sodipodi:nodetypes="cc" />
   <metadata
@@ -265,8 +265,8 @@
     </rdf:RDF>
   </metadata>
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 67.134222,53.610238 C 99.0175,-1.435191 278.31839,16.533958 278.31839,16.843458"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.55197704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 55.42063,44.256376 C 81.740927,-1.1847231 229.75736,13.649161 229.75736,13.90466"
      id="path1014"
      sodipodi:nodetypes="cc" />
 </svg>
diff --git a/Documentation/pictures/text-input-2-annotate.svg b/Documentation/pictures/text-input-2-annotate.svg
index 4bfa545226..821ff0d300 100644
--- a/Documentation/pictures/text-input-2-annotate.svg
+++ b/Documentation/pictures/text-input-2-annotate.svg
@@ -10,8 +10,8 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg548"
    sodipodi:version="0.32"
-   width="627.78601"
-   height="293.95193"
+   width="500.48596"
+   height="234.34607"
    sodipodi:docname="text-input-2-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/usr/src/savannah/lily/newweb/site/graphics"
@@ -30,9 +30,9 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="313.9679"
-     inkscape:cy="165.56815"
-     inkscape:window-width="720"
+     inkscape:cx="250.24298"
+     inkscape:cy="130.00247"
+     inkscape:window-width="590"
      inkscape:window-height="708"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -40,170 +40,170 @@
      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"
+     style="font-size:22.32228661px;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"
+     y="20.849016"
      id="text554"
      sodipodi:linespacing="100%"><tspan
        x="0"
-       y="26.152"
+       y="20.849016"
        sodipodi:role="line"
        id="tspan954">\relative c'' {</tspan><tspan
        x="0"
-       y="54.152"
+       y="43.171303"
        sodipodi:role="line"
        id="tspan956">  \key c \minor</tspan><tspan
        x="0"
-       y="82.152"
+       y="65.493591"
        sodipodi:role="line"
        id="tspan958">  g(</tspan><tspan
        x="0"
-       y="110.152"
+       y="87.815872"
        sodipodi:role="line"
        id="tspan960">  &lt;ees c'&gt;)</tspan><tspan
        x="0"
-       y="138.15201"
+       y="110.13817"
        sodipodi:role="line"
        id="tspan962">  &lt;d f gis b&gt;-.</tspan><tspan
        x="0"
-       y="166.15201"
+       y="132.46045"
        sodipodi:role="line"
        id="tspan964">  &lt;ees g bes&gt;-.</tspan><tspan
        x="0"
-       y="194.15201"
+       y="154.78273"
        sodipodi:role="line"
        id="tspan968">}</tspan></text>
   <rect
      style="font-size:12px;fill:#ff5555;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" />
+     width="14.642494"
+     height="61.952389"
+     x="25.663036"
+     y="72.921082" />
   <rect
      style="font-size:12px;fill:#ff5555;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect628"
-     width="16.250458"
-     height="25.903381"
-     x="200.35558"
-     y="115.45953" />
+     width="12.955252"
+     height="20.650805"
+     x="159.72823"
+     y="92.04718" />
   <rect
      style="font-size:12px;fill:#ff5555;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.97468004pt"
      id="rect629"
-     width="16.719164"
-     height="24.725952"
-     x="200.10721"
-     y="145.14482" />
+     width="13.328919"
+     height="19.712105"
+     x="159.53014"
+     y="115.71297" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect630"
-     width="36.500156"
-     height="20.016266"
-     x="67.512375"
-     y="92.161186" />
+     width="29.098824"
+     height="15.957442"
+     x="53.822475"
+     y="73.47319" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect631"
-     width="34.145306"
-     height="23.548523"
-     x="67.262375"
-     y="145.82246" />
+     width="27.221458"
+     height="18.773443"
+     x="53.623177"
+     y="116.25316" />
   <rect
      style="font-size:12px;fill:#5fd35f;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03682003pt"
      id="rect632"
-     width="32.49921"
-     height="25.314667"
-     x="167.37041"
-     y="144.77921" />
+     width="25.90918"
+     height="20.181479"
+     x="133.43172"
+     y="115.42152" />
   <rect
      style="font-size:12px;fill:#5f8dd3;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect633"
-     width="21.674971"
-     height="28.378223"
-     x="51.618736"
-     y="59.31012" />
+     width="17.27981"
+     height="22.623793"
+     x="41.151756"
+     y="47.283508" />
   <rect
      style="font-size:12px;fill:#5f8dd3;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.99361296pt"
      id="rect634"
-     width="37.677589"
-     height="26.735905"
-     x="216.90187"
-     y="115.21575" />
+     width="30.037495"
+     height="21.314493"
+     x="172.91939"
+     y="91.852707" />
   <rect
      style="font-size:12px;fill:#5f8dd3;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03922997pt"
      id="rect635"
-     width="37.677547"
-     height="24.725952"
-     x="217.01862"
-     y="145.00471" />
+     width="30.037457"
+     height="19.712105"
+     x="173.01242"
+     y="115.60121" />
   <rect
      style="font-size:12px;fill:#5fd35f;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" />
+     width="29.568201"
+     height="20.181479"
+     x="107.30313"
+     y="91.765289" />
   <rect
      style="font-size:12px;fill:#5f8dd3;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.95553303pt"
      id="rect638"
-     width="16.719124"
-     height="26.140112"
-     x="167.80193"
-     y="88.378838" />
+     width="13.328888"
+     height="20.839533"
+     x="133.77571"
+     y="70.457733" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 84.243832,69.907952 C 104.22483,69.907952 211.41043,94.280612 306.32243,72.633612"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.49878109;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 67.161219,55.732309 C 83.09054,55.732309 168.5415,75.162789 244.20763,57.905279"
      id="path639"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.65999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 262.28466,130.53191 C 295.58766,130.53191 359.60543,114.26261 379.58743,85.955612"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.32339287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 209.09968,104.06325 C 235.64965,104.06325 286.68619,91.092979 302.61624,68.525899"
      id="path640"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 91.941634,176.82716 C 101.93263,193.47816 218.18163,255.29016 299.77363,218.65716"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.49878109;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 73.298096,140.97096 C 81.263158,154.24545 173.93977,203.52356 238.98676,174.31879"
      id="path641"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 184.11345,180.21915 C 205.76045,208.52615 231.11745,228.42415 298.55545,210.10815"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.49878109;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 146.77971,143.67516 C 164.03718,166.24218 184.25243,182.10525 238.01555,167.50331"
      id="path642"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 41.12779,172.55803 C 22.811805,222.51203 17.816808,264.14003 97.742784,279.12603"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.49878109;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 32.78807,137.56749 C 18.186121,177.39201 14.203998,210.5789 77.922913,222.52594"
      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="320.47546"
-     y="79.294334"
+     style="font-size:20.72782326px;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="255.49059"
+     y="63.215355"
      id="text694">
     <tspan
-       x="320.47546"
-       y="79.294334"
+       x="255.49059"
+       y="63.215355"
        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:#008f00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="305.0423"
-     y="219.60112"
+     style="font-size:20.72782326px;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="243.18698"
+     y="175.07127"
      id="text699">
     <tspan
-       x="305.0423"
-       y="219.60112"
+       x="243.18698"
+       y="175.07127"
        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:#af0000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="113.56139"
-     y="288.28394"
+     style="font-size:20.72782326px;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="90.533844"
+     y="229.82741"
      id="text702">
     <tspan
-       x="113.56139"
-       y="288.28394"
+       x="90.533844"
+       y="229.82741"
        sodipodi:role="line"
        id="tspan625">Enclose pitches in &lt; &gt; for chords</tspan>
   </text>
@@ -221,8 +221,8 @@
   <rect
      style="font-size:12px;fill:#ff5555;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
      id="rect970"
-     width="16.250458"
-     height="25.903381"
-     x="149.80469"
-     y="87.498466" />
+     width="12.955252"
+     height="20.650805"
+     x="119.42799"
+     y="69.75592" />
 </svg>
diff --git a/Documentation/pictures/text-input-parts-both-annotate.svg b/Documentation/pictures/text-input-parts-both-annotate.svg
index eb337abc04..bb79a65859 100644
--- a/Documentation/pictures/text-input-parts-both-annotate.svg
+++ b/Documentation/pictures/text-input-parts-both-annotate.svg
@@ -11,8 +11,8 @@
    sodipodi:docbase="/home/hanwen/vc/savannah/lily/newweb/site/graphics"
    inkscape:version="0.46"
    sodipodi:docname="text-input-parts-both-annotate.svg"
-   height="373.27905"
-   width="631.18286"
+   height="275.04843"
+   width="465.08301"
    sodipodi:version="0.32"
    id="svg548"
    xml:space="preserve"
@@ -30,124 +30,127 @@
    inkscape:window-y="0"
    inkscape:window-x="0"
    inkscape:window-height="708"
-   inkscape:window-width="730"
-   inkscape:cy="186.63953"
-   inkscape:cx="310.00752"
+   inkscape:window-width="590"
+   inkscape:cy="132.60176"
+   inkscape:cx="242.11971"
    inkscape:zoom="1"
    id="base"
    showgrid="false"
    inkscape:current-layer="svg548" />
   <text
    id="text555"
-   y="28.739059"
-   x="7.7990665"
-   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"
+   y="21.176262"
+   x="5.7466927"
+   style="font-size:20.63162804px;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"
    sodipodi:linespacing="100%"><tspan
      id="tspan1190"
      sodipodi:role="line"
-     y="28.739059"
-     x="7.7990665">hornNotes =</tspan><tspan
+     y="21.176262"
+     x="5.7466927">hornNotes =</tspan><tspan
      id="tspan1192"
      sodipodi:role="line"
-     y="56.739059"
-     x="7.7990665">\relative c {</tspan><tspan
+     y="41.807892"
+     x="5.7466927">\relative c {</tspan><tspan
      id="tspan1194"
      sodipodi:role="line"
-     y="84.739059"
-     x="7.7990665">  \time 2/4</tspan><tspan
+     y="62.439514"
+     x="5.7466927">  \time 2/4</tspan><tspan
      id="tspan1196"
      sodipodi:role="line"
-     y="112.73906"
-     x="7.7990665">  R2*3</tspan><tspan
+     y="83.071152"
+     x="5.7466927">  R2*3</tspan><tspan
      id="tspan1198"
      sodipodi:role="line"
-     y="140.73906"
-     x="7.7990665">  r4 f8 a cis4 f e d</tspan><tspan
+     y="103.70277"
+     x="5.7466927">  r4 f8 a cis4 f e d</tspan><tspan
      id="tspan1200"
      sodipodi:role="line"
-     y="168.73906"
-     x="7.7990665">}</tspan><tspan
+     y="124.3344"
+     x="5.7466927">}</tspan><tspan
      id="tspan1202"
      sodipodi:role="line"
-     y="196.73906"
-     x="7.7990665" /><tspan
+     y="144.96603"
+     x="5.7466927" /><tspan
      id="tspan1204"
      sodipodi:role="line"
-     y="224.73906"
-     x="7.7990665">bassoonNotes =</tspan><tspan
+     y="165.59766"
+     x="5.7466927">bassoonNotes =</tspan><tspan
      id="tspan1206"
      sodipodi:role="line"
-     y="252.73906"
-     x="7.7990665">\relative c {</tspan><tspan
+     y="186.22928"
+     x="5.7466927">\relative c {</tspan><tspan
      id="tspan1208"
      sodipodi:role="line"
-     y="280.73907"
-     x="7.7990665">  \clef bass</tspan><tspan
+     y="206.8609"
+     x="5.7466927">  \clef bass</tspan><tspan
      id="tspan1210"
      sodipodi:role="line"
-     y="308.73907"
-     x="7.7990665">  r4 d,8 f gis4 c b bes</tspan><tspan
+     y="227.49255"
+     x="5.7466927">  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
+     y="248.12418"
+     x="5.7466927">  a8 e f4 g d gis f</tspan><tspan
      id="tspan1226"
      sodipodi:role="line"
-     y="364.73907"
-     x="7.7990665">}</tspan></text>
+     y="268.7558"
+     x="5.7466927">}</tspan></text>
+
 
   <rect
-   y="89.084488"
-   x="37.881714"
-   height="25.80957"
-   width="72.433189"
+   y="65.641357"
+   x="27.912884"
+   height="19.017622"
+   width="53.371971"
    id="rect662"
    style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-opacity:1" />
   <rect
    y="0"
    x="0"
-   height="31.637497"
-   width="203.97852"
+   height="23.31189"
+   width="150.30025"
    id="rect663"
    style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <rect
-   y="200.48082"
-   x="0.57910347"
-   height="27.80954"
-   width="246.43933"
+   y="147.72284"
+   x="0.42670885"
+   height="20.491276"
+   width="181.58743"
    id="rect664"
    style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <path
    id="path665"
-   d="M 110.82412,105.8604 C 183.82412,105.8604 300.38912,82.311399 389.87312,83.489399"
-   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
+   d="M 81.66007,78.002619 C 135.44967,78.002619 221.33988,60.650669 287.27561,61.518599"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.38158238;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
   <path
    sodipodi:nodetypes="cc"
    id="path666"
-   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:#af0000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
+   d="M 182.25754,161.2483 C 224.76832,141.29368 321.97936,174.7376 323.71429,146.97486"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.38158238;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
   <text
    sodipodi:linespacing="100%"
    id="text667"
-   y="91.711288"
-   x="399.36646"
-   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:#008f00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
-     y="91.711288"
-     x="399.36646"
+   y="67.576889"
+   x="294.27057"
+   style="font-size:19.15789032px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;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"><tspan
+     y="67.576889"
+     x="294.27057"
      id="tspan1315"
      sodipodi:role="line">Enter multi-rest</tspan></text>
 
+
   <text
    sodipodi:linespacing="100%"
    id="text674"
-   y="189.8231"
-   x="373.74023"
-   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:#af0000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
-     y="189.8231"
-     x="373.74023"
+   y="139.86978"
+   x="275.38846"
+   style="font-size:19.15789032px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;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"><tspan
+     y="139.86978"
+     x="275.38846"
      id="tspan1317"
      sodipodi:role="line">Store notes in variable</tspan></text>
 
+
 <metadata
    id="metadata1054">
   <rdf:RDF>
diff --git a/Documentation/pictures/text-input-parts-single-annotate.svg b/Documentation/pictures/text-input-parts-single-annotate.svg
index 57e14ed2d8..7be745c435 100644
--- a/Documentation/pictures/text-input-parts-single-annotate.svg
+++ b/Documentation/pictures/text-input-parts-single-annotate.svg
@@ -11,8 +11,8 @@
    sodipodi:docbase="/home/hanwen/vc/savannah/lily/newweb/site/graphics"
    inkscape:version="0.46"
    sodipodi:docname="text-input-parts-single-annotate.svg"
-   height="289.1824"
-   width="541.65167"
+   height="234.40562"
+   width="439.052"
    sodipodi:version="0.32"
    id="svg682"
    xml:space="preserve"
@@ -31,97 +31,101 @@
    inkscape:window-y="0"
    inkscape:window-x="0"
    inkscape:window-height="708"
-   inkscape:window-width="642"
-   inkscape:cy="145.83431"
-   inkscape:cx="268.0911"
+   inkscape:window-width="590"
+   inkscape:cy="119.77016"
+   inkscape:cx="216.61728"
    inkscape:zoom="1"
    id="base"
    showgrid="false" />
   <text
    sodipodi:linespacing="100%"
    id="text690"
-   y="83.387314"
-   x="2.52"
-   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"><tspan
+   y="67.592178"
+   x="2.0426602"
+   style="font-size:22.69622612px;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"><tspan
      id="tspan1160"
      sodipodi:role="line"
-     y="83.387314"
-     x="2.52">{</tspan><tspan
+     y="67.592178"
+     x="2.0426602">{</tspan><tspan
      id="tspan1162"
      sodipodi:role="line"
-     y="111.38731"
-     x="2.52">  \set Score.skipBars = ##t</tspan><tspan
+     y="90.288406"
+     x="2.0426602">  \set Score.skipBars = ##t</tspan><tspan
      id="tspan1164"
      sodipodi:role="line"
-     y="139.38731"
-     x="2.52">  \transpose f c' \hornNotes</tspan><tspan
+     y="112.98463"
+     x="2.0426602">  \transpose f c' \hornNotes</tspan><tspan
      id="tspan1168"
      sodipodi:role="line"
-     y="167.38731"
-     x="2.52">}</tspan></text>
+     y="135.68086"
+     x="2.0426602">}</tspan></text>
+
 
   <rect
-   y="86.242416"
-   x="34.790546"
-   height="31.066223"
-   width="425.08368"
+   y="69.906464"
+   x="28.200512"
+   height="25.181662"
+   width="344.56424"
    id="rect705"
    style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <rect
-   y="117.33445"
-   x="34.588528"
-   height="28.01602"
-   width="250.31258"
+   y="95.109039"
+   x="28.03676"
+   height="22.709219"
+   width="202.89841"
    id="rect706"
    style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <rect
-   y="117.21618"
-   x="302.40845"
-   height="27.169315"
-   width="171.67058"
+   y="95.013046"
+   x="245.12634"
+   height="22.022905"
+   width="139.1528"
    id="rect707"
    style="font-size:12px;fill:#5f8dd3;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <path
    id="path708"
-   d="M 163.83323,85.180624 C 169.72123,26.308624 222.58789,22.073051 250.84589,17.363051"
-   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 132.7999,69.045669 C 137.57268,21.325254 180.42533,17.891987 203.3307,14.074159"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.51983678;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    sodipodi:nodetypes="cc" />
   <path
    id="path709"
-   d="M 71.877889,145.70205 C 29.490919,185.73505 -29.380781,232.83205 22.425919,265.80005"
-   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+   d="M 58.262776,118.10312 C 23.904744,150.55314 -23.81547,188.72901 18.177998,215.45214"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.51983678;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <path
    id="path710"
-   d="M 360.92788,145.46937 C 309.12088,197.27537 331.02199,218.70305 363.98999,239.89605"
-   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 292.56089,117.91462 C 250.56723,159.90753 268.3198,177.27628 295.043,194.45495"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1.51983678;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    sodipodi:nodetypes="cc" />
   <text
    sodipodi:linespacing="100%"
    id="text711"
-   y="24.959999"
-   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:#af0000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
-     y="24.959999"
-     x="258.03763"
+   y="20.232079"
+   x="209.16023"
+   style="font-size:21.07508087px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;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"><tspan
+     y="20.232079"
+     x="209.16023"
      id="tspan1306"
      sodipodi:role="line">Condense multi-rests</tspan></text>
 
+
   <text
    sodipodi:linespacing="100%"
    id="text718"
-   y="283.5144"
-   x="28.926991"
-   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:#008f00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
-     y="283.5144"
-     x="28.926991"
+   y="229.81126"
+   x="23.447643"
+   style="font-size:21.07508087px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;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"><tspan
+     y="229.81126"
+     x="23.447643"
      id="tspan1304"
      sodipodi:role="line">Transpose for F instrument</tspan></text>
 
+
   <text
    id="text723"
-   y="245.49294"
-   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>
+   y="198.99159"
+   x="302.90204"
+   style="font-size:21.07508087px;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>
+
 
 <metadata
    id="metadata1154">
diff --git a/Documentation/pictures/text-input-pop-annotate.svg b/Documentation/pictures/text-input-pop-annotate.svg
index ae2deb2af0..59159577d9 100644
--- a/Documentation/pictures/text-input-pop-annotate.svg
+++ b/Documentation/pictures/text-input-pop-annotate.svg
@@ -10,8 +10,8 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg548"
    sodipodi:version="0.32"
-   width="605.17108"
-   height="441.13013"
+   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"
@@ -30,7 +30,7 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="301.03312"
+     inkscape:cx="307.46076"
      inkscape:cy="221.78706"
      inkscape:window-width="719"
      inkscape:window-height="708"
@@ -40,125 +40,125 @@
      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="36.074203"
-     y="13.266"
+     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="36.074203"
-       y="13.266">&lt;&lt;</tspan><tspan
+       x="35.776142"
+       y="13.156391">&lt;&lt;</tspan><tspan
        sodipodi:role="line"
        id="tspan1340"
-       x="36.074203"
-       y="40.765999">  \chords {</tspan><tspan
+       x="35.776142"
+       y="40.429176">  \chords {</tspan><tspan
        sodipodi:role="line"
        id="tspan1342"
-       x="36.074203"
-       y="68.265999">    c1:m7 f2:7 c2</tspan><tspan
+       x="35.776142"
+       y="67.701965">    c1:m7 f2:7 c2</tspan><tspan
        sodipodi:role="line"
        id="tspan1344"
-       x="36.074203"
-       y="95.765999">  }</tspan><tspan
+       x="35.776142"
+       y="94.974747">  }</tspan><tspan
        sodipodi:role="line"
        id="tspan1346"
-       x="36.074203"
-       y="123.266">  \relative c'' {</tspan><tspan
+       x="35.776142"
+       y="122.24753">  \relative c'' {</tspan><tspan
        sodipodi:role="line"
        id="tspan1348"
-       x="36.074203"
-       y="150.76601">    g2 es8( c4.)</tspan><tspan
+       x="35.776142"
+       y="149.52031">    g2 es8( c4.)</tspan><tspan
        sodipodi:role="line"
        id="tspan1350"
-       x="36.074203"
-       y="178.26601">    f8 f es d c2</tspan><tspan
+       x="35.776142"
+       y="176.79311">    f8 f es d c2</tspan><tspan
        sodipodi:role="line"
        id="tspan1352"
-       x="36.074203"
-       y="205.76601">  }</tspan><tspan
+       x="35.776142"
+       y="204.06589">  }</tspan><tspan
        sodipodi:role="line"
        id="tspan1354"
-       x="36.074203"
-       y="233.26601">  \addlyrics {</tspan><tspan
+       x="35.776142"
+       y="231.33867">  \addlyrics {</tspan><tspan
        sodipodi:role="line"
        id="tspan1356"
-       x="36.074203"
-       y="260.76599">    Li ly,</tspan><tspan
+       x="35.776142"
+       y="258.61145">    Li ly,</tspan><tspan
        sodipodi:role="line"
        id="tspan1358"
-       x="36.074203"
-       y="288.26599">    got me on my knees</tspan><tspan
+       x="35.776142"
+       y="285.88425">    got me on my knees</tspan><tspan
        sodipodi:role="line"
        id="tspan1360"
-       x="36.074203"
-       y="315.76599">  }</tspan><tspan
+       x="35.776142"
+       y="313.15701">  }</tspan><tspan
        sodipodi:role="line"
        id="tspan1374"
-       x="36.074203"
-       y="343.26599">&gt;&gt;</tspan></text>
+       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="251.07663"
-     height="57.471516"
-     x="86.326164"
-     y="239.49001" />
+     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="180.25644"
-     height="28.735817"
-     x="85.793449"
-     y="46.086891" />
+     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="168.34248"
-     height="53.896721"
-     x="85.395088"
-     y="131.00386" />
+     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.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 339.01268,262.49363 C 375.84812,260.20645 487.82435,300.91729 447.36182,324.158"
+     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.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 256.08974,151.88217 C 326.51229,146.16489 365.89437,199.33836 438.58844,185.61387"
+     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.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 268.05002,60.498658 C 296.44606,62.785848 438.43008,33.458498 470.34357,73.453508"
+     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:26px;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="382.18661"
-     y="100.48704"
+     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="382.18661"
-       y="100.48704"
+       x="379.02905"
+       y="99.656807"
        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:#008f00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="452.82004"
-     y="196.02174"
+     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="452.82004"
-       y="196.02174"
+       x="449.0787"
+       y="194.40211"
        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="377.27579"
-     y="357.28284"
+     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>
@@ -166,19 +166,19 @@
   <rect
      style="font-size:12px;fill:#b25ed5;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
      id="rect686"
-     width="168.6489"
-     height="27.448336"
-     x="59.510609"
-     y="211.5591" />
+     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.88;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 58.681262,224.92288 C -37.036244,256.49057 -11.438005,380.5755 118.30805,414.83831"
+     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: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="138.99094"
-     y="431.01611"
+     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>
diff --git a/Documentation/pictures/text-input-score-annotate.svg b/Documentation/pictures/text-input-score-annotate.svg
index 557a2e01d3..13ce102e99 100644
--- a/Documentation/pictures/text-input-score-annotate.svg
+++ b/Documentation/pictures/text-input-score-annotate.svg
@@ -11,8 +11,8 @@
    xml:space="preserve"
    id="svg728"
    sodipodi:version="0.32"
-   width="417.08264"
-   height="249.08209"
+   width="364.08301"
+   height="217.4305"
    sodipodi:docname="text-input-score-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/usr/src/savannah/lily/newweb/site/switch"
@@ -29,80 +29,83 @@
   <sodipodi:namedview
    id="base"
    inkscape:zoom="1"
-   inkscape:cx="212.71028"
-   inkscape:cy="132.21059"
+   inkscape:cx="185.72127"
+   inkscape:cy="90.21002"
    inkscape:window-width="590"
    inkscape:window-height="708"
-   inkscape:window-x="163"
-   inkscape:window-y="28"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
    showgrid="false"
    inkscape:current-layer="svg728" />
   <text
-   style="font-size:26px;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="3.5347519"
-   y="89.062035"
+   style="font-size:22.69612122px;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="3.0855813"
+   y="77.74469"
    id="text731"
    sodipodi:linespacing="100%"><tspan
-     x="3.5347519"
-     y="89.062035"
+     x="3.0855813"
+     y="77.74469"
      sodipodi:role="line"
      id="tspan1178">&lt;&lt;</tspan><tspan
-     x="3.5347519"
-     y="115.06203"
+     x="3.0855813"
+     y="100.44081"
      sodipodi:role="line"
      id="tspan1182">  \new Staff \hornNotes</tspan><tspan
-     x="3.5347519"
-     y="141.06203"
+     x="3.0855813"
+     y="123.13693"
      sodipodi:role="line"
      id="tspan2394">  \new Staff \bassoonNotes</tspan><tspan
-     x="3.5347519"
-     y="167.06203"
+     x="3.0855813"
+     y="145.83305"
      sodipodi:role="line"
      id="tspan1188">&gt;&gt;</tspan></text>
 
+
   <rect
    style="font-size:12px;fill:#ff5555;fill-opacity:0.48945151;fill-rule:evenodd;stroke-width:1pt"
    id="rect758"
-   width="341.33691"
-   height="24.600643"
-   x="34.672348"
-   y="94.407906" />
+   width="297.96231"
+   height="21.474592"
+   x="30.266476"
+   y="82.41127" />
   <rect
    style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
    id="rect759"
-   width="379.18369"
-   height="24.600645"
-   x="34.681282"
-   y="120.88321" />
+   width="331.00024"
+   height="21.474594"
+   x="30.274221"
+   y="105.5222" />
   <rect
    style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
    id="rect760"
-   width="34.380184"
-   height="100.57295"
+   width="30.011412"
+   height="87.792824"
    x="0"
-   y="70.369949" />
+   y="61.427887" />
   <path
-   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-   d="M 15.410247,171.78213 C 13.745147,226.73113 67.234672,234.30377 113.85866,234.30377"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#008f00;stroke-width:1.63673937;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 13.452029,149.95334 C 11.998512,197.91985 58.691013,204.53017 99.390328,204.53017"
    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 122.92925,93.307816 C 121.26325,30.032539 143.61735,19.28898 193.57135,17.62388"
+   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#af0000;stroke-width:1.63673937;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="M 107.30841,81.450991 C 105.8541,26.216235 125.3676,16.837894 168.97382,15.384385"
    id="path762"
    sodipodi:nodetypes="cc" />
   <text
-   style="font-size:26px;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="207.41716"
-   y="25.402"
+   style="font-size:22.69612122px;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="181.0603"
+   y="22.17411"
    id="text763">Create staff</text>
 
+
   <text
-   style="font-size:26px;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="127.97768"
-   y="242.50409"
+   style="font-size:22.69612122px;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="111.71525"
+   y="211.68839"
    id="text766">Combine staffs in parallel</text>
 
+
 <metadata
    id="metadata1091">
   <rdf:RDF>