From 56fc1f2ca57f7a7f4073710ee30f1a6340eaddad Mon Sep 17 00:00:00 2001
From: Patrick McCarty <pnorcks@gmail.com>
Date: Sun, 16 Aug 2009 20:22:19 -0700
Subject: [PATCH] Web: clean up background colors in SVG files

---
 .../pictures/text-input-1-annotate.svg        | 109 ++++++++---------
 .../pictures/text-input-2-annotate.svg        | 112 +++++++++---------
 .../text-input-parts-both-annotate.svg        |  48 ++------
 .../text-input-parts-single-annotate.svg      | 111 +++++------------
 .../pictures/text-input-pop-annotate.svg      |  90 +++++++-------
 .../pictures/text-input-score-annotate.svg    |  99 +++++-----------
 6 files changed, 226 insertions(+), 343 deletions(-)

diff --git a/Documentation/pictures/text-input-1-annotate.svg b/Documentation/pictures/text-input-1-annotate.svg
index c24061df0f..0f5d3319ab 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="570.22498"
-   height="215.19048"
+   width="549.9397"
+   height="212.76448"
    sodipodi:docname="text-input-1-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/usr/src/newweb/site/switch"
@@ -57,81 +57,81 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="285.11249"
+     inkscape:cx="271.75797"
      inkscape:cy="112.28524"
-     inkscape:window-width="696"
+     inkscape:window-width="647"
      inkscape:window-height="708"
-     inkscape:window-x="248"
-     inkscape:window-y="24"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showgrid="false"
      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="54.354366"
+     y="52.434368"
      id="text551"
      sodipodi:linespacing="100%"><tspan
        x="2.1600001"
