lilypond-0.0.20

diff --git a/.dstreamrc b/.dstreamrc
index 1d35c0489b9ad46b6d5c417542a1e08c7dc37676..0fb28ce927ac4651c7b19b4450dd7bc6ea1b258c 100644 (file)
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -1,6 +1,6 @@
 # class name           silence?
 
-My_flex_lexer          1
+My_flex_lexer          0
 yyFlexLexer            1
 PCol                   1
 Score_column           1

diff --git a/init/dutch.ini b/init/dutch.ini
new file mode 100644 (file)
index 0000000..d573656
--- /dev/null
+++ b/init/dutch.ini
@@ -0,0 +1,11 @@
+dutch_names = 
+notenames {
+       "ceses" 0 -2 "ces" 0 -1         "c" 0 0         "cis" 0 1 "cisis" 0 2
+       "deses" 1 -2 "des" 1 -1         "d" 1 0         "dis" 1 1 "disis" 1 2
+       "eses"  2 -2 "es"  2 -1         "e" 2 0         "eis" 2 1 "eisis" 2 2
+       "feses" 3 -2 "fes" 3 -1         "f" 3 0         "fis" 3 1 "fisis" 3 2
+       "geses" 4 -2 "ges" 4 -1         "g" 4 0         "gis" 4 1 "gisis" 4 2
+       "ases"  5 -2 "as"  5 -1         "a" 5 0         "ais" 5 1 "aisis" 5 2
+       "beses" 6 -2 "bes" 6 -1         "b" 6 0         "bis" 6 1 "bisis" 6 2
+}
+

