From f18af60f6d54f318f63ffbab7cbc6cb09f40a457 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:12:45 +0000
Subject: [PATCH] lilypond-1.0.1

---
 init/bar-numbering.ly |  7 ++--
 init/performer.ly     | 16 ++++-----
 init/score-paper.ly   | 29 ++++++++++++++++
 init/table11.ly       | 79 +++++++++++++++++++++---------------------
 init/table13.ly       | 80 +++++++++++++++++++++----------------------
 init/table26.ly       | 78 ++++++++++++++++++++---------------------
 6 files changed, 157 insertions(+), 132 deletions(-)
 create mode 100644 init/score-paper.ly

diff --git a/init/bar-numbering.ly b/init/bar-numbering.ly
index e642545548..f7831b439c 100644
--- a/init/bar-numbering.ly
+++ b/init/bar-numbering.ly
@@ -1,13 +1,15 @@
 % bar-numbering.ly
 % 
 Staff = \translator {
-	\type "Engraver_group_engraver";
+	\type "Line_group_engraver_group";
 	defaultclef = violin;
+	barColumnPriority = "0";
 
+	marginBreakPriority = "-4";
 	\consists "Bar_engraver";
 	\consists "Clef_engraver";
 	\consists "Key_engraver";
-	\consists "Meter_engraver";
+	\consists "Time_signature_engraver";
 	\consists "Local_key_engraver";
 	\consists "Staff_sym_engraver";
 	\consists "Collision_engraver";
@@ -15,7 +17,6 @@ Staff = \translator {
 	\consists "Bar_column_engraver";
 	\consists "Bar_number_engraver";
 	\consists "Separating_line_group_engraver";
-	\consists "Line_group_engraver";
 	  
 	\accepts "Voice";
 }
diff --git a/init/performer.ly b/init/performer.ly
index 7d7cd9f113..a4cee69b75 100644
--- a/init/performer.ly
+++ b/init/performer.ly
@@ -6,7 +6,7 @@ Staff =	\translator {
 	\type "Staff_performer";
 	\accepts Voice;
 	\consists "Key_performer";
-	\consists "Meter_performer";
+	\consists "Time_signature_performer";
 }
 
 Thread =\translator
@@ -21,13 +21,13 @@ Voice = \translator
 	\accepts Thread;
 }
 
-Grand_staff = \translator
+GrandStaff = \translator
 {
 	\type "Performer_group_performer";
 	\accepts Staff;
 }
 
