lilypond-1.3.141

diff --git a/Documentation/user/convert-ly.itexi b/Documentation/user/convert-ly.itexi
index 1902988827faa83557ad59a20b0ac17fd5c5f6db..9d001f89b1391930f83847e091583496faec1ec8 100644 (file)
--- a/Documentation/user/convert-ly.itexi
+++ b/Documentation/user/convert-ly.itexi
@@ -11,20 +11,22 @@ detect the old version number.
 @subsection Invoking convert-ly
 
 @example
-        convert-ly [options] [files]
+        convert-ly [OPTION]... [FILE]...
 @end example
 
 
 @table @code
-@item --output
-    The output file to write.  
+@item --assume-old
+    If version number cannot be determined, apply all conversions.
 @item --edit
     Do an inline edit of the input file. override @code{--output}
-@item --show-rules
-    shows all known conversions, and exit
 @item --from=@var{FROM_PATCHLEVEL}
     Set the level to convert from. If this is not set, convert-ly will
     guess this, on the basis of @code{\version} strings in the file
+@item --output
+    The output file to write.  
+@item --show-rules
+    shows all known conversions, and exit
 @item --to=@var{TO_PATCHLEVEL}
     Set the goal version of the conversion. It defaults to the latest
     available version.

diff --git a/make/ports-targets.make b/make/ports-targets.make
new file mode 100644 (file)
index 0000000..93d19a9
--- /dev/null
+++ b/make/ports-targets.make
@@ -0,0 +1,46 @@
+
+local-ly-clean:
+       $(if $(wildcard *.ly), -mv -f $(wildcard *.ly) $(outdir))
+
+ly-clean: local-ly-clean
+       $(LOOP)
+
+local-download: $(mutopia-examples:%=%.ly)
+       @echo downloading $<
+
+download: local-download
+       $(LOOP)
+
+#
+# Lots smarter would be to do one recursive wget, getting all index.html,
+# parse those with python script to setup tree.
+#
+local-sync:
+       wget --recursive --no-parent --level=1 --timestamping --dont-remove-listing --no-host-directories --accept=index.html $(MUTOPIA_MIRROR)/$(mutopia-dir)/
+# ugh
+# -mv ./ftp/$(mutopia-dir)/* .
+       cp -r ./ftp/$(mutopia-dir)/* .
+       rm -rf ./ftp
+       $(MAKE) 'dirs-before=$(dirs-before)' generate-GNUmakefiles
+
+#
+# should we dowload .ly and .zip just to fill-in tree?
+#
+sync: local-sync
+#      wget --recursive --no-parent --timestamping --dont-remove-listing --no-host-directories --cut-dirs=2 --accept=foo $(MUTOPIA_MIRROR)/$(mutopia-dir)/
+       $(LOOP)
+
+generate-GNUmakefiles: $(dirs-after:%=%/GNUmakefile)
+
+# too time-consuming?
+# local-dist: local-ly-clean
+
+local-help: local-ports-help
+
+local-ports-help:
+       @echo -e "\
+  download    download .lys from $(MUTOPIA_MIRROR)\n\
+  ly-clean    move all .lys to $(outdir)\n\
+  sync        generate missing parts of tree\n\
+"\
+

diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index 27f12728c8e77221eb0606d3b8f8524d45815402..69a2c13dab616d944b57edb459042a04a6a1985d 100644 (file)
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -371,7 +371,7 @@ contrabasso =  \notes \relative c {
        R1|
        \!c4\p r r2|
        R1|
-       g4-#'((font-shape . upright) "pizz.") r r2|
+       g4-#"pizz." r r2|
        
        %295
        R1|

diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
index 2229887ad635677a56f99c2a6ece54aff16c7083..782d6d470386b6ecc474e6bc3dadb7f33d0fbae3 100644 (file)
--- a/mutopia/Coriolan/viola-1.ly
+++ b/mutopia/Coriolan/viola-1.ly
@@ -398,11 +398,11 @@ violaI =  \notes \relative c {
        R1|
        \!c4\p r r2|
        R1|
-       g4-#'((font-shape . upright) "pizz.") r r2|
+       g4-#"pizz." r r2|
        R1|
        c,4 r r2|
        R1*15|
-       c4-#'((font-shape . upright) "pizz.") r r2|
+       c4-#"pizz." r r2|
        c4 r r2|
        c4 r r2|
 }

diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index 381dee9b9244ade0e733597e80d861ade7ab5e57..87235e5ce539cf129b38599ff93b1a36f1f64acd 100644 (file)
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -390,11 +390,11 @@ violaII =  \notes \relative c {
        R1|
        \!c4\p r r2|
        R1|
-       g4-#'((font-shape . upright) "pizz.") r r2|
+       g4-#"pizz." r r2|
        R1|
        c,4 r r2|
        R1*15|
-       c4-#'((font-shape . upright) "pizz.") r r2|
+       c4-#"pizz." r r2|
        c4 r r2|
        c4 r r2|
 }

diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index fa5c80df60f687366818f75fea26de66f47be2a6..38bab61f525cc233ed963a368ecce5c94dec586c 100644 (file)
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -400,7 +400,7 @@ violinoI =  \notes \relative c {
        R1|
        \!es4\p r r2|
        R1|
-       d,4-#'((font-shape . upright) "pizz.") r r2|
+       d,4-#"pizz." r r2|
        
        %295
        R1|
@@ -431,7 +431,7 @@ violinoI =  \notes \relative c {
        %310
        \!c4\pp r r2|
        R1|
-       c4-#'((font-shape . upright) "pizz.") r r2|
+       c4-#"pizz." r r2|
        c4 r r2|
        c4 r r2|
 }

diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index ed2efcfbd59fd19852f2cfbdc592b414700d123c..20f05cac292ba96252ba78411f4924e7fef5880f 100644 (file)
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -413,13 +413,13 @@ violinoII =  \notes \relative c {
        R1|
        \!g4\p r r2|
        R1|
-       b,4-#'((font-shape . upright) "pizz.") r r2|
+       b,4-#"pizz." r r2|
        
        %295
        R1|
        c4 r r2|
        R1*15|
-       c4-#'((font-shape . upright) "pizz.") r r2|
+       c4-#"pizz." r r2|
        c4 r r2|
        c4 r r2|
 }

diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 584e00bbd5e99896afea026aac4bc48356d07e9d..0e1c0d54666869c0e6b7b4c5899b6f9b28b9950c 100644 (file)
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -441,7 +441,7 @@ violoncello =  \notes \relative c {
        R1|
        \!c4\p r r2|
        R1|
-       g4-#'((font-shape . upright) "pizz.") r r2|
+       g4-#"pizz." r r2|
        
        %295
        R1|
@@ -472,7 +472,7 @@ violoncello =  \notes \relative c {
        \!c,\pp r r2|
        R1|
        % no mistake: octave lower than contrabass, ie, sounding equal
-       c,4-#'((font-shape . upright) "pizz.") r r2|
+       c,4-#"pizz." r r2|
        c4 r r2|
        c4 r r2|
 }

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 92e3747de496574ef465dca179be9c87836a4da2..fa8f5966e226e1885d608ed14a30d1a5511ae87c 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -49,5 +49,17 @@
   \global\let\lilypondpiece\relax%
   \global\let\mustmakelilypondpiecetitle\undefined%
 }
+% header -- head ?
+% these names can't be changed: they're uses in mutopia headers
+\def\theheader
+{
+  \ifx\lilypondhead\undefined\else%
+    \parbox{\textwidth}{\mbox{}\lilypondhead}\fi
+}
+\def\thefooter
+{
+  \ifx\lilypondfooter\undefined\else%
+    \parbox{\textwidth}{\mbox{}\lilypondfooter}\fi
+}
 \endinput