CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/16 11:13:02
Modified files:
. : ChangeLog
lily : program-option.cc
ly : engraver-init.ly
make : mutopia-rules.make
Log message:
* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
$(outdir)/%.ly $(outdir)/%.ps):
* ly/engraver-init.ly: make Staff default child of ChoirStaff.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3786&tr2=1.3787&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/program-option.cc.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.235&tr2=1.236&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/mutopia-rules.make.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3786 lilypond/ChangeLog:1.3787
--- lilypond/ChangeLog:1.3786 Thu Jun 16 06:43:20 2005
+++ lilypond/ChangeLog Thu Jun 16 11:13:02 2005
@@ -1,3 +1,9 @@
+2005-06-16 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
$(outdir)/%.ly $(outdir)/%.ps):
+
+ * ly/engraver-init.ly: make Staff default child of ChoirStaff.
+
2005-06-16 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* ChangeLog: Recode utf-8.
@@ -11,6 +17,8 @@
2005-06-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * make/mutopia-rules.make: switch off ps, p&c for lilypond runs.
+
* scm/framework-ps.scm (write-preamble): remove status check.
* Documentation/user/invoking.itely (Updating files with
Index: lilypond/lily/program-option.cc
diff -u lilypond/lily/program-option.cc:1.8 lilypond/lily/program-option.cc:1.9
--- lilypond/lily/program-option.cc:1.8 Tue Jun 14 00:44:14 2005
+++ lilypond/lily/program-option.cc Thu Jun 16 11:13:02 2005
@@ -71,6 +71,9 @@
const int INDENT = 2;
const int SEPARATION = 5;
+/*
+ Hmmm. should do in SCM / C++ ?
+ */
static String
get_help_string ()
{
@@ -78,7 +81,8 @@
SCM convertor = ly_lily_module_constant ("scm->string");
- String help ("Options supported by ly:set-option\n\n");
+ Array<String> opts;
+
for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
{
SCM sym = scm_caar (s);
@@ -105,9 +109,14 @@
String ("\n")
+ String_convert::char_string (' ', HELP_INDENT));
- help += opt_spec + opt_help + "\n";
+ opts.push (opt_spec + opt_help + "\n");
}
-
+
+ String help ("Options supported by ly:set-option\n\n");
+ opts.sort (String::compare);
+ for (int i = 0; i < opts.size (); i++)
+ help += opts[i];
+
help += String ("\n");
return help;
}
Index: lilypond/ly/engraver-init.ly
diff -u lilypond/ly/engraver-init.ly:1.235 lilypond/ly/engraver-init.ly:1.236
--- lilypond/ly/engraver-init.ly:1.235 Mon Jun 6 20:58:23 2005
+++ lilypond/ly/engraver-init.ly Thu Jun 16 11:13:02 2005
@@ -104,7 +104,7 @@
\InnerChoirStaff
\name ChoirStaff
- \defaultchild "InnerChoirStaff"
+ \defaultchild "Staff"
\accepts "InnerChoirStaff"
\accepts "InnerStaffGroup"
\description "Identical to @code{StaffGroup} except that the
Index: lilypond/make/mutopia-rules.make
diff -u lilypond/make/mutopia-rules.make:1.28
lilypond/make/mutopia-rules.make:1.29
--- lilypond/make/mutopia-rules.make:1.28 Sat Jul 24 21:36:34 2004
+++ lilypond/make/mutopia-rules.make Thu Jun 16 11:13:02 2005
@@ -15,7 +15,7 @@
# hmm. notdir builds srcdir builds?
$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
- cd $(outdir); $(LILYPOND) --pdf --ps --png -I $(shell pwd)/ $(notdir $<)
+ cd $(outdir); $(LILYPOND) --pdf --png -ddelete-intermediate-files
-dno-point-and-click -I $(shell pwd)/ $(notdir $<)
touch $(outdir)/$(basename $(notdir $<)).png
$(outdir)/%.ly: %.ly
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