diff --git a/init/table_sixteen.ini b/init/table_sixteen.ini
new file mode 100644 (file)
index 0000000..8b506b8
--- /dev/null
+++ b/init/table_sixteen.ini
@@ -0,0 +1,99 @@
+table_sixteen=
+symboltables {
+       
+   texid       "\musixsixteendefs"
+
+   % index TeXstring,  xmin xmax ymin ymax
+
+
+     "style" = table {
+               "roman" "\settext{%}" 0pt 0pt 0pt 0pt
+               "italic"        "\setitalic{%}" 0pt 0pt 0pt 0pt
+     }
+     "align" = table {
+               "-1"    "\leftalign{%}" 0pt 0pt 0pt 0pt
+               "0"     "\centeralign{%}" 0pt 0pt 0pt 0pt
+               "1"     "\rightalign{%}" 0pt 0pt 0pt 0pt
+       }
+
+     "clefs" = table {
+            "violin"   "\violinclef"           0pt     12.8pt  -10pt   18pt
+            "bass"     "\bassclef"             0pt     11.2pt  0pt     16pt
+            "viola"    "\violaclef"            0pt     12.8pt  0pt     16pt
+            "violin_change"    "\cviolinclef"  0pt     11.2pt  -12pt   12pt
+            "bass_change"      "\cbassclef"    0pt     12.8pt  0pt     16pt
+            "viola_change"     "\cviolaclef"   0pt     11.2pt  0pt     16pt
+     }
+
+     "balls" = table {
+            "1"        "\wholeball"    0pt     6pt     -2 pt   2pt
+            "2"        "\halfball"     0pt     5pt     -2 pt   2pt
+            "4"        "\quartball"    0pt     5pt     -2 pt   2pt
+     }
+
+     "slur" = table {
+            "whole"    "\slurchar%{%}" 0pt     0pt     0pt     0pt
+            "half"     "\hslurchar%{%}"        0pt     0pt     0pt     0pt
+     }
+     "accidentals" = table {
+            "-2"       "\flatflat"     0pt     10.2pt  -2.5pt 7.5pt
+            "-1"       "\flat"         0pt     6pt     -2.5pt 7.5pt
+            "0"        "\natural"      0pt     6pt     -7.5pt 7.5pt
+            "1"        "\sharp"                0pt     6pt     -7.5pt 7.5pt
+            "2"        "\sharpsharp"   0pt     6pt     -2.5pt 7.5pt
+     }
+
+     "streepjes" = table {
+            "toplines" "\toplines{%}"  -3pt    9pt 0pt 0pt
+            "botlines" "\botlines{%}"  -3pt    9pt 0pt 0pt
+     }
+
+     "bars" = table {
+            "empty"    "\emptybar"     0pt     0pt     0pt     0pt
+            "|"        "\maatstreep"   0pt     5pt     -12pt   12pt
+            "||"       "\finishbar"    0pt     2pt     -12pt   12pt
+     }
+
+     "rests" = table {
+            "1"        "\wholerest"            -5pt    1pt     -1pt    1pt
+            "2"        "\halfrest"             -5pt    1pt     -1pt    1pt
+            "4"        "\quartrest"            -5pt    2pt     -5pt    5pt
+            "8"        "\eighthrest"           0pt     5pt     0pt     8pt
+            "16"       "\sixteenthrest"                0pt     6pt     0pt     12pt
+            "32"       "\thirtysecondrest"     0pt     6pt     0pt     16pt
+     }
+
+     "meters" = table {
+            "C"        "\fourfourmeter"                0pt     10pt    -5pt    5pt
+            "C2"       "\allabreve"            0pt     10pt    -5pt    5pt
+     }
+
+     % dims ignored for this table
+     "param" = table {
+            "meter"    "\generalmeter{%}{%}"   -3pt    10pt    -5pt    5pt
+            "linestaf" "\linestafsym{%}{%}"
+            "stem"     "\stem{%}{%}"           
+            "fill"     "\hbox{}"
+     }
+
+     "dots" = table {
+            "1"        "\lsingledot"           0pt     2pt     -1pt    1pt
+            "2"        "\ldoubledot"           0pt     5pt     -1pt    1pt
+            "3"        "\ltripledot"           0pt     8pt     -1pt    1pt
+     }
+
+     "flags" = table {
+            "8"        "\eigthflag"            0pt     4pt     0pt     0pt     
+            "16"       "\sixteenthflag"                0pt     4pt     0pt     0pt
+            "32"       "\thirtysecondflag"     0pt     4pt     0pt     0pt
+            "-8"       "\deigthflag"           0pt     4pt     0pt     0pt
+            "-16"      "\dsixteenthflag"               0pt     4pt     0pt     0pt
+            "-32"      "\dthirtysecondflag"    0pt     4pt     0pt     0pt
+     }
+
+     "beamslopes" = table {
+            "slope"    "\beamslope{%}{%}" 
+            "horizontal"       "\rulesym{%}{%}"        
+     }
+
+}

