patch::: 1.1.29.jcn1: gnu stuff + font fixje

pl 29.jcn1
	- bf: volta sizes
	- GNU stuff on home page

---
Generated by janneke@gnu.org using package-diff 0.62,
>From = lilypond-1.1.29, To = lilypond-1.1.29.jcn1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.29.jcn1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.29
1.1.29.jcn1
++state

diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo
index 11eb7166ed83119ec26c682ab240e5861ac09965..8ebbc3d8117601ee084779ce397d21ebf55044ca 100644 (file)
--- a/Documentation/topdocs/index.yo
+++ b/Documentation/topdocs/index.yo
@@ -8,7 +8,7 @@ DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand(</strong></font>)))
 redef(htmlnewfile)(0)()
 setchapterstring()
 
-nchapter(LilyPond -- The GNU Project Music Typesetter)
+nchapter(LilyPond -- The url(GNU Project)(http://www.fsf.org/gnu/gnu-history.html) Music Typesetter)
 
 includefile(../BLURB.in)(url(italiano)(DOEXPAND(docdir)/DOEXPAND(outdir)/COPERTINA.html))(url(nederlands)(DOEXPAND(docdir)/DOEXPAND(outdir)/FLAPTEKST.html))
 nl()
@@ -39,6 +39,16 @@ of LilyPond, specifically, this page was made from LilyPond
 @TOPLEVEL_VERSION@.tar.gz
 
 
+nsect(Free Software)
+
+LilyPond is url(free software)(http://www.fsf.org/copyleft/copyleft.html).
+We believe that 
+url(software should be free)(http://www.fsf.org/philosophy/why-free.html).
+For more url(information)(http://www.fsf.org/philosophy/philosophy.html),
+see the url(Free Software Foundation)(http://www.fsf.org/).
+Just say ``No'' to proprietary software.
+
+
 nsect(Preview)
 
 itemize(

diff --git a/NEWS b/NEWS
index 59c08785c2a4702ab208822da26bfe34c05295fe..54aedcfc58bd5c69cf78d77eb0ce6c270d569e45 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
-pl 28.hwn1
+--- ../lilypond-1.1.29/NEWS    Tue Feb  9 13:54:27 1999
+++ b/NEWS      Tue Feb  9 17:15:49 1999
+@@ -1,3 +1,7 @@
+pl 29.jcn1
+       - bf: volta sizes
+       - GNU stuff on home page
+
+ xl 28.jcn1
+       - new outline TODO + .emacs setup
+ pl 28.hwn1
        - bf: mid measure clefs (breakable  items in non-breakable columns.)
        - spanner.cc assert changed to warning
        - (c) 1998 -> 1999 search replace.

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

diff --git a/lily/lookup.cc b/lily/lookup.cc
index bdf95d73e59fac9263a8071946860aa473c9be0b..bb6ac3fe8917917ddc1ae28b84be354286dfdca1 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -388,6 +388,7 @@ static Dict_initialiser<char const*> cmr_init[] = {
   {"Large", "cmbx"},
   {"mark", "feta-nummer"},
   {"number", "feta-nummer"},
+  {"volta", "feta-nummer"},
   {0,0}
 };
 

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index a9836484d07e9eea548ff83a76dee4dfdd69a9b5..5162ac429c94bcb234a743c3c624c03517ea93dc 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -81,7 +81,8 @@ Volta_spanner::do_add_processing ()
       set_bounds (RIGHT, column_arr_.top ());  
     }
 
-  number_p_->style_str_ = "number";
+  // number_p_->style_str_ = "number-1";
+  number_p_->style_str_ = "volta";
 }
   
 Interval

diff --git a/ly/paper16.ly b/ly/paper16.ly
index 8a40d38949e9c0a2aac23d0e3e8db729ea6bd350..aa15beff32f160572dfae3ea41bcf10bbd3e0da5 100644 (file)
--- a/ly/paper16.ly
+++ b/ly/paper16.ly
@@ -14,11 +14,11 @@ paper_sixteen = \paper {
        font_large = 12.;
        font_Large = 10.;
        font_normal = 8.;
-       font_finger = 4.;
-       "font_number-1" = 5.;
-       
 
-       
+       font_finger = 4.;
+       font_volta = 5.;
+       font_number = 8.;
+       font_mark = 10.;
 
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;

diff --git a/ly/paper20.ly b/ly/paper20.ly
index 2f4958a23cf34588dbcd19149f5da852ed43597c..61f5951ed94bff97d53365ed3c163fd3a4caa4b3 100644 (file)
--- a/ly/paper20.ly
+++ b/ly/paper20.ly
@@ -9,8 +9,17 @@ paper_twenty = \paper {
        font_large = 12.;
        font_Large = 12.;       
        font_normal = 10.;
+
        font_finger = 5.;
-       "font_number-1" = 7.;
+       font_volta = 8.;
+       font_number = 10.;
+       font_mark = 12.;
+
+       % what about:
+       "font_number-1" = 8.;
+       %"font_number" = 10.;
+       "font_number+1" = 12.;
+
        
        % ugh see table20 for sizes
        quartwidth =  6.61\pt;