X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=init%2Fpaper16.ly;h=8ce2fb67ed0f3368d1f690f09ba0c80b649bfafb;hb=f5d88b8b3b09ac724d7f2234b25fcbde4bc1b072;hp=9a6f98aeccb30f3b83983ad8260c5c2e29670c47;hpb=c573fa28c07b03f17d96b97815765f1a8bf8c47a;p=lilypond.git

diff --git a/init/paper16.ly b/init/paper16.ly
index 9a6f98aecc..8ce2fb67ed 100644
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -1,29 +1,29 @@
 % paper16.ly
 
-\include "table16.ly"
+\include "table13.ly";
+\include "table11.ly";
+\include "table16.ly";
 
 
+
+\version "1.0.1";
+
 paper_sixteen = \paper {
-	linewidth = 15.0 \cm;
-	rule_thickness = 0.4\pt;
-	bar_size = 16.0 \pt;
-	interline = 4.\pt;
-	notewidth = 5.0\pt;
-	wholewidth = 4.8\pt;
-	unitspace = 22.\pt;
-	%geometric = 1.414;
-	%basicspace = 4.\pt;
+	staffheight = 16.0\pt;
+	linewidth = 15.5 \cm;
 
-	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 ";
    
-	%
-	interbeam = 2.667\pt;
-
-	gourlay_energybound = 100000.;
-	gourlay_maxmeasures = 14.;
-	castingalgorithm = \Gourlay;
-	\symboltables { \table_sixteen }
-	\requesttranslator { \orchestral_score_translator }
+	0 = \symboltables { \table_sixteen }
+	-1 = \symboltables { \table_thirteen }
+	-2 = \symboltables { \table_eleven }
+	
+	\include "params.ly";
 }