diff --git a/init/table_twenty.ini b/init/table_twenty.ini
new file mode 100644 (file)
index 0000000..1b49eab
--- /dev/null
+++ b/init/table_twenty.ini
@@ -0,0 +1,103 @@
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+table_twenty = symboltables {
+
+    texid      "\musixtwentydefs"
+
+     "style" = table {
+               "roman" "\settext{%}" 0pt 0pt 0pt 0pt
+               "italic"        "\setitalic{%}" 0pt 0pt 0pt 0pt
+     }
+     "align" = table {
+               "-1"    "\leftalign{%}" 0pt 0pt 0pt 0pt
+               "0"     "\centeralign{%}" 0pt 0pt 0pt 0pt
+               "1"     "\rightalign{%}" 0pt 0pt 0pt 0pt
+       }
+
+
+    % index TeXstring,         xmin xmax ymin ymax
+    % be careful with editing this:
+    % the "index" entry is hardwired into lilypond.
+
+    "clefs" = table {
+           "violin"    "\violinclef"   0pt     16pt    -12.5pt 22.5pt
+           "bass"      "\bassclef"             0pt     16pt    0pt     20pt
+           "viola"     "\violaclef"            0pt     16pt    0pt     20pt
+           "violin_change"     "\cviolinclef"  0pt     16pt    -12.5pt 22.5pt
+           "bass_change"       "\cbassclef"    0pt     16pt    0pt     20pt
+           "viola_change"      "\cviolaclef"   0pt     16pt    0pt     20pt
+    }
+
+    "balls" = table {
+           "1" "\wholeball"    0pt     7.5pt   -2.5pt  2.5pt
+           "2" "\halfball"     0pt     6pt     -2.5pt  2.5pt
+           "4" "\quartball"    0pt     6pt     -2.5pt  2.5pt
+    }
+
+    "slur" = table {
+           "whole"     "\slurchar%{%}" 0pt     0pt     0pt     0pt
+           "half"      "\hslurchar%{%}"        0pt     0pt     0pt     0pt
+    }
+    "accidentals" = table {
+           "-2"        "\flatflat"     0pt     10.2pt  -2.5pt 7.5pt
+           "-1"        "\flat"         0pt     6pt     -2.5pt 7.5pt
+           "0" "\natural"      0pt     6pt     -7.5pt 7.5pt
+           "1" "\sharp"                0pt     6pt     -7.5pt 7.5pt
+           "2" "\sharpsharp"   0pt     6pt     -2.5pt 7.5pt
+    }
+
+    "streepjes" = table {
+           "toplines"  "\toplines{%}"  -3pt    9pt 0pt 0pt
+           "botlines"  "\botlines{%}"  -3pt    9pt 0pt 0pt
+    }
+
+    "bars" = table {
+           "empty"     "\emptybar"     0pt     0pt     0pt     0pt
+           "|" "\maatstreep"   0pt     5pt     -12pt   12pt
+           "||"        "\finishbar"    0pt     2pt     -12pt   12pt
+    }
+
+    "rests" = table {
+           "1" "\wholerest"            -5pt    1pt     -1pt    1pt
+           "2" "\halfrest"             -5pt    1pt     -1pt    1pt
+           "4" "\quartrest"            -5pt    2pt     -5pt    5pt
+           "8" "\eighthrest"           0pt     5pt     0pt     8pt
+           "16"        "\sixteenthrest"                0pt     6pt     0pt     12pt
+           "32"        "\thirtysecondrest"     0pt     6pt     0pt     16pt
+    }
+
+    "meters" = table {
+           "C" "\fourfourmeter"                0pt     10pt    -5pt    5pt
+           "C2"        "\allabreve"            0pt     10pt    -5pt    5pt
+    }
+
+    % dims ignored for this table
+    "param" = table {
+           "meter"     "\generalmeter{%}{%}"   -3pt    10pt    -5pt    5pt
+           "linestaf"  "\linestafsym{%}{%}"    
+           "stem"      "\stem{%}{%}"           
+            "fill"     "\hbox{}"
+    }
+
+    "dots" = table {
+           "1" "\lsingledot"           0pt     8pt     -1pt    1pt
+           "2" "\ldoubledot"           0pt     12pt    -1pt    1pt
+           "3" "\ltripledot"           0pt     16pt    -1pt    1pt
+    }
+
+    "flags" = table {
+           "8" "\eigthflag"            0pt     5pt     0pt     0pt     
+           "16"        "\sixteenthflag"                0pt     5pt     0pt     0pt
+           "32"        "\thirtysecondflag"     0pt     5pt     0pt     0pt
+           "-8"        "\deigthflag"           0pt     5pt     0pt     0pt
+           "-16"       "\dsixteenthflag"               0pt     5pt     0pt     0pt
+           "-32"       "\dthirtysecondflag"    0pt     5pt     0pt     0pt
+    }
+
+    "beamslopes" = table {
+           "slope"     "\beamslope{%}{%}"
+           "horizontal"        "\rulesym{%}{%}"        
+    }
+
+}

