From 4f93f83cda84549e83cbc6604a33177cd6ff6817 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:04:40 +0000 Subject: [PATCH] lilypond-0.1.41 --- Documentation/INSTALL.pod | 16 +++++++++++----- bin/mf-deps.py | 8 +++++++- lily/beam.cc | 20 ++++++++++++++------ lily/include/beam.hh | 8 ++++++-- mf/Makefile | 16 +++++++--------- 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Documentation/INSTALL.pod b/Documentation/INSTALL.pod index c15658f917..bca2cc23f9 100644 --- a/Documentation/INSTALL.pod +++ b/Documentation/INSTALL.pod @@ -25,7 +25,7 @@ For compilation you need. =item * A GNU system: GNU LilyPond is known to run on these GNU systems: -Linux, AIX, Digital Unix and Solaris. +Linux, FreeBSD, AIX, Digital Unix and Solaris. If you have the Cygnus WINDOWS32 port of the GNU utils, it will even work in Windows NT/95, but we don't promise to support it. @@ -62,7 +62,9 @@ TeX =item * -A PostScript printer and/or viewer (such as Ghostscript). +A PostScript printer and/or viewer (such as Ghostscript) is strongly +recommended. Xdvi will show all embedded PostScript too if you have +Ghostscript installed. =back @@ -226,7 +228,11 @@ If you have done a successful C, then a simple make install -should do the trick. +should do the trick. + +If you are doing an upgrade, please remember to remove obsolete .pk +and .tfm files of the fonts. A script has been provided to do the +work, see F. =head1 CAVEATS @@ -308,8 +314,8 @@ is unpacked correctly, in particular the empty out directories Previous versions (before 0.1.39) used fonts from the TeX macro package "MusixTeX". You can still use these, but they are not supported. Since LilyPond's Feta font is much prettier, you'd be -stupid to use them, but anyway, here are the installation instructions -for those deprecated fonts. +seriously misguided if you used them, but anyway, here are the +installation instructions for those deprecated fonts. [obsolete] I use the MusixTeX fonts those found in MusixTeX diff --git a/bin/mf-deps.py b/bin/mf-deps.py index c17e5d949a..6d022fff45 100644 --- a/bin/mf-deps.py +++ b/bin/mf-deps.py @@ -22,9 +22,15 @@ from regsub import * ; import sys; import os; + +version = "0.2" input_re = compile('^[ \t]*input *\([^;]+\);') postfixes = ['log', 'dvi', '2602gf', 'tfm'] +def identify (): + return "mf-deps.py %s" % version + + def print_one(x): print x @@ -73,7 +79,7 @@ class Targetdeps: return reduce(line_concat, dependencies) - +print "# Automatically generated by %s\n" % identify () for file in sys.argv[1:]: # skip programname t = Targetdeps(file) diff --git a/lily/beam.cc b/lily/beam.cc index 450c12db14..ebda7c1ccd 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -317,28 +317,34 @@ Beam::quantise_left_y (Beam::Pos pos, bool extend_b) Real staffline_thickness = paper ()->rule_thickness (); Real beam_thickness = 0.48 * (interline_f - staffline_thickness); - const int QUANTS = 6; - Real qy[QUANTS] = { + const int QUANTS = 7; + Real qy[QUANTS] = + { 0, beam_thickness / 2, beam_thickness, interline_f / 2 + beam_thickness / 2 + staffline_thickness / 2, interline_f, interline_f + beam_thickness / 2, + interline_f + beam_thickness }; /* ugh, using i triggers gcc 2.7.2.1 internal compiler error (far down): for (int i = 0; i < QUANTS; i++) */ + + // fixme! for (int ii = 0; ii < QUANTS; ii++) - qy[ii] -= beam_thickness / 2; - Pos qpos[QUANTS] = { + qy[ii] -= 0.5 *beam_thickness; + Pos qpos[QUANTS] = + { HANG, STRADDLE, SIT, INTER, HANG, - STRADDLE + STRADDLE, + SIT }; // y-values traditionally use internote dimension @@ -384,7 +390,7 @@ Beam::quantise_left_y (Beam::Pos pos, bool extend_b) if (extend_b) left_y_ = (dir_ > 0 ? upper_y : lower_y); else - left_y_ = (upper_y - left_y_ < y - lower_y ? upper_y : lower_y); + left_y_ = (upper_y - y < y - lower_y ? upper_y : lower_y); } void @@ -436,6 +442,8 @@ Beam::set_stemlens () for (int j=0; j < stems_.size (); j++) { Stem *s = stems_[j]; + if (s->transparent_b_) + continue; Real x = s->hpos_f () - x0; s->set_stemend (left_y_ + slope_f_ * x); diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 1b9710034c..3729be625c 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -16,9 +16,13 @@ beam and that point in the correct direction */ class Beam: public Directional_spanner { public: + /** The beams (especially at small slopes) should be prevented to + conflict with the stafflines. This necessitates some quantisation + of start and end posititons of the beam. + */ enum Pos { NONE, SIT = 1, STRADDLE = 2, HANG = 4, INTER = 8 }; - // ugh, silly C++ - enum Quantise { NUN, NORMAL, TRADITIONAL }; + // ugh, silly C++ (Pos::NONE vs Quantise::NONE) + enum Quantise { NUNE, NORMAL, TRADITIONAL }; Link_array stems_; /// the slope of the beam in posns / point (dimension) diff --git a/mf/Makefile b/mf/Makefile index 68ebc72621..00b46f2f99 100644 --- a/mf/Makefile +++ b/mf/Makefile @@ -12,7 +12,8 @@ include ./$(depth)/make/Include.make # TEXFILES = $(wildcard *.tex) MFFILES = $(wildcard *.mf) -EXTRA_DISTFILES = $(MFFILES) $(TEXFILES) TODO README +MFDEPS = mf.dep +EXTRA_DISTFILES = $(MFFILES) $(TEXFILES) $(MFDEPS) TODO README # FONT_FILES = $(wildcard *[0-9].mf) @@ -27,7 +28,7 @@ TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex)) all: $(LYTABLES) $(TEXTABLES) localclean: - rm -f $(LYTABLES) $(TEXTABLES) $(outdir)/mfdeps + rm -f $(LYTABLES) $(TEXTABLES) $(MFDEPS) $(outdir)/%.dvi: %.mf mf $< @@ -41,7 +42,7 @@ $(outdir)/%.log: %.mf rm $(basename $< ).*gf $(lyout)/%.ly $(texout)/%.tex: $(outdir)/%.log - $(depth)/bin/$(outdir)/mf-to-table --ly $(lyout)/$( $@ - $(depth)/bin/$(outdir)/mf-deps $^ >> $@ + $(PYTHON) $(depth)/bin/mf-deps.py $^ >> $@ # dependencies: # -include $(outdir)/mfdeps +include $(MFDEPS) # - - - -- 2.39.5