lilypond-1.3.27

diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in
index 50bcaf5b2d0a30fed5803ed7cfa6bc1e5ff92618..1930f851afd9bb0189b777701dfe6dd247c3fece 100644 (file)
--- a/Documentation/footer.html.in
+++ b/Documentation/footer.html.in
@@ -32,7 +32,7 @@ Please send comments on these web pages to
 
 <p>
 
-Copyright (c) 1997, 1998, 1999 Han-Wen Nienhuys and Jan Nieuwenhuizen.
+Copyright (c) 1997, 1998, 1999, 2000 Han-Wen Nienhuys and Jan Nieuwenhuizen.
 
 <p>
 

diff --git a/Documentation/index.texi b/Documentation/index.texi
index 2e0450d1b50ab3c1266abf5ed99f07b2c76828c6..e9258e0c7271eede06af745ef7c67b988a4a1db4 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -5,7 +5,7 @@
 @node Top, , , (dir)
 @top
 
-@unnumberedsubsec Introduction
+@unnumberedsubsec Info
 
 @itemize @bullet 
 @item @uref{DEDICATION.txt,Dedication}
@@ -15,13 +15,13 @@
 @end itemize
 
 
-@unnumberedsubsec Documentation
+@unnumberedsubsec Manuals
 
 @itemize @bullet