diff --git a/src/lexer.l b/src/lexer.l
index 0b17abac663d3a0bdd3aef64337e24c9b83c0f57..4968c89de65b611430fbb7390b98168951fdb282 100644 (file)
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -144,6 +144,17 @@ DOTS               \.+
          yyterminate(); // can't move this, since it actually rets a YY_NULL
 }
 
+
+include           { BEGIN(incl); }
+<incl>[ \t]*      { /* eat the whitespace */ }
+<incl>\"[^"]*\"+   { /* got the include file name */
+   String s (YYText()+1);
+       s = s.left(s.len()-1);
+   new_input(s);
+   BEGIN(INITIAL);
+}
+
+
 {WORD}         {
        mtor << "word: " << YYText()<<eol;
        String c = YYText();

diff --git a/symbol.ini b/symbol.ini
index ed7b4f23be3f8b33cfddeff189315ae72a2e7780..fd28f9ea0fbfc4060a807bc708075e23955b9046 100644 (file)
--- a/symbol.ini
+++ b/symbol.ini
@@ -3,214 +3,13 @@
 % It has a lot of hard-wired stringconstants
 %
 
-table_sixteen = symboltables {
-       
-   texid       "\musixsixteendefs"
+include "init/dutch.ini"
+include "init/table_sixteen.ini"
 
-   % index TeXstring,  xmin xmax ymin ymax
-
-
-     "clefs" = table {
-            "violin"   "\violinclef"           0pt     12.8pt  -10pt   18pt
-            "bass"     "\bassclef"             0pt     11.2pt  0pt     16pt
-            "viola"    "\violaclef"            0pt     12.8pt  0pt     16pt
-            "violin_change"    "\cviolinclef"  0pt     11.2pt  -12pt   12pt
-            "bass_change"      "\cbassclef"    0pt     12.8pt  0pt     16pt
-            "viola_change"     "\cviolaclef"   0pt     11.2pt  0pt     16pt
-     }
-
-     "balls" = table {
-            "1"        "\wholeball"    0pt     6pt     -2 pt   2pt
-            "2"        "\halfball"     0pt     5pt     -2 pt   2pt
-            "4"        "\quartball"    0pt     5pt     -2 pt   2pt
-     }
-
-     "slur" = table {
-            "whole"    "\slurchar%{%}" 0pt     0pt     0pt     0pt
-            "half"     "\hslurchar%{%}"        0pt     0pt     0pt     0pt
-     }
-     "accidentals" = table {
-            "-2"       "\flatflat"     0pt     10.2pt  -2.5pt 7.5pt
-            "-1"       "\flat"         0pt     6pt     -2.5pt 7.5pt
-            "0"        "\natural"      0pt     6pt     -7.5pt 7.5pt
-            "1"        "\sharp"                0pt     6pt     -7.5pt 7.5pt
-            "2"        "\sharpsharp"   0pt     6pt     -2.5pt 7.5pt
-     }
-
-     "streepjes" = table {
-            "toplines" "\toplines{%}"  -3pt    9pt 0pt 0pt
-            "botlines" "\botlines{%}"  -3pt    9pt 0pt 0pt
-     }
-
-     "bars" = table {
-            "empty"    "\emptybar"     0pt     0pt     0pt     0pt
-            "|"        "\maatstreep"   0pt     5pt     -12pt   12pt
-            "||"       "\finishbar"    0pt     2pt     -12pt   12pt
-     }
-
-     "rests" = table {
-            "1"        "\wholerest"            -5pt    1pt     -1pt    1pt
-            "2"        "\halfrest"             -5pt    1pt     -1pt    1pt
-            "4"        "\quartrest"            -5pt    2pt     -5pt    5pt
-            "8"        "\eighthrest"           0pt     5pt     0pt     8pt
-            "16"       "\sixteenthrest"                0pt     6pt     0pt     12pt
-            "32"       "\thirtysecondrest"     0pt     6pt     0pt     16pt
-     }
-
-     "meters" = table {
-            "C"        "\fourfourmeter"                0pt     10pt    -5pt    5pt
-            "C2"       "\allabreve"            0pt     10pt    -5pt    5pt
-     }
-
-     % dims ignored for this table
-     "param" = table {
-            "meter"    "\generalmeter{%}{%}"   -3pt    10pt    -5pt    5pt
-            "linestaf" "\linestafsym{%}{%}"
-            "stem"     "\stem{%}{%}"           
-            "fill"     "\hbox{}"
-     }
-
-     "dots" = table {
-            "1"        "\lsingledot"           0pt     2pt     -1pt    1pt
-            "2"        "\ldoubledot"           0pt     5pt     -1pt    1pt
-            "3"        "\ltripledot"           0pt     8pt     -1pt    1pt
-     }
-
-     "flags" = table {
-            "8"        "\eigthflag"            0pt     4pt     0pt     0pt     
-            "16"       "\sixteenthflag"                0pt     4pt     0pt     0pt
-            "32"       "\thirtysecondflag"     0pt     4pt     0pt     0pt
-            "-8"       "\deigthflag"           0pt     4pt     0pt     0pt
-            "-16"      "\dsixteenthflag"               0pt     4pt     0pt     0pt
-            "-32"      "\dthirtysecondflag"    0pt     4pt     0pt     0pt
-     }
-
-     "beamslopes" = table {
-            "slope"    "\beamslope{%}{%}" 
-            "horizontal"       "\rulesym{%}{%}"        
-     }
-
-}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-table_twenty = symboltables {
-
-    texid      "\musixtwentydefs"
-
-
-    % index TeXstring,         xmin xmax ymin ymax
-    % be careful with editing this:
-    % the "index" entry is hardwired into lilypond.
-
-    "clefs" = table {
-           "violin"    "\violinclef"   0pt     16pt    -12.5pt 22.5pt
-           "bass"      "\bassclef"             0pt     16pt    0pt     20pt
-           "viola"     "\violaclef"            0pt     16pt    0pt     20pt
-           "violin_change"     "\cviolinclef"  0pt     16pt    -12.5pt 22.5pt
-           "bass_change"       "\cbassclef"    0pt     16pt    0pt     20pt
-           "viola_change"      "\cviolaclef"   0pt     16pt    0pt     20pt
-    }
-
-    "balls" = table {
-           "1" "\wholeball"    0pt     7.5pt   -2.5pt  2.5pt
-           "2" "\halfball"     0pt     6pt     -2.5pt  2.5pt
-           "4" "\quartball"    0pt     6pt     -2.5pt  2.5pt
-    }
-
-    "slur" = table {
-           "whole"     "\slurchar%{%}" 0pt     0pt     0pt     0pt
-           "half"      "\hslurchar%{%}"        0pt     0pt     0pt     0pt
-    }
-    "accidentals" = table {
-           "-2"        "\flatflat"     0pt     10.2pt  -2.5pt 7.5pt
-           "-1"        "\flat"         0pt     6pt     -2.5pt 7.5pt
-           "0" "\natural"      0pt     6pt     -7.5pt 7.5pt
-           "1" "\sharp"                0pt     6pt     -7.5pt 7.5pt
-           "2" "\sharpsharp"   0pt     6pt     -2.5pt 7.5pt
-    }
-
-    "streepjes" = table {
-           "toplines"  "\toplines{%}"  -3pt    9pt 0pt 0pt
-           "botlines"  "\botlines{%}"  -3pt    9pt 0pt 0pt
-    }
-
-    "bars" = table {
-           "empty"     "\emptybar"     0pt     0pt     0pt     0pt
-           "|" "\maatstreep"   0pt     5pt     -12pt   12pt
-           "||"        "\finishbar"    0pt     2pt     -12pt   12pt
-    }
-
-    "rests" = table {
-           "1" "\wholerest"            -5pt    1pt     -1pt    1pt
-           "2" "\halfrest"             -5pt    1pt     -1pt    1pt
-           "4" "\quartrest"            -5pt    2pt     -5pt    5pt
-           "8" "\eighthrest"           0pt     5pt     0pt     8pt
-           "16"        "\sixteenthrest"                0pt     6pt     0pt     12pt
-           "32"        "\thirtysecondrest"     0pt     6pt     0pt     16pt
-    }
-
-    "meters" = table {
-           "C" "\fourfourmeter"                0pt     10pt    -5pt    5pt
-           "C2"        "\allabreve"            0pt     10pt    -5pt    5pt
-    }
-
-    % dims ignored for this table
-    "param" = table {
-           "meter"     "\generalmeter{%}{%}"   -3pt    10pt    -5pt    5pt
-           "linestaf"  "\linestafsym{%}{%}"    
-           "stem"      "\stem{%}{%}"           
-            "fill"     "\hbox{}"
-    }
-
-    "dots" = table {
-           "1" "\lsingledot"           0pt     8pt     -1pt    1pt
-           "2" "\ldoubledot"           0pt     12pt    -1pt    1pt
-           "3" "\ltripledot"           0pt     16pt    -1pt    1pt
-    }
-
-    "flags" = table {
-           "8" "\eigthflag"            0pt     5pt     0pt     0pt     
-           "16"        "\sixteenthflag"                0pt     5pt     0pt     0pt
-           "32"        "\thirtysecondflag"     0pt     5pt     0pt     0pt
-           "-8"        "\deigthflag"           0pt     5pt     0pt     0pt
-           "-16"       "\dsixteenthflag"               0pt     5pt     0pt     0pt
-           "-32"       "\dthirtysecondflag"    0pt     5pt     0pt     0pt
-    }
-
-    "beamslopes" = table {
-           "slope"     "\beamslope{%}{%}"
-           "horizontal"        "\rulesym{%}{%}"        
-    }
-
-}
 
 %
 % common dutch names for notes. "es" means flat, "is" means sharp
 %
 
-dutch_names = notenames {
-       "ceses" 0 -2 "ces" 0 -1         "c" 0 0         "cis" 0 1 "cisis" 0 2
-       "deses" 1 -2 "des" 1 -1         "d" 1 0         "dis" 1 1 "disis" 1 2
-       "eses"  2 -2 "es"  2 -1         "e" 2 0         "eis" 2 1 "eisis" 2 2
-       "feses" 3 -2 "fes" 3 -1         "f" 3 0         "fis" 3 1 "fisis" 3 2
-       "geses" 4 -2 "ges" 4 -1         "g" 4 0         "gis" 4 1 "gisis" 4 2
-       "ases"  5 -2 "as"  5 -1         "a" 5 0         "ais" 5 1 "aisis" 5 2
-       "beses" 6 -2 "bes" 6 -1         "b" 6 0         "bis" 6 1 "bisis" 6 2
-}
-
-%
-% f = flat, s = sharp.
-%
-english_names = notenames {
-       "cff" 0 -2 "cf" 0 -1    "c" 0 0         "cs" 0 1 "css" 0 2
-       "dff" 1 -2 "df" 1 -1    "d" 1 0         "ds" 1 1 "dss" 1 2
-       "eff" 2 -2 "ef" 2 -1    "e" 2 0         "es" 2 1 "ess" 2 2
-       "fff" 3 -2 "ff" 3 -1    "f" 3 0         "fs" 3 1 "fss" 3 2
-       "gff" 4 -2 "gf" 4 -1    "g" 4 0         "gs" 4 1 "gss" 4 2
-       "aff" 5 -2 "af" 5 -1    "a" 5 0         "as" 5 1 "ass" 5 2
-       "bff" 6 -2 "bf" 6 -1    "b" 6 0         "bs" 6 1 "bss" 6 2
-}
-
 default_table = symboltables { table_sixteen }
 notenames { dutch_names }