lilypond-1.2.0

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
index bab72175afd1820d7ca3819a418f1f00d7056867..2091bb1ae4f886f91450165b2edc399e9cfdcb3e 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "allemande-urtext.ly";
 
@@ -23,12 +23,12 @@ allemande_cello_global = \notes{
        \time 4/4;
        \key f;
        \clef bass;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \partial 16;
                s16
                s1*11 |
                s2 s4 s8.
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                s16
                s1*11
                s16*15

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
index 96e750a706d5a64c935cf00975ce8cea8a340306..635c93381341dff55c30646d7d16b6159946ec3d 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
@@ -99,4 +99,4 @@ allemande = \context Staff \notes<
 >
 
 
-\version "1.1.66";
+\version "1.2.0";

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
index 66fd70bc0a6c5f193cea7e8c317be79f23e92e33..0be45ea104faaad556335dcdc5b6351a85223dcc 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "allemande-urtext.ly";
 
@@ -23,12 +23,12 @@ allemande_viola_global = \notes{
        \time 4/4;
        \key f;
        \clef alto;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \partial 16;
                s16
                s1*11 |
                s2 s4 s8.
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                s16
                s1*11
                s16*15

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
index 8d6e0b8f5fee02529cbe350e82e171e22e66c5c7..7dead3a18fc3bd75ea03eea4bcd1fd9a4658d97a 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "courante-urtext.ly";
 
@@ -23,12 +23,12 @@ courante_cello_global = \notes{
        \time 3/4;
        \key f;
        \clef bass;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \partial 16;
                s16
                s2.*15
                s2 s8.
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                s16
                s2.*15
                s16*11

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
index 1a8ab22cc6a07bbd48e7f1b3c47f310d7d0ae6ac..9df40fb2c210afcc844df064c23466955950ff65 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
@@ -88,4 +88,4 @@ courante = \context Staff \notes<
  \$courante_b
 >
 
-\version "1.1.66";
+\version "1.2.0";

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
index 0901b5407a00fb18c54ba7a13818d6121360fcc9..b1e9d556d9ee933161169937ec53e9c9e42dd257 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "courante-urtext.ly";
 
@@ -23,12 +23,12 @@ courante_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \partial 16;
                s16
                s2.*15
                s2 s8.
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                s16
                s2.*15
                s16*11

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
index 2956b1feed0419c8cc93269607458e4d1b06af6e..1febb285303013062d71e1f2df65ff2a0dbf3d86 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "gigue-urtext.ly";
 
@@ -23,13 +23,13 @@ gigue_cello_global = \notes{
        \time 3/8;
        \key f;
        \clef bass;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \partial 8;
                s8
                s4.*31
                s4
                %\partial 4;
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                % urg
                %s16 \partial 8; s16
                s8

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
index 9ca10793450acedaf64a28efc56632b1d484bab6..dd6968719175b67fdaf3b3988510657a6123fa5f 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
@@ -102,4 +102,4 @@ gigue = \notes<
        \$gigue_b
 >
 
-\version "1.1.66";
+\version "1.2.0";

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
index b6a1ad56e0512eaf79977e81a70a650485502771..d533d6c0da26753ba4f6e601699f969085c5ee2b 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "gigue-urtext.ly";
 
@@ -23,13 +23,13 @@ gigue_viola_global = \notes{
        \time 3/8;
        \key f;
        \clef alto;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \partial 8;
                s8
                s4.*31
                s4
                \partial 4;
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                % urg
                s16 \partial 8; s16
                s4.*43

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
index 0ab8471e10ec39cca24387b6cf7d192759a9f76d..40f3a86ce258edfe92c2a2e5cd818fb9727a5c31 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly
@@ -16,7 +16,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "menuetto-urtext.ly";
 
@@ -24,10 +24,10 @@ menuetto_i_cello_global = \notes{
        \time 3/4;
        \key f;
        \clef bass;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \skip 2.*8;
        }
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \skip 2.*1;
                \slurdotted
                \skip 2.*14;
@@ -81,10 +81,10 @@ menuetto_ii_cello_global = \notes{
        \time 3/4;
        \key D;
        \clef bass;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \skip 2.*8;
        }
-       \repeat  "semi" 2 {
+       \repeat  "volta" 2 {
                \skip 2.*1;
                \slurdotted
                \skip 2.*14;

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
index 1393a3d5b0a617d68bf463718502fa533ea49bf3..6475b772ba515dd902fc96b6e9f0f91edd180d88 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
@@ -110,8 +110,8 @@ menuetto_i_b_voice_urg_urg = \notes<
 >
 
 menuetto_i = \context Staff \notes<
-       \repeat "semi" 2 { \$menuetto_i_a_voice_urg_urg }
-       \repeat "semi" 2 { \$menuetto_i_b_voice_urg_urg }
+       \repeat "volta" 2 { \$menuetto_i_a_voice_urg_urg }
+       \repeat "volta" 2 { \$menuetto_i_b_voice_urg_urg }
 >
 
 menuetto_ii = \context Staff\notes \relative c {
@@ -148,4 +148,4 @@ menuetto_ii = \context Staff\notes \relative c {
        d2.
 }
 
-\version "1.1.66";
+\version "1.2.0";

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
index 5a6c36dbd9e25037a15536ac844aadad618aa8f4..0145f42f8b5a64938f17514511038d30216b6093 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly
@@ -17,7 +17,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "menuetto-urtext.ly";
 
@@ -25,11 +25,11 @@ menuetto_i_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \skip 2.*8;
                \clef violin;
                \skip 2.*1;
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                \slurdotted
                \skip 2.*3;
                \clef alto;
@@ -79,9 +79,9 @@ menuetto_ii_viola_global = \notes{
        \time 3/4;
        \key D;
        \clef alto;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                \skip 2.*8;
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                \skip 2.*1;
                \slurdotted
                \skip 2.*14;

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
index 37145416702bf46542ba74d7a214be7dbd9617ed..3bdb49c83910c7db694f0a617ecdf411304adf69 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "prelude-urtext.ly";
 

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
index cc2d406fbb5386ebb6e6d3478be07378e4a0c13c..faa88b84b9d10f22f92b8c6cacba9d7880fe204e 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
@@ -194,4 +194,4 @@ prelude = \context Staff \notes<
        \$prelude_b
 >
 
-\version "1.1.66";
+\version "1.2.0";

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
index 669726565f70dcee7e1604233af3ea5ad6a16979..d708f602dc166f59dc37fa68ae73719e751ace12 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "prelude-urtext.ly";
 

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
index 0555aca76062401808234fdc3cb7bf2bab42c4ba..2ec74f62578c755ff5b4a49aa52544e75a626abb 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "sarabande-urtext.ly";
 
@@ -23,9 +23,9 @@ sarabande_cello_global = \notes{
        \time 3/4;
        \key f;
        \clef bass;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                s2.*12
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                s2.*16
        }
 }

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
index 2ca87484a4df13d1504d2124d793b78415f7a732..593384ab1aac243c4aee9014047a3a8137f6dbfd 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
@@ -89,4 +89,4 @@ sarabande = \context Staff \notes<
        \$sarabande_b
 >
 
-\version "1.1.66";
+\version "1.2.0";

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
index 6d95062cc548fba58d3f74578a0559c42bb230f9..80bfce29dc13a2880db9b128aaae78a55590d8f5 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly
@@ -15,7 +15,7 @@ copyright =    "public domain";
  dotted slurs
 %}
 
-\version "1.1.66";
+\version "1.2.0";
 
 \include "sarabande-urtext.ly";
 
@@ -23,9 +23,9 @@ sarabande_viola_global = \notes{
        \time 3/4;
        \key f;
        \clef alto;
-       \repeat "semi" 2 {
+       \repeat "volta" 2 {
                s2.*12
-       } \repeat "semi" 2 {
+       } \repeat "volta" 2 {
                s2.*16
        }
 }

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 39b46d05e38dda73f5b0a7f1657b535f0b46f12b..7395958a0ff980ffd89db12b2e405447d7553e71 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -389,7 +389,7 @@ if 1:
        def conv(lines):
                newlines =[]
                for x in lines:
-                       x =  re.sub ('\\repeat *\"?semi\"?','\\repeat "volta"', x)
+                       x =  re.sub ('\\\\repeat *\"?semi\"?','\\\\repeat "volta"', x)
                        newlines.append (x)
                return newlines
 
@@ -406,7 +406,18 @@ if 1:
                return newlines
 
        conversions.append ((1,1,67), conv,
-                           'beamAuto -> noAutoBeaming, automaticMelismas -> automaticMelismata',)
+                           'beamAuto -> noAutoBeaming')
+
+if 1:
+       def conv(lines):
+               newlines =[]
+               for x in lines:
+                       x =  re.sub ('automaticMelismas', 'automaticMelismata', x)
+                       newlines.append (x)
+               return newlines
+
+       conversions.append ((1,2,0), conv,
+                           'automaticMelismas -> automaticMelismata')
 
 
 ############################