release: 1.0.6

[lilypond.git] / init / paper16.ly

diff --git a/init/paper16.ly b/init/paper16.ly
index 69cac7239525fea9c25dbff5d465cdb98384f0b6..8ce2fb67ed0f3368d1f690f09ba0c80b649bfafb 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -1,43 +1,29 @@
 % paper16.ly
 
-\include "table16.ly"
+\include "table13.ly";
+\include "table11.ly";
+\include "table16.ly";
 
 
-%{
 
-TODO make this somehow parametric. for example the linewidth was
-chosen to look good on A4 paper.  This probably looks less good on US
-paper sizes.
+\version "1.0.1";
 
-
-%}
 paper_sixteen = \paper {
+       staffheight = 16.0\pt;
        linewidth = 15.5 \cm;
-       indent = 10.\mm;
-       rulethickness = 0.4\pt;
-       barsize = 16.0 \pt;
-       interline = 4.\pt;
-       notewidth = 5.93\pt; % ugh, see table16 for sizes
-       wholewidth = 8.64\pt;
-       unitspace = 22.\pt;
-       %geometric = 1.414;
-       basicspace = 4.\pt;
 
-       geometric = 0.;
+       % ugh, see table16 for sizes
+       quartwidth = 5.28\pt;
+       wholewidth = 7.92\pt;
+
+       basicspace = 4.\pt;
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;
+       texsetting = "\\input lilyponddefs \\musixsixteendefs ";
    
-       % three beams span two interlines, including stafflines:
-       % 2 interbeam + beam_thickness = 2 interline - staffline_thickness
-       % ( beam_thickness = 0.48 interline for now...)
-       % interbeam = interline - (beam_thickness + staffline_thickness) / 2
-       % interbeam = 2.84;
-       % ugh: interline *in fact* is rule_thickness + "interline"?
-       interbeam = 3.14;
-
-       gourlay_energybound = 100000.;
-       gourlay_maxmeasures = 14.;
-       castingalgorithm = \Gourlay;
-       \symboltables { \table_sixteen }
-       \include "engraver.ly"
+       0 = \symboltables { \table_sixteen }
+       -1 = \symboltables { \table_thirteen }
+       -2 = \symboltables { \table_eleven }
+       
+       \include "params.ly";
 }