From: Han-Wen Nienhuys Date: Fri, 17 Dec 2004 15:02:43 +0000 (+0000) Subject: * scm/output-ps.scm (new-text): don't access t glyph for getting X-Git-Tag: release/2.5.14~396 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=15c43df3abc82ef71c674d7a7e4e4b6951b38187;p=lilypond.git * scm/output-ps.scm (new-text): don't access t glyph for getting space dimension. * ly/init.ly: warn about \version * lily/lexer.ll: set version-seen? --- diff --git a/ChangeLog b/ChangeLog index 3351f0ba0d..58de9d7ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-12-17 Han-Wen Nienhuys + + * scm/output-ps.scm (new-text): don't access t glyph for getting + space dimension. + + * ly/init.ly: warn about \version + + * lily/lexer.ll: set version-seen? + 2004-12-17 Jan Nieuwenhuizen * scm/output-svg.scm (string->entities): Update. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index c4015e1368..87965ea671 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -69,7 +69,11 @@ You need the following packages to compile LilyPond: @itemize -@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.0.17 or +@item @uref{http://www.freetype.org/,Freetype} version 2. + +@item @uref{http://fontforge.sf.net/,FontForge} 20041211 or newer. + +@item @uref{http://www.xs4all.nl/~hanwen/mftrace/,mftrace} (1.0.33 or newer), You will need to install some additional packages to get mftrace to diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index 6c3ec3bd8b..fa3d95d221 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -1003,12 +1003,12 @@ possibilities when setting properties manually. @lilypond[quote,raggedright,verbatim] { - \set Staff.clefGlyph = #"clefs-F" + \set Staff.clefGlyph = #"clefs.F" \set Staff.clefPosition = #2 c'4 - \set Staff.clefGlyph = #"clefs-G" + \set Staff.clefGlyph = #"clefs.G" c'4 - \set Staff.clefGlyph = #"clefs-C" + \set Staff.clefGlyph = #"clefs.C" c'4 \set Staff.clefOctavation = #7 c'4 diff --git a/lily/lexer.ll b/lily/lexer.ll index 29e4d6367d..081dd00221 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -186,6 +186,10 @@ HYPHEN -- yy_pop_state (); if (!is_valid_version (s)) return INVALID; + + SCM top_scope = scm_car (scm_last_pair (scopes_)); + scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T); + } \"[^"]*\" { String s (YYText () + 1); diff --git a/ly/init.ly b/ly/init.ly index 8e94170d0d..b5471de7c5 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -13,6 +13,7 @@ #(ly:set-point-and-click #f) #(define toplevel-scores '()) #(define $globalheader #f) +#(define version-seen? #f) \maininput %% there is a problem at the end of the input file @@ -29,6 +30,11 @@ input-file-name ": old relative compatibility was not used." )))%% there is a problem at the end of the input file +#(if (not version-seen?) + (ly:warn "No \\version included in input file.\nAdd\n\n\t\\version \"~a\"\n\nfor future compatibility" (lilypond-version))) + + + #(if (pair? toplevel-scores) (ly:parser-print-book parser (apply ly:make-book $defaultpaper $globalheader (reverse toplevel-scores)))) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 1347c415d1..014d7b1d71 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -58,7 +58,7 @@ $(outdir)/%.otf: $(outdir)/%.pe (cd $(outdir) && fontforge -script $(notdir $<)) $(outdir)/%.otf-table: $(outdir)/%.lisp - cat $< $(subst parmesan,feta,$<) $(subst feta-alphabet,feta,$<) > $@ + cat $< $(wildcard $(subst feta,parmesan,$<)) $(wildcard $(subst feta,feta-alphabet,$<)) > $@ $(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 2adda3e4c4..9999ced858 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -266,7 +266,7 @@ (right-edge . (extra-space . 0.1)) )) (print-function . ,Text_interface::print) - (text . ,(make-musicglyph-markup "scripts-rcomma")) + (text . ,(make-musicglyph-markup "scripts.rcomma")) (Y-offset-callbacks . (,Breathing_sign::offset_callback)) (break-visibility . ,begin-of-line-invisible) (meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface item-interface )))) @@ -1186,7 +1186,7 @@ (TrillSpanner . ( (print-function . ,Dynamic_text_spanner::print) - (edge-text . ,(cons (make-musicglyph-markup "scripts-trill") + (edge-text . ,(cons (make-musicglyph-markup "scripts.trill") "")) (style . trill) (staff-padding . 1.0) diff --git a/scm/output-ps.scm b/scm/output-ps.scm index 75251dcbfa..a6b13dc079 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -221,7 +221,7 @@ ;; ugh, we should find a better way to ;; extract the hsbw for /space from the font. - ((space-length (cdar (ly:text-dimension font "t"))) + ((space-length (cdar (ly:text-dimension font " "))) (commands '()) (add-command (lambda (x) (set! commands (cons x commands)))) ) @@ -249,7 +249,7 @@ (define (new-text font s) (let* - ((space-length (cdar (ly:text-dimension font "t"))) + ((space-length (cdar (ly:text-dimension font " "))) (space-move (string-append (number->string space-length) " 0.0 rmoveto ")) (input-enc (assoc-get 'input-name diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 47a324c042..de067edc25 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -514,6 +514,7 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s (ly:parser-print-score p (ly:music-scorify m p)))) +#(define version-seen? #t) %(preamble_string)s \paper {