From: Han-Wen Nienhuys Date: Thu, 7 Sep 2006 13:11:29 +0000 (+0000) Subject: * scm/framework-ps.scm (output-preview-framework): use new name. X-Git-Tag: cvs/HEAD~98 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=29ebcd1876a0b529f747069c44fa3c9b9f2e4843;p=lilypond.git * scm/framework-ps.scm (output-preview-framework): use new name. * lily/program-option.cc (internal_set_option): use new names. * Documentation/user/SConscript (lilypond_book_flags): update -d variable names. * Documentation/user/lilypond-book.itely (Inserting LilyPond output into other programs): new variable names. * scm/lily.scm (define-scheme-options): uniformize var names. * lily/tuplet-engraver.cc (listen_tuplet_span): verify that tuplets_ is non-empty before popping. --- diff --git a/ChangeLog b/ChangeLog index 4733dca8d3..6593dee623 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-09-07 Han-Wen Nienhuys + + * scm/framework-ps.scm (output-preview-framework): use new name. + + * lily/program-option.cc (internal_set_option): use new names. + + * Documentation/user/SConscript (lilypond_book_flags): update -d + variable names. + + * Documentation/user/lilypond-book.itely (Inserting LilyPond + output into other programs): new variable names. + + * scm/lily.scm (define-scheme-options): uniformize var names. + + * lily/tuplet-engraver.cc (listen_tuplet_span): verify that + tuplets_ is non-empty before popping. + 2006-09-07 Joe Neeman * lily/spanner.cc (find_broken_piece): diff --git a/Documentation/user/SConscript b/Documentation/user/SConscript index 44570d30d4..5ef1efdd3d 100644 --- a/Documentation/user/SConscript +++ b/Documentation/user/SConscript @@ -16,7 +16,7 @@ env.Depends ('lilypond.texi', 'lilypond-internals.texi') eps = src_glob ('*.eps') + map (env.PNG2EPS, base_glob ('*.png')) env.Depends ('lilypond.texi', eps + png) -lilypond_book_flags = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond -I$srcdir/input/manual/ $__verbose --backend=eps --formats=ps,png --header=texidoc -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 -dgs-font-load" ''' +lilypond_book_flags = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond -I$srcdir/input/manual/ $__verbose --backend=eps --formats=ps,png --header=texidoc -dcheck-internal-types -ddump-signatures -danti-alias-factor=2 -dgs-load-fonts" ''' e = env.Copy ( # LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/manual -e '(ly:set-option (quote internal-type-checking) \#t)'"''', LILYPOND_BOOK_FLAGS = lilypond_book_flags, diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 3d5ab680e1..89a7af3af0 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -794,6 +794,6 @@ the following options To produce a useful @file{eps} file, use @example -lilypond -b eps -dno-gs-font-load -deps-font-include myfile.ly +lilypond -b eps -dno-gs-load-fonts -dinclude-eps-fonts myfile.ly @end example diff --git a/lily/program-option.cc b/lily/program-option.cc index 215bcfe0b9..279cb37686 100644 --- a/lily/program-option.cc +++ b/lily/program-option.cc @@ -48,7 +48,7 @@ void internal_set_option (SCM var, SCM val) profile_property_accesses = to_boolean (val); val = scm_from_bool (to_boolean (val)); } - else if (var == ly_symbol2scm ("midi-debug")) + else if (var == ly_symbol2scm ("debug-midi")) { do_midi_debugging_global = to_boolean (val); val = scm_from_bool (to_boolean (val)); @@ -58,12 +58,12 @@ void internal_set_option (SCM var, SCM val) point_and_click_global = to_boolean (val); val = scm_from_bool (to_boolean (val)); } - else if (var == ly_symbol2scm ("parse-protect")) + else if (var == ly_symbol2scm ("protected-scheme-parsing")) { parse_protect_global = to_boolean (val); val = scm_from_bool (to_boolean (val)); } - else if (var == ly_symbol2scm ("internal-type-checking")) + else if (var == ly_symbol2scm ("check-internal-types")) { do_internal_type_checking_global = to_boolean (val); val = scm_from_bool (to_boolean (val)); diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index a160d0e444..971d1e703a 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -61,7 +61,7 @@ Tuplet_engraver::listen_tuplet_span (Stream_event *ev) d.event_ = ev; tuplets_.push_back (d); } - if (dir == STOP) + if (dir == STOP && tuplets_.size ()) { stopped_tuplets_.push_back (tuplets_.back ()); tuplets_.pop_back (); diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index fe2920ad18..3c55dbeedc 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -23,8 +23,10 @@ ABC2LY = $(script-dir)/abc2ly.py CONVERT_LY = $(script-dir)/convert-ly.py LILYPOND_BOOK = $(script-dir)/lilypond-book.py LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/manual/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/ -I $(top-build-dir)/mf/out/ -LILYPOND_BOOK_LILYPOND_FLAGS=-dgs-font-load -LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --backend=eps --formats=ps,png,pdf -deps-font-include -dgs-font-load --header=texidoc -I $(top-src-dir)/input/manual -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)" + +LILYPOND_BOOK_LILYPOND_FLAGS=--backend=eps --formats=ps,png,pdf -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=2 + +LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) $(LILYPOND_BOOK_LILYPOND_FLAGS)" TEXINPUTS=$(top-src-dir)/tex/:: export TEXINPUTS diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 53d6447c98..35dd9d9d60 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -544,7 +544,7 @@ ;; skip booktitles. (if (and - (not (ly:get-option 'preview-include-book-title)) + (not (ly:get-option 'include-book-title-preview)) (pair? systems) (ly:prob-property (car systems) 'is-book-title #f)) diff --git a/scm/lily.scm b/scm/lily.scm index 5601d1e727..c95d7d47c6 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -11,20 +11,29 @@ (ly:add-option (car x) (cadr x) (caddr x))) `( + + ;; NAMING: either + + ;; - [subject-]object-object-verb +"ing" + ;; - [subject-]-verb-object-object + (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG") - (book-title-preview #t "include book-titles in preview images.") + (check-internal-types #f "check every property assignment for types") (debug-gc #f "dump memory debugging statistics") + (debug-midi #f "generate human readable MIDI") (delete-intermediate-files #f "delete unusable PostScript files") (dump-signatures #f "dump output signatures of each system") - (eps-font-include #f "Include fonts in separate-system EPS files.") - (eps-pad-boxes #f "Pad EPS bounding boxes to guarantee alignment between systems") - (gs-font-load #f + (gs-load-fonts #f "load fonts via Ghostscript.") + (include-book-title-preview #t "include book-titles in preview images.") + (include-eps-font #f "Include fonts in separate-system EPS files.") + + (pad-eps-boxes #f "Pad EPS bounding boxes to guarantee alignment between systems") + (gui #f "running from gui; redirect stderr to log file") - (internal-type-checking #f "check every property assignment for types") - (midi-debug #f "generate human readable MIDI") + (old-relative #f "relative for simultaneous music works similar to chord syntax") @@ -32,18 +41,23 @@ similar to chord syntax") "experimental mechanism for remembering tweaks") (point-and-click #t "use point & click") (paper-size "a4" "the default paper size") - (parse-protect #t "continue when finding errors in inline + (protected-scheme-parsing #t "continue when finding errors in inline scheme are caught in the parser. If off, halt on errors, and print a stack trace.") (profile-property-accesses #f "keep statistics of get_property() calls.") + (resolution 101 "resolution for generating bitmaps") (read-file-list #f "Read files to be processed from command line arguments") + (safe #f "Run safely") (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN") + (ttf-verbosity 0 "how much verbosity for TTF font embedding?") + (show-available-fonts #f "List font names available.") + (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") ))) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 597c666a43..1c08e6a247 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1719,14 +1719,14 @@ def main (): if (global_options.format in (TEXINFO, LATEX) and global_options.create_pdf): - global_options.process_cmd += "--pdf -deps-font-include -dgs-font-load " + global_options.process_cmd += "--pdf -dinclude-eps-font -dgs-load-font " if global_options.verbose: global_options.process_cmd += " --verbose " - global_options.process_cmd += " -dread-file-list -deps-pad-boxes " + global_options.process_cmd += " -dread-file-list -dpad-eps-boxes " identify ()