-Lyric_voice = \translator {
+LyricVoice = \translator {
 	\type "Performer_group_performer";
 	\consists "Lyric_performer";
 }
@@ -35,11 +35,11 @@ Lyric_voice = \translator {
 
 Lyrics = \translator { 
 	\type "Staff_performer";
-	\accepts Lyric_voice;
-	\consists "Meter_performer";
+	\accepts LyricVoice;
+	\consists "Time_signature_performer";
 }
 
-Staff_group = \translator
+StaffGroup = \translator
 {
 	\type Performer_group_performer;
 	\accepts Staff;
@@ -49,9 +49,9 @@ Score = \translator {
 	\type "Score_performer";
 	instrument = piano;
 	\accepts Staff;
-	\accepts Grand_staff;
+	\accepts GrandStaff;
 	\accepts Lyrics; 
-	\accepts Staff_group;
+	\accepts StaffGroup;
 	\consists "Swallow_performer";
 }
 
diff --git a/init/score-paper.ly b/init/score-paper.ly
new file mode 100644
index 0000000000..f0e4783822
--- /dev/null
+++ b/init/score-paper.ly
@@ -0,0 +1,29 @@
+%score-paper.ly
+
+\paper { 
+	% for simple testing only!
+	castingalgorithm = \Wordwrap; % lots faster on my 486 -- jcn
+Staff = \translator {
+	\type "Hara_kiri_line_group_engraver";
+
+	defaultclef = violin;
+	barColumnPriority = "0";
+	marginBreakPriority = "-4";
+
+	\consists "Bar_engraver";
+	\consists "Clef_engraver";
+	\consists "Key_engraver";
+	\consists "Time_signature_engraver";
+	\consists "Local_key_engraver";
+	\consists "Staff_sym_engraver";
+	\consists "Collision_engraver";
+	\consists "Rest_collision_engraver";
+	\consists "Staff_margin_engraver";
+	\consists "Separating_line_group_engraver";
+	  
+	\accepts "Voice";
+}
+
+\include "score-bar-numbering.ly";
+
+}
diff --git a/init/table11.ly b/init/table11.ly
index 34bffcc63c..646a0b843c 100644
--- a/init/table11.ly
+++ b/init/table11.ly
@@ -6,72 +6,71 @@
 
 table_eleven  = \symboltables {
 
-   \texid 	"\input lilyponddefs \musixelevendefs"
+   \font 	"feta11.afm"
 
     % index TeXstring, 	xmin xmax ymin ymax
 
      "style" = \table {
-		"bold"	"\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
-		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
-		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
-		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
-		"large"	"\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
-		"number"	"\setnumber{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
-		"roman"	"\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
+		"bold"	"\\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
+		"dynamic"	"\\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"finger"	"\\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
+		"italic"	"\\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"large"	"\\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
+		"number"	"\\setnumber{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
+		"roman"	"\\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
      }
 
      "dynamics" = \table {
 
-	"mf" "\dynmf"
-	"fff" "\dynfff"
-	"ff" "\dynff"
-	"f" "\dynf"
+	"mf" "\\dynmf"
+	"fff" "\\dynfff"
+	"ff" "\\dynff"
+	"f" "\\dynf"
 
-	"mp" "\dynmp"
-	"p" "\dynp"
-	"pp" "\dynpp"
-	"ppp" "\dynppp"
-	"fp" "\dynfp"
-	"sf" "\dynsf"
-	"sfz" "\dynsfz"
+	"mp" "\\dynmp"
+	"p" "\\dynp"
+	"pp" "\\dynpp"
+	"ppp" "\\dynppp"
+	"fp" "\\dynfp"
+	"sf" "\\dynsf"
+	"sfz" "\\dynsfz"
 
 	}
      "align" = \table {
-		"-1"	"\leftalign{%}"
-		"0"	"\centeralign{%}"
-		"1"	"\rightalign{%}"
+		"-1"	"\\leftalign{%}"
+		"0"	"\\centeralign{%}"
+		"1"	"\\rightalign{%}"
  	}
 
 
 
 
     "bars" = \table {
-	"empty"	"\emptybar"
+	"empty"	"\\emptybar"
 	""	""			0.0\pt	0.0\pt	0.0\pt	16.0\pt
-	"|"	"\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
-	"||"	"\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
-	"|."	"\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
-	".|"	"\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
-	":|"	"\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
-	"|:"	"\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
-	":|:"	"\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
+	"|"	"\\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
+	"||"	"\\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
+	"|."	"\\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
+	".|"	"\\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
+	".|."	"\\fatdoublebar{%}"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|"	"\\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
+	"|:"	"\\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|:"	"\\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
     }
 
-    "meters" = \table {
-	"C"	"\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
-	"C2"	"\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+    "foobar" = \table {
+	"C"	"\\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	"C2"	"\\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
     }
 
     % dims ignored for this table
     "param" = \table {
-	 "brace"    "\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
-	 "meter"	"\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
-	 "stem"	"\stem{%}{%}"
-	 "fill"	"\hbox{}"
-	 "rule" "\rulesym{%}{%}"
+	 "brace"    "\\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
+	 "time_signature"	"\\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	 "stem"	"\\stem{%}{%}"
+	 "fill"	"\\hbox{}"
+	 "rule" "\\rulesym{%}{%}"
      }
 
-    % ugh what's our outdir called?
-    \include "feta11.ly"
 }
 
diff --git a/init/table13.ly b/init/table13.ly
index d8d64fff07..1432209b8e 100644
--- a/init/table13.ly
+++ b/init/table13.ly
@@ -6,72 +6,70 @@
 
 table_thirteen  = \symboltables {
 
-   \texid 	"\input lilyponddefs \musixthirteendefs"
+   \font 	"feta13.afm"
 
     % index TeXstring, 	xmin xmax ymin ymax
 
      "style" = \table {
-		"bold"	"\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
-		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
-		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
-		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
-		"large"	"\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
-		"number"	"\setnumber{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
-		"roman"	"\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
+		"bold"	"\\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
+		"dynamic"	"\\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"finger"	"\\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
+		"italic"	"\\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"large"	"\\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
+		"number"	"\\setnumber{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
+		"roman"	"\\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
      }
 
      "dynamics" = \table {
 
-	"mf" "\dynmf"
-	"fff" "\dynfff"
-	"ff" "\dynff"
-	"f" "\dynf"
+	"mf" "\\dynmf"
+	"fff" "\\dynfff"
+	"ff" "\\dynff"
+	"f" "\\dynf"
 
-	"mp" "\dynmp"
-	"p" "\dynp"
-	"pp" "\dynpp"
-	"ppp" "\dynppp"
-	"fp" "\dynfp"
-	"sf" "\dynsf"
-	"sfz" "\dynsfz"
+	"mp" "\\dynmp"
+	"p" "\\dynp"
+	"pp" "\\dynpp"
+	"ppp" "\\dynppp"
+	"fp" "\\dynfp"
+	"sf" "\\dynsf"
+	"sfz" "\\dynsfz"
 
 	}
      "align" = \table {
-		"-1"	"\leftalign{%}"
-		"0"	"\centeralign{%}"
-		"1"	"\rightalign{%}"
+		"-1"	"\\leftalign{%}"
+		"0"	"\\centeralign{%}"
+		"1"	"\\rightalign{%}"
  	}
 
 
 
 
     "bars" = \table {
-	"empty"	"\emptybar"
+	"empty"	"\\emptybar"
 	""	""			0.0\pt	0.0\pt	0.0\pt	16.0\pt
-	"|"	"\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
-	"||"	"\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
-	"|."	"\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
-	".|"	"\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
-	":|"	"\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
-	"|:"	"\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
-	":|:"	"\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
+	"|"	"\\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
+	"||"	"\\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
+	"|."	"\\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
+	".|"	"\\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
+	".|."	"\\fatdoublebar{%}"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|"	"\\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
+	"|:"	"\\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|:"	"\\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
     }
 
-    "meters" = \table {
-	"C"	"\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
-	"C2"	"\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+    "time_signatures" = \table {
+	"C"	"\\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	"C2"	"\\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
     }
 
     % dims ignored for this table
     "param" = \table {
-	 "brace"    "\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
-	 "meter"	"\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
-	 "stem"	"\stem{%}{%}"
-	 "fill"	"\hbox{}"
-	 "rule" "\rulesym{%}{%}"
+	 "brace"    "\\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
+	 "time_signature"	"\\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	 "stem"	"\\stem{%}{%}"
+	 "fill"	"\\hbox{}"
+	 "rule" "\\rulesym{%}{%}"
      }
-
-    % ugh what's our outdir called?
-    \include "feta13.ly"
 }
 
diff --git a/init/table26.ly b/init/table26.ly
index 93d9bd645a..c9d7dbc412 100644
--- a/init/table26.ly
+++ b/init/table26.ly
@@ -6,72 +6,70 @@
 
 table_twentysix  = \symboltables {
 
-   \texid 	"\input lilyponddefs \musixtwentysixdefs"
+   \font 	"feta26.afm"
 
     % index TeXstring, 	xmin xmax ymin ymax
 
      "style" = \table {
-		"bold"	"\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
-		"dynamic"	"\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
-		"finger"	"\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
-		"italic"	"\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
-		"large"	"\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
-		"number"	"\setnumber{%}"	0.0\pt	8.0\pt	0.0\pt	10.0\pt
-		"roman"	"\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
+		"bold"	"\\setbold{%}"	0.0\pt	7.50\pt	0.0\pt	8.0\pt
+		"dynamic"	"\\setdynamic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"finger"	"\\setfinger{%}"	0.0\pt	0.0\pt	0.0\pt	5.0\pt
+		"italic"	"\\setitalic{%}"	0.0\pt	0.0\pt	0.0\pt	10.0\pt
+		"large"	"\\setlarge{%}"	0.0\pt	9.50\pt	0.0\pt	12.0\pt
+		"number"	"\\setnumber{%}"	0.0\pt	8.0\pt	0.0\pt	10.0\pt
+		"roman"	"\\settext{%}"	0.0\pt	7.5\pt	0.0\pt	10.0\pt
      }
 
      "dynamics" = \table {
 
-	"mf" "\dynmf"
-	"fff" "\dynfff"
-	"ff" "\dynff"
-	"f" "\dynf"
+	"mf" "\\dynmf"
+	"fff" "\\dynfff"
+	"ff" "\\dynff"
+	"f" "\\dynf"
 
-	"mp" "\dynmp"
-	"p" "\dynp"
-	"pp" "\dynpp"
-	"ppp" "\dynppp"
-	"fp" "\dynfp"
-	"sf" "\dynsf"
-	"sfz" "\dynsfz"
+	"mp" "\\dynmp"
+	"p" "\\dynp"
+	"pp" "\\dynpp"
+	"ppp" "\\dynppp"
+	"fp" "\\dynfp"
+	"sf" "\\dynsf"
+	"sfz" "\\dynsfz"
 
 	}
      "align" = \table {
-		"-1"	"\leftalign{%}"
-		"0"	"\centeralign{%}"
-		"1"	"\rightalign{%}"
+		"-1"	"\\leftalign{%}"
+		"0"	"\\centeralign{%}"
+		"1"	"\\rightalign{%}"
  	}
 
 
 
 
     "bars" = \table {
-	"empty"	"\emptybar"
+	"empty"	"\\emptybar"
 	""	""			0.0\pt	0.0\pt	0.0\pt	16.0\pt
-	"|"	"\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
-	"||"	"\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
-	"|."	"\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
-	".|"	"\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
-	":|"	"\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
-	"|:"	"\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
-	":|:"	"\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
+	"|"	"\\maatstreep{%}"	0.0\pt	0.64\pt 	0.0\pt	20.0\pt
+	"||"	"\\doublebar{%}"		0.0\pt	5.0\pt	0.0\pt	20.0\pt
+	"|."	"\\finishbar{%}"		-5.0\pt	0.0\pt	0.0\pt	20.0\pt
+	".|"	"\\startbar{%}"		0.0\pt	4.0\pt	0.0\pt	20.0\pt
+	".|."	"\\fatdoublebar{%}"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|"	"\\repeatbar"		-10.0\pt	0.0\pt	0.0\pt	20.0\pt
+	"|:"	"\\startrepeat"		0.0\pt	10.0\pt	0.0\pt	20.0\pt
+	":|:"	"\\repeatbarstartrepeat"	0.0\pt 20.0\pt	0.0\pt	20.0\pt
     }
 
     "meters" = \table {
-	"C"	"\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
-	"C2"	"\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	"C"	"\\fourfourmeter"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	"C2"	"\\allabreve"		0.0\pt	10.0\pt	-5.0\pt	5.0\pt
     }
 
     % dims ignored for this table
     "param" = \table {
-	 "brace"    "\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
-	 "meter"	"\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
-	 "stem"	"\stem{%}{%}"
-	 "fill"	"\hbox{}"
-	 "rule" "\rulesym{%}{%}"
+	 "brace"    "\\pianobrace{%}"	0.0\pt	0.0\pt	32.0\pt	96.0\pt	 
+	 "time_signature"	"\\generalmeter{%}{%}"	0.0\pt	10.0\pt	-5.0\pt	5.0\pt
+	 "stem"	"\\stem{%}{%}"
+	 "fill"	"\\hbox{}"
+	 "rule" "\\rulesym{%}{%}"
      }
-
-    % ugh what's our outdir called?
-    \include "feta26.ly"
 }
 
-- 
2.39.5