-       y="54.354366"
+       y="52.434368"
        sodipodi:role="line"
        id="tspan1054">{</tspan><tspan
        x="2.1600001"
-       y="78.35437"
+       y="76.434372"
        sodipodi:role="line"
        id="tspan1056">  \time 2/4</tspan><tspan
        x="2.1600001"
-       y="102.35437"
+       y="100.43437"
        sodipodi:role="line"
        id="tspan1058">  \clef bass</tspan><tspan
        x="2.1600001"
-       y="126.35437"
+       y="124.43437"
        sodipodi:role="line"
        id="tspan1060">  c4 c g g a a g2</tspan><tspan
        x="2.1600001"
-       y="150.35437"
+       y="148.43437"
        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="73.559502"
+     y="71.639503"
      id="text562">
     <tspan
        id="tspan563" />
   </text>
   <rect
-     style="font-size:12px;fill:#fa0000;fill-opacity:0.42335803;fill-rule:evenodd;stroke-width:1pt"
+     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="58.073055" />
+     y="56.153057" />
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.73476" />
+     y="105.81476" />
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.73476" />
+     y="105.81476" />
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.60976" />
+     y="105.68976" />
   <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="73.559502"
+     y="71.639503"
      id="text734">
     <tspan
        id="tspan735" />
@@ -139,22 +139,22 @@
   <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="72.382103"
+     y="70.462105"
      id="text739">
     <tspan
        id="tspan740" />
   </text>
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.73471" />
+     y="105.81471" />
   <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="73.559502"
+     y="71.639503"
      id="text744">
     <tspan
        id="tspan745" />
@@ -162,92 +162,95 @@
   <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="73.559471"
+     y="71.639473"
      id="text749">
     <tspan
        id="tspan750" />
   </text>
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.84353" />
+     y="105.92353" />
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.73476" />
+     y="105.81476" />
   <rect
-     style="font-size:12px;fill:#1ae293;fill-opacity:0.37956202;fill-rule:evenodd;stroke-width:1pt"
+     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="107.60971" />
+     y="105.68971" />
   <rect
-     style="font-size:12px;fill:#5974c8;fill-opacity:0.57391298;fill-rule:evenodd;stroke-width:1pt"
+     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="107.68618" />
+     y="105.76618" />
   <rect
-     style="font-size:12px;fill:#5974c8;fill-opacity:0.57391298;fill-rule:evenodd;stroke-width:1pt"
+     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="107.76675" />
+     y="105.84675" />
   <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="26.879999"
+     y="24.959999"
      id="text763">
     <tspan
        x="286.23145"
-       y="26.879999"
+       y="24.959999"
        sodipodi:role="line"
-       id="tspan800">Commands start with \</tspan>
+       id="tspan800"
+       style="font-size:26px">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"
+     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="68.715347"
+     y="66.795349"
      id="text775">
     <tspan
        x="263.24698"
-       y="68.715347"
+       y="66.795349"
        sodipodi:role="line"
-       id="tspan806">Letters are notes</tspan>
+       id="tspan806"
+       style="font-size:26px">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,198.13267 C 52.561552,197.11331 32.073652,187.00825 50.931802,130.94348"
+     d="M 81.103622,196.21267 C 52.561552,195.19331 32.073652,185.08825 50.931802,129.02348"
      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,185.4778 C 289.96806,160.93485 237.22913,179.15264 238.91581,130.31405"
+     d="M 284.60109,183.5578 C 289.96806,159.01485 237.22913,177.23264 238.91581,128.39405"
      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="208.10648"
+     y="206.18648"
      id="text784">
     <tspan
        x="89.437927"
-       y="208.10648"
+       y="206.18648"
        sodipodi:role="line"
-       id="tspan804">Numbers are durations</tspan>
+       id="tspan804"
+       style="font-size:26px">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 256.77151,58.37138 C 240.28751,58.37138 206.14855,60.119077 192.89688,105.14769"
+     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"
      id="path808"
      sodipodi:nodetypes="cc" />
   <metadata
@@ -262,8 +265,8 @@
     </rdf:RDF>
   </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 67.134222,55.530237 C 99.0175,0.48480815 278.31839,18.453957 278.31839,18.763457"
+     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"
      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 80b4bb80f9..4bfa545226 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="681.26355"
-   height="300.84195"
+   width="627.78601"
+   height="293.95193"
    sodipodi:docname="text-input-2-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/usr/src/savannah/lily/newweb/site/graphics"
@@ -30,12 +30,12 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="340.63177"
-     inkscape:cy="145.56815"
-     inkscape:window-width="774"
+     inkscape:cx="313.9679"
+     inkscape:cy="165.56815"
+     inkscape:window-width="720"
      inkscape:window-height="708"
-     inkscape:window-x="191"
-     inkscape:window-y="24"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      showgrid="false"
      inkscape:current-layer="svg548" />
   <text
@@ -72,141 +72,137 @@
        x="0"
        y="194.15201"
        sodipodi:role="line"
-       id="tspan966">}</tspan><tspan
-       x="0"
-       y="222.15201"
-       sodipodi:role="line"
-       id="tspan968" /></text>
+       id="tspan968">}</tspan></text>
   <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
+     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" />
   <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
+     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="201.35558"
+     x="200.35558"
      y="115.45953" />
   <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.97468004pt"
+     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="201.35721"
-     y="144.89482" />
+     x="200.10721"
+     y="145.14482" />
   <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
+     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.012375"
-     y="91.911186" />
+     x="67.512375"
+     y="92.161186" />
   <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
+     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.012375"
-     y="146.07246" />
+     x="67.262375"
+     y="145.82246" />
   <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03682003pt"
+     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.87041"
-     y="144.52921" />
+     x="167.37041"
+     y="144.77921" />
   <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
+     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.118736"
-     y="59.06012" />
+     x="51.618736"
+     y="59.31012" />
   <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.99361296pt"
+     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="218.90187"
+     x="216.90187"
      y="115.21575" />
   <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03922997pt"
+     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="219.01862"
+     x="217.01862"
      y="145.00471" />
   <rect
-     style="font-size:12px;fill:#67ee7a;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1.03682003pt"
+     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" />
   <rect
-     style="font-size:12px;fill:#ad99f2;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:0.95553303pt"
+     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="169.80193"
+     x="167.80193"
      y="88.378838" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 86.243832,69.907952 C 106.22483,69.907952 213.41043,94.280612 308.32243,72.633612"
+     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"
      id="path639"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000b0;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 264.28466,130.53191 C 297.58766,130.53191 361.60543,114.26261 381.58743,85.955612"
+     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"
      id="path640"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b300;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 93.941634,176.82716 C 103.93263,193.47816 220.18163,255.29016 301.77363,218.65716"
