lilypond-1.0.6

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 0b9c0fb9bb9d98a5df616c379334ef909337255f..5d80bab7143fba5c386ebfce340e2139f38b31ff 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly
@@ -1,10 +1,10 @@
 % allemande-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }

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 c04de2dac631e85881dc640be3fcf94354acc0e2..3d540b4378c9d821288a5bc06a876a97bb7386e7 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly
@@ -1,10 +1,10 @@
 % courante-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }

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 100156c7d7bf31bcc0ce862ceb3ddcbeafcd039f..8f36fb38bd4d6087d5c06897af9ce2429025d4b5 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly
@@ -1,10 +1,10 @@
 % gigue-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }

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 67e2f4412893fc04dcefb8edff2010c6ba8426b6..76c93f5fb792b27ba93b67b66572fe2cf4f9d418 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly
@@ -1,10 +1,10 @@
 % menuetto-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 menuetto_i_a = \melodic \relative c {

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 f93032b967f1ec3753147cf73ba6eed90b49b571..2c31ae382dc8f8e0904df33fd39feb88b1e488d4 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly
@@ -1,10 +1,10 @@
 % prelude-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % who is going to make a -violin.ly? 
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet see alto_scripts .
+But merging melodic and scripts doen't work too well yet see viola_scripts .
 %}
 
 % urg, Thread is gone, try Voice

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 00db06b77e333b0b60b9b10e0f051574f3551d1e..1a82029959d3d954d0b2f3fdc2e74b2039be60bf 100644 (file)
--- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly
@@ -1,10 +1,10 @@
 % sarabande-urtext.ly
-% belongs together with -cello.ly and -alto.ly
+% belongs together with -cello.ly and -viola.ly
 % (who is going to make a -violin.ly?)
 
 %{
 Well, there are still some scripts in this "urtext".
-But merging melodic and scripts doen't work too well yet (see alto_scripts).
+But merging melodic and scripts doen't work too well yet (see viola_scripts).
 %}
 
 n = { \slurnormal }

diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly
new file mode 100644 (file)
index 0000000..b6db279
--- /dev/null
+++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly
@@ -0,0 +1,7 @@
+\header{
+instrument="Alto";
+}
+
+instrument="viola";
+\include "solo-cello-suite-ii.ly"
+

diff --git a/scripts/ly2dvi.sh b/scripts/ly2dvi.sh
index bd60c01f777fa03a70ddf4575445a99207a23f5f..1e7976e24c06c2954af5b3649d47404487747236 100644 (file)
--- a/scripts/ly2dvi.sh
+++ b/scripts/ly2dvi.sh
@@ -5,12 +5,12 @@
 # Written by Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no>
 #  Sat Nov 22 22:26:43 CET 1997
 #
-# $Id: ly2dvi.sh,v 1.3 1998/08/21 22:05:30 fred Exp $
+# $Id: ly2dvi.sh,v 1.6 1998/09/15 17:22:43 fred Exp $
 #
 #  Original LaTeX file made by Mats Bengtsson, 17/8 1997
 #
 
-VERSION="0.12"
+VERSION="0.12.jcn1"
 NAME=ly2dvi.sh
 IDENTIFICATION="$NAME $VERSION" 
 NOW=`date`
@@ -21,9 +21,11 @@ echo "$IDENTIFICATION" 1>&2
 
 # NEWS
 
+# 0.12.jcn1
+#  - mudelaDefs really fixed (sorry, PC)
+
 # 0.12
 #  - -S/--sourcedir switch
-#
 
 #
 #0.11.jcn3
@@ -636,20 +638,28 @@ regexp_quote(){
 #
 mudelaDefs(){
 # Include \def\mudela-definitions
+# The aim here is to pick up the definition for the 
+# current file, then any other file.
 #
+mudelatmp=$TMP/mudelaDefs$$
+# Use `cat' to prevent filenames being prepended
+# 
+cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp
 for L in $MU_DEF
 do
-  for F in "$File" "$OF"
-  do
-    LL=`sed -n 's/\\\\def\\\\'"$L"'{\([^}]*\)}.*$/\1/p' "$F"`
-    [ "$LL" ] && {
-         Echo "$1\\"$L'{'"$LL"'}%'                                >> $LatF
-         break
-    }
-  done
+    # This converts \def\mudelatitle{fred}
+    # to \mudelatitle{fred} or to
+    # \def\mudelatitle{fred}
+    # and stops after the first one found.
+    sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{
+       s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p
+       q
+    }'  $mudelatmp  >> $LatF
 done
+rm -f $mudelatmp
 }
 #
+#
 startFile(){
 #
 # LaTeX file name