]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-0.0.77.jcn1
authorfred <fred>
Sun, 24 Mar 2002 19:49:21 +0000 (19:49 +0000)
committerfred <fred>
Sun, 24 Mar 2002 19:49:21 +0000 (19:49 +0000)
17 files changed:
.version
NEWS
flower/string-convert.cc
init/bare.ly [new file with mode: 0644]
init/dutch.ly [new file with mode: 0644]
init/dynamic.ly [new file with mode: 0644]
init/english.ly [new file with mode: 0644]
init/engraver.ly [new file with mode: 0644]
init/midi.ly [new file with mode: 0644]
init/performer.ly [new file with mode: 0644]
init/script.ly [new file with mode: 0644]
init/swedish.ly [new file with mode: 0644]
init/symbol.ly [new file with mode: 0644]
init/table16.ly [new file with mode: 0644]
init/table_twenty.ly [new file with mode: 0644]
lily/debug.cc
lily/template4.cc

index 8deba99f456fd448ac676cc57d26e8e158227058..623bd9d848531820047454711cc7379ac5722e8b 100644 (file)
--- a/.version
+++ b/.version
@@ -1,7 +1,7 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 0
-TOPLEVEL_PATCH_LEVEL = 76
+TOPLEVEL_PATCH_LEVEL = 77
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 
-TOPLEVEL_MY_PATCH_LEVEL = 
+TOPLEVEL_MY_PATCH_LEVEL = .jcn1
diff --git a/NEWS b/NEWS
index 2cf9b4d45e39b8629d3f58415e7c9609f55e5ee7..e6d1201daee5e2a2bd1876ca5f0e67be63bd1c50 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+pl 77.jcn1
+       - init/*.ly in dist
+       - bf: string-convert.cc: return local buf
+       - bf: debug.cc: <new.h>
+       - bf: template4.cc: #includes
+
+pl 77  
+       - some fixes for internal compiler errors 
+derive from Pointer_list with default dtor gives error with -O2
+       - .ini -> .ly
+       - lyrics fix 
+       - Performer beautification: got rid of set_track(), midi_output()
+       - pseudo RTTI for midi-items
+       - bf: Performer*::print() 
+       - links.pod
+       - Voice_element -> Request_chord
+       - fixed flex problems: stdin input works again 
+       - Documentation/Rules.make, make-website via make
+       - spacing: now add basicspace
+
+*******
+july 28
 pl 76
        - mudela version bumped to 0.1
        - mudela-book
index feb793369f7b95e625ac9723348b2eed2f03a8e7..f791e1f6c2608da6a97ce8dfd8690fed677f859b 100644 (file)
@@ -204,7 +204,7 @@ String_convert::int_str(int i, char const* fmt)
 String
 String_convert::double_str(double f, char const* fmt)
 {
-    char buf[STRING_BUFFER_LEN]; 
+    static char buf[STRING_BUFFER_LEN]; 
 
     snprintf(buf, STRING_BUFFER_LEN, fmt ? fmt : "%f", f);
     return buf;
diff --git a/init/bare.ly b/init/bare.ly
new file mode 100644 (file)
index 0000000..67963e1
--- /dev/null
@@ -0,0 +1,5 @@
+
+% enough for the parsing step
+
+include "init/dutch.ly"
+include "init/table_sixteen.ly"
diff --git a/init/dutch.ly b/init/dutch.ly
new file mode 100644 (file)
index 0000000..b3d80dc
--- /dev/null
@@ -0,0 +1,99 @@
+%{
+ common dutch names for notes. "es" means flat, "is" means sharp
+
+
+
+
+ Please note that, while these names are used to enter *notes*, they
+ actually are *melodic*s, i.e. they represent a pitch solely. Notes
+ have a rhythmic part too. This is the reason that we don't write 'note { .. }'
+
+%}
+
+\notenames {
+       ceses   = \melodic_request { -1 0 -2 }
+       ces     = \melodic_request { -1 0 -1 }
+       c       = \melodic_request { -1 0 0 }
+       cis     = \melodic_request { -1 0 1 }
+       cisis   = \melodic_request { -1 0 2 }
+       deses   = \melodic_request { -1 1 -2 }
+       des     = \melodic_request { -1 1 -1 }
+       d       = \melodic_request { -1 1 0 }
+       dis     = \melodic_request { -1 1 1 }
+       disis   = \melodic_request { -1 1 2 }
+       eeses   = \melodic_request { -1 2 -2 }
+       eses    = \melodic_request { -1 2 -2 }
+       ees     = \melodic_request { -1 2 -1 }
+       es      = \melodic_request { -1 2 -1 }
+       e       = \melodic_request { -1 2 0 }
+       eis     = \melodic_request { -1 2 1 }
+       eisis   = \melodic_request { -1 2 2 }
+       feses   = \melodic_request { -1 3 -2 }
+       fes     = \melodic_request { -1 3 -1 }
+       "f"     = \melodic_request { -1 3 0 }
+       fis     = \melodic_request { -1 3 1 }
+       fisis   = \melodic_request { -1 3 2 }
+       geses   = \melodic_request { -1 4 -2 }
+       ges     = \melodic_request { -1 4 -1 }
+       g       = \melodic_request { -1 4 0 }
+       gis     = \melodic_request { -1 4 1 }
+       gisis   = \melodic_request { -1 4 2 }
+       aeses   = \melodic_request { -1 5 -2 }
+       ases    = \melodic_request { -1 5 -2 }
+       aes     = \melodic_request { -1 5 -1 }
+       as      = \melodic_request { -1 5 -1 }
+       a       = \melodic_request { -1 5 0 }
+       ais     = \melodic_request { -1 5 1 }
+       aisis   = \melodic_request { -1 5 2 }
+       beses   = \melodic_request { -1 6 -2 }
+       bes     = \melodic_request { -1 6 -1 }
+       b       = \melodic_request { -1 6 0 }
+       bis     = \melodic_request { -1 6 1 }
+       bisis   = \melodic_request { -1 6 2 }
+
+
+       %
+       % upper case: 1 octave lower.
+       %
+
+
+       Ceses   = \melodic_request { -2 0 -2 }
+       Ces     = \melodic_request { -2 0 -1 }
+       C       = \melodic_request { -2 0 0 }
+       Cis     = \melodic_request { -2 0 1 }
+       Cisis   = \melodic_request { -2 0 2 }
+       Deses   = \melodic_request { -2 1 -2 }
+       Des     = \melodic_request { -2 1 -1 }
+       D       = \melodic_request { -2 1 0 }
+       Dis     = \melodic_request { -2 1 1 }
+       Disis   = \melodic_request { -2 1 2 }
+       Eses    = \melodic_request { -2 2 -2 }
+       Es      = \melodic_request { -2 2 -1 }
+       E       = \melodic_request { -2 2 0 }
+       Eis     = \melodic_request { -2 2 1 }
+       Eisis   = \melodic_request { -2 2 2 }
+       Feses   = \melodic_request { -2 3 -2 }
+       Fes     = \melodic_request { -2 3 -1 }
+       F       = \melodic_request { -2 3 0 }
+       Fis     = \melodic_request { -2 3 1 }
+       Fisis   = \melodic_request { -2 3 2 }
+       Geses   = \melodic_request { -2 4 -2 }
+       Ges     = \melodic_request { -2 4 -1 }
+       G       = \melodic_request { -2 4 0 }
+       Gis     = \melodic_request { -2 4 1 }
+       Gisis   = \melodic_request { -2 4 2 }
+       Aeses   = \melodic_request { -2 5 -2 }
+       Ases    = \melodic_request { -2 5 -2 }
+       Aes     = \melodic_request { -2 5 -1 }
+       As      = \melodic_request { -2 5 -1 }
+       A       = \melodic_request { -2 5 0 }
+       Ais     = \melodic_request { -2 5 1 }
+       Aisis   = \melodic_request { -2 5 2 }
+       Beses   = \melodic_request { -2 6 -2 }
+       Bes     = \melodic_request { -2 6 -1 }
+       B       = \melodic_request { -2 6 0 }
+       Bis     = \melodic_request { -2 6 1 }
+       Bisis   = \melodic_request { -2 6 2 }
+
+
+}
diff --git a/init/dynamic.ly b/init/dynamic.ly
new file mode 100644 (file)
index 0000000..4dcaf78
--- /dev/null
@@ -0,0 +1,17 @@
+%
+% declare the standard dynamic identifiers.
+%
+
+ppp = \absdynamic {7 }
+pp = \absdynamic { 6 }
+p = \absdynamic { 5 }
+mp = \absdynamic { 4 }
+mf = \absdynamic { 3 }
+f = \absdynamic { 2 } % f is a notename too.
+ff = \absdynamic { 1 }
+fff = \absdynamic { 0 }
+
+cr = \spandynamic { 1 1 } 
+decr = \spandynamic { -1 1 }
+rc = \spandynamic { 1 2 } % stop a crescendo (worrks for decrescendo too)
+
diff --git a/init/english.ly b/init/english.ly
new file mode 100644 (file)
index 0000000..d876d29
--- /dev/null
@@ -0,0 +1,13 @@
+
+%
+% 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
+}
diff --git a/init/engraver.ly b/init/engraver.ly
new file mode 100644 (file)
index 0000000..4d73ecf
--- /dev/null
@@ -0,0 +1,86 @@
+%
+% setup for Request->Element conversion. Guru-only
+%
+
+staff_engraver = \requesttranslator {
+                 Engraver "Engraver_group_engraver"
+                 \alias "Staff";
+                 \consists "Line_group_engraver";
+                 \consists "Bar_engraver";
+                 \consists "Clef_engraver";
+                 \consists "Key_engraver";
+                 \consists "Meter_engraver";
+                 \consists "Local_key_engraver";
+                 \consists "Staff_sym_engraver";
+                 \consists "Collision_engraver";
+                 \consists "Rest_collision_engraver";
+                 \contains \requesttranslator {
+                         Engraver  "Voice_group_engravers"
+                         \alias "Voice_group";
+                         \consists "Dynamic_engraver";
+                         \consists "Stem_beam_engraver";
+                         \consists "Script_engraver";
+                         \consists "Note_column_engraver";
+                         \consists "Slur_engraver";
+                         \contains \requesttranslator {
+                                 Engraver "Engraver_group_engraver"
+                                 \alias "Voice";
+                                 \consists "Note_head_engraver" ;
+                                 \consists "Tie_engraver";
+                         }
+               }
+            }
+
+piano_staff_engraver = \requesttranslator {
+       Engraver "Engraver_group_engraver"
+       \alias "Piano";
+       \alias "Hoenoemjedat";
+       \consists "Span_bar_engraver";
+       \consists "Vertical_align_engraver";
+       \consists "Line_group_engraver";
+       \consists "Piano_bar_engraver";
+       \contains\requesttranslator { \staff_engraver }
+}
+
+staff_group_engraver = \requesttranslator {
+       Engraver "Engraver_group_engraver"
+       \alias "Staff_group";
+       \consists "Span_bar_engraver";
+       \consists "Vertical_align_engraver";
+       \consists "Line_group_engraver";
+       \contains\requesttranslator { \staff_engraver }
+}
+lyric_engraver = \requesttranslator {
+       Engraver "Engraver_group_engraver"
+       \alias "Lyric";
+
+       \contains\requesttranslator{
+               Engraver "Engraver_group_engraver"
+               \consists "Lyric_engraver";
+               \consists "Line_group_engraver";
+               \consists "Swallow_engraver";
+       }
+       \consists "Vertical_align_engraver";
+}
+
+orchestral_score_translator = \requesttranslator {
+       Engraver Score_engraver
+       \alias "Score";
+
+       \consists "Bar_align_engraver";
+       \consists "Clef_align_engraver";
+       \consists "Key_align_engraver";
+       \consists "Meter_align_engraver";
+       \consists "Score_horizontal_align_engraver";
+       \consists "Vertical_align_engraver";
+       \consists "Span_score_bar_engraver";
+
+       \contains \requesttranslator { \staff_group_engraver }
+       \contains \requesttranslator { \lyric_engraver }
+       \contains \requesttranslator { \piano_staff_engraver }
+
+       
+}
+
+
+
diff --git a/init/midi.ly b/init/midi.ly
new file mode 100644 (file)
index 0000000..f10856a
--- /dev/null
@@ -0,0 +1,5 @@
+
+default_midi = \midi {
+        \tempo 4:60;
+       \include "performer.ly"
+}
diff --git a/init/performer.ly b/init/performer.ly
new file mode 100644 (file)
index 0000000..fa184d1
--- /dev/null
@@ -0,0 +1,30 @@
+%
+% setup for Request->Element conversion. Guru-only
+%
+
+\requesttranslator {
+       Performer "Score_performer"
+       \alias "Score";
+%      \consists "Clef_performer";
+%      \consists "Key_performer";
+%      \consists "Meter_performer";
+%      \consists "Tempo_performer";
+
+       \contains\requesttranslator {
+               Performer "Staff_performer"
+               \alias "Midi";
+               \contains\requesttranslator{
+                       Performer "Voice_group_performer"
+                       \alias "Voice_group";
+                       \contains\requesttranslator{
+                               Performer "Performer_group_performer"
+                               \consists "Lyric_performer";
+                               \consists "Note_performer";
+                               
+                       }
+               }
+               \consists "Key_performer";
+               \consists "Meter_performer";
+               \consists "Swallow_performer";
+       }
+}
diff --git a/init/script.ly b/init/script.ly
new file mode 100644 (file)
index 0000000..6a1c283
--- /dev/null
@@ -0,0 +1,44 @@
+
+% name = \script {
+% indexstring follow_into_staff same_dir_as_stem above_below_staff symbol_can_beinverted priority }
+%
+
+accent = \script { "sforzato"  0 -1 0 0 0 }
+marcato = \script { "marcato" 0 -1 0 1  0 }
+staccatissimo = \script { "staccatissimo" 0  -1 0 1 0 }
+portato= \script { "portato" 0 -1 0 1 0 }
+fermata = \script { "fermata" 0 1 0 1 0 }
+stopped = \script { "stopped" 0 0 1 0 0 }
+staccato = \script { "staccato" 1 -1 0 0 0 }
+tenuto = \script {"tenuto" 0 -1 0 0 0 }
+upbow = \script { "upbow" 0 0 1 0 0 }
+downbow = \script { "downbow" 0 0 1 0 0 }
+lheel = \script { "heel" 0 0 -1  0 0 }
+rheel = \script { "heel" 0 0 1 0 0 }
+ltoe = \script { "toe" 0 0 -1 0 0 }
+rtoe = \script { "toe" 0 0 1 0 0 }
+lbheel = \script { "bheel" 0 0 -1  0 0 }
+rbheel = \script { "bheel" 0 0 1 0 0 }
+lbtoe = \script { "btoe" 0 0 -1 0 0 }
+rbtoe = \script { "btoe" 0 0 1 0 0 }
+lfheel = \script { "fheel" 0 0 -1  0 0 }
+rfheel = \script { "fheel" 0 0 1 0 0 }
+lftoe = \script { "ftoe" 0 0 -1 0 0 }
+rftoe = \script { "ftoe" 0 0 1 0 0 }
+%
+% left toe:      right heel:
+%
+%                    u     -
+%                    -     u
+%  ---|-----|--   --|x----|x--
+%  ---|-----|--   --|-----|---
+%  --x|----x|--   --|-----|---
+%    ^     -                   
+%    -     ^                   
+%  back  front     back  front
+%
+% 
+% heu, me thought for a moment that order in table_xxx.ly was
+% being translated into priority...
+back = \script { "back" 0 -1 -1  0 0 }
+front = \script { "front" 0 -1 1 0 0 }
diff --git a/init/swedish.ly b/init/swedish.ly
new file mode 100644 (file)
index 0000000..22f1664
--- /dev/null
@@ -0,0 +1,92 @@
+%
+% common Swedish names for notes. "ess" means flat, "iss" means sharp
+%
+% by Mats Bengtsson.
+
+
+%
+% Please note that, while these names are used to enter *notes*, they
+% actually are *melodic*s, i.e. they represent a pitch solely. Notes
+% have a rhythmic part too. This is the reason that we don't write 'note { .. }'
+%
+\notenames {
+       cessess = \melodic_request { -1 0 -2 }
+       cess    = \melodic_request { -1 0 -1 }
+       c       = \melodic_request { -1 0 0 }
+       ciss    = \melodic_request { -1 0 1 }
+       cississ = \melodic_request { -1 0 2 }
+       dessess = \melodic_request { -1 1 -2 }
+       dess    = \melodic_request { -1 1 -1 }
+       d       = \melodic_request { -1 1 0 }
+       diss    = \melodic_request { -1 1 1 }
+       dississ = \melodic_request { -1 1 2 }
+       essess  = \melodic_request { -1 2 -2 }
+       ess     = \melodic_request { -1 2 -1 }
+       e       = \melodic_request { -1 2 0 }
+       eiss    = \melodic_request { -1 2 1 }
+       eississ = \melodic_request { -1 2 2 }
+       fessess = \melodic_request { -1 3 -2 }
+       fess    = \melodic_request { -1 3 -1 }
+       "f"     = \melodic_request { -1 3 0 }
+       fiss    = \melodic_request { -1 3 1 }
+       fississ = \melodic_request { -1 3 2 }
+       gessess = \melodic_request { -1 4 -2 }
+       gess    = \melodic_request { -1 4 -1 }
+       g       = \melodic_request { -1 4 0 }
+       giss    = \melodic_request { -1 4 1 }
+       gississ = \melodic_request { -1 4 2 }
+       assess  = \melodic_request { -1 5 -2 }
+       ass     = \melodic_request { -1 5 -1 }
+       a       = \melodic_request { -1 5 0 }
+       aiss    = \melodic_request { -1 5 1 }
+       aississ = \melodic_request { -1 5 2 }
+       hessess = \melodic_request { -1 6 -2 }
+       b       = \melodic_request { -1 6 -1 }
+       h       = \melodic_request { -1 6 0 }
+       hiss    = \melodic_request { -1 6 1 }
+       hississ = \melodic_request { -1 6 2 }
+
+
+       %
+       % upper case: 1 octave lower.
+       %
+
+
+       Cessess = \melodic_request { -2 0 -2 }
+       Cess    = \melodic_request { -2 0 -1 }
+       C       = \melodic_request { -2 0 0 }
+       Ciss    = \melodic_request { -2 0 1 }
+       Cississ = \melodic_request { -2 0 2 }
+       Dessess = \melodic_request { -2 1 -2 }
+       Dess    = \melodic_request { -2 1 -1 }
+       D       = \melodic_request { -2 1 0 }
+       Diss    = \melodic_request { -2 1 1 }
+       Dississ = \melodic_request { -2 1 2 }
+       Essess  = \melodic_request { -2 2 -2 }
+       Ess     = \melodic_request { -2 2 -1 }
+       E       = \melodic_request { -2 2 0 }
+       Eiss    = \melodic_request { -2 2 1 }
+       Eississ = \melodic_request { -2 2 2 }
+       Fessess = \melodic_request { -2 3 -2 }
+       Fess    = \melodic_request { -2 3 -1 }
+       F       = \melodic_request { -2 3 0 }
+       Fiss    = \melodic_request { -2 3 1 }
+       Fississ = \melodic_request { -2 3 2 }
+       Gessess = \melodic_request { -2 4 -2 }
+       Gess    = \melodic_request { -2 4 -1 }
+       G       = \melodic_request { -2 4 0 }
+       Giss    = \melodic_request { -2 4 1 }
+       Gississ = \melodic_request { -2 4 2 }
+       Assess  = \melodic_request { -2 5 -2 }
+       Ass     = \melodic_request { -2 5 -1 }
+       A       = \melodic_request { -2 5 0 }
+       Aiss    = \melodic_request { -2 5 1 }
+       Aississ = \melodic_request { -2 5 2 }
+       Hessess = \melodic_request { -2 6 -2 }
+       B       = \melodic_request { -2 6 -1 }
+       H       = \melodic_request { -2 6 0 }
+       Hiss    = \melodic_request { -2 6 1 }
+       Hississ = \melodic_request { -2 6 2 }
+
+
+}
diff --git a/init/symbol.ly b/init/symbol.ly
new file mode 100644 (file)
index 0000000..62baead
--- /dev/null
@@ -0,0 +1,15 @@
+\version "0.1.0";
+
+\include "dynamic.ly"
+\include "dutch.ly" 
+\include "script.ly"
+\include "paper16.ly"
+
+% ugh
+\include "midi.ly"
+
+left = -1
+right = 1
+up = 1
+down = -1
+
diff --git a/init/table16.ly b/init/table16.ly
new file mode 100644 (file)
index 0000000..c64b5fc
--- /dev/null
@@ -0,0 +1,168 @@
+%
+% spacing info for LilyPond. Do not edit this if you're not a guru.
+% It has a lot of hard-wired stringconstants
+%
+
+
+table_sixteen= 
+\symboltables {
+
+   \texid      "\input lilyponddefs \musixsixteendefs"
+
+   % index TeXstring,  xmin xmax ymin ymax
+
+    "scripts" = \table {
+           "fermata" "\fermata"                0.0\pt 0.0\pt   0.0\pt 6.0\pt
+           "-fermata" "\ifermata"              0.0\pt 0.0\pt   -6.0\pt 0.0\pt
+           "portato" "\portato"                0.0\pt 4.0\pt   0.0\pt  2.0\pt
+           "-portato" "\iportato"              0.0\pt 4.0\pt   -2.0\pt 0.0\pt
+           "tenuto" "\tenuto"                  0.0\pt 4.0\pt   -1.0\pt 1.0\pt
+           "-tenuto" "\itenuto"                0.0\pt 4.0\pt   -1.0\pt 1.0\pt
+           "sforzato" "\sforzato"              -0.8\pt 4.0\pt  -1.92\pt 1.92\pt
+           "marcato" "\marcato"                0.0\pt 4.0\pt   0.0\pt  4.0\pt
+           "-marcato" "\imarcato"              0.0\pt 4.0\pt   -4.0\pt 0.0\pt
+           "staccato" "\staccato"              0.0\pt  0.0\pt  -1.1\pt 1.1\pt
+           "staccatissimo" "\staccatissimo"    0.0\pt  0.0\pt  0.0\pt  1.0\pt
+           "-staccatissimo" "\istaccatissimo"  0.0\pt  0.0\pt  0.0\pt  1.0\pt
+           "upbow" "\upbow"                    -1.0\pt 6.0\pt  0.0\pt  5.0\pt
+           "downbow" "\downbow"                0.0\pt  5.0\pt  0.0\pt 7.5\pt
+           "back" "\backorfront"               0.0\pt  6.0\pt  0.0\pt  3.0\pt
+           "-front" "\backorfront"             0.0\pt  6.0\pt  0.0\pt  3.0\pt
+           "heel" "\heel"                      0.0\pt  6.0\pt  -1.0\pt 5.0\pt
+           "toe" "\toe"                        0.0\pt  6.0\pt  -1.0\pt 5.0\pt
+           "bheel" "\bheel"                    0.0\pt  6.0\pt  -1.0\pt 5.0\pt
+           "btoe" "\btoe"                      0.0\pt  6.0\pt  -1.0\pt 5.0\pt
+           "fheel" "\fheel"                    0.0\pt  6.0\pt  -1.0\pt 5.0\pt
+           "ftoe" "\ftoe"                      0.0\pt  6.0\pt  -1.0\pt 5.0\pt
+           "-back" "\backorfront"              0.0\pt  6.0\pt  0.0\pt  3.0\pt
+           "front" "\backorfront"              0.0\pt  6.0\pt  0.0\pt  3.0\pt
+       }
+
+     "style" = \table {
+               "roman" "\settext{%}"   0.0\pt  5.0\pt  0.0\pt  8.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
+               "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  8.0\pt
+     }
+     "dynamics" = \table {
+
+       "mf" "\dynmf"
+       "fff" "\dynfff"
+       "ff" "\dynff"
+       "f" "\dynf"
+       "mp" "\dynmp"
+       "p" "\dynp"
+       "pp" "\dynpp"
+       "ppp" "\dynppp"
+
+       }
+     "align" = \table {
+               "-1"    "\leftalign{%}"
+               "0"     "\centeralign{%}"
+               "1"     "\rightalign{%}"
+       }
+
+     "clefs" = \table {
+            "violin"   "\violinclef"           0.0\pt  12.8\pt -10.0\pt        18.0\pt
+            "bass"     "\bassclef"             0.0\pt  12.8\pt 0.0\pt  16.0\pt
+            "alto"     "\altoclef"             0.0\pt  12.8\pt 0.0\pt  16.0\pt
+            "tenor"    "\altoclef"             0.0\pt  12.8\pt 0.0\pt  16.0\pt
+            "violin_change"    "\cviolinclef"  0.0\pt  11.2\pt -12.0\pt        12.0\pt
+            "bass_change"      "\cbassclef"    0.0\pt  11.2\pt 0.0\pt  16.0\pt
+            "alto_change"      "\caltoclef"    0.0\pt  11.2\pt 0.0\pt  16.0\pt
+            "tenor_change"     "\caltoclef"    0.0\pt  11.2\pt 0.0\pt  16.0\pt
+     }
+
+     "balls" = \table {
+            "1"        "\wholeball"    0.0\pt  6.0\pt  -2.0\pt 2.0\pt
+            "2"        "\halfball"     0.0\pt  5.0\pt  -2.0\pt 2.0\pt
+            "4"        "\quartball"    0.0\pt  5.0\pt  -2.0\pt 2.0\pt
+     }
+
+     "slur" = \table {
+            "whole"    "\slurchar%{%}"
+            "half"     "\hslurchar%{%}"
+     }
+     "accidentals" = \table {
+            "-2"       "\flatflat"     0.0\pt  8.16\pt -2.5\pt 7.5\pt
+            "-1"       "\flat"         0.0\pt  4.8\pt  -2.5\pt 7.5\pt
+            "0"        "\natural"      0.0\pt  4.8\pt  -7.5\pt 7.5\pt
+            "1"        "\sharp"        0.0\pt  3.6\pt  -7.5\pt 7.5\pt
+            "2"        "\sharpsharp"   0.0\pt  4.8\pt  -2.5\pt 7.5\pt
+     }
+
+     "streepjes" = \table {
+            "toplines" "\toplines{%}"  -1.0\pt 7.0\pt  0.0\pt  0.0\pt
+            "botlines" "\botlines{%}"  -1.0\pt 7.0\pt  0.0\pt  0.0\pt
+     }
+
+     "bars" = \table {
+       "empty" "\emptybar"
+       ""      ""                      0.0\pt  0.0\pt  0.0\pt  16.0\pt
+       "|"     "\maatstreep{%}"        0.0\pt  0.64\pt 0.0\pt  16.0\pt
+       "||"    "\doublebar{%}"         0.0\pt  4.0\pt  0.0\pt  16.0\pt
+       "|."    "\finishbar{%}"         -4.0\pt 0.0\pt  0.0\pt  16.0\pt
+       ":|"    "\repeatbar"            -8.0\pt 0.0\pt  0.0\pt  16.0\pt
+       "|:"    "\startrepeat"          0.0\pt  8.0\pt  0.0\pt 16.0\pt
+       ":|:"   "\repeatbarstartrepeat" 0.0\pt  16.0\pt 0.0\pt  16.0\pt
+
+     }
+
+     "rests" = \table {
+            "1o"       "\outsidewholerest"     0.0\pt  6.0\pt  0.0\pt  2.0\pt
+            "1"        "\wholerest"            0.0\pt  6.0\pt  0.0\pt  2.0\pt
+            "2"        "\halfrest"             0.0\pt  6.0\pt  -2.0\pt 0.0\pt
+            "2o"       "\outsidehalfrest"              0.0\pt  6.0\pt  -2.0\pt 0.0\pt
+            "4o"       "\quartrest"            -5.0\pt 2.0\pt  -5.0\pt 5.0\pt
+            "8o"       "\eighthrest"           0.0\pt  5.0\pt  0.0\pt  8.0\pt
+            "16o"      "\sixteenthrest"                0.0\pt  6.0\pt  0.0\pt  12.0\pt
+            "4"        "\quartrest"            -5.0\pt 2.0\pt  -5.0\pt 5.0\pt
+            "8"        "\eighthrest"           0.0\pt  5.0\pt  0.0\pt  8.0\pt
+            "16"       "\sixteenthrest"                0.0\pt  6.0\pt  0.0\pt  12.0\pt
+            "32"       "\thirtysecondrest"     0.0\pt  6.0\pt  0.0\pt  16.0\pt
+            "64"       "\sixtyfourthrest"      0.0\pt  6.0\pt  0.0\pt  16.0\pt
+            "128"      "\hundredtwentyeighthrest"      0.0\pt  6.0\pt  0.0\pt  16.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
+     }
+
+     % dims ignored for this table
+     "param" = \table {
+            "brace"    "\pianobrace{%}"        0.0\pt  0.0\pt  0.0\pt  0.0\pt
+            "meter"    "\generalmeter{%}{%}"   0.0\pt  10.0\pt -5.0\pt 5.0\pt
+            "linestaf" "\linestafsym{%}{%}"
+            "stem"     "\stem{%}{%}"
+            "fill"     "\hbox{}"
+       % ugh. 8pt
+            "crescendosym" "\crescendosym{%}"  0.0\pt  0.0\pt  -3.0\pt 3.0\pt
+            "decrescendosym" "\decrescendosym{%}"      0.0\pt  0.0\pt  -3.0\pt 3.0\pt
+     }
+
+     "dots" = \table {
+            "1"        "\lsingledot"           0.0\pt  2.0\pt  -1.0\pt 1.0\pt
+            "2"        "\ldoubledot"           0.0\pt  5.0\pt  -1.0\pt 1.0\pt
+            "3"        "\ltripledot"           0.0\pt  8.0\pt  -1.0\pt 1.0\pt
+     }
+
+     "flags" = \table {
+            "8"        "\eighthflag"           0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "16"       "\sixteenthflag"                0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "32"       "\thirtysecondflag"     0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "64"       "\sixtyfourthflag"      0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "128"      "\hundredtwentyeighthflag"      0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "-8"       "\deighthflag"          0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "-16"      "\dsixteenthflag"               0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "-32"      "\dthirtysecondflag"    0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "-64"      "\dsixtyfourthflag"     0.0\pt  4.0\pt  0.0\pt  0.0\pt
+            "-128"     "\dhundredtwentyeighthflag"     0.0\pt  4.0\pt  0.0\pt  0.0\pt
+     }
+
+     "beamslopes" = \table {
+            "slope"    "\beamslope{%}{%}"
+            "horizontal"       "\rulesym{%}{%}"
+     }
+
+}
+
diff --git a/init/table_twenty.ly b/init/table_twenty.ly
new file mode 100644 (file)
index 0000000..e4a5f78
--- /dev/null
@@ -0,0 +1,108 @@
+%
+% spacing info for LilyPond. Do not edit this.
+% It has a lot of hard-wired stringconstants
+%
+
+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
+           "alto"      "\altoclef"             0pt     16pt    0pt     20pt
+           "tenor"     "\altoclef"             0pt     16pt    0pt     20pt
+           "violin_change"     "\cviolinclef"  0pt     16pt    -12.5pt 22.5pt
+           "bass_change"       "\cbassclef"    0pt     16pt    0pt     20pt
+           "alto_change"       "\caltoclef"    0pt     16pt    0pt     20pt
+           "tenor_change"      "\caltoclef"    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{%}{%}"        
+    }
+
+}
+default_table = \symboltables { table_twenty }
index 3d046bd4147ffdc26a486b54b4366423b49999f3..4b95a385191f2765969b1131ea85d704101e9a1e 100644 (file)
@@ -1,6 +1,6 @@
 #include <fstream.h>
 #include <signal.h>
-#include <std/new.h>
+#include <new.h>
 #include <stdlib.h>
 #include "debug.hh"
 #include "dstream.hh"
index 484729579becf4cc01a027a9c388b855893b6fb8..f072a5b28641efbe3aa251df9d4e7995ee4334ba 100644 (file)
@@ -7,6 +7,7 @@
 */
 
 #include "proto.hh"
+#include "plist.hh"
 #include "list.tcc"
 #include "cursor.tcc"