+     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"
      id="path641"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b300;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 186.11345,180.21915 C 207.76045,208.52615 233.11745,228.42415 300.55545,210.10815"
+     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"
      id="path642"
      sodipodi:nodetypes="cc" />
   <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b30000;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 43.12779,172.55803 C 24.811805,222.51203 19.816808,264.14003 99.742784,279.12603"
+     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"
      id="path643" />
   <text
      style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#00009e;fill-opacity:1;stroke:none;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="322.47546"
+     x="320.47546"
      y="79.294334"
      id="text694">
     <tspan
-       x="322.47546"
+       x="320.47546"
        y="79.294334"
        sodipodi:role="line"
        id="tspan648">Add articulations</tspan>
   </text>
   <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#00ad00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="307.0423"
+     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"
      id="text699">
     <tspan
-       x="307.0423"
+       x="305.0423"
        y="219.60112"
        sodipodi:role="line"
        id="tspan707">Add -es for flat, -is for sharp</tspan>
   </text>
   <text
-     style="font-size:26px;font-style:normal;font-weight:normal;writing-mode:lr-tb;text-anchor:start;fill:#a60000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"
-     x="115.56139"
+     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"
      id="text702">
     <tspan
-       x="115.56139"
+       x="113.56139"
        y="288.28394"
        sodipodi:role="line"
        id="tspan625">Enclose pitches in &lt; &gt; for chords</tspan>
@@ -223,10 +219,10 @@
     </rdf:RDF>
   </metadata>
   <rect
-     style="font-size:12px;fill:#ee9797;fill-opacity:0.48905101;fill-rule:evenodd;stroke:none;stroke-width:1pt"
+     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="150.80469"
-     y="88.498466" />
+     x="149.80469"
+     y="87.498466" />
 </svg>
diff --git a/Documentation/pictures/text-input-parts-both-annotate.svg b/Documentation/pictures/text-input-parts-both-annotate.svg
index b366995da6..eb337abc04 100644
--- a/Documentation/pictures/text-input-parts-both-annotate.svg
+++ b/Documentation/pictures/text-input-parts-both-annotate.svg
@@ -12,7 +12,7 @@
    inkscape:version="0.46"
    sodipodi:docname="text-input-parts-both-annotate.svg"
    height="373.27905"
-   width="709.20117"
+   width="631.18286"
    sodipodi:version="0.32"
    id="svg548"
    xml:space="preserve"
@@ -26,19 +26,17 @@
      inkscape:vp_z="744.09448 : 526.18109 : 1"
      inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
      id="perspective35" /></defs>
-
   <sodipodi:namedview
-   inkscape:window-y="5"
-   inkscape:window-x="157"
+   inkscape:window-y="0"
+   inkscape:window-x="0"
    inkscape:window-height="708"
-   inkscape:window-width="818"
+   inkscape:window-width="730"
    inkscape:cy="186.63953"
-   inkscape:cx="354.88018"
+   inkscape:cx="310.00752"
    inkscape:zoom="1"
    id="base"
    showgrid="false"
    inkscape:current-layer="svg548" />
-
   <text
    id="text555"
    y="28.739059"
@@ -96,12 +94,7 @@
      id="tspan1226"
      sodipodi:role="line"
      y="364.73907"
-     x="7.7990665">} </tspan></text>
-
-
-
-
-
+     x="7.7990665">}</tspan></text>
 
   <rect
    y="89.084488"
@@ -109,67 +102,52 @@
    height="25.80957"
    width="72.433189"
    id="rect662"
-   style="font-size:12px;fill:#01b500;fill-opacity:0.56204403;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-opacity:1" />
-
+   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"
    id="rect663"
-   style="font-size:12px;fill:#af3738;fill-opacity:0.56521702;fill-rule:evenodd;stroke-width:1pt" />
-
+   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"
    id="rect664"
-   style="font-size:12px;fill:#af3738;fill-opacity:0.56521702;fill-rule:evenodd;stroke-width:1pt" />
-
+   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:#00ad00;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
-
+   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" />
   <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:#b10000;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
-
+   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" />
   <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:#00ad00;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
+   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"
      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:#b10000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
