release: 1.0.15

[lilypond.git] / init / paper16.ly

diff --git a/init/paper16.ly b/init/paper16.ly
index 35b411d5d9609bcc6a125c2f57354ff521528134..c7f7352521dd78c1ba5705ab2074af190964fed1 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -1,50 +1,30 @@
 % 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.7";
 
-
-%}
 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;
+
+
        arithmetic_basicspace = 2.;
         arithmetic_multiplier = 4.8\pt;
-   
-       % three beams span two interlines, including stafflines:
-       % 2ib + bt = 2 il - st
-       % bt = 0.48(il - st) for now.
-       % 2ib + 0.48il - 0.48 st = 2il - st
-       % 2ib = 1.52il - 0.52 st
-       % ib = 0.76il - 0.26st = 2.94 --jcn
-       % now, it seams rather ib = 0.76il + 0.26st = 3.14
-       % interbeam = 2.94\pt;
-       % No -- hwn
-       interbeam = 3.14\pt;
-
-       gourlay_energybound = 100000.;
-       %{
-       The following bounds the number of measures
-       on a line.  Decreasing it greatly reduces computation time
-       %}
-       gourlay_maxmeasures = 10.;
-       castingalgorithm = \Gourlay;
-       \symboltables { \table_sixteen }
-       \include "engraver.ly"
+       texsetting = "\\input lilyponddefs \\musixsixteendefs ";
+       pssetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n";
+
+       0 = \symboltables { \table_sixteen }
+       -1 = \symboltables { \table_thirteen }
+       -2 = \symboltables { \table_eleven }
+       
+       \include "params.ly";
 }