release: 1.1.0

[lilypond.git] / init / paper20.ly

diff --git a/init/paper20.ly b/init/paper20.ly
index d9302be296e6a37844de153ddb850d549ec35ccb..cf6e0dbe95a727b9c6f2117c1a9883ac89c43336 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -1,38 +1,29 @@
 % paper20.ly
 
-\include "table20.ly"
+\include "table20.ly";
+
+ \include "table13.ly";
+ \include "table16.ly";
+
+\version "1.0.7";
 
 paper_twenty = \paper {
-       linewidth = 15.0 \cm;
-       indent = 12.\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;
+
+       % ugh see table20 for sizes
+       quartwidth =  6.61\pt;
+       wholewidth = 9.90\pt;
+
 
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 6.\pt;
-       
-       %
-       % 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"
+       texsetting = "\\input lilyponddefs \\musixtwentydefs ";
+       pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
+
+       -2 = \symboltables { \table_thirteen }  
+       -1 = \symboltables { \table_sixteen }
+       0 = \symboltables { \table_twenty }
+
+       \include "params.ly";
 }