patch::: 1.3.140.jcn3

1.3.140.jcn3
============

* Convert-ly: added some missing rules.

* Ly2dvi: changed footer (and header) macros to match mutopia headers again.

* Convert-ly: always insert or update version number.  New option:
--assume-old will apply all conversions if version cannot be
determined.

diff --git a/CHANGES b/CHANGES
index a7491de9cbfbe46be4d3654b2f24f17a79e0c5d9..bb20d7f4669352e24bf952e6a82d66ce5738f611 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+1.3.140.jcn3
+============
+
+* Convert-ly: added some missing rules.
+
+* Ly2dvi: changed footer (and header) macros to match mutopia headers again.
+
+* Convert-ly: always insert or update version number.  New option:
+--assume-old will apply all conversions if version cannot be
+determined.
+
 1.3.140.jcn2
 ============
 
@@ -9,7 +20,8 @@ TextSpanner.
 1.3.140.jcn1
 ============
 
-* Moved ports section of mutopia to mutopia/ports.  Fixed make bootstrapping.  Added sync target, synced with www.mutopiaproject.org.
+* Moved ports section of mutopia to mutopia/ports.  Fixed make
+bootstrapping.  Added sync target, synced with www.mutopiaproject.org.
 
 1.3.139.jcn6
 ============

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/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 28ef92607889f92e14bc8f8accca74884d83c1ce..fd009a91b0b3aaca77dcb11606da42282a92af69 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -712,14 +712,25 @@ Similarly, for slurs use
 @code{\slurBoth}, 
 @code{\slurDown}, 
 @code{\slurUp}.
-@cindex @code{\slurBoth}
-@cindex @code{\slurDown} 
-@cindex @code{\slurUp}
-Aand for ties use
+
+@cindex @code{\tieBoth}
+@cindex @code{\tieDown} 
+@cindex @code{\tieUp}
+For ties use
 @code{\tieBoth}, 
 @code{\tieDown}, 
 @code{\tieUp}.
 
+@cindex @code{\dynacmicBoth}
+@cindex @code{\dynamicDown} 
+@cindex @code{\dynamicUp}
+For dynamics use
+@code{\dynamicBoth}, 
+@code{\dynamicDown}, 
+@code{\dynamicUp}.
+
+@c text scripts? articulation scripts? fingering?
+
 @cindex @code{\voiceOne}
 @cindex @code{\voiceTwo}
 @cindex @code{\voiceThree}

diff --git a/VERSION b/VERSION
index 10c1d01d4e7fc55979373b18803364994ba90182..4367c26f8c7d0bbfeb7c10e4dd34c97256abb764 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=140
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/ly/property.ly b/ly/property.ly
index 4ae2d3b4e2ab4c6a41fde1ea15e1106f6f8d2d1a..3029e49e94653c72e3fec5770efe75e31012c0b3 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -14,18 +14,30 @@ shiftOnn  = \property Voice.NoteColumn \override #'horizontal-shift = #2
 shiftOnnn  = \property Voice.NoteColumn \override #'horizontal-shift = #3
 shiftOff  = \property Voice.NoteColumn \revert #'horizontal-shift 
 
-
 tieUp = \property Voice.Tie \override #'direction = #1
 tieDown = \property Voice.Tie \override #'direction = #-1
 tieBoth = \property Voice.Tie \revert #'direction 
 
+dynamicUp  = {
+  \property Voice.DynamicText \override #'direction = #1
+  \property Voice.DynamicLineSpanner \override #'direction = #1
+}
+dynamicDown = {
+  \property Voice.DynamicText \override #'direction = #-1
+  \property Voice.DynamicLineSpanner \override #'direction = #-1
+}
+dynamicBoth = {
+  \property Voice.DynamicText \revert #'direction
+  \property Voice.DynamicLineSpanner \revert #'direction
+}
+
 cadenzaOn = \property Score.timing = ##f
 cadenzaOff = {
   \property Score.timing = ##t
   \property Score.measurePosition = #(make-moment 0 1)
 }
 
-       
+% dynamic dir?  text script, articulation script dir?  
 oneVoice = {   
   \stemBoth
   \slurBoth
@@ -59,8 +71,11 @@ voiceFour = {
   \shiftOn
 }
 
+% There's also dash, but setting dash period/length should be fixed.
 slurDotted = \property Voice.Slur \override #'dashed = #1
-slurNoDots = \property Voice.Slur \revert #'dashed
+slurSolid = \property Voice.Slur \revert #'dashed
+tieDotted = \property Voice.Tie \override #'dashed = #1
+tieSolid = \property Voice.Tie \revert #'dashed
 
        
 tiny  = 

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index e3304811220fc5bb00e1c62558266b8f151628b8..1e5eaf51760fe6d8a024a412156e8e03b3084137 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -15,7 +15,7 @@ convert-ly: local-convert-ly
        $(LOOP)
 
 local-convert-ly:
-       $(PYTHON) $(CONVERT_LY) -e *ly
+       $(PYTHON) $(CONVERT_LY) --edit --assume-old *ly
 
 tar:
        mkdir -p $(outdir)/$(tarball)

diff --git a/make/ports-rules.make b/make/ports-rules.make
index 3293cbe4f346926c4f0d48efc210a5f7d417e05e..b819f0747b5428766a550b2d652bb4b228a372d0 100644 (file)
--- a/make/ports-rules.make
+++ b/make/ports-rules.make
@@ -14,9 +14,9 @@ endif
 %/GNUmakefile:
        mkdir -p $(@D)
        $(if $(shell grep '[.]ly' $(@D)/index.html), \
-               echo 'mutopia-examples = $(@D)' > $@, \
+               echo 'mutopia-name = $(@D)' > $@, \
                $(if $(shell grep '[.]zip' $(@D)/index.html), \
-                       echo -e 'zipped = true\nmutopia-examples = $(@D)' > $@))
+                       echo -e 'zipped = true\nmutopia-name = $(@D)' > $@))
        echo -e $(GNUmakefile) >> $@
 
 

diff --git a/make/ports-targets.make b/make/ports-targets.make
index aa27aa6a5f46589caf7e8ea57d3df08de09848cf..93d19a946b573f153ddaebe543f4b65091218b86 100644 (file)
--- a/make/ports-targets.make
+++ b/make/ports-targets.make
@@ -1,6 +1,6 @@
 
 local-ly-clean:
-       -mv -f $(wildcard *.ly) $(outdir)
+       $(if $(wildcard *.ly), -mv -f $(wildcard *.ly) $(outdir))
 
 ly-clean: local-ly-clean
        $(LOOP)

diff --git a/make/ports-vars.make b/make/ports-vars.make
index e5d96e8e78bdb55e3270ad36a098817dbe883cc1..bd0262efcb98be69aaa8ae2a93a1547340957996 100644 (file)
--- a/make/ports-vars.make
+++ b/make/ports-vars.make
@@ -19,3 +19,23 @@ include $$(depth)/ports/ports.make\n\
 '
 
 
+#
+# scores for target local-WWW (duh)
+#
+examples=
+
+
+#
+# scores for target mutopia
+#
+# Hairy hack to support name `score.ly' inside zipfile.
+# This will fail to download and build mutopia in one go,
+# either download first, or issue make mutopia twice.
+#
+mutopia-parts = $(patsubst %.ly,%,$(wildcard *-part.ly))
+mutopia-scores = $(patsubst %.ly,%,$(wildcard $(mutopia-name).ly score.ly))
+ifeq ($(mutopia-scores),)
+mutopia-scores = $(mutopia-name)
+endif
+mutopia-examples = $(mutopia-scores) $(mutopia-parts)
+

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/ports/mutopia/ArbeauT/Orch/belle/GNUmakefile b/ports/mutopia/ArbeauT/Orch/belle/GNUmakefile
index f51703e6139311edfce893d9f7ea08e0069d288a..323b5086e4d5b2a5472815554009ca0122fb2742 100644 (file)
--- a/ports/mutopia/ArbeauT/Orch/belle/GNUmakefile
+++ b/ports/mutopia/ArbeauT/Orch/belle/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = belle
+mutopia-name = belle
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV1008/solo-cello-suite-ii/GNUmakefile b/ports/mutopia/BachJS/BWV1008/solo-cello-suite-ii/GNUmakefile
index 5d0d36550bcd4a6f949491b4b55ad24ca185a810..7315975faa3e739054fcaace9ff4bba7bc0eaca5 100644 (file)
--- a/ports/mutopia/BachJS/BWV1008/solo-cello-suite-ii/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV1008/solo-cello-suite-ii/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = solo-cello-suite-ii
+mutopia-name = solo-cello-suite-ii
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile b/ports/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile
index c1dcf28717b5630d89d0140495b51c53c12ff844..906bb5888465fb891549f3a7732e883d1d19dfcc 100644 (file)
--- a/ports/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV1042/concerto-in-e-major/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = concerto-in-e-major
+mutopia-name = concerto-in-e-major
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV1043/concerto-in-d-minor/GNUmakefile b/ports/mutopia/BachJS/BWV1043/concerto-in-d-minor/GNUmakefile
index 983e377085ce2d0008673672960576c7741e74af..54462b8f775b83c50b7be48cf90c49f4803b706d 100644 (file)
--- a/ports/mutopia/BachJS/BWV1043/concerto-in-d-minor/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV1043/concerto-in-d-minor/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = concerto-in-d-minor
+mutopia-name = concerto-in-d-minor
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile b/ports/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile
index 63f176735c7dc93805a68f8164eaf46fb22c1e09..c95bad2c7ef35be3d519f6f45338e8d6e5446a4c 100644 (file)
--- a/ports/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV772/bach-invention-01/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = bach-invention-01
+mutopia-name = bach-invention-01
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV846/wtk1-fugue1/GNUmakefile b/ports/mutopia/BachJS/BWV846/wtk1-fugue1/GNUmakefile
index a506d1117f8bce6644a572ed1f74cde600169a4c..548dd190214e4cc72fc0e41bb32811aa017f837c 100644 (file)
--- a/ports/mutopia/BachJS/BWV846/wtk1-fugue1/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV846/wtk1-fugue1/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk1-fugue1
+mutopia-name = wtk1-fugue1
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV846/wtk1-prelude1/GNUmakefile b/ports/mutopia/BachJS/BWV846/wtk1-prelude1/GNUmakefile
index ba5fd027ff023a9f48373a8b3a14e700fd83149d..c019c24022663289cb148fdcc1846fb6c29cbcae 100644 (file)
--- a/ports/mutopia/BachJS/BWV846/wtk1-prelude1/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV846/wtk1-prelude1/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk1-prelude1
+mutopia-name = wtk1-prelude1
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV847/wtk1-fugue2/GNUmakefile b/ports/mutopia/BachJS/BWV847/wtk1-fugue2/GNUmakefile
index 5c7848fff70ec2b641b348ff9b5190d2a1fb1b30..4c96983e078f0c7900ccfc10571ddcc69ebb69e0 100644 (file)
--- a/ports/mutopia/BachJS/BWV847/wtk1-fugue2/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV847/wtk1-fugue2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk1-fugue2
+mutopia-name = wtk1-fugue2
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV847/wtk1-prae2/GNUmakefile b/ports/mutopia/BachJS/BWV847/wtk1-prae2/GNUmakefile
index f086f700d8b4b85f69da4425a5a22dd8b030903a..b508d6578c71d5f5ab51b373e2073fdea37502c5 100644 (file)
--- a/ports/mutopia/BachJS/BWV847/wtk1-prae2/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV847/wtk1-prae2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk1-prae2
+mutopia-name = wtk1-prae2
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV851/fugue_re_mineur_BWV851/GNUmakefile b/ports/mutopia/BachJS/BWV851/fugue_re_mineur_BWV851/GNUmakefile
index 77101f601ea76aea46a79d65da0519fa76c749cc..ece1342444367ce85482c3a17d75f6c01a4f0c49 100644 (file)
--- a/ports/mutopia/BachJS/BWV851/fugue_re_mineur_BWV851/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV851/fugue_re_mineur_BWV851/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = fugue_re_mineur_BWV851
+mutopia-name = fugue_re_mineur_BWV851
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV854/wtk1-fugue9/GNUmakefile b/ports/mutopia/BachJS/BWV854/wtk1-fugue9/GNUmakefile
index c1ae7a6627b0a657ecd453070a5dd01bab069549..cccc7e47b16a076b6e452e231cddc2697e1fe719 100644 (file)
--- a/ports/mutopia/BachJS/BWV854/wtk1-fugue9/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV854/wtk1-fugue9/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk1-fugue9
+mutopia-name = wtk1-fugue9
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV854/wtk1-prelude9/GNUmakefile b/ports/mutopia/BachJS/BWV854/wtk1-prelude9/GNUmakefile
index 130edf4072ab51eb236c92b89feefd5cc01160a4..df6b7a962650b9b67868e33efc4f2eb70a064e0f 100644 (file)
--- a/ports/mutopia/BachJS/BWV854/wtk1-prelude9/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV854/wtk1-prelude9/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk1-prelude9
+mutopia-name = wtk1-prelude9
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV871/wtk2-fugue2/GNUmakefile b/ports/mutopia/BachJS/BWV871/wtk2-fugue2/GNUmakefile
index 6f5b2e5cc19b41305136cf457f358f59f46e56ab..9c56ab8f3a0af495ece14854f207e18e70e5749d 100644 (file)
--- a/ports/mutopia/BachJS/BWV871/wtk2-fugue2/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV871/wtk2-fugue2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = wtk2-fugue2
+mutopia-name = wtk2-fugue2
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV997/Bach_Preludio_BWV997/GNUmakefile b/ports/mutopia/BachJS/BWV997/Bach_Preludio_BWV997/GNUmakefile
index 3934916e7038bb6aec022989493a7d744f51195d..a656a9bdb28f3dc6aa6a0720eaef5bd327d60863 100644 (file)
--- a/ports/mutopia/BachJS/BWV997/Bach_Preludio_BWV997/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV997/Bach_Preludio_BWV997/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Bach_Preludio_BWV997
+mutopia-name = Bach_Preludio_BWV997
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV997/bwv997-01prelude/GNUmakefile b/ports/mutopia/BachJS/BWV997/bwv997-01prelude/GNUmakefile
index 61f67f5df0b929cdf081189c70247a4f459b790f..49b38457b2d9c503db61d610b43ca447c2e78eec 100644 (file)
--- a/ports/mutopia/BachJS/BWV997/bwv997-01prelude/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV997/bwv997-01prelude/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = bwv997-01prelude
+mutopia-name = bwv997-01prelude
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV997/bwv997-02fuga/GNUmakefile b/ports/mutopia/BachJS/BWV997/bwv997-02fuga/GNUmakefile
index 2e3d982642573151c782ecdfcd9475d7fbf62bff..02a3dc6f366d77b9358a08e57e9fba5eae24a8e9 100644 (file)
--- a/ports/mutopia/BachJS/BWV997/bwv997-02fuga/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV997/bwv997-02fuga/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = bwv997-02fuga
+mutopia-name = bwv997-02fuga
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV997/bwv997-03sarabande/GNUmakefile b/ports/mutopia/BachJS/BWV997/bwv997-03sarabande/GNUmakefile
index b2c178189c7e7e8af0f76f8e9e5efd5a97520c6c..c48449e9a9e492c3c4ab0687dd6cde43c1c56d79 100644 (file)
--- a/ports/mutopia/BachJS/BWV997/bwv997-03sarabande/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV997/bwv997-03sarabande/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = bwv997-03sarabande
+mutopia-name = bwv997-03sarabande
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV997/bwv997-04gigue/GNUmakefile b/ports/mutopia/BachJS/BWV997/bwv997-04gigue/GNUmakefile
index a9cb5c25890938ddeb06d3c33bd61d82293c5d84..3cbd1b12f3800445dda50fdab653f1420d086f9a 100644 (file)
--- a/ports/mutopia/BachJS/BWV997/bwv997-04gigue/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV997/bwv997-04gigue/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = bwv997-04gigue
+mutopia-name = bwv997-04gigue
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV997/bwv997-05double/GNUmakefile b/ports/mutopia/BachJS/BWV997/bwv997-05double/GNUmakefile
index 7fd747e6c553080ec0cd9cbfa15c4ca278ab43fc..7a4719efde0d603213fdfa0c193dfe4f11fb06ba 100644 (file)
--- a/ports/mutopia/BachJS/BWV997/bwv997-05double/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV997/bwv997-05double/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = bwv997-05double
+mutopia-name = bwv997-05double
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/BWV999/praludum-in-c-moll/GNUmakefile b/ports/mutopia/BachJS/BWV999/praludum-in-c-moll/GNUmakefile
index 322ca125fa1ccb34241cf50ad1747a2c4e14fba6..1ba40da3081b807f7361e949daf7ca4f1927bdd1 100644 (file)
--- a/ports/mutopia/BachJS/BWV999/praludum-in-c-moll/GNUmakefile
+++ b/ports/mutopia/BachJS/BWV999/praludum-in-c-moll/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = praludum-in-c-moll
+mutopia-name = praludum-in-c-moll
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BachJS/chorale_1/GNUmakefile b/ports/mutopia/BachJS/chorale_1/GNUmakefile
index ab6b95b35985efc13de4f173b35dbcda060a5399..b3db5d4c48b894f14746b6cf49d9e9d4d7b9cd00 100644 (file)
--- a/ports/mutopia/BachJS/chorale_1/GNUmakefile
+++ b/ports/mutopia/BachJS/chorale_1/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = chorale_1
+mutopia-name = chorale_1
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BanchieriA/Reg1_Suon1/GNUmakefile b/ports/mutopia/BanchieriA/Reg1_Suon1/GNUmakefile
index d3f30e459eb9f73e7b0e2b4c0d98c99d45ae4334..6b65bcd987739bb4dfc0bbc0b3bda32e1303f9bc 100644 (file)
--- a/ports/mutopia/BanchieriA/Reg1_Suon1/GNUmakefile
+++ b/ports/mutopia/BanchieriA/Reg1_Suon1/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Reg1_Suon1
+mutopia-name = Reg1_Suon1
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BanchieriA/Reg1_Suon2/GNUmakefile b/ports/mutopia/BanchieriA/Reg1_Suon2/GNUmakefile
index ead21cb96ccf8f8c2907495d4dbd2e01449df459..a85e3e7711544abe88bfb893b4636eeed2163159 100644 (file)
--- a/ports/mutopia/BanchieriA/Reg1_Suon2/GNUmakefile
+++ b/ports/mutopia/BanchieriA/Reg1_Suon2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Reg1_Suon2
+mutopia-name = Reg1_Suon2
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BanchieriA/Reg1_Suon3/GNUmakefile b/ports/mutopia/BanchieriA/Reg1_Suon3/GNUmakefile
index eedae5d87d0134ba900447e92eed296905e650ef..6eb7b33bdcf5611e19733d9b511ee15702a526b1 100644 (file)
--- a/ports/mutopia/BanchieriA/Reg1_Suon3/GNUmakefile
+++ b/ports/mutopia/BanchieriA/Reg1_Suon3/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Reg1_Suon3
+mutopia-name = Reg1_Suon3
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BanchieriA/Reg1_Suon4/GNUmakefile b/ports/mutopia/BanchieriA/Reg1_Suon4/GNUmakefile
index 16557a731c3becd7891f5660454466cb9b3b8f03..e6e08121421606acbeed6e2028b8be0fc3b3e525 100644 (file)
--- a/ports/mutopia/BanchieriA/Reg1_Suon4/GNUmakefile
+++ b/ports/mutopia/BanchieriA/Reg1_Suon4/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Reg1_Suon4
+mutopia-name = Reg1_Suon4
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BanchieriA/Reg1_Suon5/GNUmakefile b/ports/mutopia/BanchieriA/Reg1_Suon5/GNUmakefile
index 5419d7ec3e9e7c9238bfe458a88162068630176d..c62fb577f9b13f96ab29b7ee54e85702b56f9b37 100644 (file)
--- a/ports/mutopia/BanchieriA/Reg1_Suon5/GNUmakefile
+++ b/ports/mutopia/BanchieriA/Reg1_Suon5/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Reg1_Suon5
+mutopia-name = Reg1_Suon5
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BanchieriA/Reg1_Suon6/GNUmakefile b/ports/mutopia/BanchieriA/Reg1_Suon6/GNUmakefile
index 6fd097b99df210823e527df323701a8a2c25c4f9..4ff0e467f9e6c7706beb12c429f15f94b7fbe952 100644 (file)
--- a/ports/mutopia/BanchieriA/Reg1_Suon6/GNUmakefile
+++ b/ports/mutopia/BanchieriA/Reg1_Suon6/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Reg1_Suon6
+mutopia-name = Reg1_Suon6
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BeethovenLv/WoO59/fur-elise/GNUmakefile b/ports/mutopia/BeethovenLv/WoO59/fur-elise/GNUmakefile
index 8df2fb89a2da3ac4d399ba2b102be7d9c2934d92..a8fc9af261f73883b2037393b8e9720adc9811b6 100644 (file)
--- a/ports/mutopia/BeethovenLv/WoO59/fur-elise/GNUmakefile
+++ b/ports/mutopia/BeethovenLv/WoO59/fur-elise/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = fur-elise
+mutopia-name = fur-elise
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BendaJA/Benda_SonateG3/GNUmakefile b/ports/mutopia/BendaJA/Benda_SonateG3/GNUmakefile
index cdfe21b1d1df5ab307980ffed38e96976def6699..5b327214efed92e289de7bd62f508b8e1fc7e13e 100644 (file)
--- a/ports/mutopia/BendaJA/Benda_SonateG3/GNUmakefile
+++ b/ports/mutopia/BendaJA/Benda_SonateG3/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Benda_SonateG3
+mutopia-name = Benda_SonateG3
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/BruhnsN/BWV847/Pfeminor/GNUmakefile b/ports/mutopia/BruhnsN/BWV847/Pfeminor/GNUmakefile
index 12c04ff015a2fb463b390dd76eabd59142ce8eb4..e455a642834f271add4db1580f65e830c708446d 100644 (file)
--- a/ports/mutopia/BruhnsN/BWV847/Pfeminor/GNUmakefile
+++ b/ports/mutopia/BruhnsN/BWV847/Pfeminor/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = Pfeminor
+mutopia-name = Pfeminor
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/CarcassiM/O60/carcassi-op60-01/GNUmakefile b/ports/mutopia/CarcassiM/O60/carcassi-op60-01/GNUmakefile
index 491930b5c59cb2a1f67915bd337eb0885f7dae43..b515408b052b3a599924f1744456b4cf7bff6f81 100644 (file)
--- a/ports/mutopia/CarcassiM/O60/carcassi-op60-01/GNUmakefile
+++ b/ports/mutopia/CarcassiM/O60/carcassi-op60-01/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = carcassi-op60-01
+mutopia-name = carcassi-op60-01
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/CarcassiM/O60/carcassi-op60-03/GNUmakefile b/ports/mutopia/CarcassiM/O60/carcassi-op60-03/GNUmakefile
index 8e976b0c78cec1d4c60c04b039758b30a08f6de0..67f8a16354b2d6d9cc04f01550357c20863d6bbd 100644 (file)
--- a/ports/mutopia/CarcassiM/O60/carcassi-op60-03/GNUmakefile
+++ b/ports/mutopia/CarcassiM/O60/carcassi-op60-03/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = carcassi-op60-03
+mutopia-name = carcassi-op60-03
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/CarcassiM/O60/carcassi-op60-08/GNUmakefile b/ports/mutopia/CarcassiM/O60/carcassi-op60-08/GNUmakefile
index 4db037cece40bbb0722214b8883962b44b461d35..b69c4bf66168134174142de855fa181156a0fe84 100644 (file)
--- a/ports/mutopia/CarcassiM/O60/carcassi-op60-08/GNUmakefile
+++ b/ports/mutopia/CarcassiM/O60/carcassi-op60-08/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = carcassi-op60-08
+mutopia-name = carcassi-op60-08
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/CarcassiM/O60/carcassi-op60-15/GNUmakefile b/ports/mutopia/CarcassiM/O60/carcassi-op60-15/GNUmakefile
index 9ebbe9da2edae8714ea1044eea29118c12380d34..41e472dc1bf77c3922839aa72d9ff8e08e329a95 100644 (file)
--- a/ports/mutopia/CarcassiM/O60/carcassi-op60-15/GNUmakefile
+++ b/ports/mutopia/CarcassiM/O60/carcassi-op60-15/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = carcassi-op60-15
+mutopia-name = carcassi-op60-15
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/CarulliF/carulli-duet-in-g/GNUmakefile b/ports/mutopia/CarulliF/carulli-duet-in-g/GNUmakefile
index 950b794a589a0df1a5ef66a7ae04ab0247263282..4963b07fb1009d28a77cfb1d54035eee7fd9ccb7 100644 (file)
--- a/ports/mutopia/CarulliF/carulli-duet-in-g/GNUmakefile
+++ b/ports/mutopia/CarulliF/carulli-duet-in-g/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = carulli-duet-in-g
+mutopia-name = carulli-duet-in-g
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/ClementiM/O36/sonatina-36-1/GNUmakefile b/ports/mutopia/ClementiM/O36/sonatina-36-1/GNUmakefile
index aa1609d2a422f2d277a04cca00e6079091082704..81e0fdf887c575097806d41a8c3305ae1da58864 100644 (file)
--- a/ports/mutopia/ClementiM/O36/sonatina-36-1/GNUmakefile
+++ b/ports/mutopia/ClementiM/O36/sonatina-36-1/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = sonatina-36-1
+mutopia-name = sonatina-36-1
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/ClementiM/O36/sonatina-36-2/GNUmakefile b/ports/mutopia/ClementiM/O36/sonatina-36-2/GNUmakefile
index bee977268af86c6e8d82f5dcd57cec7dd04d0d25..3a6baa442118d24209aa374a51393a7f2b0d6ed8 100644 (file)
--- a/ports/mutopia/ClementiM/O36/sonatina-36-2/GNUmakefile
+++ b/ports/mutopia/ClementiM/O36/sonatina-36-2/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = sonatina-36-2
+mutopia-name = sonatina-36-2
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/ClementiM/O36/sonatina-36-3/GNUmakefile b/ports/mutopia/ClementiM/O36/sonatina-36-3/GNUmakefile
index 9b75ed31b97649c33b41e92952306d6e448b1e7e..c21fdd08698ade206725bef8ce8494a31d8c869b 100644 (file)
--- a/ports/mutopia/ClementiM/O36/sonatina-36-3/GNUmakefile
+++ b/ports/mutopia/ClementiM/O36/sonatina-36-3/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = sonatina-36-3
+mutopia-name = sonatina-36-3
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/ClementiM/O36/sonatina-36-4/GNUmakefile b/ports/mutopia/ClementiM/O36/sonatina-36-4/GNUmakefile
index 812aaf1bfe918a2f150faafa46230ff5d70d123b..d2df3d537eba3fbaa8660a45bfe14eabf3e4df3f 100644 (file)
--- a/ports/mutopia/ClementiM/O36/sonatina-36-4/GNUmakefile
+++ b/ports/mutopia/ClementiM/O36/sonatina-36-4/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = sonatina-36-4
+mutopia-name = sonatina-36-4
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/DowlandJ/ALS1/unquietthoughts/GNUmakefile b/ports/mutopia/DowlandJ/ALS1/unquietthoughts/GNUmakefile
index bbe2554dc5d9fe1ce6d279a85308785d94baa15d..424a2528376fe475d9e16ff65ea41de888b90575 100644 (file)
--- a/ports/mutopia/DowlandJ/ALS1/unquietthoughts/GNUmakefile
+++ b/ports/mutopia/DowlandJ/ALS1/unquietthoughts/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = unquietthoughts
+mutopia-name = unquietthoughts
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/GiordianoG/caromioben/GNUmakefile b/ports/mutopia/GiordianoG/caromioben/GNUmakefile
index cd6f1ade24a8c80f79df9c3b3be0add997c537bc..eed950e492b6ab0dcd181017aaa30c35a660227a 100644 (file)
--- a/ports/mutopia/GiordianoG/caromioben/GNUmakefile
+++ b/ports/mutopia/GiordianoG/caromioben/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = caromioben
+mutopia-name = caromioben
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/JoplinS/maple/GNUmakefile b/ports/mutopia/JoplinS/maple/GNUmakefile
index cbf429ec85934143907035e1b118dce3d9c4585d..5c59dcc11b1e8a9336d38ea3096df56d94eadeef 100644 (file)
--- a/ports/mutopia/JoplinS/maple/GNUmakefile
+++ b/ports/mutopia/JoplinS/maple/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = maple
+mutopia-name = maple
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/MilanL/milan-pavan2/GNUmakefile b/ports/mutopia/MilanL/milan-pavan2/GNUmakefile
index c079fcab8e005a391e2240b133c4ff9b1176722c..c03fa43c5ae5f3bb71054af3f4baa2c287efe8df 100644 (file)
--- a/ports/mutopia/MilanL/milan-pavan2/GNUmakefile
+++ b/ports/mutopia/MilanL/milan-pavan2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = milan-pavan2
+mutopia-name = milan-pavan2
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/MozartWA/KV447/horn-concerto-3/GNUmakefile b/ports/mutopia/MozartWA/KV447/horn-concerto-3/GNUmakefile
index 9b796426414b111c2a66d130b635b906716470da..c1c010897337f0166bc1cd8fe5945436909922d5 100644 (file)
--- a/ports/mutopia/MozartWA/KV447/horn-concerto-3/GNUmakefile
+++ b/ports/mutopia/MozartWA/KV447/horn-concerto-3/GNUmakefile
@@ -1,5 +1,5 @@
 zipped = true
-mutopia-examples = horn-concerto-3
+mutopia-name = horn-concerto-3
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/PaganiniN/O1/caprice-24/GNUmakefile b/ports/mutopia/PaganiniN/O1/caprice-24/GNUmakefile
index ac5e3f6d935ff60ffbc90c596de24b145dda10f7..252d3c45c6473aa0c6d601d7917308db955c5d65 100644 (file)
--- a/ports/mutopia/PaganiniN/O1/caprice-24/GNUmakefile
+++ b/ports/mutopia/PaganiniN/O1/caprice-24/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = caprice-24
+mutopia-name = caprice-24
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/Saint-SaensC/O94/morceau-de-concert/GNUmakefile b/ports/mutopia/Saint-SaensC/O94/morceau-de-concert/GNUmakefile
index 80ba34a0cbae94d4dd5d179fbb9557f2e7eedad9..4ab7f621f60c94ea4e6e9b0dfa93250a3763ed19 100644 (file)
--- a/ports/mutopia/Saint-SaensC/O94/morceau-de-concert/GNUmakefile
+++ b/ports/mutopia/Saint-SaensC/O94/morceau-de-concert/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = morceau-de-concert
+mutopia-name = morceau-de-concert
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gnossienne_1/GNUmakefile b/ports/mutopia/SatieE/gnossienne_1/GNUmakefile
index 775dd7b4f929eb93b3cdef423805477c92ab790c..8c2e7e3aeb81ada4ac2cc766058b36144da3ab62 100644 (file)
--- a/ports/mutopia/SatieE/gnossienne_1/GNUmakefile
+++ b/ports/mutopia/SatieE/gnossienne_1/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gnossienne_1
+mutopia-name = gnossienne_1
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gnossienne_2/GNUmakefile b/ports/mutopia/SatieE/gnossienne_2/GNUmakefile
index afb2bf6991c8761a956cdfd9963bdb798e9ae4ca..78cc307d7030c3308debf5d1195229ded6d2c96a 100644 (file)
--- a/ports/mutopia/SatieE/gnossienne_2/GNUmakefile
+++ b/ports/mutopia/SatieE/gnossienne_2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gnossienne_2
+mutopia-name = gnossienne_2
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gnossienne_3/GNUmakefile b/ports/mutopia/SatieE/gnossienne_3/GNUmakefile
index 37306e9330f8175e9e4a8a629b43027c7c8190e9..75aa85586ea42a2119f3b9787f90e3f54c58429b 100644 (file)
--- a/ports/mutopia/SatieE/gnossienne_3/GNUmakefile
+++ b/ports/mutopia/SatieE/gnossienne_3/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gnossienne_3
+mutopia-name = gnossienne_3
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gnossienne_4/GNUmakefile b/ports/mutopia/SatieE/gnossienne_4/GNUmakefile
index 6857379747150a7fd3b90607ea9c4d90b49596f7..1b014e5ca7645cb61d5f19a4390c5939c2a60976 100644 (file)
--- a/ports/mutopia/SatieE/gnossienne_4/GNUmakefile
+++ b/ports/mutopia/SatieE/gnossienne_4/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gnossienne_4
+mutopia-name = gnossienne_4
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gnossienne_5/GNUmakefile b/ports/mutopia/SatieE/gnossienne_5/GNUmakefile
index 618d9c733fc781af6e911e1e0af57e8e9185c2b7..8c342be26a46d7d426c5674d7da76c7078f41f01 100644 (file)
--- a/ports/mutopia/SatieE/gnossienne_5/GNUmakefile
+++ b/ports/mutopia/SatieE/gnossienne_5/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gnossienne_5
+mutopia-name = gnossienne_5
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gymnopedie_1/GNUmakefile b/ports/mutopia/SatieE/gymnopedie_1/GNUmakefile
index 5c9955a0d8afc133f9e76607ac93c8cfa33aee97..f674d2ccfe1ab1f89aab80bf0608a00821e9513a 100644 (file)
--- a/ports/mutopia/SatieE/gymnopedie_1/GNUmakefile
+++ b/ports/mutopia/SatieE/gymnopedie_1/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gymnopedie_1
+mutopia-name = gymnopedie_1
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gymnopedie_2/GNUmakefile b/ports/mutopia/SatieE/gymnopedie_2/GNUmakefile
index 2ffb3221a2848a73819107deb6ed7ef967575cca..968e3ebd8236279fd4dfebe4a58f114b1fa39f7f 100644 (file)
--- a/ports/mutopia/SatieE/gymnopedie_2/GNUmakefile
+++ b/ports/mutopia/SatieE/gymnopedie_2/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gymnopedie_2
+mutopia-name = gymnopedie_2
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SatieE/gymnopedie_3/GNUmakefile b/ports/mutopia/SatieE/gymnopedie_3/GNUmakefile
index d4d7a87a9ecf434f62c27a504f461fba25de70c3..f249bdeec2a47b46cfbcc2fb6c4b7c2c6a2c1518 100644 (file)
--- a/ports/mutopia/SatieE/gymnopedie_3/GNUmakefile
+++ b/ports/mutopia/SatieE/gymnopedie_3/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = gymnopedie_3
+mutopia-name = gymnopedie_3
  depth = ../../../..
  include $(depth)/ports/ports.make
  

diff --git a/ports/mutopia/SchubertF/D891/AnSylvia/GNUmakefile b/ports/mutopia/SchubertF/D891/AnSylvia/GNUmakefile
index d1cc51b6e6d6259f62b3e0822604cee3d1a31002..ff3229ba3fdf425202a0438fd04e167aa5986b93 100644 (file)
--- a/ports/mutopia/SchubertF/D891/AnSylvia/GNUmakefile
+++ b/ports/mutopia/SchubertF/D891/AnSylvia/GNUmakefile
@@ -1,4 +1,4 @@
-mutopia-examples = AnSylvia
+mutopia-name = AnSylvia
  depth = ../../../../..
  include $(depth)/ports/ports.make
  

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index aada9feac1009635eb472256811e07d5bdb97718..0ba8cb886b376581d40183060c3c09d0c336db25 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -42,6 +42,7 @@ Try to convert to newer lilypond-versions.  The version number of the
 input is guessed by default from \version directive
 
 Options:
+  -a, --assume-old       apply all conversions to unversioned files
   -h, --help             print this help
   -e, --edit             in place edit
   -f, --from=VERSION     start from version
@@ -215,7 +216,7 @@ if 1:
 
 if 1:
        def conv(str):
-               str =  re.sub ('\\\\lyric', '\\\\lyrics',str)
+               str =  re.sub ('\\\\lyrics*', '\\\\lyrics',str)
                        
                return str
        
@@ -540,10 +541,27 @@ if 1:
                str = re.sub ('\\\\voicefour', '\\\\voiceFour', str)
 
                # I don't know exactly when these happened...
-               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?(1|(\\\\up))', '\\\\stemUp\\\\slurUp\\\\tieUp', str)
-               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?((-1)|(\\\\down))', '\\\\stemDown\\\\slurDown\\\\tieDown', str)
-               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?(1|(\\\\up))', '\\\\\\1Up', str)
-               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?((-1)|(\\\\down))', '\\\\\\1Down', str)
+               # ugh, we loose context setting here...
+               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\stemUp\\\\slurUp\\\\tieUp', str)
+               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\stemDown\\\\slurDown\\\\tieDown', str)
+               str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\\\stemBoth\\\\slurBoth\\\\tieBoth', str)
+               
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\\\1Up', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\\\1Down', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?"?(0|(\\\\center))"?', '\\\\\\1Both', str)
+
+               ## dynamic..
+               str = re.sub ('\\\\property *[^ .]*[.]?dynamicDirection[^=]*= *#?"?(1|(\\\\up))"?', '\\\\dynamicUp', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?dyn[^=]*= *#?"?((-1)|(\\\\down))"?', '\\\\dynamicDown', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?dyn[^=]*= *#?"?(0|(\\\\center))"?', '\\\\dynamicBoth', str)
+
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)Dash[^=]*= *#?"?(0|(""))"?', '\\\\\\1NoDots', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)Dash[^=]*= *#?"?([1-9]+)"?', '\\\\\\1Dotted', str)
+
+               str = re.sub ('\\\\property *[^ .]*[.]?noAutoBeaming[^=]*= *#?"?(0|(""))"?', '\\\\autoBeamOn', str)
+               str = re.sub ('\\\\property *[^ .]*[.]?noAutoBeaming[^=]*= *#?"?([1-9]+)"?', '\\\\autoBeamOff', str)
+
+
 
                return str
        
@@ -706,6 +724,13 @@ if 1:
        
        conversions.append (((1,3,139), conv, 'font-point-size -> font-design-size.'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('([a-zA-Z]*)NoDots', '\\1Solid', str)
+               return str
+       
+       conversions.append (((1,3,141), conv, 'xNoDots -> xSolid'))
+
 
 ############################
        
@@ -742,8 +767,8 @@ def do_conversion (infile, from_version, outfile, to_version):
                # esp. as current conversion rules are soo incomplete
                if re.search (lilypond_version_re_str, str):
                        str = re.sub (lilypond_version_re_str,'\\'+new_ver , str)
-               #else:
-               #       str = new_ver + '\n' + str
+               else:
+                       str = new_ver + '\n' + str
 
                outfile.write(str)
 
@@ -804,12 +829,13 @@ def do_one_file (infile_name):
        sys.stderr.flush ()
 
 edit = 0
+assume_old = 0
 to_version = ()
 from_version = ()
 outfile_name = ''
 
 (options, files) = getopt.getopt (
-       sys.argv[1:], 'o:f:t:seh', ['version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to='])
+       sys.argv[1:], 'ao:f:t:seh', ['assume-old', 'version', 'output', 'show-rules', 'help', 'edit', 'from=', 'to='])
 
 for opt in options:
        o = opt[0]
@@ -831,6 +857,8 @@ for opt in options:
                sys.exit(0)
        elif o == '--output' or o == '-o':
                outfile_name = a
+       elif o == '--assume-old' or o == '-a':
+               assume_old = 1
        else:
                print o
                raise getopt.error
@@ -845,6 +873,12 @@ for f in files:
                sys.stderr.write ('\n')
                sys.stderr.write ("%s: can't determine version for %s" % (program_name, f))
                sys.stderr.write ('\n')
-               sys.stderr.write ("%s: skipping" % program_name)
+               if assume_old:
+                       fv = from_version
+                       from_version = (0,0,0)
+                       do_one_file (f)
+                       from_version = fv
+               else:
+                       sys.stderr.write ("%s: skipping: %s " % (program_name,  f))
                pass
 sys.stderr.write ('\n')

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 8728e28f50755ca85780a6af2288bab146aced9b..1c93f63ceded422e4f1612bf2c1426fc0910511e 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -416,13 +416,13 @@ def global_latex_definition (tfiles, extra):
 \usepackage[latin1]{inputenc}
 \input{titledefs}
 \makeatletter
-\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\makelilypondfooter}}%
+\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%
 '''
        
        if extra['pagenumber'] and extra['pagenumber'][-1] and extra['pagenumber'][-1] != 'no':
                s = s + r'''
 \renewcommand{\@oddhead}{\parbox{\textwidth}%
-    {\mbox{}\small\makelilypondheader\hfill\textbf{\thepage}}}
+    {\mbox{}\small\theheader\hfill\textbf{\thepage}}}
 '''
        else:
                s = s + '\\pagestyle{empty}\n'

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index e8c4a1fec7371b42a6186e4f6b278e9e972d33ff..fa8f5966e226e1885d608ed14a30d1a5511ae87c 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -50,12 +50,13 @@
   \global\let\mustmakelilypondpiecetitle\undefined%
 }
 % header -- head ?
-\def\makelilypondheader
+% these names can't be changed: they're uses in mutopia headers
+\def\theheader
 {
   \ifx\lilypondhead\undefined\else%
     \parbox{\textwidth}{\mbox{}\lilypondhead}\fi
 }
-\def\makelilypondfooter
+\def\thefooter
 {
   \ifx\lilypondfooter\undefined\else%
     \parbox{\textwidth}{\mbox{}\lilypondfooter}\fi