* scm/paper.scm (set-staff-size): new function: set default

staff-size.

* scm/paper.scm: new file.
(set-staff-size): new function
(set-paper-size): new function

* Documentation/user/refman.itely (Fermatas): document \lyricsto

diff --git a/ChangeLog b/ChangeLog
index f84162eb71a1d3418b48cb1d6011a2f28ce82ccf..1aea67579f52f7117bae1ee6d98c029b515a3d1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-01-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scripts/convert-ly.py (conv): add \include "paper" rule. 
+
        * ly/paper*.ly: remove files. 
        
        * scm/paper.scm (set-staff-size): new function: set default

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 8794234d050aad19d948591083c873baa92b9985..bdb6407484f31a9c58dd6c127e2d1459ba2b86d1 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -22,9 +22,9 @@ setting staff sizes is, both demonstrated in this fragment
 
 @example
   #(set-staff-size 15)
-  \paper {
+  \paper @{
     #(paper-set-staff-size (* 15 pt))
-  }   
+  @}   
 @end example
 
 @noindent

diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely
index 6d3c2ab7afa02acfd0d836466a494047ad387651..edb79eb3f6bcdbe8aca397ce87ed7293a6a5115e 100644 (file)
--- a/Documentation/user/internals.itely
+++ b/Documentation/user/internals.itely
@@ -304,9 +304,10 @@ music to be interpreted. The @var{context modifications} property
 settings and @code{\remove}, @code{\consists} and @code{\consistsend}
 commands. The syntax is similar to the @code{\translator} block.
 
-The following example shows how a staff is created with bigger spaces:
+The following example shows how a staff is created with bigger spaces,
+and without a @code{Clef_engraver}.
 
-@lilypond[relative=1,fragment]
+@lilypond[relative=1,fragment,verbatim]
 <<
   \new Staff { c4 es4 g2 }
   \new Staff \with {
@@ -320,8 +321,8 @@ The following example shows how a staff is created with bigger spaces:
 
 @refbugs
 
-@code{\with} has no effect on contexts that already exist. Neither can
-it be used for @internalsref{Score} contexts.
+The command @code{\with} has no effect on contexts that already
+exist. Neither can it be used for @internalsref{Score} contexts.
 
 
 @node Engravers and performers

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 581b0afeea69190352728a24db11d6c26afbae3c..724dd4adde3190cd34844bb7492f44c82d28500b 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -7329,6 +7329,7 @@ entering the chant, as the following short excerpt demonstrates:
 @lilypond[raggedright,verbatim,noindent]
 \include "gregorian-init.ly"
 \score {
+<<
   \context VaticanaVoice {
     \property Score.BarNumber \set #'transparent = ##t
     \notes {
@@ -7339,7 +7340,8 @@ entering the chant, as the following short excerpt demonstrates:
   }
   \lyricsto "" \new LyricsVoice \lyrics {
     San- ctus, San- ctus, San- ctus
-  }
+  } >>
+  
 }
 @end lilypond
 
@@ -8454,7 +8456,7 @@ sizes. Each font is tuned for a different staff size: at smaller sizes
 the font gets heavier, to match the relatively heavier staff lines.
 The recommended font sizes are listed in the following table:
 
-@multitable @columnfractions  .3 .3 .4  
+@multitable @columnfractions  .25 .25 .25 .25
 
 @item @b{name}
 @tab @b{staff height (pt)}

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 48986498b95596db3bb717db5fd4f251f258cbe9..a622b8b44afca367bb41e6f92a2158bd10c1a9eb 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -62,7 +62,6 @@ melismaEnd = \property Staff.melismaBusy = ##f
        (font-series . medium)
     ))
     
-    #(set-paper-size "a4")
     \include "engraver-init.ly"
 }
 
@@ -108,6 +107,7 @@ paperTwentysix = \paper {
 }
 
 \paper { \paperTwenty }
+#(set-paper-size "a4")
 
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"

diff --git a/scm/paper.scm b/scm/paper.scm
index 7987d8f0218761af5d60b7a7a63cd2bee3a8021a..56110a32bf88ad488d92dcdfa6f64a359d17f279 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -50,7 +50,7 @@
 ;; todo: take dimension arguments.
 
 
-(define (set-paper-dimensions m h w)
+(define (set-paper-dimensions m w h)
   (let*
       ( (mm (eval 'mm m)) )
 
@@ -65,7 +65,9 @@
 (define-public (set-paper-size name)
   (let*
       ((entry (assoc name paper-alist))
-       (m (current-module))
+       (pap (eval '$defaultpaper (current-module)))
+       (new-paper (ly:output-def-clone pap))
+       (m  (ly:output-def-scope new-paper))
        (mm (eval 'mm m))
        )
 
@@ -73,6 +75,10 @@
        (begin
          (set! entry (eval  (cdr entry) m))
          (set-paper-dimensions m (car entry) (cdr entry))
+         (module-define! m 'papersize name)
+         (module-define! m 'papersizename name)
+         (set-paper-dimensions m (car entry) (cdr entry))
+         (module-define! (current-module) '$defaultpaper new-paper)
          )
        (ly:warning (string-append "Unknown papersize: " name))
        )))