From 3f730e9e528ad05611c80a856341569c99082b26 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 28 Jul 2003 12:04:27 +0000 Subject: [PATCH] * Documentation/topdocs/INSTALL.texi (Top): bump GUILE reqd version to 1.6.4 * lily/font-interface.cc (get_font): bugfix: take font-name from alist chain too. This fixes font-name override for \markup. --- ChangeLog | 14 +++++++++++ Documentation/bibliography/engraving.bib | 30 ++++++++++-------------- Documentation/topdocs/INSTALL.texi | 7 +++--- lily/font-interface.cc | 2 +- scm/music-functions.scm | 2 +- scripts/ly2dvi.py | 4 +++- 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7b8ba1dc1..f71366da68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-07-28 Han-Wen Nienhuys + + * Documentation/topdocs/INSTALL.texi (Top): bump GUILE + reqd version to 1.6.4 + + * lily/font-interface.cc (get_font): bugfix: take font-name from + alist chain too. This fixes font-name override for \markup. + 2003-07-28 Jan Nieuwenhuizen * Documentation/pictures/GNUmakefile (OUT_DIST_FILES): Remove icon. @@ -17,6 +25,12 @@ 2003-07-27 Han-Wen Nienhuys + * scripts/ly2dvi.py (include_path): use preview_resolution for PNG + images. + + * scm/music-functions.scm (make-voice-props-set): set Script / + TextScript dir for polyphony too. + * scm/define-grobs.scm (all-grob-descriptions): decrease space before clef. diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib index d058058b0e..fbfa408412 100644 --- a/Documentation/bibliography/engraving.bib +++ b/Documentation/bibliography/engraving.bib @@ -107,17 +107,6 @@ annote = {This is about engraving, i.e. professional typesetting. It contain isbn = {ISBN 3-7957-2886-x}, } -@Book{willemze, - note = {A comprehensive overview of music theory; -the (Dutch) authority on general music theory}, - year = {1964-1993}, - title = {Algemene muziekleer}, - author = {Theo Willemze}, - publisher = {Aula, Het Spectrum}, - address = {Utrecht}, - isbn = {ISBN 90-274-1817-9}, -} - @Book {hader48, year = {1948}, @@ -126,12 +115,14 @@ the (Dutch) authority on general music theory}, publisher = {Waldheim--Eberle Verlag}, address ={Vienna}, - note = {Hader was the chief-engraver of the Waldheim-Eberle music - publishers. This beautiful booklet was intended as an introduction - for laymen on the art of engraving. It contains a step by step, - in-depth explanation of how to cut and stamp music into zinc plates. - It also contains a few compactly formulated rules on musical - orthography. Out of print. } + note = {Hader was a chief-engraver in a Viennese engraving +workshop. This beautiful booklet was intended as an introduction for +laymen on the art of engraving. It contains a step by step, in-depth +explanation of how to cut and stamp music into zinc plates. It also +contains a few compactly formulated rules on musical orthography. Out +of print. } + + } @Book{gamble23:_music_engrav, @@ -265,7 +256,10 @@ It can be ordered from the rental department. @Book {chlapik87, - note = {An clearly written book for the casually interested reader. It shows some of the conventions and difficulties in printing music HWN}, + note = {An clearly written book for the casually interested + reader. It shows some of the conventions and difficulties in + printing music HWN}, + year = {1987}, title = {Die Praxis des Notengraphikers}, author = {Herbert Chlapik}, diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 033383227f..b011a475eb 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -103,8 +103,7 @@ There are two options for upgrading sources: @item If you have an unpacked source tree of a previous version, you may the patches. -@emph{If you upgrade by patching do remember to rerun autoconf after -applying the patch}. +@emph{If you upgrade by patching do remember to rerun autoconf after makefilesapplying the patch}. @item If you have the @code{.tar.gz} file of a previous release, you can use @@ -150,11 +149,11 @@ that generates gcc-3.1.x compliant C++ code. @item Python (version 2.1 or newer). Check out @uref{http://www.python.org, the python website}. -@item GUILE (version 1.6 or newer). +@item GUILE (version 1.6.4 or newer). Check out @uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}. -@item GNU Make. +@item GNU Make (version 3.78 or newer). Check out @uref{ftp://ftp.gnu.org/gnu/make/, the GNU make FTP directory}. diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 5a7d6300df..dc0882e23c 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -106,7 +106,7 @@ LY_DEFINE(ly_font_interface_get_font,"ly:get-font", 2, 0, 0, Font_metric * Font_interface::get_font (Grob *me, SCM chain) { - SCM name = me->get_grob_property ("font-name"); + SCM name = ly_assoc_chain (ly_symbol2scm ("font-name"), chain); if (!gh_string_p (name)) { diff --git a/scm/music-functions.scm b/scm/music-functions.scm index ac26282fe3..81ce5251a0 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -166,7 +166,7 @@ i.e. this is not an override" (append (map (lambda (x) (make-grob-property-set x 'direction (if (odd? n) -1 1))) - '(Tie Slur Stem Dots)) + '(Tie Slur Script TextScript Stem Dots)) (list (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2)) (make-grob-property-set 'MultiMeasureRest 'staff-position diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index b65d7ed042..c3c44c4374 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -920,7 +920,9 @@ if 1: ly.warning (_("Running LaTeX failed. Rerun with --verbose for a trace.")) if page_images_p: - ly.make_ps_images (outbase + '.ps' ) + ly.make_ps_images (outbase + '.ps' , + resolution = preview_resolution + ) # add DEP to targets? if track_dependencies_p: -- 2.39.2