+   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"
      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 ca92ffa299..57e14ed2d8 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="306.22705"
-   width="610.3028"
+   height="289.1824"
+   width="541.65167"
    sodipodi:version="0.32"
    id="svg682"
    xml:space="preserve"
@@ -26,161 +26,112 @@
      inkscape:vp_z="744.09448 : 526.18109 : 1"
      inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
      id="perspective24" /></defs>
-
-
   <sodipodi:namedview
    inkscape:current-layer="svg682"
-   inkscape:window-y="33"
-   inkscape:window-x="233"
+   inkscape:window-y="0"
+   inkscape:window-x="0"
    inkscape:window-height="708"
-   inkscape:window-width="734"
+   inkscape:window-width="642"
    inkscape:cy="145.83431"
-   inkscape:cx="305.1514"
+   inkscape:cx="268.0911"
    inkscape:zoom="1"
    id="base"
    showgrid="false" />
-
-
   <text
    sodipodi:linespacing="100%"
    id="text690"
-   y="93.541931"
+   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
      id="tspan1160"
      sodipodi:role="line"
-     y="93.541931"
+     y="83.387314"
      x="2.52">{</tspan><tspan
      id="tspan1162"
      sodipodi:role="line"
-     y="121.54193"
+     y="111.38731"
      x="2.52">  \set Score.skipBars = ##t</tspan><tspan
      id="tspan1164"
      sodipodi:role="line"
-     y="149.54193"
-     x="2.52">  \transpose f c'  \hornNotes</tspan><tspan
+     y="139.38731"
+     x="2.52">  \transpose f c' \hornNotes</tspan><tspan
      id="tspan1168"
      sodipodi:role="line"
-     y="177.54193"
+     y="167.38731"
      x="2.52">}</tspan></text>
 
-
-
-
-
-
-
-
   <rect
-   y="96.397034"
+   y="86.242416"
    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" />
-
-
+   style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <rect
-   y="127.48907"
+   y="117.33445"
    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" />
-
-
+   style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <rect
-   y="127.3708"
-   x="320.40845"
+   y="117.21618"
+   x="302.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" />
-
-
+   style="font-size:12px;fill:#5f8dd3;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt" />
   <path
    id="path708"
-   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"
+   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"
    sodipodi:nodetypes="cc" />
-
-
   <path
    id="path709"
-   d="M 71.877889,155.85667 C 29.490919,195.88967 -29.380781,242.98667 22.425919,275.95467"
-   style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#00b300;stroke-width:1.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-
-
+   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" />
   <path
    id="path710"
-   d="M 360.92788,155.62399 C 309.12088,207.42999 331.02199,228.85767 363.98999,250.05067"
+   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"
    sodipodi:nodetypes="cc" />
-
-
   <text
    sodipodi:linespacing="100%"
    id="text711"
-   y="35.11462"
+   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:#b00000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
-     y="35.11462"
+   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"
      id="tspan1306"
      sodipodi:role="line">Condense multi-rests</tspan></text>
 
-
-
-
-
-
-
-
   <text
    sodipodi:linespacing="100%"
    id="text718"
-   y="293.66904"
+   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:#00b200;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Charter"><tspan
-     y="293.66904"
+   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"
      id="tspan1304"
      sodipodi:role="line">Transpose for F instrument</tspan></text>
 
-
-
-
-
-
-
-
   <text
    id="text723"
-   y="255.64755"
+   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>
 
-
-
-
-
-
-
-
 <metadata
    id="metadata1154">
   <rdf:RDF>
     <cc:Work
    rdf:about="">
       <dc:format>image/svg+xml</dc:format>
-
       <dc:type
    rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-
     </cc:Work>
-
   </rdf:RDF>
-
 </metadata>
-
 </svg>
\ No newline at end of file
diff --git a/Documentation/pictures/text-input-pop-annotate.svg b/Documentation/pictures/text-input-pop-annotate.svg
index 7d518b30e3..ae2deb2af0 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="665.10199"
-   height="443.57413"
+   width="605.17108"
+   height="441.13013"
    sodipodi:docname="text-input-pop-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/vc/savannah/lily/newweb/site/graphics"
@@ -30,154 +30,154 @@
   <sodipodi:namedview
      id="base"
      inkscape:zoom="1"