-@item @uref{faq.html,Frequently asked questions}, with answers
+@item @uref{faq.html,FAQ: Frequently asked questions}, with answers
 @item @uref{programs.html,`Manual pages'}
 @item @uref{../user/out-www/index.html,User documentation}
-@item @uref{../programmer/out-www/index.html,Programmer's documentation}
+@item @uref{../programmer/out-www/index.html,Programmer documentation}
 @item @uref{../bibliography/out-www/index.html,Bibliography}
 @item @uref{../misc/out-www/index.html,Miscellaneous texts}
 @end itemize
@@ -35,7 +35,7 @@
 @end itemize
 
 
-@unnumberedsubsec Logo:
+@unnumberedsubsec Logo
 @itemize @bullet
 @item @uref{../pictures/out-www/lelieblond.png,  logo} in large size
 @item @uref{../pictures/out-www/lelie-logo.png, logo} in medium size

diff --git a/Documentation/programmer/regression-test.tely b/Documentation/programmer/regression-test.tely
index b0f0718039a85db185914e92aa05d896667084f3..149ea061bb98b867036aa0108ea07039fab8356e 100644 (file)
--- a/Documentation/programmer/regression-test.tely
+++ b/Documentation/programmer/regression-test.tely
@@ -131,9 +131,10 @@ Stems may be short, but noteheads should never touch the beam.
 
 @mudelafile{beam-extreme.ly}
 
-Beams should always reach the middle staff line, the second beam
+Beams should always reach the middle staff line.  The second beam
 counting from the note head side, should never be lower than the
 second staff line.  This does not hold for grace note beams.
+Override with @code{noStemExtend}.
 
 @mudelafile{beam-position.sly}
 

diff --git a/input/test/beam-position.sly b/input/test/beam-position.sly
index 0fe44dafa2a610baba7e206063b873394d35dc4d..86136e69a727ad079fd65f4307ec7f049e1f9948 100644 (file)
--- a/input/test/beam-position.sly
+++ b/input/test/beam-position.sly
@@ -1 +1,3 @@
-[f8 f] \grace { [f8 e8] } [f64 f]
+[f8 f]  [f64 f] \grace { [f8 e8] }
+\property Voice.noStemExtend = ##t
+[f8 f]

diff --git a/input/test/test-as5.ly b/input/test/test-as5.ly
index ee77e7645a617ec259cd27ecd444a824691a88c1..cdc0727eb11a9a7cc248b7021cfe2aa815283065 100644 (file)
--- a/input/test/test-as5.ly
+++ b/input/test/test-as5.ly
@@ -3,7 +3,9 @@
 \score {
        \notes\relative c''{
                \time 4/4;
-               g1 g2 g4. g8 |
+               g1 a b c 
+               g2 a b c
+               g4 a b c
        }
        \paper {
                \paper_as_five

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 759f8758db0926299b4f19870f39a99965cd39fa..177cbb8d53a72912091703e5e85b4cd10b14c0c1 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -5,7 +5,7 @@
 StaffContext=\translator {
        \type "Engraver_group_engraver";
        \name Staff ;
-       
+       \consists "Output_property_engraver";   
        barAuto = ##t
        voltaVisibility = ##t
        Generic_property_list = #generic-staff-properties
@@ -92,7 +92,8 @@ RhythmicStaffContext=\translator{
        \type "Engraver_group_engraver";
        numberOfStaffLines  = #1
        \consists "Property_engraver";
-       
+       \consists "Output_property_engraver";   
+
        Generic_property_list = #generic-staff-properties
        
        barSize = #'staff-height
@@ -113,6 +114,7 @@ VoiceContext = \translator {
        \type "Engraver_group_engraver";
        dynamicPadding = #5.0
        Generic_property_list = #generic-voice-properties
+       \consists "Output_property_engraver";   
 
        \consists "Dynamic_engraver";   % must come before text_engraver.
        \name Voice ;
@@ -145,6 +147,7 @@ VoiceContext = \translator {
 GraceContext=\translator {
        \type "Grace_engraver_group";
        \name "Grace";
+       \consists "Output_property_engraver";   
 
        Generic_property_list = #generic-grace-properties
        
@@ -170,7 +173,7 @@ GraceContext=\translator {
        
        stemLength = #6.0
        verticalDirection = \up ;
-       graceAccidentalSpace= 1.5 * \interline;
+       graceAccidentalSpace= 1.5 * \staffspace;
 };
 
 \translator{\GraceContext}
@@ -179,6 +182,7 @@ GraceContext=\translator {
 ThreadContext = \translator{
        \type Engraver_group_engraver;
        \consists "Note_heads_engraver" ;
+       \consists "Output_property_engraver";   
        Generic_property_list = #generic-thread-properties
        \consists "Property_engraver";
        \name Thread;
@@ -211,6 +215,7 @@ PianoStaffContext = \translator{\GrandStaffContext
 StaffGroupContext= \translator {
        \type "Engraver_group_engraver";
        \consists "Span_bar_engraver";
+       \consists "Output_property_engraver";   
        
        \consists "Staff_group_bar_engraver";
        \name StaffGroup;
@@ -251,6 +256,7 @@ LyricsContext = \translator {
 
 \translator{
        \type "Engraver_group_engraver";
+       \consists "Output_property_engraver";   
 
        \consistsend "Axis_group_engraver";
        \name ChordNameVoice ;
@@ -311,6 +317,7 @@ ScoreContext = \translator {
        \name Score;
 
        \consists "Timing_engraver";
+       \consists "Output_property_engraver";   
 
        \consists "Span_score_bar_engraver";
 %      \consists "Score_priority_engraver";

diff --git a/ly/params-as.ly b/ly/params-as.ly
index 94dbfc8e05e24b61e13b413bb5550d9025d3f3be..2a7838c996903965a8fd75203cb4531f0cabb5df 100644 (file)
--- a/ly/params-as.ly
+++ b/ly/params-as.ly
@@ -14,17 +14,20 @@ linewidth = 60.0\char;
 textheight = 60.0\char;
 indent = 8.0\char;
 
-interline = (\staffheight - 1.0 ) / 4.0;
-stafflinethickness = \interline / 2.0;
+staffspace = (\staffheight - 1.0 ) / 4.0;
+stafflinethickness = \staffspace / 2.0;
+
+% deprecated
+interline = \staffspace;
 
 % urg, need grace_ versions of these too?
-beam_thickness = 0.52 * (\interline - \stafflinethickness);
+beam_thickness = 0.52 * (\staffspace - \stafflinethickness);
 
 #'beam-thickness = \beam_thickness;  %% UGR
 
 
-interbeam = (2.0 * \interline + \stafflinethickness - \beam_thickness) / 2.0;
-interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
+interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0;
+interbeam4 = (3.0 * \staffspace - \beam_thickness) / 3.0;
 
 %{
 The space taken by a note is determined by the formula 
@@ -49,20 +52,20 @@ arithmetic_multiplier = 0.9 * \quartwidth ;
 
 % catch suspect beam slopes, set slope to zero if
 % outer stem is lengthened more than
-beam_lengthened = 0.2 * \interline;
+beam_lengthened = 0.2 * \staffspace;
 % and slope is running away steeper than
 beam_steep_slope = 0.2 / 1.0;
 
 %{
 dit(code(slur_x_gap)) Horizontal space between note and slur.  Set to
-code(\interline / 5) by default.  
+code(\staffspace / 5) by default.  
 
 %}
 % OSU: suggested gap = ss / 5;
-slur_x_gap = \interline / 5.0;
-slur_y_gap = 0.25 * \interline;
-slur_y_free = 0.75 * \interline;
-slur_x_minimum = 1.5 * \interline;
+slur_x_gap = \staffspace / 5.0;
+slur_y_gap = 0.25 * \staffspace;
+slur_y_free = 0.75 * \staffspace;
+slur_x_minimum = 1.5 * \staffspace;
 
 %{
 Like beams, slurs often aren't as steep as the notes they encompass.
@@ -75,20 +78,20 @@ slur_interstaff_slope_damping = 0.6;
 slur_height_damping = 0.4;
 slur_interstaff_height_damping = 0.5;
 % snap to stem if slur ends closer to stem than
-slur_snap_to_stem = 1.75 * \interline;
-slur_interstaff_snap_to_stem = 2.5 * \interline;
+slur_snap_to_stem = 1.75 * \staffspace;
+slur_interstaff_snap_to_stem = 2.5 * \staffspace;
 % maximum dy change allowed by snapping
 slur_snap_max_slope_change = 0.5;
 slur_interstaff_snap_max_slope_change = 0.5;
 
 
 
-tie_x_minimum = \interline + \slur_x_minimum;
+tie_x_minimum = \staffspace + \slur_x_minimum;
 % OSU: tie gap == slur gap
 tie_x_gap = \slur_x_gap;
-tie_y_gap = 0.25 * \interline;
+tie_y_gap = 0.25 * \staffspace;
 % length of a tie that's a staffspace high
-tie_staffspace_length = 4.0 * \interline;
+tie_staffspace_length = 4.0 * \staffspace;
 
 % ugh: rename to bow (in bezier.cc and fonts.doc too...)
 
@@ -131,14 +134,14 @@ barthick_thick = 2.0\char;
 barthick_score = 1.0\char;
 barthick_thin = 1.0\char;
 
-bracket_arch_thick = \interline / 3.0;
-bracket_width = 2.0 * \interline;
+bracket_arch_thick = \staffspace / 3.0;
+bracket_width = 2.0 * \staffspace;
 bracket_thick = 2.0 * \stafflinethickness;
-bracket_arch_height = 1.5 * \interline;
+bracket_arch_height = 1.5 * \staffspace;
 bracket_arch_width = \bracket_arch_height;
 bracket_arch_angle = 50.0;
 
-tuplet_spanner_gap = 2.0 * \interline;
+tuplet_spanner_gap = 2.0 * \staffspace;
 tuplet_thick = 1.0\char;
 volta_thick = 1.0\char;
 volta_spanner_height = 1.0\char;
@@ -156,13 +159,13 @@ hyphen_minimum_length = 0.25*\font_normal;
 
 % Multi-measure rests
 multi_measure_rest_x_minimum = 2.5*\staffheight;
-multi_measure_rest_padding = 2.0 *\interline;
+multi_measure_rest_padding = 2.0 *\staffspace;
 multi_measure_rest_expand_limit = 10.0;
 
 % chop off this much when next to pp / ff sign.
-crescendo_shorten = 4.0 * \interline;
+crescendo_shorten = 4.0 * \staffspace;
 crescendo_thickness   = \stafflinethickness;
-crescendo_height = 0.666 * \interline;
+crescendo_height = 0.666 * \staffspace;
 
 % in internote.
 restcollision_minimum_dist = 3.0;
@@ -176,7 +179,7 @@ collision_note_width = \notewidth;  %ugh.
 postBreakPadding = 0.0;
 
 % optical correction amount.
-stemSpacingCorrection = 0.5*\interline;
+stemSpacingCorrection = 0.5*\staffspace;
 
 
 %{
@@ -203,7 +206,7 @@ before_grace_spacing_factor = 1.2;
 %{
 If columns do not have spacing information set, set it to this much
 %}
-loose_column_distance = 2.0 * \interline;
+loose_column_distance = 2.0 * \staffspace;
 
 %{
 Relative cost of compressing (vs. stretching).  Increasing this
@@ -216,7 +219,7 @@ compression_energy_factor = 0.6;
 % if stem is on middle line, choose this direction.
 stem_default_neutral_direction = 1.0;
 
-% in interline
+% in staffspace
 articulation_script_padding_default = 1.0;
 
 % Backward compatibility -- has no function; 
@@ -233,6 +236,6 @@ Wordwrap =0.0;
 #'Local_key_item::left-padding = #'0.2
 #'Local_key_item::right-padding = #'0.4
 
-#'Staff_symbol::staff-space = \interline ;
+#'Staff_symbol::staff-space = \staffspace ;
 #'Staff_symbol::line-count = #5
 

diff --git a/ly/params.ly b/ly/params.ly
index 988e697e098c08c4fcfd7f59b949b65eb3a934e4..063c8e92cd7cd48ef4d78b2323fa3760276f318d 100644 (file)
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -8,19 +8,21 @@ paperfile = \papersize + ".ly";
 \include \paperfile;
 \include "paper.ly";
 
-interline = \staffheight / 4.0;
+staffspace = \staffheight / 4.0;
+stafflinethickness = \staffspace / 10.0;
 
+% deprecated
+interline = \staffspace;
 
-stafflinethickness = \interline / 10.0;
 
 % urg, need grace_ versions of these too?
-beam_thickness = 0.52 * (\interline - \stafflinethickness);
+beam_thickness = 0.52 * (\staffspace - \stafflinethickness);
 
 #'beam-thickness = \beam_thickness;  %% UGR
 
 
-interbeam = (2.0 * \interline + \stafflinethickness - \beam_thickness) / 2.0;
-interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
+interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0;
+interbeam4 = (3.0 * \staffspace - \beam_thickness) / 3.0;
 
 %{
 The space taken by a note is determined by the formula 
@@ -45,20 +47,20 @@ arithmetic_multiplier = 0.9 * \quartwidth ;
 
 % catch suspect beam slopes, set slope to zero if
 % outer stem is lengthened more than
-beam_lengthened = 0.2 * \interline;
+beam_lengthened = 0.2 * \staffspace;
 % and slope is running away steeper than
 beam_steep_slope = 0.2 / 1.0;
 
 %{
 dit(code(slur_x_gap)) Horizontal space between note and slur.  Set to
-code(\interline / 5) by default.  
+code(\staffspace / 5) by default.  
 
 %}
 % OSU: suggested gap = ss / 5;
-slur_x_gap = \interline / 5.0;
-slur_y_gap = 0.25 * \interline;
-slur_y_free = 0.75 * \interline;
-slur_x_minimum = 1.5 * \interline;
+slur_x_gap = \staffspace / 5.0;
+slur_y_gap = 0.25 * \staffspace;
+slur_y_free = 0.75 * \staffspace;
+slur_x_minimum = 1.5 * \staffspace;
 
 %{
 Like beams, slurs often aren't as steep as the notes they encompass.
@@ -71,8 +73,8 @@ slur_interstaff_slope_damping = 0.6;
 slur_height_damping = 0.4;
 slur_interstaff_height_damping = 0.5;
 % snap to stem if slur ends closer to stem than
-slur_snap_to_stem = 1.75 * \interline;
-slur_interstaff_snap_to_stem = 2.5 * \interline;
+slur_snap_to_stem = 1.75 * \staffspace;
+slur_interstaff_snap_to_stem = 2.5 * \staffspace;
 % maximum dy change allowed by snapping
 slur_snap_max_slope_change = 0.5;
 slur_interstaff_snap_max_slope_change = 0.5;
@@ -80,12 +82,12 @@ slur_thickness = 1.2 * \stafflinethickness;
 
 
 
-tie_x_minimum = \interline + \slur_x_minimum;
+tie_x_minimum = \staffspace + \slur_x_minimum;
 % OSU: tie gap == slur gap
 tie_x_gap = \slur_x_gap;
-tie_y_gap = 0.25 * \interline;
+tie_y_gap = 0.25 * \staffspace;
 % length of a tie that's a staffspace high
-tie_staffspace_length = 4.0 * \interline;
+tie_staffspace_length = 4.0 * \staffspace;
 
 % ugh: rename to bow (in bezier.cc and fonts.doc too...)
 
@@ -125,11 +127,11 @@ gourlay_maxmeasures = 10.;
 %{ Ross. page 151 lists these values, but we think that thick lines
 and kernings are too thick.
 
-bar_kern = 0.5 * \interline;
-bar_thinkern = 0.75 * \interline;
-barthick_thick = 0.5* \interline;
-barthick_score = 0.13333* \interline;
-barthick_thin = 0.1*\interline;
+bar_kern = 0.5 * \staffspace;
+bar_thinkern = 0.75 * \staffspace;
+barthick_thick = 0.5* \staffspace;
+barthick_score = 0.13333* \staffspace;
+barthick_thin = 0.1*\staffspace;
 
 %}
 
@@ -139,17 +141,17 @@ barthick_thick = 6.0* \stafflinethickness;
 barthick_thin = 1.6*\stafflinethickness;
 barthick_score = 1.6*\stafflinethickness;
 
-bracket_arch_thick = \interline / 3.0;
-bracket_width = 2.0 * \interline;
+bracket_arch_thick = \staffspace / 3.0;
+bracket_width = 2.0 * \staffspace;
 bracket_thick = 2.0 * \stafflinethickness;
-bracket_arch_height = 1.5 * \interline;
+bracket_arch_height = 1.5 * \staffspace;
 bracket_arch_width = \bracket_arch_height;
 bracket_arch_angle = 50.0;
 
-tuplet_spanner_gap = 2.0 * \interline;
+tuplet_spanner_gap = 2.0 * \staffspace;
 tuplet_thick = 1.0*\stafflinethickness;
 volta_thick = 1.6*\stafflinethickness;
-volta_spanner_height = 2.0 *\interline;
+volta_spanner_height = 2.0 *\staffspace;
 
 % relative thickness of thin lines  1.6 : 1 : 0.8
 stemthickness = 0.8*\stafflinethickness;
@@ -164,13 +166,13 @@ hyphen_minimum_length = 0.25*\font_normal;
 
 % Multi-measure rests
 multi_measure_rest_x_minimum = 2.5*\staffheight;
-multi_measure_rest_padding = 2.0 *\interline;
+multi_measure_rest_padding = 2.0 *\staffspace;
 multi_measure_rest_expand_limit = 10.0;
 
 % chop off this much when next to pp / ff sign.
-crescendo_shorten = 4.0 * \interline;
+crescendo_shorten = 4.0 * \staffspace;
 crescendo_thickness   = \stafflinethickness;
-crescendo_height = 0.666 * \interline;
+crescendo_height = 0.666 * \staffspace;
 
 % in internote.
 restcollision_minimum_dist = 3.0;
@@ -184,7 +186,7 @@ collision_note_width = \notewidth;  %ugh.
 postBreakPadding = 0.0;
 
 % optical correction amount.
-stemSpacingCorrection = 0.5*\interline;
+stemSpacingCorrection = 0.5*\staffspace;
 
 
 %{
@@ -211,7 +213,7 @@ before_grace_spacing_factor = 1.2;
 %{
 If columns do not have spacing information set, set it to this much
 %}
-loose_column_distance = 2.0 * \interline;
+loose_column_distance = 2.0 * \staffspace;
 
 %{
 Relative cost of compressing (vs. stretching).  Increasing this
@@ -224,7 +226,7 @@ compression_energy_factor = 0.6;
 % if stem is on middle line, choose this direction.
 stem_default_neutral_direction = 1.0;
 
-% in interline
+% in staffspace
 articulation_script_padding_default = 1.0;
 
 % Backward compatibility -- has no function; 
@@ -241,6 +243,6 @@ Wordwrap =0.0;
 #'Local_key_item::left-padding = #'0.2
 #'Local_key_item::right-padding = #'0.4
 
-#'Staff_symbol::staff-space = \interline ;
+#'Staff_symbol::staff-space = \staffspace ;
 #'Staff_symbol::line-count = #5
 

diff --git a/mf/as5.af b/mf/as5.af
index 5b2c13810c835a9e46ede32ef58a6810b36a9978..a8fd2500e34c9f5f506df45e37a5ba33d3cfe6f1 100644 (file)
--- a/mf/as5.af
+++ b/mf/as5.af
@@ -12,7 +12,7 @@
        StartFontMetrics 2.0
        FontName as 5
        FontFamily as
-       StartCharMetrics 56
+       StartCharMetrics 59
 
        Comment BBox: (llx lly urx ury) * 1000
 \f C 0; WX 7; N rests-0; B 0 0 1000 1000;
@@ -51,11 +51,18 @@ x
 :
 \f C 31; WX 5; N noteheads-ledgerending; B -1500 -500 1500 500;
 -
-\f C 33; WX 9; N noteheads-0; B 0 -500 1000 500;
+\f C 33; WX 1; N noteheads-0; B 0 -500 1000 500;
 O
-\f C 34; WX 6; N noteheads-1; B -1000 -500 0 500;
+\f C 33.5; WX 1; N noteheads-0; B -1000 -500 1000 2000;
+,-,
+`-'
+\f C 34; WX 1; N noteheads-1; B -1000 -500 0 500;
 o
-\f C 35; WX 6; N noteheads-2; B -1000 0 0 1000;
+\f C 34.5; WX 1; N noteheads-1; B -1000 -500 0 500;
+°
+\f C 35; WX 1; N noteheads-2; B -1000 0 0 1000;
+x
+\f C 35.5; WX 1; N noteheads-2.5; B -1000 0 0 1000;
 *
 \f C 36; WX 9; N noteheads-0diamond; B 0 -2750 9900 2750;
 V

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index c536c3334b2405ab6f71086cf3490a8e4bd8f4a6..fdf9b0eb3f2e17c3e545d40bc939522ef8ccda48 100644 (file)
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 % these macros help create ascii logging output

diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf
index 1288d6f20d4c5f50e214d66bfc7632a85e1e8e92..17cf755a95ced789f189930b45ab58aa1f0ccd83 100644 (file)
--- a/mf/feta-beum.mf
+++ b/mf/feta-beum.mf
@@ -3,7 +3,7 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 mode_setup;
 

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index efb52eb290cf318017ce98810cd70b6de25b14b7..877d03cc59c4f7056e42513ae34b7d7bc802489f 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -3,8 +3,8 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
-% & Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 

diff --git a/mf/feta-braces11.mf b/mf/feta-braces11.mf
index 396746b6e32b114acbcbceda0b1fee208fdec098..29ad26a6ae58158cdcbd414361ca4d99ea7157df 100644 (file)
--- a/mf/feta-braces11.mf
+++ b/mf/feta-braces11.mf
@@ -4,7 +4,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_identifier:="feta-braces11";

diff --git a/mf/feta-braces13.mf b/mf/feta-braces13.mf
index ac316161467a288213687781d2d046436153a85f..013ecad6893eb59fe85acb6c38e4ebb4d9206120 100644 (file)
--- a/mf/feta-braces13.mf
+++ b/mf/feta-braces13.mf
@@ -4,7 +4,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_identifier:="feta-braces13";

diff --git a/mf/feta-braces16.mf b/mf/feta-braces16.mf
index 60dc07118638a2199a675c7615ef65b1ab62c551..06f05f40edfef253aa488abc3704011cedf2cb5a 100644 (file)
--- a/mf/feta-braces16.mf
+++ b/mf/feta-braces16.mf
@@ -4,7 +4,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_identifier:="feta-braces16";

diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf
index 9aae3d5379d95cddffab3de63a59f1836d8171d7..c7b944e73379d64d46ddac07ce77d95d77a8c53a 100644 (file)
--- a/mf/feta-braces20.mf
+++ b/mf/feta-braces20.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_identifier:="feta-braces20";

diff --git a/mf/feta-braces23.mf b/mf/feta-braces23.mf
index a97ec9c0c22a0f1eeb2b51266091cacc532b7e11..c14215dd7c9f2d5e859c306d86a341f4e5d8dea2 100644 (file)
--- a/mf/feta-braces23.mf
+++ b/mf/feta-braces23.mf
@@ -4,7 +4,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_identifier:="feta-braces23";

diff --git a/mf/feta-braces26.mf b/mf/feta-braces26.mf
index 7c92ac6f1984fa303b7d3cff0f0bd1a278097cea..c75ee3544e3db06b806ee840889559776334ca7c 100644 (file)
--- a/mf/feta-braces26.mf
+++ b/mf/feta-braces26.mf
@@ -4,7 +4,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 font_identifier:="feta-braces26";

diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf
index c7e83735513019d5839ab2e486337a52ac251ae3..b5f172dbe29aab6366fdce5243007c938ecfd41c 100644 (file)
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-eindelijk.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("rests");
 

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index c7fa397902d35d8277c1c9a1c4c0a993bf1fece3..9d082d27a4f01150d454e0413530294f454da6a1 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -5,7 +5,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 3bd3971f456585cbbfe7d93a052ec9534c875801..579e555585d1b3d0aa8f82b1c2a816a15412cf05 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>,
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 % Jan Nieuwenhuizen <janneke@gnu.org>
 
 

diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index be478d4ab1ff8c9dc2289bb13e44d2a9373b3fbb..b66cc177a57ba098ebbd0644685fd76c306e28c7 100644 (file)
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
 fet_begingroup("nummer")
 

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index c3fdc46c0d0197c4fab67ca5b166ca59d5eed5ca..b72653b4adca3bbd42124292c43041f581c4a429 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 %      Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 47ec9438ab9c175d812fef893daa262879f4fb83..060e4537c5a607e772b992bdbc1b62d1128c2553 100644 (file)
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 % 
 
 % this file is included by feta-scripts.mf

diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf
index 40a4e84885850a8657ad7b7d2978e0200688bec0..3b129a8bdb48c67d6a3125dfd34695b7dd957f39 100644 (file)
--- a/mf/feta-sleur.mf
+++ b/mf/feta-sleur.mf
@@ -3,8 +3,8 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1997, 1998 Jan Nieuwenhuizen <janneke@gnu.org>
-% & Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 % see Documentation/fonts.tex
 

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index a5d6325621b3fb3df2383ce3f1e2297939a396ab..22d6b3b9b930d01af57bb02fe1fea0aad4d86113 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
+% (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 % 
 
 

diff --git a/mf/feta.tex b/mf/feta.tex
index a8815e7f64df43d1b15f8b80d17ebd12ef52ddc5..a1f4e05cd67b3ea98d0ce93fc6f2388e74bf54f7 100644 (file)
--- a/mf/feta.tex
+++ b/mf/feta.tex
@@ -1,6 +1,6 @@
 % display all feta chars in a pretty picture
 % GNU LilyPond
-% (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+% (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % urg: fool ls-latex
 \def\urg{

diff --git a/scripts/as2text.scm b/scripts/as2text.scm
index b6cd31355f73d5b6a19fcd204884442055a611e6..b322842de80381307c4b916f1c5a671f8be56b89 100644 (file)
--- a/scripts/as2text.scm
+++ b/scripts/as2text.scm
@@ -137,6 +137,9 @@ Options:
 ;; 
 (define line-char "-")
 
+;; 
+(define half-char-kludge #f)
+
 ;; the plotting fields
 (define canvas 0)
 ;; urg: 
@@ -263,9 +266,13 @@ Options:
 
 (define (char n)
   (let* ((font (get-font cur-font))
-        (c (get-char font n)))
-       (if c
-           (plot-char c))))
+        (c
+         (if (and half-char-kludge
+                  (assoc (+ n 0.5) font))
+             (get-char font (+ n 0.5))
+             (get-char font n))))
+        (if c
+            (plot-char c))))
 
 (define (end-output) 
   (display (string-append 
@@ -339,9 +346,16 @@ Options:
                     (if (< 0 (length font))
                         (set! fonts (cons (cons name font) fonts))))))))
 
+(define (number->rounded-exact x)
+  (* (sign x) (inexact->exact (abs x))))
+  
 (define (move-to x y)
   (set! cur-x x)
-  (set! cur-y y))
+  (let ((ey (number->rounded-exact y)))
+    (if (= 0.5 (- (abs ey) (abs y)))
+       (set! half-char-kludge #t)
+       (set! half-char-kludge #f))
+    (set! cur-y ey)))
 
 (define (put c)
   (plot cur-x cur-y c))