From 528b2eaeda85becc0f456ecc8373b9eabf6b869e Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:24:46 +0000
Subject: [PATCH] lilypond-1.2.0

---
 .../J.S.Bach/Solo-Cello-Suites/allemande-cello.ly |  6 +++---
 .../Solo-Cello-Suites/allemande-urtext.ly         |  2 +-
 .../J.S.Bach/Solo-Cello-Suites/allemande-viola.ly |  6 +++---
 .../J.S.Bach/Solo-Cello-Suites/courante-cello.ly  |  6 +++---
 .../J.S.Bach/Solo-Cello-Suites/courante-urtext.ly |  2 +-
 .../J.S.Bach/Solo-Cello-Suites/courante-viola.ly  |  6 +++---
 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly |  6 +++---
 .../J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly    |  2 +-
 mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly |  6 +++---
 .../J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly  | 10 +++++-----
 .../J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly |  6 +++---
 .../J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly  | 10 +++++-----
 .../J.S.Bach/Solo-Cello-Suites/prelude-cello.ly   |  2 +-
 .../J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly  |  2 +-
 .../J.S.Bach/Solo-Cello-Suites/prelude-viola.ly   |  2 +-
 .../J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly |  6 +++---
 .../Solo-Cello-Suites/sarabande-urtext.ly         |  2 +-
 .../J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly |  6 +++---
 scripts/convert-mudela.py                         | 15 +++++++++++++--
 19 files changed, 57 insertions(+), 46 deletions(-)

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 bab72175af..2091bb1ae4 100644
--- 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 96e750a706..635c933813 100644
--- 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 66fd70bc0a..0be45ea104 100644
--- 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 8d6e0b8f5f..7dead3a18f 100644
--- 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 1a8ab22cc6..9df40fb2c2 100644
--- 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 0901b5407a..b1e9d556d9 100644
--- 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 2956b1feed..1febb28530 100644
--- 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 9ca1079345..dd69687191 100644
--- 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 b6a1ad56e0..d533d6c0da 100644
--- 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 0ab8471e10..40f3a86ce2 100644
--- 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 1393a3d5b0..6475b772ba 100644
--- 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 5a6c36dbd9..0145f42f8b 100644
--- 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 3714541670..3bdb49c839 100644
--- 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 cc2d406fbb..faa88b84b9 100644
--- 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 669726565f..d708f602dc 100644
--- 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 0555aca760..2ec74f6257 100644
--- 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 2ca87484a4..593384ab1a 100644
--- 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 6d95062cc5..80bfce29dc 100644
--- 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 39b46d05e3..7395958a0f 100644
--- 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')
 
 
 ############################
-- 
2.39.5