patch::: 1.3.26.jcn2

1.3.26.jcn2
===========

* Bugfix: font used in volta-spanner calculation.

* Added simple selection list to webpage, inspired by sawmill.

diff --git a/CHANGES b/CHANGES
index 4080a7f603f0befba40ad6340746f2ec355c6388..5a4ec57e684302145c1983fecb02181a2d7754bd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.3.26.jcn2
+===========
+
+* Bugfix: font used in volta-spanner calculation.
+
+* Added simple selection list to webpage, inspired by sawmill.
+
 1.3.26.jcn1
 ===========
 

diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely
index c24859c33be2323fd2ce497b16b75f48f9bfc7c8..90142fb51e3a86284e4e01f1fa4c3e60cf9d3106 100644 (file)
--- a/Documentation/topdocs/index.tely
+++ b/Documentation/topdocs/index.tely
@@ -5,13 +5,31 @@
 @node Top, , , (dir)
 @top
 
-
-@unnumberedsec LilyPond -- The GNU Project Music Typesetter
-
+@html
+<p align=center>
+[
+    <a href="#download">Download</a>
+    |
+    <a href="Documentation/out-www/faq.html">FAQ</a>
+    |
+    <a href="Documentation/out-www/index.html">Documentation</a>
+    |
+    <a href="#music">Music archives</a>
+    |
+    <a href="#mailing-lists">Mailing lists</a>
+    |
+    <a href="Documentation/programmer/out-www/regression-test.html">
+    Regression test</a>
+    |
+    <a href="Documentation/out-www/CHANGES.txt">News</a>
+]
+@end html
 
 @html
-<img src="Documentation/pictures/out-www/lelie-logo.png">
+<p align=center>
+<img src="Documentation/pictures/out-www/lelie-logo.png" alt="[logo]">
 @end html
+@unnumberedsec LilyPond -- The GNU Project Music Typesetter
 
 @c something breaks on 3.12 f
 
@@ -65,6 +83,10 @@ If want more information, you can browse the
 For the latest and greatest features, check out the
 @uref{Documentation/out-www/CHANGES.txt, Change Log}.
 
+
+@html
+<a name="music">
+@end html
 @unnumberedsec Sheet music
 
 
@@ -83,6 +105,9 @@ putting @uref{http://www4.smart.net/~jcovey/scores/,guitar music} on the
 net. The @uref{http://sca.uwaterloo.ca/Mutopia/,Mutopia project} is a
 large archive of public domain sheet music under construction.
 
+@html
+<a name="download">
+@end html
 @unnumberedsec Download
 
 If you want to compile LilyPond from source, download here:
@@ -109,6 +134,10 @@ binary RPMs:  @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/}
 @item Windows NT: @uref{http://home.austin.rr.com/jbr/jeff/lilypond/}
 @end itemize
 
+
+@html
+<a name="mailing-lists">
+@end html
 @unnumberedsec Mailing list
 
 If you have questions, do write to the mailing lists!
@@ -158,5 +187,24 @@ of the LilyPond package.  The version of this webpage is printed at the
 bottom. If you want to volunteer for making more beautiful webpages,
 then please mail us!
 
+@html
+<p align=center>
+[
+    <a href="#download">Download</a>
+    |
+    <a href="Documentation/out-www/faq.html">FAQ</a>
+    |
+    <a href="Documentation/out-www/index.html">Documentation</a>
+    |
+    <a href="#music">Music archives</a>
+    |
+    <a href="#mailing-lists">Mailing lists</a>
+    |
+    <a href="Documentation/programmer/out-www/regression-test.html">
+    Regression test</a>
+    |
+    <a href="Documentation/out-www/CHANGES.txt">News</a>
+]
+@end html
 
 @bye

diff --git a/VERSION b/VERSION
index 2387dbbf1b337064e36c6b507dc8037a43452f94..8fac086972764c56edcca1c174c3501a558a529c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=26
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 6258b17008f142d414fc23ced7e59b64515953e4..72ace70c4f1f1c30399b55cd848b790ef5de5be1 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -98,7 +98,7 @@ Volta_spanner::do_brew_molecule_p () const
     dy = dy >? note_column_arr[i]->extent (Y_AXIS)[BIGGER];
   dy -= h;
 
-  Molecule two (lookup_l ()->text ("number", "2", paper_l ()));
+  Molecule two (lookup_l ()->text ("volta", "2", paper_l ()));
   Real gap = two.dim_.x ().length () / 2;
   Offset off (num.dim_.x ().length () + gap, 
              h / half_staff_space - gap);

diff --git a/scm/lily.scm b/scm/lily.scm
index 050a9a16b11aed79e992b4fecf20a7090f631535..a57d0e9e081e97cad323e2ee79ac7f2c2489a0fd 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -787,7 +787,6 @@
 
   (define (volta h w thick vert-start vert-end)
          ;; urg
-         (set! h 1)
          (string-append
           (func "set-line-char" "|")
           (func "rmove-to" 0 -4)