From 095750f4177ff3c486c33ec5475d20620d4ea926 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 23 Feb 2000 21:53:56 +0100 Subject: [PATCH] patch::: 1.3.26.jcn1 1.3.26.jcn1 =========== * Devised kludge for ascii 5 character font pitches. * Substitutions: interline, 1997,1998, @stack.nl and small typo fixes. --- CHANGES | 7 ++ Documentation/footer.html.in | 2 +- Documentation/index.texi | 10 +-- Documentation/programmer/regression-test.tely | 3 +- Documentation/topdocs/index.tely | 30 ++++---- TODO | 1 + VERSION | 2 +- input/test/beam-position.sly | 4 +- input/test/test-as5.ly | 4 +- ly/engraver.ly | 2 +- ly/params-as.ly | 57 ++++++++-------- ly/params.ly | 68 ++++++++++--------- mf/as5.af | 15 ++-- mf/feta-autometric.mf | 2 +- mf/feta-beum.mf | 2 +- mf/feta-bolletjes.mf | 4 +- mf/feta-braces11.mf | 2 +- mf/feta-braces13.mf | 2 +- mf/feta-braces16.mf | 2 +- mf/feta-braces20.mf | 2 +- mf/feta-braces23.mf | 2 +- mf/feta-braces26.mf | 2 +- mf/feta-eindelijk.mf | 2 +- mf/feta-generic.mf | 2 +- mf/feta-klef.mf | 2 +- mf/feta-nummer.mf | 2 +- mf/feta-schrift.mf | 2 +- mf/feta-slag.mf | 2 +- mf/feta-sleur.mf | 4 +- mf/feta-toevallig.mf | 2 +- mf/feta.tex | 2 +- scm/lily.scm | 12 +++- scripts/as2text.scm | 22 ++++-- 33 files changed, 162 insertions(+), 117 deletions(-) diff --git a/CHANGES b/CHANGES index 5904ba5aee..4080a7f603 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.3.26.jcn1 +=========== + +* Devised kludge for ascii 5 character font pitches. + +* Substitutions: interline, 1997,1998, @stack.nl and small typo fixes. + 1.3.25.jcn2 =========== diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index 50bcaf5b2d..1930f851af 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -32,7 +32,7 @@ Please send comments on these web pages to

-Copyright (c) 1997, 1998, 1999 Han-Wen Nienhuys and Jan Nieuwenhuizen. +Copyright (c) 1997, 1998, 1999, 2000 Han-Wen Nienhuys and Jan Nieuwenhuizen.

