From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 2 Aug 2004 18:38:00 +0000 (+0000)
Subject: * lily/lookup.cc (round_filled_box): remove warnings about blot
X-Git-Tag: release/2.3.11~3
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=2ee25ca26bf670a6671503381cf3325d35d28e93;p=lilypond.git

* 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 2bf659a3bc..4f411f2c96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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
 
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 222d7ebd0f..ac2c14cdc3 100644
--- 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)
     {
-      programming_error (_f ("round filled box horizontal extent smaller than blot; decreasing blot"));
       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 ();
     }
 
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 942c554214..1ffa23fe45 100644
--- 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)
 
+try \once \set Score.allowBeamBreak = ##t
+
 %}
 
 %% rather name \newline, \newpage ?
@@ -70,45 +72,6 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 #(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
diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index af82b3cc01..94a7e487bf 100644
--- 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
-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. 
diff --git a/scm/paper.scm b/scm/paper.scm
index 211208ac86..dad869d880 100644
--- 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))
-	 (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)
@@ -19,7 +32,7 @@
     (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))
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 682b67cc38..2d76b3c7bb 100644
--- 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
-	if process_cmd = '':
+	if process_cmd == '':
 		process_cmd = lilypond_binary + " -f tex "
 	
 	if process_cmd: