release: 1.0.10

[lilypond.git] / init / paper20.ly

diff --git a/init/paper20.ly b/init/paper20.ly
index 62322672deded78965e59e56e2b042b3015fe57f..955f164eecb20ce764e05bd00566fce0911ad30e 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -1,38 +1,31 @@
 % paper20.ly
 
-\include "table20.ly"
+\include "table20.ly";
+
+ \include "table13.ly";
+ \include "table16.ly";
+
+\version "1.0.4";
 
 paper_twenty = \paper {
-       linewidth = 15.0 \cm;
-       indent = 10.\mm;
-       rulethickness = 0.4\pt;
-       barsize = 20.0 \pt;
-       interline = 5.\pt;
-       notewidth = 7.15\pt; % ugh see table20 for sizes
-       wholewidth = 10.44\pt;
-       unitspace = 22.\pt;
-%      basicspace = 4.\pt;
-%      geometric = 1.414;
-       geometric = 0.;
-       basicspace = 8.\pt;
+       staffheight = 20.0\pt;
+       % where to get papersize (e.g. a5, letter)
+       papersize = "a4";
+
+       % ugh see table20 for sizes
+       quartwidth =  6.61\pt
+       wholewidth = 9.90\pt
 
+       basicspace = 8.\pt;
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 6.\pt;
+       texsetting = "\\input lilyponddefs \\musixtwentydefs ";
+
+
+       -2 = \symboltables { \table_thirteen }  
+       -1 = \symboltables { \table_sixteen }
+       0 = \symboltables { \table_twenty }
        
-       %
-       % 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 = 3.6;
-       % ugh: interline *in fact* is rule_thickness + "interline"?
-       interbeam = 3.9;
-
-       gourlay_energybound = 100000.;
-       gourlay_maxmeasures = 12.;
-       
-       castingalgorithm = \Gourlay;
-       \symboltables { \table_twenty }
-\include "engraver.ly"
+       \include "params.ly";
 }