diff --git a/Documentation/index.texi b/Documentation/index.texi index 2e0450d1b5..e9258e0c72 100644 --- 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 b0f0718039..149ea061bb 100644 --- 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/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 38360739ad..c24859c33b 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -25,8 +25,8 @@ internet. @unnumberedsec Why should I use it? -The input to LilyPond is plain text. So you can use your favorite text -editor to edit it, you can put it in mail or embed it in an article like +The input to LilyPond is plain text. So, you can use your favorite text +editor to enter it, you can put it in mail or embed it in an article like this: @quotation @@ -45,14 +45,14 @@ files with lilypond, and we have a simple MIDI to lilypond conversion tool, @file{midi2ly}. LilyPond is free software. It is licensed under GNU General Public -License, so you can use, modify and redistribute the program almost no -restrictions. LilyPond is part of the @uref{http://www.gnu.org/,GNU -Project}. - -The version numbers are in Linux-kernel style: even unnumbered versions -are `stable'. The webpages for the stable version reside at GNU, here: - @uref{http://www.gnu.org/software/lilypond}. Big enhancements go -into the odd numbered versions, whose webpages are on +License, so you can use, modify and redistribute the program with +almost no restrictions. LilyPond is part of the +@uref{http://www.gnu.org/,GNU Project}. + +The version numbers are in Linux-kernel style: even numbered versions +are `stable'. The webpages for the stable version (1.2) reside at GNU, +here: @uref{http://www.gnu.org/software/lilypond}. Big enhancements go +into the latest odd numbered version (1.3), which webpages are on @uref{http://www.cs.uu.nl/~hanwen/lilypond/,Han-Wen's site}. If want more information, you can browse the @@ -74,7 +74,7 @@ examples} and @uref{./mutopia/out-www/index.html,longer examples}. The examples include sound bites in MIDI, pictures in PNG, printable scores in PostScript, and LilyPond input. -Other use LilyPond too. +Others use LilyPond too. @uref{http://www.geocities.com/Vienna/Studio/1714/harpsichord.html,John Sankey}, harpsichordist to the internet, is typesetting the complete @uref{http://www.geocities.com/Vienna/Studio/1714/scarlattidwn.html/,sonatas @@ -85,7 +85,7 @@ large archive of public domain sheet music under construction. @unnumberedsec Download -If you want to compile LilyPond from sources, download them here: +If you want to compile LilyPond from source, download here: @itemize @bullet @item Download stable releases at @uref{ftp://ftp.gnu.org/gnu/lilypond/} @@ -111,9 +111,9 @@ binary RPMs: @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/} @unnumberedsec Mailing list -If you have questions do write to the mailing lists! - (but don't forget to read the @uref{Documentation/out-www/faq.html, -Frequently Asked Questions} first) +If you have questions, do write to the mailing lists! + (But don't forget to read the @uref{Documentation/out-www/faq.html, +Frequently Asked Questions} first.) @table @samp diff --git a/TODO b/TODO index cdde07acc9..1f0b03638b 100644 --- a/TODO +++ b/TODO @@ -14,6 +14,7 @@ Grep -i for TODO, FIXME and ugh/ugr/urg. lilypond --paper=paper16 foo.ly lilypond --paper=paper20 foo.ly lilypond --paper=paper-as9 foo.ly +. * entangle ly/* paper-params papersize stuff . * fix tremolos. . * change ) c4 to c4-) . * internationalize GUILE msgs. diff --git a/VERSION b/VERSION index 87d3037b52..2387dbbf1b 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=26 -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/input/test/beam-position.sly b/input/test/beam-position.sly index 0fe44dafa2..86136e69a7 100644 --- 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 ee77e7645a..cdc0727eb1 100644 --- 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 759f8758db..5604407d63 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -170,7 +170,7 @@ GraceContext=\translator { stemLength = #6.0 verticalDirection = \up ; - graceAccidentalSpace= 1.5 * \interline; + graceAccidentalSpace= 1.5 * \staffspace; }; \translator{\GraceContext} diff --git a/ly/params-as.ly b/ly/params-as.ly index 94dbfc8e05..2a7838c996 100644 --- 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 988e697e09..063c8e92cd 100644 --- 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 5b2c13810c..a8fd2500e3 100644 --- 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 C 0; WX 7; N rests-0; B 0 0 1000 1000; @@ -51,11 +51,18 @@ x : C 31; WX 5; N noteheads-ledgerending; B -1500 -500 1500 500; - - C 33; WX 9; N noteheads-0; B 0 -500 1000 500; + C 33; WX 1; N noteheads-0; B 0 -500 1000 500; O - C 34; WX 6; N noteheads-1; B -1000 -500 0 500; + C 33.5; WX 1; N noteheads-0; B -1000 -500 1000 2000; +,-, +`-' + C 34; WX 1; N noteheads-1; B -1000 -500 0 500; o - C 35; WX 6; N noteheads-2; B -1000 0 0 1000; + C 34.5; WX 1; N noteheads-1; B -1000 -500 0 500; +° + C 35; WX 1; N noteheads-2; B -1000 0 0 1000; +x + C 35.5; WX 1; N noteheads-2.5; B -1000 0 0 1000; * 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 c536c3334b..fdf9b0eb3f 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % Jan Nieuwenhuizen % % these macros help create ascii logging output diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf index 1288d6f20d..17cf755a95 100644 --- 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 +% (c) 1997--2000 Jan Nieuwenhuizen % mode_setup; diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index efb52eb290..877d03cc59 100644 --- 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 -% & Han-Wen Nienhuys +% (c) 1997--2000 Jan Nieuwenhuizen +% & Han-Wen Nienhuys % diff --git a/mf/feta-braces11.mf b/mf/feta-braces11.mf index 396746b6e3..29ad26a6ae 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % font_identifier:="feta-braces11"; diff --git a/mf/feta-braces13.mf b/mf/feta-braces13.mf index ac31616146..013ecad689 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % font_identifier:="feta-braces13"; diff --git a/mf/feta-braces16.mf b/mf/feta-braces16.mf index 60dc071186..06f05f40ed 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % font_identifier:="feta-braces16"; diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf index 9aae3d5379..c7b944e733 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % font_identifier:="feta-braces20"; diff --git a/mf/feta-braces23.mf b/mf/feta-braces23.mf index a97ec9c0c2..c14215dd7c 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % font_identifier:="feta-braces23"; diff --git a/mf/feta-braces26.mf b/mf/feta-braces26.mf index 7c92ac6f19..c75ee3544e 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % font_identifier:="feta-braces26"; diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index c7e8373551..b5f172dbe2 100644 --- 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 +% (c) 1997--2000 Jan Nieuwenhuizen fet_begingroup("rests"); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index c7fa397902..9d082d27a4 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 3bd3971f45..579e555585 100644 --- 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 , +% (c) 1997--2000 Han-Wen Nienhuys , % Jan Nieuwenhuizen diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf index be478d4ab1..b66cc177a5 100644 --- 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 +% (c) 1997--2000 Jan Nieuwenhuizen fet_begingroup("nummer") diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index c3fdc46c0d..b72653b4ad 100644 --- 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 +% (c) 1997 Han-Wen Nienhuys % Jan Nieuwenhuizen % diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index 47ec9438ab..060e4537c5 100644 --- 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 +% (c) 1998--2000 Jan Nieuwenhuizen % % this file is included by feta-scripts.mf diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index 40a4e84885..3b129a8bdb 100644 --- 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 -% & Han-Wen Nienhuys +% (c) 1997--2000 Jan Nieuwenhuizen +% & Han-Wen Nienhuys % % see Documentation/fonts.tex diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index a5d6325621..22d6b3b9b9 100644 --- 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 +% (c) 1997--2000 Han-Wen Nienhuys % diff --git a/mf/feta.tex b/mf/feta.tex index a8815e7f64..a1f4e05cd6 100644 --- 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 +% (c) 1998--2000 Jan Nieuwenhuizen % % urg: fool ls-latex \def\urg{ diff --git a/scm/lily.scm b/scm/lily.scm index 337387b0bf..050a9a16b1 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -752,13 +752,19 @@ (define (lily-def key val) (if - (equal? key "mudelapaperlinewidth") + (or (equal? key "mudelapaperlinewidth") + (equal? key "mudelapaperstaffheight")) (string-append "(define " key " " (arg->string val) ")\n") "")) (define (placebox x y s) - (string-append (func "move-to" x y) s)) - + (let ((ey (inexact->exact y))) + (string-append "(move-to " (number->string (inexact->exact x)) " " + (if (= 0.5 (- (abs y) (abs ey))) + (number->string y) + (number->string ey)) + ")\n" s))) + (define (select-font font-name-symbol) (let* ((c (assoc font-name-symbol font-name-alist))) (if (eq? c #f) diff --git a/scripts/as2text.scm b/scripts/as2text.scm index b6cd31355f..b322842de8 100644 --- 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)) -- 2.39.2