CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/09 14:09:33
Modified files:
. : ChangeLog
Documentation/user: invoking.itely point-and-click.itely
flower : getopt-long.cc
lily : main.cc midi-item.cc midi-stream.cc
music-sequence.cc parser.yy
relative-octave-music.cc repeated-music.cc
ly : init.ly
make : lilypond-vars.make
scm : backend-library.scm framework-ps.scm
framework-tex.scm lily.scm
scripts : lilypond-book.py
Added files:
lily : program-option.cc
lily/include : program-option.hh
Removed files:
lily : scm-option.cc
lily/include : scm-option.hh
Log message:
* lily/program-option.cc: rename from scm-option.cc
* lily/scm-option.cc (LY_DEFINE): handle no-foobar option setting.
(get_help_string): Print pretty help string.
* scripts/lilypond-book.py (PREAMBLE_LY): add no-point-and-click
to snippet preamble.
* lily/scm-option.cc: remove command-line-settings option. Fold
all command-line options plus default settings in a generic
interface.
* flower/getopt-long.cc (table_string): indent 2nd lines of help
texts too.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3748&tr2=1.3749&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/invoking.itely.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/point-and-click.itely.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/getopt-long.cc.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/program-option.cc?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.259&tr2=1.260&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-item.cc.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-stream.cc.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-sequence.cc.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.473&tr2=1.474&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/relative-octave-music.cc.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/repeated-music.cc.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/program-option.hh?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/init.ly.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/lilypond-vars.make.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-ps.scm.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/framework-tex.scm.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.356&tr2=1.357&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-book.py.diff?tr1=1.261&tr2=1.262&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3748 lilypond/ChangeLog:1.3749
--- lilypond/ChangeLog:1.3748 Thu Jun 9 11:52:07 2005
+++ lilypond/ChangeLog Thu Jun 9 14:09:30 2005
@@ -1,3 +1,20 @@
+2005-06-09 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/program-option.cc: rename from scm-option.cc
+
+ * lily/scm-option.cc (LY_DEFINE): handle no-foobar option setting.
+ (get_help_string): Print pretty help string.
+
+ * scripts/lilypond-book.py (PREAMBLE_LY): add no-point-and-click
+ to snippet preamble.
+
+ * lily/scm-option.cc: remove command-line-settings option. Fold
+ all command-line options plus default settings in a generic
+ interface.
+
+ * flower/getopt-long.cc (table_string): indent 2nd lines of help
+ texts too.
+
2005-06-09 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* flower/file-name.cc: Bugfix: only append DIRSEP if BASE_
@@ -19,21 +36,18 @@
* lily/parser.yy (Repeated_music): remove >?
- * scm/framework-ps.scm (write-preamble): Support for -d
- gs-font-load=1: read fonts via ghostscript.
-
* scm/backend-library.scm (postscript->pdf): Support for
-dgs-font-load=1
+ * scm/framework-ps.scm (write-preamble): make font loading
+ switchable to GS via --define-default gs-font-load=1
+
2005-06-09 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/global.itely: added \layout docs.
2005-06-09 Han-Wen Nienhuys <[EMAIL PROTECTED]>
- * scm/framework-ps.scm (write-preamble): make font loading
- switchable to GS via --define-default gs-font-load=1
-
* lily/lily-parser-scheme.cc: add unistd.h
2005-06-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: lilypond/Documentation/user/invoking.itely
diff -u lilypond/Documentation/user/invoking.itely:1.34
lilypond/Documentation/user/invoking.itely:1.35
--- lilypond/Documentation/user/invoking.itely:1.34 Tue Jun 7 05:29:30 2005
+++ lilypond/Documentation/user/invoking.itely Thu Jun 9 14:09:33 2005
@@ -53,9 +53,7 @@
@item -e,[EMAIL PROTECTED]
Evaluate the Scheme @var{expr} before parsing any @file{.ly} files.
Multiple @code{-e} options may be given, they will be evaluated
-sequentially. The function @code{ly:set-option} allows access to
-some internal variables. Use @code{-e '(ly:option-usage)'} for more
-information.
+sequentially.
@item -f,[EMAIL PROTECTED]
which formats should be written. Choices are @code{svg}, @code{ps},
@@ -97,19 +95,23 @@
@cindex output format, setting
@item -d,[EMAIL PROTECTED]@var{val}
-This defines an internal variable @var{var} as the Scheme value
[EMAIL PROTECTED]
+This sets the internal program option @var{var} to the Scheme value
[EMAIL PROTECTED] If @var{val} is not supplied, then @var{#t} is used. To
+switch off an option, @code{no-} may be prefixed to @var{var}, eg.
[EMAIL PROTECTED]
+-dno-point-and-click
[EMAIL PROTECTED] example
-Supported values include:
[EMAIL PROTECTED] @code
[EMAIL PROTECTED] resolution
-set PNG resolution
[EMAIL PROTECTED] preview-include-book-title
-include book-titles in preview
[EMAIL PROTECTED] table
[EMAIL PROTECTED]
+is the same as
[EMAIL PROTECTED]
+-dpoint-and-click='#f'
[EMAIL PROTECTED] example
+
[EMAIL PROTECTED] point and click
-These settings are returned when calling
[EMAIL PROTECTED](ly:get-option 'command-line-settings)} from Scheme.
+Setting the @code{help} option will print a summary of the options
+available, and exit.
@item -h,--help
Show a summary of usage.
@@ -135,7 +137,11 @@
specified, i.e., @code{-f tex}.
@item --png
-Generate pictures of each page, in PNG format. This implies @code{--ps}.
+Generate pictures of each page, in PNG format. This implies
[EMAIL PROTECTED] The resolution in DPI of the image may be set with
[EMAIL PROTECTED]
+-dresolution=110
[EMAIL PROTECTED] example
@item --pdf
Generate PDF. This implies @code{--ps}.
@@ -191,7 +197,7 @@
@item -j,[EMAIL PROTECTED],@var{group},@var{jail},@var{dir}
-Run LilyPond in a jail.
+Run LilyPond in a chroot jail.
The @code{--jail} option provides a more flexible alternative to
@code{--safe} when LilyPond formatting is available through a web
Index: lilypond/Documentation/user/point-and-click.itely
diff -u lilypond/Documentation/user/point-and-click.itely:1.13
lilypond/Documentation/user/point-and-click.itely:1.14
--- lilypond/Documentation/user/point-and-click.itely:1.13 Wed Jun 8
02:36:21 2005
+++ lilypond/Documentation/user/point-and-click.itely Thu Jun 9 14:09:33 2005
@@ -103,6 +103,6 @@
option
@example
-lilypond -e "(ly:set-option 'point-and-click #f)" file.ly
+lilypond -dno-point-and-click file.ly
@end example
Index: lilypond/flower/getopt-long.cc
diff -u lilypond/flower/getopt-long.cc:1.24 lilypond/flower/getopt-long.cc:1.25
--- lilypond/flower/getopt-long.cc:1.24 Sat Apr 30 23:43:03 2005
+++ lilypond/flower/getopt-long.cc Thu Jun 9 14:09:33 2005
@@ -306,7 +306,6 @@
String
Long_option_init::table_string (Long_option_init *l)
{
- String argstr = "ARG";
String tabstr = "";
int wid = 0;
@@ -320,7 +319,9 @@
String s = " " + l[i].str_for_help ();
s += String_convert::char_string (' ', wid - s.length () + EXTRA_SPACES);
- tabstr += s + gettext (l[i].help_str0_) + "\n";
+ String help_text (gettext (l[i].help_str0_));
+ help_text.substitute ("\n", "\n" + String_convert::char_string (' ', wid
+ EXTRA_SPACES + 2));
+ tabstr += s + help_text + "\n";
}
return tabstr;
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.259 lilypond/lily/main.cc:1.260
--- lilypond/lily/main.cc:1.259 Wed Jun 8 12:31:22 2005
+++ lilypond/lily/main.cc Thu Jun 9 14:09:33 2005
@@ -137,12 +137,13 @@
static Long_option_init options_static[]
= {
- {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\n
scm, svg, tex, texstr)")},
+ {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps
[default],\nscm, svg, tex, texstr)")},
{_i ("SYM=VAL"), "define-default", 'd',
- _i ("define a default Scheme setting.")},
+ _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
+ "Try -dhelp for help.")},
- {_i ("EXPR"), "evaluate", 'e', _i ("set scheme option, for help use\n
-e '(ly:option-usage)'")},
+ {_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")},
/* Bug in option parser: --output =foe is taken as an abbreviation
for --output-format. */
{_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,... Also as separate
options:")},
@@ -157,7 +158,8 @@
{_i ("FILE"), "init", 'i', _i ("use FILE as init file")},
{_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be
added)")},
#if HAVE_CHROOT
- {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become
USER:GROUP\n and cd into DIR")},
+ {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become
USER:GROUP\n"
+ "and cd into DIR")},
#endif
{0, "no-print", 0, _i ("do not generate printed output")},
{0, "preview", 'p', _i ("generate a preview of the first system")},
@@ -535,7 +537,7 @@
if (!init_scheme_variables.is_empty ()
|| !init_scheme_code_string.is_empty ())
{
- init_scheme_variables = "(ly:set-option 'command-line-settings (list "
+ init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr
x))) (list "
+ init_scheme_variables + "))";
init_scheme_code_string
Index: lilypond/lily/midi-item.cc
diff -u lilypond/lily/midi-item.cc:1.83 lilypond/lily/midi-item.cc:1.84
--- lilypond/lily/midi-item.cc:1.83 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/midi-item.cc Thu Jun 9 14:09:33 2005
@@ -14,7 +14,7 @@
#include "string-convert.hh"
#include "midi-stream.hh"
#include "duration.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
#include "killing-cons.tcc"
#define PITCH_WHEEL_TOP 0x3FFF
@@ -455,12 +455,12 @@
Midi_track::data_string () const
{
String str = Midi_chunk::data_string ();
- if (midi_debug_global_b)
+ if (do_midi_debugging_global)
str += "\n";
for (Cons<Midi_event> *i = event_p_list_.head_; i; i = i->next_)
{
str += i->car_->to_string ();
- if (midi_debug_global_b)
+ if (do_midi_debugging_global)
str += "\n";
}
return str;
Index: lilypond/lily/midi-stream.cc
diff -u lilypond/lily/midi-stream.cc:1.54 lilypond/lily/midi-stream.cc:1.55
--- lilypond/lily/midi-stream.cc:1.54 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/midi-stream.cc Thu Jun 9 14:09:33 2005
@@ -17,7 +17,7 @@
#include "misc.hh"
#include "midi-item.hh"
#include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
Midi_stream::Midi_stream (String file_name)
{
@@ -52,7 +52,7 @@
String str = midi_c_r.to_string ();
// ugh, should have separate debugging output with Midi*::print routines
- if (midi_debug_global_b)
+ if (do_midi_debugging_global)
{
str = String_convert::bin2hex (str) + "\n";
for (int i = str.index ("0a"); i >= 0; i = str.index ("0a"))
Index: lilypond/lily/music-sequence.cc
diff -u lilypond/lily/music-sequence.cc:1.59
lilypond/lily/music-sequence.cc:1.60
--- lilypond/lily/music-sequence.cc:1.59 Sat Apr 30 23:43:03 2005
+++ lilypond/lily/music-sequence.cc Thu Jun 9 14:09:33 2005
@@ -7,7 +7,7 @@
*/
#include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
#include "pitch.hh"
#include "input.hh"
#include "music-sequence.hh"
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.473 lilypond/lily/parser.yy:1.474
--- lilypond/lily/parser.yy:1.473 Thu Jun 9 10:26:19 2005
+++ lilypond/lily/parser.yy Thu Jun 9 14:09:33 2005
@@ -41,7 +41,7 @@
#include "paper-book.hh"
#include "output-def.hh"
#include "scm-hash.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
#include "score.hh"
#include "text-interface.hh"
#include "warn.hh"
Index: lilypond/lily/relative-octave-music.cc
diff -u lilypond/lily/relative-octave-music.cc:1.38
lilypond/lily/relative-octave-music.cc:1.39
--- lilypond/lily/relative-octave-music.cc:1.38 Thu Mar 10 14:36:13 2005
+++ lilypond/lily/relative-octave-music.cc Thu Jun 9 14:09:33 2005
@@ -9,7 +9,7 @@
#include "music.hh"
#include "pitch.hh"
#include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
class Relative_octave_music
{
Index: lilypond/lily/repeated-music.cc
diff -u lilypond/lily/repeated-music.cc:1.63
lilypond/lily/repeated-music.cc:1.64
--- lilypond/lily/repeated-music.cc:1.63 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/repeated-music.cc Thu Jun 9 14:09:33 2005
@@ -10,7 +10,7 @@
#include "music-sequence.hh"
#include "pitch.hh"
#include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
Music *
Repeated_music::body (Music *me)
Index: lilypond/ly/init.ly
diff -u lilypond/ly/init.ly:1.75 lilypond/ly/init.ly:1.76
--- lilypond/ly/init.ly:1.75 Thu Apr 14 20:19:07 2005
+++ lilypond/ly/init.ly Thu Jun 9 14:09:33 2005
@@ -12,7 +12,7 @@
\include "declarations-init.ly"
-#(ly:set-option 'new-relative)
+#(ly:set-option 'old-relative #f)
#(define toplevel-scores '())
#(define $globalheader #f)
#(define version-seen? #f)
Index: lilypond/make/lilypond-vars.make
diff -u lilypond/make/lilypond-vars.make:1.62
lilypond/make/lilypond-vars.make:1.63
--- lilypond/make/lilypond-vars.make:1.62 Wed May 18 14:46:38 2005
+++ lilypond/make/lilypond-vars.make Thu Jun 9 14:09:33 2005
@@ -18,7 +18,7 @@
LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
LILYPOND_BOOK = $(script-dir)/lilypond-book.py
LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I
$(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I
$(builddir)/mf/$(outconfbase)/ -I $(builddir)/mf/out/
-LILYPOND_BOOK_FLAGS = --process="$(LILYPOND) --backend=eps --formats=ps,png
--header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote
internal-type-checking) \#t)'"
+LILYPOND_BOOK_FLAGS = --process="$(LILYPOND) --backend=eps --formats=ps,png
--header=texidoc -I $(srcdir)/input/test -dinternal-type-checking"
#texi-html for www only:
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.32
lilypond/scm/backend-library.scm:1.33
--- lilypond/scm/backend-library.scm:1.32 Thu Jun 9 10:14:31 2005
+++ lilypond/scm/backend-library.scm Thu Jun 9 14:09:33 2005
@@ -48,8 +48,7 @@
-c .setpdfwrite\
-f ~S\
"
- (if (assoc 'gs-font-load
- (ly:get-option 'command-line-settings))
+ (if (ly:get-option 'gs-font-load)
" -dNOSAFER "
" -dSAFER ")
(sanitize-command-option papersizename)
Index: lilypond/scm/framework-ps.scm
diff -u lilypond/scm/framework-ps.scm:1.115 lilypond/scm/framework-ps.scm:1.116
--- lilypond/scm/framework-ps.scm:1.115 Thu Jun 9 10:14:31 2005
+++ lilypond/scm/framework-ps.scm Thu Jun 9 14:09:33 2005
@@ -379,8 +379,7 @@
(lambda (x y) (string<? (cadr x) (cadr y))))))
- (font-loader (if (assoc 'gs-font-load
- (ly:get-option 'command-line-settings))
+ (font-loader (if (ly:get-option 'gs-font-load)
load-font-via-GS
load-font))
@@ -478,9 +477,7 @@
;; skip booktitles.
(if (and
(not
- (cdr (assoc
- 'preview-include-book-title
- (ly:get-option 'command-line-settings))))
+ (ly:get-option 'preview-include-book-title))
(< 1 (length systems))
(ly:paper-system-title? (list-ref systems 0))
(ly:paper-system-title? (list-ref systems 1)))
@@ -542,8 +539,7 @@
(defs-resolution (ly:output-def-lookup defs 'pngresolution))
(resolution (if (number? defs-resolution)
defs-resolution
- (cdr (assoc 'resolution
- (ly:get-option 'command-line-settings)))))
+ (ly:get-option 'resolution)))
(papersizename (ly:output-def-lookup defs 'papersizename)))
(postscript->png resolution
Index: lilypond/scm/framework-tex.scm
diff -u lilypond/scm/framework-tex.scm:1.81 lilypond/scm/framework-tex.scm:1.82
--- lilypond/scm/framework-tex.scm:1.81 Fri May 27 12:00:15 2005
+++ lilypond/scm/framework-tex.scm Thu Jun 9 14:09:33 2005
@@ -300,9 +300,7 @@
(postscript->png
(if (number? resolution)
resolution
- (assoc
- 'resolution
- (ly:get-option 'command-line-settings)))
+ (ly:get-option 'resolution))
(if (string? papersizename)
papersizename
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.356 lilypond/scm/lily.scm:1.357
--- lilypond/scm/lily.scm:1.356 Thu Jun 9 11:52:06 2005
+++ lilypond/scm/lily.scm Thu Jun 9 14:09:33 2005
@@ -37,11 +37,6 @@
(debug-enable 'backtrace)
(read-enable 'positions)))
-;; initialize defaults.
-(ly:set-option 'command-line-settings
- '((resolution . 90)
- (preview-include-book-title . #t)
- ))
(define-public tex-backend?
(member (ly:output-backend) '("texstr" "tex")))
Index: lilypond/scripts/lilypond-book.py
diff -u lilypond/scripts/lilypond-book.py:1.261
lilypond/scripts/lilypond-book.py:1.262
--- lilypond/scripts/lilypond-book.py:1.261 Wed Jun 1 15:04:57 2005
+++ lilypond/scripts/lilypond-book.py Thu Jun 9 14:09:33 2005
@@ -557,6 +557,8 @@
(ly:parser-print-score
p (ly:music-scorify m p))))
+#(ly:set-option (quote no-point-and-click))
+
#(define version-seen? #t)
%(preamble_string)s
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