-     inkscape:cx="335.52737"
+     inkscape:cx="301.03312"
      inkscape:cy="221.78706"
-     inkscape:window-width="760"
-     inkscape:window-height="711"
-     inkscape:window-x="451"
-     inkscape:window-y="29"
+     inkscape:window-width="719"
+     inkscape:window-height="708"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:current-layer="svg548"
      showgrid="false" />
   <text
      xml:space="preserve"
      style="font-size: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"
+     x="36.074203"
      y="13.266"
      id="text551"
      sodipodi:linespacing="125%"><tspan
        sodipodi:role="line"
        id="tspan1338"
-       x="40.748211"
+       x="36.074203"
        y="13.266">&lt;&lt;</tspan><tspan
        sodipodi:role="line"
        id="tspan1340"
-       x="40.748211"
+       x="36.074203"
        y="40.765999">  \chords {</tspan><tspan
        sodipodi:role="line"
        id="tspan1342"
-       x="40.748211"
+       x="36.074203"
        y="68.265999">    c1:m7 f2:7 c2</tspan><tspan
        sodipodi:role="line"
        id="tspan1344"
-       x="40.748211"
+       x="36.074203"
        y="95.765999">  }</tspan><tspan
        sodipodi:role="line"
        id="tspan1346"
-       x="40.748211"
+       x="36.074203"
        y="123.266">  \relative c'' {</tspan><tspan
        sodipodi:role="line"
        id="tspan1348"
-       x="40.748211"
+       x="36.074203"
        y="150.76601">    g2 es8( c4.)</tspan><tspan
        sodipodi:role="line"
        id="tspan1350"
-       x="40.748211"
+       x="36.074203"
        y="178.26601">    f8 f es d c2</tspan><tspan
        sodipodi:role="line"
        id="tspan1352"
-       x="40.748211"
+       x="36.074203"
        y="205.76601">  }</tspan><tspan
        sodipodi:role="line"
        id="tspan1354"
-       x="40.748211"
+       x="36.074203"
        y="233.26601">  \addlyrics {</tspan><tspan
        sodipodi:role="line"
        id="tspan1356"
-       x="40.748211"
+       x="36.074203"
        y="260.76599">    Li ly,</tspan><tspan
        sodipodi:role="line"
        id="tspan1358"
-       x="40.748211"
+       x="36.074203"
        y="288.26599">    got me on my knees</tspan><tspan
        sodipodi:role="line"
        id="tspan1360"
-       x="40.748211"
+       x="36.074203"
        y="315.76599">  }</tspan><tspan
        sodipodi:role="line"
        id="tspan1374"
-       x="40.748211"
+       x="36.074203"
        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"
+     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="91.000175"
+     x="86.326164"
      y="239.49001" />
   <rect
-     style="font-size:12px;fill:#b00000;fill-opacity:0.40875896;fill-rule:evenodd;stroke:none;stroke-width:0.97302504pt"
+     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="90.467461"
+     x="85.793449"
      y="46.086891" />
   <rect
-     style="font-size:12px;fill:#009400;fill-opacity:0.306569;fill-rule:evenodd;stroke:none;stroke-width:0.94686499pt"
+     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="90.069099"
+     x="85.395088"
      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"
+     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"
      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"
+     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"
      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"
+     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"
      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"
+     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"
      id="text669">
     <tspan
-       x="386.86063"
+       x="382.18661"
        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"
+     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"
      id="text674">
     <tspan
-       x="457.49405"
+       x="452.82004"
        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"
+     x="377.27579"
      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"
+     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="64.184616"
+     x="59.510609"
      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"
+     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"
      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"
+     x="138.99094"
      y="431.01611"
      id="text688">
     <tspan
diff --git a/Documentation/pictures/text-input-score-annotate.svg b/Documentation/pictures/text-input-score-annotate.svg
index f7ce366dfd..557a2e01d3 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="536.36145"
-   height="264.42117"
+   width="417.08264"
+   height="249.08209"
    sodipodi:docname="text-input-score-annotate.svg"
    inkscape:version="0.46"
    sodipodi:docbase="/home/hanwen/usr/src/savannah/lily/newweb/site/switch"
