* 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 4733dca8d3fb460870f450ec50c2dc52cd1bec2a..6593dee623b14225a14d7a311ec731e29bf65a37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-09-07  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * 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  <joeneeman@gmail.com>
 
        * lily/spanner.cc (find_broken_piece): 

diff --git a/Documentation/user/SConscript b/Documentation/user/SConscript
index 44570d30d4f928c707bbce98a170acecc93160df..5ef1efdd3d0ff17f2b797768f224a7d9e14d56e9 100644 (file)
--- 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 3d5ab680e1665e5a40c06f59765147ec567fc8c7..89a7af3af0efb93b3bc72ee3eee764a9f9e06f37 100644 (file)
--- 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 215bcfe0b9cee0abdde5c2e1e9df83090be36685..279cb376863840674ba5061d30d501b0cea56e17 100644 (file)
--- 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 a160d0e4440ec2dc44e216787965c460e4f39192..971d1e703a03e5df5fd5dc7feb710d0dd6a6acef 100644 (file)
--- 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 fe2920ad1818de5d4e4cb73ebf130df0cc18ad7a..3c55dbeedc54cfbf82094ebe4702b37f7ffcdca7 100644 (file)
--- 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 53d6447c98484e36a8b27a9b4f115fecea2d683c..35dd9d9d60236a4b1b0e98d87bcf226aa46f8ce1 100644 (file)
--- 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 5601d1e72722c1c01d8c4ab0140e93bbcae243ce..c95d7d47c698f811ecf8ad8f71101c4b3d95b896 100644 (file)
--- 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 597c666a43444ac923c252eeee2f83723135b777..1c08e6a247d8581a2ad8d5881d0c3a8d3dbda394 100644 (file)
--- 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 ()