* lily/lookup.cc (round_filled_box): remove warnings about blot

diameter.

* scm/paper.scm (paper-set-staff-size): tune up linethickness by
10% for  20pt staffs. Leave 16.5 untouched.

* scripts/lilypond-book.py (main): add -f tex as default process.

diff --git a/ChangeLog b/ChangeLog
index 2bf659a3bc4611a66df7d2eb309c0125a42fa49e..4f411f2c9641c691568f24e9fd0c3706b348897d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-08-02  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 2004-08-02  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

+       * lily/lookup.cc (round_filled_box): remove warnings about blot
+       diameter.
+
+       * scm/paper.scm (paper-set-staff-size): tune up linethickness by
+       10% for  20pt staffs. Leave 16.5 untouched.
+

        * lily/parser.yy (new_lyrics): \addlyrics -> \oldaddlyrics,
        \newlyrics -> \addlyrics
 
        * lily/parser.yy (new_lyrics): \addlyrics -> \oldaddlyrics,
        \newlyrics -> \addlyrics
 

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 222d7ebd0f280e19dfbb41c2c7ada30f0685a11e..ac2c14cdc39d11c7d16bb7fe93be624efca2e324 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -166,12 +166,10 @@ Lookup::round_filled_box (Box b, Real blotdiameter)
 {
   if (b.x ().length () < blotdiameter)
     {
 {
   if (b.x ().length () < blotdiameter)
     {

-      programming_error (_f ("round filled box horizontal extent smaller than blot; decreasing blot"));

       blotdiameter = b.x ().length ();
     }
   if (b.y ().length () < blotdiameter)
     {
       blotdiameter = b.x ().length ();
     }
   if (b.y ().length () < blotdiameter)
     {

-      programming_error (_f ("round filled box vertical extent smaller than blot; decreasing blot"));

       blotdiameter = b.y ().length ();
     }
 
       blotdiameter = b.y ().length ();
     }
 

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 942c554214fa6a245ea6bc585274dc99ec2bfa21..1ffa23fe4588535c828034022ac9700bfea0c344 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -27,6 +27,8 @@ center=0
 should also set allowBeamBreak, but how to do it "portably"? (ie. also
 working with lyric sections)
 
 should also set allowBeamBreak, but how to do it "portably"? (ie. also
 working with lyric sections)
 

+try \once \set Score.allowBeamBreak = ##t
+

 %}
 
 %% rather name \newline, \newpage ?
 %}
 
 %% rather name \newline, \newpage ?


@@ -70,45 +72,6 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 #(set-default-paper-size "a4")
 
 
 #(set-default-paper-size "a4")
 
 

-
-%{
-
-%% these would supercede defaults in \bookpaper.
-% let's comment this out for now. 
-
-
-paperEleven = \paper {
-    #(paper-set-staff-size (* 11.0 pt))
-}
-
-paperThirteen = \paper {
-    #(paper-set-staff-size (* 13.0 pt))
-}
-
-paperSixteen = \paper {
-    #(paper-set-staff-size (* 16.0 pt))
-}
-
-paperEightteen = \paper {
-    #(paper-set-staff-size (* 18.0 pt))
-}
-
-paperTwenty = \paper {
-    #(paper-set-staff-size (* 20.0 pt))
-}
-
-paperTwentythree = \paper {
-    #(paper-set-staff-size (* 23.0 pt))
-}
-
-paperTwentysix = \paper {
-    #(paper-set-staff-size (* 26.0 pt))
-}
-
-\paper { \paperTwenty }
-
-%}
-

 partCombineListener = \paper {
  \context {
          \Voice
 partCombineListener = \paper {
  \context {
          \Voice

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index af82b3cc0182e8c11943293d8f4539c6e6d039a0..94a7e487bfdd7825f49c9a9194b2feac2a1f1042 100644 (file)
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -15,7 +15,12 @@ staff_space# = staffsize#/(stafflines-1);
 % for increased contrast with beams.
 
 %% !! synchronize with paper.scm
 % for increased contrast with beams.
 
 %% !! synchronize with paper.scm

-stafflinethickness#  = 0.3 pt# + 0.04 staff_space#; 
+
+save fixed_line_thickness, variable_line_factor;
+fixed_line_thickness + variable_line_factor * 5 pt# = 0.50 pt#;
+fixed_line_thickness + variable_line_factor * 4.125 pt# = 0.47 pt#;
+
+stafflinethickness#  = fixed_line_thickness + variable_line_factor * staff_space#; 

 
 %
 % The following tunes the general blackness of the glyphs. 
 
 %
 % The following tunes the general blackness of the glyphs. 

diff --git a/scm/paper.scm b/scm/paper.scm
index 211208ac86bbe041d1efd6723a9c12625b796c69..dad869d88079d33cda81d56331bd88f0d17ab5d3 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -9,7 +9,20 @@
   "Function to be called inside a \\paper{} block to set the staff size."
   (let* ((m (current-module))
         (ss (/ sz 4))
   "Function to be called inside a \\paper{} block to set the staff size."
   (let* ((m (current-module))
         (ss (/ sz 4))

-        (pt (eval 'pt m)) 
+        (pt (eval 'pt m))
+
+        
+        ;; linear interpolation.
+        (x1 (* 4.125 pt))
+        (x0 (* 5 pt))
+        (f1 (* 0.47 pt))
+        (f0 (* 0.50 pt))
+        (lt (/
+             (+
+              (* f1 (- ss x0))
+              (* f0 (- x1 ss)))
+             (- x1 x0)))
+        

         (mm (eval 'mm m)))
 
     (module-define! m 'outputscale ss)
         (mm (eval 'mm m)))
 
     (module-define! m 'outputscale ss)


@@ -19,7 +32,7 @@
     (module-define! m 'staffspace ss)
 
     ;; !! synchronize with feta-params.mf
     (module-define! m 'staffspace ss)
 
     ;; !! synchronize with feta-params.mf

-    (module-define! m 'linethickness (+ (* 0.3 pt) (* 0.04 ss)))
+    (module-define! m 'linethickness lt)

     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.35 pt))
     (module-define! m 'interscoreline (* 4 mm))
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.35 pt))
     (module-define! m 'interscoreline (* 4 mm))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 682b67cc38f67c37c965c78e9a1803bb0eb6a29c..2d76b3c7bbbe30d0d71da0c61ecd04bab479b3cb 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1071,7 +1071,7 @@ def do_options ():
 def main ():
        files = do_options ()
        global process_cmd
 def main ():
        files = do_options ()
        global process_cmd

-       if process_cmd = '':
+       if process_cmd == '':

                process_cmd = lilypond_binary + " -f tex "
        
        if process_cmd:
                process_cmd = lilypond_binary + " -f tex "
        
        if process_cmd: