From: Jan Nieuwenhuizen Date: Mon, 19 Mar 2001 22:03:54 +0000 (+0100) Subject: patch::: 1.3.140.jcn3 X-Git-Tag: release/1.3.141~5 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=194c87ed054aaec8ba2acd4c377b52853d291d85;p=lilypond.git 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 a7491de9cb..bb20d7f466 100644 --- 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 1902988827..9d001f89b1 100644 --- 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 28ef926078..fd009a91b0 100644 --- 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 10c1d01d4e..4367c26f8c 100644 --- 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 4ae2d3b4e2..3029e49e94 100644 --- 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 e330481122..1e5eaf5176 100644 --- 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 3293cbe4f3..b819f0747b 100644 --- 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 aa27aa6a5f..93d19a946b 100644 --- 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 e5d96e8e78..bd0262efcb 100644 --- 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 27f12728c8..69a2c13dab 100644 --- 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 2229887ad6..782d6d4703 100644 --- 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 381dee9b92..87235e5ce5 100644 --- 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 fa5c80df60..38bab61f52 100644 --- 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 ed2efcfbd5..20f05cac29 100644 --- 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 584e00bbd5..0e1c0d5466 100644 --- 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 f51703e613..323b5086e4 100644 --- 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 5d0d36550b..7315975faa 100644 --- 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 c1dcf28717..906bb58884 100644 --- 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 983e377085..54462b8f77 100644 --- 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 63f176735c..c95bad2c7e 100644 --- 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 a506d1117f..548dd19021 100644 --- 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 ba5fd027ff..c019c24022 100644 --- 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 5c7848fff7..4c96983e07 100644 --- 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 f086f700d8..b508d6578c 100644 --- 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 77101f601e..ece1342444 100644 --- 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 c1ae7a6627..cccc7e47b1 100644 --- 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 130edf4072..df6b7a9626 100644 --- 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 6f5b2e5cc1..9c56ab8f3a 100644 --- 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 3934916e70..a656a9bdb2 100644 --- 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 61f67f5df0..49b38457b2 100644 --- 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 2e3d982642..02a3dc6f36 100644 --- 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 b2c178189c..c48449e9a9 100644 --- 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 a9cb5c2589..3cbd1b12f3 100644 --- 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 7fd747e6c5..7a4719efde 100644 --- 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 322ca125fa..1ba40da308 100644 --- 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 ab6b95b359..b3db5d4c48 100644 --- 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 d3f30e459e..6b65bcd987 100644 --- 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 ead21cb96c..a85e3e7711 100644 --- 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 eedae5d87d..6eb7b33bdc 100644 --- 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 16557a731c..e6e0812142 100644 --- 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 5419d7ec3e..c62fb577f9 100644 --- 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 6fd097b99d..4ff0e467f9 100644 --- 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 8df2fb89a2..a8fc9af261 100644 --- 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 cdfe21b1d1..5b327214ef 100644 --- 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 12c04ff015..e455a64283 100644 --- 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 491930b5c5..b515408b05 100644 --- 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 8e976b0c78..67f8a16354 100644 --- 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 4db037cece..b69c4bf661 100644 --- 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 9ebbe9da2e..41e472dc1b 100644 --- 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 950b794a58..4963b07fb1 100644 --- 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 aa1609d2a4..81e0fdf887 100644 --- 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 bee977268a..3a6baa4421 100644 --- 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 9b75ed31b9..c21fdd0869 100644 --- 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 812aaf1bfe..d2df3d537e 100644 --- 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 bbe2554dc5..424a252837 100644 --- 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 cd6f1ade24..eed950e492 100644 --- 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 cbf429ec85..5c59dcc11b 100644 --- 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 c079fcab8e..c03fa43c5a 100644 --- 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 9b79642641..c1c0108973 100644 --- 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 ac5e3f6d93..252d3c45c6 100644 --- 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 80ba34a0cb..4ab7f621f6 100644 --- 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 775dd7b4f9..8c2e7e3aeb 100644 --- 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 afb2bf6991..78cc307d70 100644 --- 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 37306e9330..75aa85586e 100644 --- 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 6857379747..1b014e5ca7 100644 --- 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 618d9c733f..8c342be26a 100644 --- 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 5c9955a0d8..f674d2ccfe 100644 --- 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 2ffb3221a2..968e3ebd82 100644 --- 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 d4d7a87a9e..f249bdeec2 100644 --- 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 d1cc51b6e6..ff3229ba3f 100644 --- 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 aada9feac1..0ba8cb886b 100644 --- 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 8728e28f50..1c93f63ced 100644 --- 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 e8c4a1fec7..fa8f5966e2 100644 --- 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