patch::: 1.3.0.jcn1

0.jcn1
	- bf: lyrics lexer
	- reverted mup2ly revert

diff --git a/CHANGES b/CHANGES
index 661f51cdb554f5c9887c810baa39c4a41d1f9d58..b7c75936c8e321b409af8eddded1eefe892a1f6c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.jcn1
+       - bf: lyrics lexer
+       - reverted mup2ly revert
+
 1.3.0:
 
 pl 15.hwn2

diff --git a/Documentation/programmer/1086342053.tex b/Documentation/programmer/1086342053.tex
index 814dd64d70fa8504b40009acc3f4d9c72bece883..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Documentation/programmer/1086342053.tex
+++ b/Documentation/programmer/1086342053.tex
@@ -1,891 +0,0 @@
-%created by: GNU LilyPond 1.2.16.hwn2, bij Tue Oct 26 21:09:33 1999
-
-% Uitvoer van Score, gedefinieerd op: 
-% out/1086342053.ly:8:17
-\def\mudelatagline{Lily was here, 1.2.16.hwn2}
-\def\LilyPondVersion{1.2.16.hwn2}
-\def\mudelapaperslur_slope_damping{0.300000}
-\def\mudelapapergrace_factor{0.800000}
-\def\mudelapaperinterbeam{3.264000}
-\def\mudelapaperbarthick_score{0.640000}
-\def\mudelapaperbeam_dir_algorithm{2.000000}
-\def\mudelapaperfont_finger{4.000000}
-\def\mudelapaperhyphen_minimum_length{2.000000}
-\def\mudelapaperloose_column_distance{8.000000}
-\def\mudelapapergrace_stem_length2{3.200000}
-\def\mudelapaperMEAN{3.000000}
-\def\mudelapaperminimum_stem_length3{2.000000}
-\def\mudelapaperWordwrap{0.000000}
-\def\mudelapaperstemSpacingCorrection{2.000000}
-\def\mudelapaperstem_max{3.000000}
-\def\mudelapaperslur_interstaff_slope_damping{0.600000}
-\def\mudelapaperstem_length1{5.000000}
-\def\mudelapaperfont_mark{10.000000}
-\def\mudelapaperquartwidth{5.280000}
-\def\mudelapaperbeam_thickness{1.872000}
-\def\mudelapaperslur_interstaff_snap_max_slope_change{0.500000}
-\def\mudelapapergrace_forced_stem_shorten0{0.000000}
-\def\mudelapaperhsize{597.507874}
-\def\mudelapaperarithmetic_multiplier{4.752000}
-\def\mudelapaperfont_number-1{8.000000}
-\def\mudelapaperbeam_steep_slope{0.200000}
-\def\mudelapaperslur_snap_to_stem{7.000000}
-\def\mudelapapergrace_minimum_stem_length0{0.000000}
-\def\mudelapapergrace_forced_stem_shorten1{0.000000}
-\def\mudelapaperstaffheight{16.000000}
-\def\mudelapaperslur_clip_height{48.000000}
-\def\mudelapapercollision_note_width{6.600000}
-\def\mudelapapergrace_forced_stem_shorten3{0.000000}
-\def\mudelapaperscmsetting{"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec}%
-  { /undefinedfilename signalerror }%
-  ifelse";
- }
-\def\mudelapaperMEDIAN{4.000000}
-\def\mudelapaperbreakable_column_space_strength{2.000000}
-\def\mudelapaperbeam_lengthened{0.800000}
-\def\mudelapaperinterline{4.000000}
-\def\mudelapaperforced_stem_shorten0{1.000000}
-\def\mudelapaperstemthickness{0.320000}
-\def\mudelapapermusical_to_musical_left_spacing_factor{0.400000}
-\def\mudelapaperpaperfile{a4.ly}
-\def\mudelapaperarithmetic_basicspace{2.000000}
-\def\mudelapaperfont_volta{5.000000}
-\def\mudelapapertie_y_gap{1.000000}
-\def\mudelapaperminimum_stem_length1{3.000000}
-\def\mudelapaperindent{38.614454}
-\def\mudelapaperforced_stem_shorten1{1.000000}
-\def\mudelapaperstem_length2{4.000000}
-\def\mudelapaperpostBreakPadding{0.000000}
-\def\mudelapaperstafflinethickness{0.400000}
-\def\mudelapaperstem_length0{7.000000}
-\def\mudelapaperfont_number+1{12.000000}
-\def\mudelapapertie_staffspace_length{16.000000}
-\def\mudelapaperslur_interstaff_snap_to_stem{10.000000}
-\def\mudelapapervolta_thick{0.640000}
-\def\mudelapaperwholewidth{7.920000}
-\def\mudelapaperstem_length3{3.000000}
-\def\mudelapapergrace_forced_stem_shorten2{0.000000}
-\def\mudelapaperslur_height_limit{16.000000}
-\def\mudelapaperstem_default_neutral_direction{1.000000}
-\def\mudelapaperhyphen_thickness{0.400000}
-\def\mudelapaperrestcollision_minimum_beamdist{1.500000}
-\def\mudelapapergrace_stem_length3{2.400000}
-\def\mudelapapertuplet_spanner_gap{8.000000}
-\def\mudelapapercrescendo_height{2.664000}
-\def\mudelapaperfont_dynamic{10.000000}
-\def\mudelapaperbefore_grace_spacing_factor{1.200000}
-\def\mudelapapercompression_energy_factor{0.600000}
-\def\mudelapapertexsetting{}
-\def\mudelapaperslur_height_damping{0.400000}
-\def\mudelapapergrace_minimum_stem_length1{2.400000}
-\def\mudelapapergrace_minimum_stem_length2{2.000000}
-\def\mudelapaperforced_stem_shorten2{1.000000}
-\def\mudelapapergourlay_energybound{100000.000000}
-\def\mudelapapervsize{844.762323}
-\def\mudelapaperfont_normal{8.000000}
-\def\mudelapaperslur_x_minimum{6.000000}
-\def\mudelapapertie_x_gap{0.800000}
-\def\mudelapaperrestcollision_minimum_dist{3.000000}
-\def\mudelapaperfont_number{8.000000}
-\def\mudelapaperbarthick_thick{2.400000}
-\def\mudelapapermmrest_x_minimum{22.400000}
-\def\mudelapaperslur_rc_factor{2.400000}
-\def\mudelapapercrescendo_thickness{0.400000}
-\def\mudelapaperarticulation_script_padding_default{1.000000}
-\def\mudelapaperslur_clip_angle{100.000000}
-\def\mudelapapergrace_stem_length1{4.000000}
-\def\mudelapapercrescendo_shorten{16.000000}
-\def\mudelapapertuplet_thick{0.400000}
-\def\mudelapaperminimum_stem_length2{2.500000}
-\def\mudelapaperslur_y_gap{1.000000}
-\def\mudelapaperGourlay{0.000000}
-\def\mudelapapertie_x_minimum{10.000000}
-\def\mudelapaperdecrease_nonmus_spacing_factor{1.000000}
-\def\mudelapaperextender_height{0.320000}
-\def\mudelapaperlinewidth{390.000000}
-\def\mudelapaperUP{1.000000}
-\def\mudelapaperslur_snap_max_slope_change{0.500000}
-\def\mudelapaperforced_stem_shorten3{1.000000}
-\def\mudelapaperslur_interstaff_height_damping{0.500000}
-\def\mudelapapergrace_stem_length0{5.600000}
-\def\mudelapaperslur_thickness{0.560000}
-\def\mudelapapergrace_minimum_stem_length3{1.600000}
-\def\mudelapapermagnification_dynamic{1.000000}
-\def\mudelapaperDOWN{-1.000000}
-\def\mudelapaperfont_Large{10.000000}
-\def\mudelapaperslur_y_free{3.000000}
-\def\mudelapaperinterbeam4{3.376000}
-\def\mudelapaperslur_ratio{0.250000}
-\def\mudelapaperfont_large{12.000000}
-\def\mudelapaperpssetting{}
-\def\mudelapaperbarthick_thin{0.640000}
-\def\mudelapapervolta_spanner_height{8.000000}
-\def\mudelapaperbar_kern{1.200000}
-\def\mudelapaperminimum_stem_length0{0.000000}
-\def\mudelapaperhyphen_height{1.600000}
-\def\mudelapapertextheight{730.951299}
-\def\mudelapaperbar_thinkern{1.200000}
-\def\mudelapaperslur_clip_ratio{1.200000}
-\def\mudelapapernotewidth{6.600000}
-\def\mudelapaperslur_x_gap{0.800000}
-\def\mudelapaperMAJORITY{2.000000}
-\def\mudelapaperrulethickness{0.400000}
-\def\mudelapapergourlay_maxmeasures{10.000000}
-\special{! %!PS-Adobe-1.0: lily.ps 
-% 
-% 2 setlanguagelevel %  hmm. auto_resize_dicts doesn't help either.  
-% round cappings 
-1 setlinecap 
- % 
-% 
-/draw_beam % width slope thick 
-{ 
-          2 div /beam_thick exch def 
-          /beam_slope exch def 
-          /beam_wd exch def 
-          beam_slope beam_wd mul /beam_ht exch def 
-          0 beam_thick neg moveto  
-          beam_wd beam_ht rlineto  
-          0 beam_thick 2 mul rlineto 
-          0 beam_thick lineto 
-          closepath fill 
-  }%
-  bind def 
- % 
-/draw_decrescendo %  width height cons thick 
-{ 
-       setlinewidth 
-       /cresc_cont exch def 
-       /cresc_ht exch def 
-       /cresc_wd exch def 
-  % 
-       cresc_wd cresc_cont moveto 
-       0 cresc_ht lineto 
-       stroke 
-       cresc_wd cresc_cont neg moveto 
-       0 cresc_ht neg lineto 
-       stroke 
-  }%
-  bind def 
- % 
-/draw_crescendo % width height cons thick 
-{ 
-       setlinewidth 
-       /cresc_cont exch def 
-       /cresc_ht exch def 
-       /cresc_wd exch def 
-  % 
-       0 cresc_cont moveto 
-       cresc_wd cresc_ht lineto 
-       stroke 
-       0 cresc_cont neg moveto 
-       cresc_wd cresc_ht neg lineto 
-       stroke 
-  }%
-  bind def 
- % 
-/lily_distance  
- { 
-       1 copy mul exch 1 copy mul add sqrt 
-  }%
-  bind def 
- % 
-/draw_tuplet % height gap dx dy thick dir 
-{ 
-  % urg: the only Level-2 PS, check effect in print 
-%      true setstrokeadjust 
-       /dir exch def 
-       setlinewidth 
-       1 setlinecap 
-       1 setlinejoin 
-       /tuplet_dy exch def 
-       /tuplet_dx exch def 
-       /tuplet_gapx exch def 
-       /tuplet_h exch def 
-       tuplet_dy tuplet_dx div tuplet_gapx mul /tuplet_gapy exch def 
-  % 
-% 
-       0 0 moveto 
-       0 tuplet_h dir mul lineto  
-       tuplet_dx tuplet_gapx sub 2 div  
-               tuplet_dy tuplet_gapy sub 2 div tuplet_h dir mul add lineto 
-       tuplet_dx tuplet_gapx add 2 div  
-               tuplet_dy tuplet_gapy add 2 div tuplet_h dir mul add moveto 
-       tuplet_dx tuplet_dy tuplet_h dir mul add lineto 
-       tuplet_dx tuplet_dy lineto 
-       stroke 
-  }%
-  bind def 
- % 
-/draw_volta % h w thick vert_start vert_end 
-{ 
-       /vert_end exch def 
-       /vert_start exch def 
-       setlinewidth 
-       /volta_w exch def 
-       /volta_h exch def 
-  % urg: the only Level-2 PS, check effect in print 
-%      true setstrokeadjust 
-       1 setlinecap 
-       1 setlinejoin 
-       vert_start 0 eq { 
-               0 0 moveto 
-               0 volta_h lineto 
-       }%
-   if 
-       0 volta_h moveto 
-       volta_w volta_h lineto 
-       vert_end 0 eq { 
-               volta_w 0 lineto 
-       }%
-   if 
-       stroke 
-  }%
-  bind def 
- % 
-% this is for drawing slurs. 
-/draw_bezier_sandwich  % thickness  
-{ 
-       setlinewidth 
-       moveto 
-       curveto 
-       lineto 
-       curveto 
-       gsave 
-       fill 
-       grestore 
-       stroke 
-  }%
-  bind def 
- % 
-/draw_dashed_slur 
- { 
-       1 setlinecap 
-       1 setlinejoin 
-       setdash 
-       setlinewidth 
-       8 -2 roll 
-       moveto 
-       curveto 
-       stroke 
-  }%
-  bind def 
- % 
-% 
-% 
-/bracket_traject 
- { 
-    /traject_ds exch def 
-    /traject_alpha exch def 
-    traject_ds traject_alpha sin mul add 
-    exch 
-    traject_ds traject_alpha cos mul add 
-    exch 
-  }%
-  bind def 
- % 
-% 
-% 
-/half_bracket 
- { 
-  %6 
-       0 0 
-  %5a 
-       bracket_b bracket_v add bracket_h bracket_t sub bracket_u add 
-       bracket_alpha bracket_v -0.15 mul bracket_traject 
-  %5b 
-       1 bracket_h 
-       0 bracket_v 0.5 mul bracket_traject 
-  %5c 
-       0 bracket_h 
-  %4a 
-       bracket_b bracket_h bracket_t sub 
-       0 bracket_v 0.4 mul bracket_traject 
-  %4b 
-       bracket_b bracket_v add bracket_h bracket_t sub bracket_u add 
-       bracket_alpha bracket_v -0.25 mul bracket_traject 
-  %4c 
-       bracket_b bracket_v add bracket_h bracket_t sub bracket_u add 
-  %3 
-       bracket_b bracket_h bracket_t sub 
-  %2 
-       bracket_b 0 
-  %1 
-       0 0 
-  }%
-  bind def 
- % 
-/draw_half_bracket { 
-       moveto 
-       lineto 
-       lineto 
-       curveto 
-       curveto 
-       lineto 
-       gsave 
-       fill 
-       grestore 
-  }%
-  bind def 
- % 
-/draw_bracket % height 
-{ 
-       2 div bracket_b add /bracket_h exch def 
-       bracket_t setlinewidth 
-  % urg: the only Level-2 PS, check effect in print 
-%      true setstrokeadjust 
-       1 setlinecap 
-       1 setlinejoin 
-       half_bracket 
-       20 copy 
-       1 -1 scale 
-       draw_half_bracket 
-       stroke 
-       1 -1 scale 
-  % ugh, ugh: 
-       0.05 0 translate 
-       draw_half_bracket 
-       stroke 
-  }%
-  bind def 
- % 
-}\input lilyponddefs \turnOnPostScript\vbox to 32.2 pt {\hbox{%
-\placebox{-24.0 pt }%
-  {38.6144544431946 pt }%
-  {\kern0.0 pt \vrule width 351.385545556806 pt depth 0.2 pt height 0.2 pt  }%
-  \placebox{-20.0 pt }%
-  {38.6144544431946 pt }%
-  {\kern0.0 pt \vrule width 351.385545556806 pt depth 0.2 pt height 0.2 pt  }%
-  \placebox{-16.0 pt }%
-  {38.6144544431946 pt }%
-  {\kern0.0 pt \vrule width 351.385545556806 pt depth 0.2 pt height 0.2 pt  }%
-  \placebox{-12.0 pt }%
-  {38.6144544431946 pt }%
-  {\kern0.0 pt \vrule width 351.385545556806 pt depth 0.2 pt height 0.2 pt  }%
-  \placebox{-8.0 pt }%
-  {38.6144544431946 pt }%
-  {\kern0.0 pt \vrule width 351.385545556806 pt depth 0.2 pt height 0.2 pt  }%
-  \font\lilyfontA=feta16\lilyfontA\placebox{-20.0 pt }%
-  {42.6144544431946 pt }%
-  {\char91 }%
-  \placebox{-24.0 pt }%
-  {58.1650144431946 pt }%
-  {\embeddedps{4.44208 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {53.5229344431946 pt }%
-  {\embeddedps{9.28416 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {53.7229344431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {53.5629344431946 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {60.6470944431946 pt }%
-  {\char23 }%
-  \placebox{-16.0 pt }%
-  {62.6070944431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {62.4470944431946 pt }%
-  {\char30 }%
-  \placebox{-24.0 pt }%
-  {86.5016544431946 pt }%
-  {\embeddedps{4.44208 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {81.8595744431946 pt }%
-  {\embeddedps{9.28415999999999 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {76.5754144431946 pt }%
-  {\embeddedps{5.68416 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {72.3333344431946 pt }%
-  {\embeddedps{4.44208 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {67.6912544431946 pt }%
-  {\embeddedps{9.28415999999999 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {67.8912544431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {67.7312544431946 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {74.8154144431946 pt }%
-  {\char23 }%
-  \placebox{-16.0 pt }%
-  {76.7754144431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {76.6154144431946 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {82.0595744431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {81.8995744431946 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {88.9837344431946 pt }%
-  {\char23 }%
-  \placebox{-16.0 pt }%
-  {90.9437344431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {90.7837344431946 pt }%
-  {\char30 }%
-  \placebox{-27.264 pt }%
-  {96.0278944431946 pt }%
-  {\embeddedps{5.68416 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {96.2278944431946 pt }%
-  {\embeddedps{2.64208 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {96.2278944431946 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {96.0678944431946 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {101.512054443195 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {101.352054443195 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {108.436214443195 pt }%
-  {\char23 }%
-  \placebox{-16.0 pt }%
-  {110.236214443195 pt }%
-  {\kern0.0 pt \vrule width 0.64 pt depth 8.0 pt height 8.0 pt  }%
-  \placebox{-27.264 pt }%
-  {128.545190550629 pt }%
-  {\embeddedps{6.2865703732489 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {128.745190550629 pt }%
-  {\embeddedps{2.94328518662445 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {122.65862017738 pt }%
-  {\embeddedps{6.2865703732489 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {118.360336107513 pt }%
-  {\embeddedps{4.49828406986707 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {113.662052037646 pt }%
-  {\embeddedps{9.39656813973413 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {113.862052037646 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {113.702052037646 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {120.786212037646 pt }%
-  {\char23 }%
-  \placebox{-16.0 pt }%
-  {122.85862017738 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {122.69862017738 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {128.745190550629 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {128.585190550629 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {134.631760923878 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {134.471760923878 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {141.555920923878 pt }%
-  {\char23 }%
-  \placebox{-27.264 pt }%
-  {152.424897203346 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {152.424897203346 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-20.736 pt }%
-  {152.424897203346 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {143.428329063612 pt }%
-  {\embeddedps{9.39656813973413 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {143.628329063612 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {143.468329063612 pt }%
-  {\char30 }%
-  \placebox{-14.0 pt }%
-  {150.552489063612 pt }%
-  {\char23 }%
-  \placebox{-16.0 pt }%
-  {152.624897203346 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {152.464897203346 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {157.909057203346 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {157.749057203346 pt }%
-  {\char30 }%
-  \placebox{-24.736 pt }%
-  {162.993217203346 pt }%
-  {\embeddedps{8.24876049766521 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {163.193217203346 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {163.033217203346 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {171.041977701011 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {170.881977701011 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {178.730738198676 pt }%
-  {\kern0.0 pt \vrule width 0.64 pt depth 8.0 pt height 8.0 pt  }%
-  \placebox{-27.264 pt }%
-  {182.156575793128 pt }%
-  {\embeddedps{8.24876049766521 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {182.156575793128 pt }%
-  {\embeddedps{8.24876049766521 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {182.356575793128 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {182.196575793128 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {190.205336290793 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {190.045336290793 pt }%
-  {\char30 }%
-  \placebox{-27.264 pt }%
-  {197.854096788458 pt }%
-  {\embeddedps{6.2865703732489 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {197.854096788458 pt }%
-  {\embeddedps{6.2865703732489 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-20.736 pt }%
-  {197.854096788458 pt }%
-  {\embeddedps{6.2865703732489 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {198.054096788458 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {197.894096788458 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {203.940667161707 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {203.780667161707 pt }%
-  {\char30 }%
-  \placebox{-31.264 pt }%
-  {209.627237534956 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.888 pt }%
-  {209.627237534956 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.512 pt }%
-  {209.627237534956 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-21.136 pt }%
-  {209.627237534956 pt }%
-  {\embeddedps{5.68415999999998 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {209.827237534956 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 15.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {209.667237534956 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {215.111397534956 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 15.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {214.951397534956 pt }%
-  {\char30 }%
-  \placebox{-32.0 pt }%
-  {220.435557534956 pt }%
-  {\char84 }%
-  \placebox{-16.0 pt }%
-  {220.435557534956 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 16.0 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {220.275557534956 pt }%
-  {\char30 }%
-  \placebox{-24.736 pt }%
-  {226.122127908205 pt }%
-  {\embeddedps{21.9840913685793 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {226.322127908205 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {226.162127908205 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {240.271400935835 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.03836152345 pt height 2.0 pt  }%
-  \placebox{-28.0 pt }%
-  {235.826360935835 pt }%
-  {\char25 }%
-  \placebox{-28.0 pt }%
-  {239.752280935835 pt }%
-  {\char25 }%
-  \placebox{-28.0 pt }%
-  {239.026680935835 pt }%
-  {\char25 }%
-  \placebox{-28.0 pt }%
-  {235.147240935835 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {247.906219276784 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {247.746219276784 pt }%
-  {\char30 }%
-  \placebox{-24.736 pt }%
-  {267.328120520947 pt }%
-  {\embeddedps{12.5026258109842 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.736 pt }%
-  {257.517169898866 pt }%
-  {\embeddedps{10.2109506220815 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {257.717169898866 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {257.557169898866 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {267.528120520947 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {267.368120520947 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {277.179071143029 pt }%
-  {\kern0.0 pt \vrule width 0.64 pt depth 8.0 pt height 8.0 pt  }%
-  \placebox{-16.0 pt }%
-  {279.630746331931 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 8.736 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {279.470746331931 pt }%
-  {\char30 }%
-  \placebox{-28.0 pt }%
-  {289.448303654769 pt }%
-  {\char82 }%
-  \placebox{-16.0 pt }%
-  {289.448303654769 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 12.0 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {289.288303654769 pt }%
-  {\char30 }%
-  \placebox{-24.0 pt }%
-  {312.013490085556 pt }%
-  {\embeddedps{4.90547531104077 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {306.908014774515 pt }%
-  {\embeddedps{10.2109506220815 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {299.05925427685 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {299.25925427685 pt }%
-  {\embeddedps{3.92438024883263 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {299.25925427685 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {299.09925427685 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {307.108014774515 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {306.948014774515 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {316.918965396597 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {316.758965396597 pt }%
-  {\char30 }%
-  \placebox{-20.736 pt }%
-  {350.276197511674 pt }%
-  {\embeddedps{3.92438024883263 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {346.151817262842 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {346.151817262842 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {338.303056765176 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {338.303056765176 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {330.454296267511 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {330.454296267511 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {324.567725894262 pt }%
-  {\embeddedps{6.28657037324893 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {324.567725894262 pt }%
-  {\embeddedps{6.28657037324893 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-20.736 pt }%
-  {324.767725894262 pt }%
-  {\embeddedps{2.94328518662446 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {324.767725894262 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {324.607725894262 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {330.654296267511 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {330.494296267511 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {338.503056765176 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {338.343056765176 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {346.351817262842 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {346.191817262842 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {354.200577760507 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {354.040577760507 pt }%
-  {\char30 }%
-  \placebox{-20.736 pt }%
-  {378.727954315711 pt }%
-  {\embeddedps{4.90547531104077 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {378.727954315711 pt }%
-  {\embeddedps{4.90547531104077 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {373.62247900467 pt }%
-  {\embeddedps{10.2109506220815 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {365.773718507005 pt }%
-  {\embeddedps{8.24876049766526 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {365.973718507005 pt }%
-  {\embeddedps{3.92438024883263 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-27.264 pt }%
-  {359.887148133756 pt }%
-  {\embeddedps{6.28657037324893 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-24.0 pt }%
-  {360.087148133756 pt }%
-  {\embeddedps{2.94328518662446 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-20.736 pt }%
-  {360.087148133756 pt }%
-  {\embeddedps{2.94328518662446 0.0 1.872 draw_beam}%
-   }%
-  \placebox{-16.0 pt }%
-  {360.087148133756 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {359.927148133756 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {365.973718507005 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {365.813718507005 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {373.82247900467 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {373.66247900467 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {383.633429626751 pt }%
-  {\kern-0.16 pt \vrule width 0.32 pt depth 11.264 pt height 1.03836152344995 pt  }%
-  \placebox{-14.0 pt }%
-  {383.473429626751 pt }%
-  {\char30 }%
-  \placebox{-16.0 pt }%
-  {389.36 pt }%
-  {\kern0.0 pt \vrule width 0.64 pt depth 8.0 pt height 8.0 pt  }%
-  }%
- \vss}
-\EndLilyPondOutput
\ No newline at end of file

diff --git a/VERSION b/VERSION
index dc92e1726d9b164227c1412cfe7fbaa0529f62db..0e766f405c73c76b7b3e06515f26eb22672a1f8b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 7d2d699eadd2dce9d8cbd34bfa4ae0025f11674e..8d95d0e42e6bb7a20f6d17d6421df038f12b3dbf 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -333,7 +333,7 @@ HYPHEN              --
                if (c == '{' &&  c == '}') // brace open is for not confusing dumb tools.
                        here_input ().warning (
                                "Brace found at end of lyric. Did you forget a space?");
-               yylval.scm = ly_ch_C_to_scm (YYText());
+               yylval.scm = ly_ch_C_to_scm (s.ch_C ());
 
                DEBUG_OUT << "lyric : `" << s << "'\n";
                return STRING;

diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py
index c1349377c52d0ffe7f12eb188eef3db5500268cf..0ffa3a9bcf6d0f02e8be1cb68f7bdc9789eaae0a 100644 (file)
--- a/scripts/mup2ly.py
+++ b/scripts/mup2ly.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 # 
-# (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+# (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>
 
 # TODO: regex -> re.
 
@@ -84,6 +84,11 @@ def line_to_ly (s):
                        last_name = name
                else:
                        name = last_name
+               name = lstrip (name)
+               name = rstrip (name)
+               if name == "ms":
+                       name = "s"
+                       duration = 1
                if duration:
                        last_duration = duration
                else:
@@ -91,7 +96,7 @@ def line_to_ly (s):
                name = regsub.sub ("#", "is", name)
                name = regsub.sub ("+", "'", name)
                name = regsub.sub ("-", ",", name)
-               name = regsub.sub ("ms", "s1", name)
+               #name = regsub.sub ("ms", "s1", name)
                notes = notes + " %s%s" % (name, duration)
        return notes
 
@@ -149,7 +154,7 @@ for i in range (len (staffs)):
 lyfile.write ("\\score{\n")
 lyfile.write ("\\notes <\n")
 for i in range (len (staffs)):
-       lyfile.write ("\\type Staff=staff%s <\n" % chr(ord('A')+i))
+       lyfile.write ("\\context Staff=staff%s <\n" % chr(ord('A')+i))
        for v in range (len (staffs[i])):
                lyfile.write ("{ \\$staff%d_voice_%d } " % (i+1, v+1))
        lyfile.write ("\n>\n")