@@ -26,137 +26,92 @@
      inkscape:vp_z="744.09448 : 526.18109 : 1"
      inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
      id="perspective22" /></defs>
-
-
   <sodipodi:namedview
    id="base"
    inkscape:zoom="1"
-   inkscape:cx="268.18073"
+   inkscape:cx="212.71028"
    inkscape:cy="132.21059"
-   inkscape:window-width="640"
+   inkscape:window-width="590"
    inkscape:window-height="708"
    inkscape:window-x="163"
    inkscape:window-y="28"
    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="99.128212"
+   y="89.062035"
    id="text731"
    sodipodi:linespacing="100%"><tspan
      x="3.5347519"
-     y="99.128212"
+     y="89.062035"
      sodipodi:role="line"
      id="tspan1178">&lt;&lt;</tspan><tspan
      x="3.5347519"
-     y="125.12821"
-     sodipodi:role="line"
-     id="tspan1180">  \new Staff \_(&quot;hornNotes&quot;)</tspan><tspan
-     x="3.5347519"
-     y="151.1282"
+     y="115.06203"
      sodipodi:role="line"
-     id="tspan1182">  \new Staff \_(&quot;bassoonNotes&quot;)</tspan><tspan
+     id="tspan1182">  \new Staff \hornNotes</tspan><tspan
      x="3.5347519"
-     y="177.1282"
+     y="141.06203"
      sodipodi:role="line"
-     id="tspan1184">&gt;&gt;</tspan><tspan
+     id="tspan2394">  \new Staff \bassoonNotes</tspan><tspan
      x="3.5347519"
-     y="203.1282"
+     y="167.06203"
      sodipodi:role="line"
-     id="tspan1186" /><tspan
-     x="3.5347519"
-     y="229.1282"
-     sodipodi:role="line"
-     id="tspan1188">  </tspan></text>
-
-
-
-
-
-
+     id="tspan1188">&gt;&gt;</tspan></text>
 
   <rect
-   style="font-size:12px;fill:#c12b28;fill-opacity:0.53658495;fill-rule:evenodd;stroke-width:1pt"
+   style="font-size:12px;fill:#ff5555;fill-opacity:0.48945151;fill-rule:evenodd;stroke-width:1pt"
    id="rect758"
-   width="403.33691"
+   width="341.33691"
    height="24.600643"
    x="34.672348"
-   y="104.47408" />
-
-
+   y="94.407906" />
   <rect
-   style="font-size:12px;fill:#c12b28;fill-opacity:0.53658495;fill-rule:evenodd;stroke-width:1pt"
+   style="font-size:12px;fill:#ff5555;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
    id="rect759"
-   width="450.18369"
+   width="379.18369"
    height="24.600645"
    x="34.681282"
-   y="130.94939" />
-
-
+   y="120.88321" />
   <rect
-   style="font-size:12px;fill:#23ca22;fill-opacity:0.58841505;fill-rule:evenodd;stroke-width:1pt"
+   style="font-size:12px;fill:#5fd35f;fill-opacity:0.49019608;fill-rule:evenodd;stroke-width:1pt"
    id="rect760"
    width="34.380184"
    height="100.57295"
    x="0"
-   y="80.436127" />
-
-
+   y="70.369949" />
   <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 15.410247,181.8483 C 13.745147,236.7973 67.234672,244.36994 113.85866,244.36994"
+   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"
    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,103.37399 C 121.26325,40.098713 143.61735,29.355154 193.57135,27.690054"
+   d="M 122.92925,93.307816 C 121.26325,30.032539 143.61735,19.28898 193.57135,17.62388"
    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"
+   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="35.468174"
+   y="25.402"
    id="text763">Create staff</text>
 
-
-
-
-
-
-
   <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"
+   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="252.57027"
+   y="242.50409"
    id="text766">Combine staffs in parallel</text>
 
-
-
-
-
-
-
 <metadata
    id="metadata1091">
   <rdf:RDF>
     <cc:Work
    rdf:about="">
       <dc:format>image/svg+xml</dc:format>
-
       <dc:type
    rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-
     </cc:Work>
-
   </rdf:RDF>
-
 </metadata>
-
 </svg>
\ No newline at end of file
-- 
2.39.5