lilypond-1.0.10

diff --git a/Documentation/tex/glossary.yo b/Documentation/tex/glossary.yo
index 839ed95eca38870000212465ba795d2cdc9f3baf..3fb23a5f58193f44be066502af52fa7bef1d9655 100644 (file)
--- a/Documentation/tex/glossary.yo
+++ b/Documentation/tex/glossary.yo
@@ -25,7 +25,6 @@ latexlayoutcmds(
 \setlength{\evensidemargin}{0.25in}
 )
 
-latexpackage()(a4wide) COMMENT(UGH)
 
 whenlatex(notableofcontents())
 whentexinfo(notableofcontents())

diff --git a/TODO b/TODO
index 3ec1590a2523e8f8907537115307a73ffb55e3e8..ea03cc73a294df235a38128d539e912a905e9b77 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,6 +9,8 @@ grep for TODO and ugh/ugr/urg
 
        * egcs-1.1 support
 
+       * make engraver hacking robust.
+
        * fix LOCALE settings, and \def\foo{2,000pt} output
 
        * use streambufs and iostream
@@ -54,8 +56,6 @@ grep for TODO and ugh/ugr/urg
 
        * install TeX stuff into tex/generic directory.
 
-       * preformatted .info stuff.
-
        * percussion note heads
 
        * mi2mu empty staffs.

diff --git a/init/book-fragment.ly b/init/book-fragment.ly
index 91645e70c70baf6a8fdcb9d9764c736ad697cd3d..242d28e06168a82624e1ba489fda359f5be3022c 100644 (file)
--- a/init/book-fragment.ly
+++ b/init/book-fragment.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 \include "declarations.ly"

diff --git a/init/book-init.ly b/init/book-init.ly
index 2975e48249b77fda5c40b8520d00b05c942fc0a2..4637aeba108167861d116d822005e43e34c64903 100644 (file)
--- a/init/book-init.ly
+++ b/init/book-init.ly
@@ -1,12 +1,12 @@
 % Toplevel initialisation file. 
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 \include "declarations.ly";
 \include "paper16.ly"
 
-default_paper = \paper{
+ \paper{
        \paper_sixteen
 }
 

diff --git a/init/center-fragment.ly b/init/center-fragment.ly
index 192f0f031faa4470ef0f3443a644c368438a4c14..8a7fb5381e8ef7761a5ab6056209c3ff493b41f9 100644 (file)
--- a/init/center-fragment.ly
+++ b/init/center-fragment.ly
@@ -1,13 +1,13 @@
 % Toplevel initialisation file. 
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 \include "declarations.ly"
 
 \include "paper16.ly";
 
-default_paper = \paper { 
+ \paper { 
   \paper_sixteen
   linewidth = 7.\cm;
 }

diff --git a/init/center.ly b/init/center.ly
index feafaedcb4b5d6c27e311b0ecd6ae426641a88e7..035c39761b24dcff5a379272c6e9d558c780ed11 100644 (file)
--- a/init/center.ly
+++ b/init/center.ly
@@ -1,12 +1,12 @@
 % Toplevel initialisation file. 
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 \include "declarations.ly"
 \include "paper16.ly"
 
-default_paper = \paper { 
+ \paper { 
   \paper_sixteen;
 %  linewidth = 7.\cm;
   linewidth = 11.\cm;

diff --git a/init/declarations.ly b/init/declarations.ly
index 73ec21f886f6f9698c8fc15d26d96bd256afdeef..ec6a60a127dca2d318a32467b0f2b852466c219d 100644 (file)
--- a/init/declarations.ly
+++ b/init/declarations.ly
@@ -13,7 +13,7 @@ Wordwrap = 0.0
 
 \include "paper20.ly"
 
-default_paper = \paper{
+\paper{
        \paper_twenty
 }
 

diff --git a/init/fragment.ly b/init/fragment.ly
index 192f0f031faa4470ef0f3443a644c368438a4c14..8a7fb5381e8ef7761a5ab6056209c3ff493b41f9 100644 (file)
--- a/init/fragment.ly
+++ b/init/fragment.ly
@@ -1,13 +1,13 @@
 % Toplevel initialisation file. 
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 \include "declarations.ly"
 
 \include "paper16.ly";
 
-default_paper = \paper { 
+ \paper { 
   \paper_sixteen
   linewidth = 7.\cm;
 }

diff --git a/init/init.ly b/init/init.ly
index e076b2102da8ba4b77a15f09e38ed29e26995551..02c6e14ff12c5773c4436306b8e712e6e6cd03d9 100644 (file)
--- a/init/init.ly
+++ b/init/init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 \include "declarations.ly";

diff --git a/init/midi.ly b/init/midi.ly
index 103028cf20dd056f8b90e5522eef36831132dad0..114d34f20f19b0565a57dcb0655f4fa4e3b94b35 100644 (file)
--- a/init/midi.ly
+++ b/init/midi.ly
@@ -1,5 +1,5 @@
 
-default_midi = \midi {
+\midi {
         \tempo 4=60;
        \include "performer.ly"
 }

diff --git a/init/paper16.ly b/init/paper16.ly
index 4ccaea135122fd206d20bf301df39a1896ce4599..c59a5c3ccfa7222a4cee46be84e6b9ed206efbb8 100644 (file)
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -6,7 +6,7 @@
 
 
 
-\version "1.0.3";
+\version "1.0.4";
 
 paper_sixteen = \paper {
        staffheight = 16.0\pt;

diff --git a/init/paper20.ly b/init/paper20.ly
index 4da2520dd5ddf42792a168703a39f01f81c1a8e2..955f164eecb20ce764e05bd00566fce0911ad30e 100644 (file)
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -5,7 +5,7 @@
  \include "table13.ly";
  \include "table16.ly";
 
-\version "1.0.3";
+\version "1.0.4";
 
 paper_twenty = \paper {
        staffheight = 20.0\pt;

diff --git a/init/svenska.ly b/init/svenska.ly
index 6b8977fdcb4d529ca57adf2c72ecceac2b27eda6..d5422ce6465854a8624f6545aff3bd776a9f4c65 100644 (file)
--- a/init/svenska.ly
+++ b/init/svenska.ly
@@ -3,12 +3,6 @@
 %
 % by Mats Bengtsson.
 
-
-%
-% Please note that, while these names are used to enter *notes*, they
-% actually are *melodic*s, i.e. they represent a pitch solely. Notes
-% have a rhythmic part too. This is the reason that we don't write 'note { .. }'
-%
 \notenames {
        cessess = \musicalpitch { -1 0 -2 }
        cess    = \musicalpitch { -1 0 -1 }

diff --git a/input/example-3.ly b/input/example-3.ly
index ebd4ba1851d4fe07c23cf390b8c0227865a6ed7f..eb8c8c48f9b93d020cfc459c12df458d38b38cbc 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,8 +1,10 @@
-one = \melodic\relative c{
+\version "1.0.4";
+
+one = \notes\relative c{
        c'' d e f
 }
 
-two = \melodic\relative c{
+two = \notes\relative c{
        \clef "bass";
        c'2 g2
 }
@@ -16,7 +18,7 @@ two = \melodic\relative c{
        \midi{}
 }
 
-% A full-mudala example with two staffs
+% A full-mudela example with two staffs
 %
 % Type:
 %

diff --git a/input/keys.ly b/input/keys.ly
index 7f4bc62a6b69c7214ec2be0e7fed7b7771880624..84738b6ed9ad31a2a27caaa6fc1501d03365b9b5 100644 (file)
--- a/input/keys.ly
+++ b/input/keys.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 
 blah = \notes {

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index c823ab99f9538b292917602df48159b2c25036e8..2baeadd3ca5cc463040c0f0a92e1e88a97e6937f 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -10,7 +10,7 @@ copyright =    "public domain";
 Tested Features: example file with comments
 
 %}
-\version "1.0.3";
+\version "1.0.4";
 
 
 % the % is a comment.

diff --git a/input/part.ly b/input/part.ly
index b7beca7636512e7f08259468536877bd83e263b6..7ee17905f3b39644411a27f13075db035b5fd908 100644 (file)
--- a/input/part.ly
+++ b/input/part.ly
@@ -1,4 +1,5 @@
-part = \melodic{
+\version "1.0.4";
+part = \{
        c-1 c c c
        r1*3
        c4-5 c c c
@@ -30,7 +31,7 @@ a4 = \paper{
 
 \score{
        <
-               \melodic{ 
+               \notes{ 
                        \property Score.part = 1
                        \part
                }
@@ -40,7 +41,7 @@ a4 = \paper{
 
 \score{
        <
-               \melodic{ 
+               \notes{ 
                        \property Score.part = 0
                        \part
                }

diff --git a/input/pedal.ly b/input/pedal.ly
index dde473995ce1b4ecc1d351367dfc9ece0f1c1723..deff27a0d731937993a0899b7c935ff61b194925 100644 (file)
--- a/input/pedal.ly
+++ b/input/pedal.ly
@@ -24,7 +24,7 @@
 % \lbheel \lbheel \lfheel \lftoe
 % \rbheel \rbtoe \rfheel \rftoe
 
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
                \notes {

diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly
index c9cb4f6da8b30c840a6ad3bb9f5506175aaf601e..b7848e8af06f6da8982187688c1e575270277666 100644 (file)
--- a/input/praeludium-fuga-E.ly
+++ b/input/praeludium-fuga-E.ly
@@ -23,7 +23,7 @@
    * organ staff...
 %}
 
-\version "1.0.3";
+\version "1.0.4";
 
 
 

diff --git a/input/rhythm.ly b/input/rhythm.ly
index b0e2e1cd66b9c0f7aaedf922562e1423300cf55e..ee8e9d6b9ddb25cb1ecf438bc5f508a8c13a3614 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,7 +7,7 @@ TestedFeatures =         "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "1.0.3";
+\version "1.0.4";
 
 ritme = \notes\transpose c'' {
        \partial 8;

diff --git a/input/scales.ly b/input/scales.ly
index 81375258ceafe835741bfab25ee94dc26ee69745..08741e02591fd514665672813f5ad95fd360e887 100644 (file)
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 % scales with accents.
 %
 
-\version "1.0.3";
+\version "1.0.4";
 blah =         \notes {
                \time 6/8;      
 \transpose c {

diff --git a/input/scripts.ly b/input/scripts.ly
index b4386c953885f55ba68ecc77689b2e6082def1dd..2de3a30b8587407f22d184bbbf8d73f9e11b8231 100644 (file)
--- a/input/scripts.ly
+++ b/input/scripts.ly
@@ -1,5 +1,5 @@
        
-\version "1.0.3";
+\version "1.0.4";
 
 
 blah =         \notes{ \transpose c'' {

diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly
index 134ff73cf01523a969a3c6865b5635c18f8d84e5..38cfe3e79542e88f4390b31e775881504c60116f 100644 (file)
--- a/input/test/abbrev.ly
+++ b/input/test/abbrev.ly
@@ -1,5 +1,5 @@
 
-\version "1.0.3";
+\version "1.0.4";
 \score{
        \notes \transpose c'''{
                \stemup

diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly
index 1a1550b37cac7862f76276193b7ea8c31cd37fc0..ec1e8e9f653e1ffd9895727b1053bbf926e69cd1 100644 (file)
--- a/input/test/bar-scripts.ly
+++ b/input/test/bar-scripts.ly
@@ -1,7 +1,7 @@
 
 
 
-\version "1.0.3";
+\version "1.0.4";
 
 onestaff = \type Staff = foo\notes  {
        \property Staff.instr = instr

diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
index 7d9e968cdf84f1fcec13555d7a2912bdf9e4be6c..76d640ade5cc5989cd455909c49ec9fff9327143 100644 (file)
--- a/input/test/beam-pos.ly
+++ b/input/test/beam-pos.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes\transpose c''{

diff --git a/input/test/beams.ly b/input/test/beams.ly
index 7e94c04216837c130057ff5c369bc6066975632a..89be9bec733f33462ac321db04295f3119fe1bf9 100644 (file)
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -6,7 +6,7 @@ copyright =      "PD";
 
 TestedFeatures =        "beams and beamflags";
 }
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        <

diff --git a/input/test/broken.ly b/input/test/broken.ly
index 27f1d708ae25b65e8def2f5574f7b14167c44182..d08dae39efc7c591f376ec43bab1add080071390 100644 (file)
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 shortlong = \notes{
        c4()c( c c  |

diff --git a/input/test/clefs.ly b/input/test/clefs.ly
index 98ba6334ef086d061f9faba1e563ddf531d5cb5f..d4d07a45cf740e6176f0bc475d196040227e9beb 100644 (file)
--- a/input/test/clefs.ly
+++ b/input/test/clefs.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 \score {
        \notes{ 

diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index e503cbf7a9e6cf9a364c2bfb4155232423269975..b99931cf4a5d48dd2cbd6cc0c7612f4ca3cf60f1 100644 (file)
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,7 +5,7 @@ enteredby =      "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "1.0.3";
+\version "1.0.4";
 
 
 

diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly
index db8efbea8a2284f9f38a43498d6ecdf8b013dc69..a3cf882cf21434f3c83efc6e8174b43e6a829843 100644 (file)
--- a/input/test/defaultbars.ly
+++ b/input/test/defaultbars.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 
 \score {

diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly
index 43b3f393be3a62fccf1e74df8c88f86113984727..59c12abf21a56ca7f808011f51868c5adfefeb6d 100644 (file)
--- a/input/test/denneboom.ly
+++ b/input/test/denneboom.ly
@@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes";
 
 \include "paper20.ly"
 
-\version "1.0.3";
+\version "1.0.4";
 
 oden = \lyric{ 
        O8 |

diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly
index e29a2aa09b2b73283538cdd25b6005dce75aa618..80fc0c07cf96b8fa93909fe1d87feb09e326649b 100644 (file)
--- a/input/test/dotted-slur.ly
+++ b/input/test/dotted-slur.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes{

diff --git a/input/test/find-quarts.ly b/input/test/find-quarts.ly
index 63d8647b21f8b56fce02e5c6ba61099bbc43ec38..1b1f7eac8a7b1137d9889244265441e861cd2d14 100644 (file)
--- a/input/test/find-quarts.ly
+++ b/input/test/find-quarts.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes \relative c {

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index dde06fd8e0df3299f17c45492e426778ddfea477..47518dabb8b36c2cf1b9853b853909006390c427 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 FontBody=      \notes\transpose c''{ 
                \bar "|:";

diff --git a/input/test/font.ly b/input/test/font.ly
index 6bc11d45b913a3d0a8a721251fdd4df81f880b4d..4fcb9dac5e4704fc56c50afd3796400f7b0a4551 100644 (file)
--- a/input/test/font.ly
+++ b/input/test/font.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "font-body.ly"
 \score{

diff --git a/input/test/font16.ly b/input/test/font16.ly
index c8ddcec3317106da2da98159f54ee9456072d6f8..377a95ac05a300f00ad327b495e3a8713da5ee71 100644 (file)
--- a/input/test/font16.ly
+++ b/input/test/font16.ly
@@ -7,7 +7,7 @@ description = "This file tests the Feta music font";
 % "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 \include "font-body.ly"
 
 \score{

diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly
index 144656f5e4e42376db6298a9760abebad93e4bb1..51c2d0f60f809f257fb66edde7f5ece4f958ac47 100644 (file)
--- a/input/test/gourlay.ly
+++ b/input/test/gourlay.ly
@@ -4,7 +4,7 @@ copyright =      "PD";
 TestedFeatures =        "This file tests some nasty Gourlay spacings";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 %{
 

diff --git a/input/test/grace.ly b/input/test/grace.ly
index 8424587c52795513731054a6610a2f8db626049e..86e3c94d2cfe5291c21ffad55b3537bf7e5871ed 100644 (file)
--- a/input/test/grace.ly
+++ b/input/test/grace.ly
@@ -1,5 +1,5 @@
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "table13.ly";
 \include "table16.ly";

diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly
index 573aea14ba297405e88729e173f2aed3ff879e49..f4f6807837b1494e9bc79f2507bc1f1603faf0a5 100644 (file)
--- a/input/test/hara-kiri.ly
+++ b/input/test/hara-kiri.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 toeter_i = \notes\relative c {
        \property Staff.instrument = "Toeters"
@@ -62,7 +62,7 @@ zoger = \type Staff = zoger \notes \relative c {
        \skip 1*1;
 }
 
-default_paper = \include "score-paper.ly";
+ \include "score-paper.ly";
 
 zagers = \type GrandStaff <
        \zager

diff --git a/input/test/keys.ly b/input/test/keys.ly
index f1cab0f0d6b0b10b810f293dc8fbb0bcaae53664..f1167e53a65db765b5060ac993993a7278a5cac9 100644 (file)
--- a/input/test/keys.ly
+++ b/input/test/keys.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 %{
 test key itemv breaking

diff --git a/input/test/knee.ly b/input/test/knee.ly
index dec8562e6429ec5f83f2719640db7465550b8f1e..afefec8948039dd46848379feb0e9d6df0259903 100644 (file)
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 \score{
        \notes\relative c'{
                [c16 \stemdown c'' \stemboth c,, d]

diff --git a/input/test/mark.ly b/input/test/mark.ly
index e694fe6c3c677967ff9dd3c956ad2fafce8120ee..2ffb0f71e3e6373bc5a2b97cb04037340728173b 100644 (file)
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 global = \notes {
   s1 | \mark "A";

diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly
index 6a801c03a310b963792d0b835fd1350b26f25094..7b694a526c11da6ddb05993c22b8b8b0eb9e5c19 100644 (file)
--- a/input/test/multi-rest.ly
+++ b/input/test/multi-rest.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 voice_one = \notes\transpose c'        {  \stemup
        R1 * 2 | f'4-. r r2 | R1 * 3 |

diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index 9aa99298e22cdc61f3d18a37719db7ed5b0a84fa..b8be66d9d0888861eef802da9e7b62843c0a9443 100644 (file)
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 \score {
 

diff --git a/input/test/score-bar-scripts.ly b/input/test/score-bar-scripts.ly
index 5d72b15d06a10072d33e9d0f6d7deec69050b3e1..9cc36708091acb85b758aa50932fabba35680c8d 100644 (file)
--- a/input/test/score-bar-scripts.ly
+++ b/input/test/score-bar-scripts.ly
@@ -1,7 +1,7 @@
 
 
 
-\version "1.0.3";
+\version "1.0.4";
 
 onestaff =     \type Staff = foo\notes  {
                \property Staff.instr = instr

diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 28ce6fc9cecbc16226fdad5c7faabbb63650e195..db1338d5d89dcdc382c59cec251226e1ab519954 100644 (file)
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests Feta embedded slurs"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 shortlong = \notes{
        c4()c( c c  |

diff --git a/input/test/slur-bug.ly b/input/test/slur-bug.ly
index ba60200dc5604ae22a6704857e8e78d3f6682093..6bd977310310fdc59853aa5a1cd49ade533f5048 100644 (file)
--- a/input/test/slur-bug.ly
+++ b/input/test/slur-bug.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 % bug
 % excentric slur can't handle this ...

diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index 32eb795327e94d1edf93cd3ebe36a05bf859f948..8199d2a769fd7bf5b178a7daf2db8b0ac0c0d59b 100644 (file)
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -1,5 +1,5 @@
 % test damping
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes\relative c'{

diff --git a/input/test/slur-swap.ly b/input/test/slur-swap.ly
index 782e9b9c13a08980c426c7f6b0b1a232abbc8d49..a4b712da93e7923c284c92d253b05394b0a7e3e4 100644 (file)
--- a/input/test/slur-swap.ly
+++ b/input/test/slur-swap.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 % urg, the direction of the slur gets swapped!
 \score{

diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index 78407e6cb166d3d8ea3afd85bea8d02f6bf4abc0..065f3209fd7393e16cacd9185481d6b6a9aa59c1 100644 (file)
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1,5 +1,5 @@
 
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes\transpose c'{

diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index 908476bc94026c53065e4bbc18157354e7803f85..1a177c47b9e527b1f56e92e662dc8bb454bbb83c 100644 (file)
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -6,7 +6,7 @@ copyright =      "public domain";
 TestedFeatures =        "This file tests various spacings";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 multipart = \notes{ 
     \type StaffGroup < 

diff --git a/input/test/stem.ly b/input/test/stem.ly
index 1db1f9d49f4fbdf84de6c21b4970e0c08acca43c..6b40f48841031a2fb8bc5668bb5ba956d37f61ef 100644 (file)
--- a/input/test/stem.ly
+++ b/input/test/stem.ly
@@ -8,7 +8,7 @@ of beams";
        
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 beamintervals = \notes{
                \time 7/4;

diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly
index 529dbf581b93707f795ca137bfd5932481dfcbe1..ce992078a0a08335074be8c83ab815102cbe5ea9 100644 (file)
--- a/input/test/test-lyrics.ly
+++ b/input/test/test-lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 $somewhat_long = \lyric{
        \textstyle "roman" ;

diff --git a/input/test/tie-bug.ly b/input/test/tie-bug.ly
index 0e9d54e8b1df699dafce758ef9c280fa3e24f4d0..15f7e0b499ce2e99ae830b51b525809d3a103f18 100644 (file)
--- a/input/test/tie-bug.ly
+++ b/input/test/tie-bug.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 
 %  middle tie is wrong

diff --git a/input/test/tie.ly b/input/test/tie.ly
index 042721976f395d5b7161d041174736ecfe31b125..e94930d739fc8d175aa65833c447aa7eecafe4dc 100644 (file)
--- a/input/test/tie.ly
+++ b/input/test/tie.ly
@@ -1,4 +1,4 @@
-\version "1.0.3";
+\version "1.0.4";
 
 tie = \notes\transpose c''{
 

diff --git a/input/test/title.ly b/input/test/title.ly
index 601c81a24ff680fc38cceb577f0dbb95677423a0..2eafb8ae116cb8e21587fc3206497d994cb7e3b8 100644 (file)
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -10,7 +10,7 @@ source =      "urtext";
 instrument=    "Instrument";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes

diff --git a/input/test/transposition.ly b/input/test/transposition.ly
index 21e9b35e2f86dfc22b199ae2a1db21c789d13b2c..ba4569910c5dd63faf5987bc4504ed63b5d0bbcc 100644 (file)
--- a/input/test/transposition.ly
+++ b/input/test/transposition.ly
@@ -22,7 +22,7 @@ copyright =    "public domain";
 }
 
 
-\version "1.0.3";
+\version "1.0.4";
 
 vOne = \notes \relative c''{
         \clef"violin";

diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly
index 6831dda8f715d345fd9232378cbf81c45d5a8c3e..e80a68201c67a9e2f10585d13fcb1aa76d3014cc 100644 (file)
--- a/input/test/vertical-align.ly
+++ b/input/test/vertical-align.ly
@@ -1,5 +1,5 @@
 
-\version "1.0.3";
+\version "1.0.4";
 
 \score {
 \notes <

diff --git a/input/tril.ly b/input/tril.ly
index 26e1dc5b39a1e134220e3b7dababccb8bef57ea0..93d228e61f982ce643e95d2a671497ea61ee2213 100644 (file)
--- a/input/tril.ly
+++ b/input/tril.ly
@@ -5,7 +5,7 @@ TestedFeatures =         "This file tests trills"
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \score{
        \notes{ 

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 153d3d65aea445c3ef50e404de110d05e5ee8cb4..842f3c4185757838d8c9b4c7763f7609490eedcb 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -12,7 +12,7 @@ copyright =    "public domain";
 Tested Features                lyrics and chords
 %}
 
-\version "1.0.3";
+\version "1.0.4";
 
 melodie = \notes\relative c {
         \clef"violin";

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 70e18c964a55deef652c170cc7fa05318039cc2c..b2b888819d4556f9204f0d61ac5e299ef9b696aa 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -20,7 +20,7 @@ traditional song in various languages.
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "1.0.3";
+\version "1.0.4";
 
 melody = \notes \relative c'' {
        \clef violin;

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 71f093fdfef0fa6fdcf59bb2da7ff204eaa5561f..c5dbee2c00efeb8ccd2389ffa551afd2515f2bef 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -18,7 +18,7 @@
 #include "script-def.hh"
 #include "request.hh"
 #include "translator.hh"
-
+#include "notename-table.hh"
 
 IMPLEMENT_IS_TYPE_B(Identifier);
 
@@ -102,7 +102,7 @@ Class ## _identifier::do_str () const { \
 }
 
 
-
+DUMMY_STR(Notename_table);
 DUMMY_STR(General_script_def);
 DUMMY_STR(Lookup);
 DUMMY_STR(Translator);
@@ -126,7 +126,8 @@ STRING_PRINT(Duration);
 STRING_PRINT(Real);
 STRING_PRINT(int);
 STRING_PRINT(String);
-
+STRING_PRINT(Notename_table);
+  
 #define DEFAULT_STR(Class) \
 String \
 Class ## _identifier::do_str () const\
@@ -185,12 +186,12 @@ IMPLEMENT_ID_CLASS(Score);
 IMPLEMENT_ID_CLASS(Request);
 IMPLEMENT_ID_CLASS(Midi_def);
 IMPLEMENT_ID_CLASS(Paper_def);
-
+IMPLEMENT_ID_CLASS(Notename_table);
 VIRTUAL_ACCESSOR(Music);
 VIRTUAL_ACCESSOR(Request);
 VIRTUAL_ACCESSOR(Translator);
 VIRTUAL_ACCESSOR(General_script_def);
-
+DEFAULT_ACCESSOR(Notename_table);
 DEFAULT_ACCESSOR(Duration);
 DEFAULT_ACCESSOR(int);
 DEFAULT_ACCESSOR(Real);

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index de26489e32547afc6f0a5c0f177bbe9ac22ef2dd..8a951de6c715edfcbb7ebb715e37e0b4a5621518 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -14,6 +14,8 @@
 
 
 #define DECLARE_TYPE_NAME(Class)
+
+class Notename_table_identifier;
 class Translator_identifier;
 class Music_identifier;
 class General_script_def_identifier;
@@ -53,6 +55,7 @@ struct Identifier : public Input {
   void error (String) const;
   String str () const;
   IDACCESSOR(Translator)
+  IDACCESSOR(Notename_table)
   IDACCESSOR(Music)
   IDACCESSOR(General_script_def)
   IDACCESSOR(Symtables)
@@ -92,6 +95,7 @@ struct Class ## _identifier : Identifier {\
 
 DECLARE_ID_CLASS(Translator);
 DECLARE_ID_CLASS(Duration);
+DECLARE_ID_CLASS(Notename_table);
 DECLARE_ID_CLASS(Real);
 DECLARE_ID_CLASS(String);
 DECLARE_ID_CLASS(General_script_def);

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index e4e3d293ed09b1daae8109b1367e5ecae427316b..5b5d17c008f2f5ff4dcfa579ea76576fbd0e9828 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -46,7 +46,7 @@ public:
   /* *************** */
 
   void start_main_input ();
-  void clear_notenames();
+  void set_notename_table(Notename_table*tab_p);
   bool notename_b(String) const;
   Identifier*lookup_identifier (String s);
   Musical_pitch lookup_pitch (String s);

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index d92762265a17c398faff3666025b95a1f5edcffa..e68324ddcd56f82699e1b488a69c3ff53fbaffa9 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -61,7 +61,6 @@ public:
   Midi_def*default_midi_p();
   void do_yyparse();
   void parser_error (String);
-  void clear_notenames();
 
   Array<Request*>* get_parens_request (int t);
     

diff --git a/lily/include/notename-table.hh b/lily/include/notename-table.hh
index 56dd7c3927c9a4dc3e0ad2636237817440f3b7c3..7338f05bf16007df3846c7660020aba929713789 100644 (file)
--- a/lily/include/notename-table.hh
+++ b/lily/include/notename-table.hh
@@ -1,5 +1,5 @@
 /*
-  notename-table.hh -- declare 
+  notename-table.hh -- declare Notename_table
 
   source file of the GNU LilyPond music typesetter
 

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index ff1c78ddb9b303262cee6e6a883c440fcce1ecc5..bcda3dbc42c642ad49a3011b6b17d2d0da33296c 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -53,7 +53,10 @@ Music_output_def::find_translator_l (String name) const
 Global_translator *
 Music_output_def::get_global_translator_p () 
 {
-  Translator * t = find_translator_l ("Score")->clone ();
+  Translator * t = find_translator_l ("Score");
+  if (!t)
+    error (_("Can't find Score context"));
+  t = t->clone ();
   Global_translator *g = t->group_l ()->global_l ();
   t->add_processing ();
   

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 01b33c406eaaeddd4fdcf602832abba91c85c806..1ae47c5057a30d83637573c0725d849deffb70ac 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -27,11 +27,9 @@ static Keyword_ent the_key_tab[]={
   {"accepts", ACCEPTS},
   {"bar", BAR},
   {"cadenza", CADENZA},
-  {"clear", CLEAR},
   {"clef", CLEF},
   {"cm", CM_T},
   {"consists", CONSISTS},
-  {"contains", CONTAINS},
   {"duration", DURATION},
   {"font", FONT},
   {"grouping", GROUPING},
@@ -178,10 +176,10 @@ My_lily_lexer::add_notename (String s, Musical_pitch p)
 }
 
 void
-My_lily_lexer::clear_notenames()
+My_lily_lexer::set_notename_table(Notename_table *p)
 {
   delete note_tab_p_;
-  note_tab_p_ = new Notename_table;
+  note_tab_p_ = p;
 }
 
 char

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 049455393000565035b8d089de9b6dbf98646d38..ea2cbe6b5ab32078da1b07a22c56f10744bdcbd2 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -40,11 +40,6 @@ My_lily_parser::~My_lily_parser()
 }
 
 
-void
-My_lily_parser::clear_notenames()
-{
-  lexer_p_->clear_notenames();
-}
 
 void
 My_lily_parser::set_version_check (bool ig)
@@ -318,14 +313,14 @@ My_lily_parser::add_notename (String s, Musical_pitch p)
 Paper_def*
 My_lily_parser::default_paper_p ()
 {
-  Identifier *id = lexer_p_->lookup_identifier ("default_paper");
+  Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper");
   return id ? id->access_Paper_def () : new Paper_def ;
 }
 
 Midi_def*
 My_lily_parser::default_midi_p ()
 {
-  Identifier *id = lexer_p_->lookup_identifier ("default_midi");
+  Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi");
   return id ? id->access_Midi_def () : new Midi_def ;
 }
 

diff --git a/lily/parser.yy b/lily/parser.yy
index f9a3094e02f639af689a3444d1b39f79d93789aa..067eed8e65b4504944083769ac156ad5d8243deb 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -10,7 +10,7 @@
 */
 
 #include <iostream.h>
-
+#include "notename-table.hh"
 #include "scalar.hh"
 #include "translation-property.hh"
 #include "script-def.hh"
@@ -45,7 +45,7 @@
 
 // mmm
 Mudela_version oldest_version ("1.0.3");
-Mudela_version version ("1.0.3");
+Mudela_version version ("1.0.4");
 
 
 // needed for bison.simple's malloc() and free()
@@ -103,6 +103,7 @@ Paper_def* current_paper = 0;
     Midi_def* midi;
     Moment *moment;
     Note_req *notereq;
+    Notename_table *notenametab;
     Paper_def *paper;
     Real real;
     Request * request;
@@ -139,61 +140,54 @@ yylex (YYSTYPE *s,  void * v_l)
 
 /* tokens which are not keywords */
 
-%token ALIAS
+%token ABSDYNAMIC
+%token ACCEPTS
 %token BAR
 %token BEAMPLET
-%token MAEBTELP
-%token PENALTY
 %token CADENZA
-%token CLEAR
 %token CLEF
-%token CONTAINS
-%token RELATIVE
-%token CONSISTS
-%token ACCEPTS
 %token CM_T
+%token CONSISTS
 %token DURATION
-%token ABSDYNAMIC
 %token END
+%token FONT
 %token GROUPING
-%token TRANSLATOR
 %token HEADER
 %token IN_T
-%token LYRIC
 %token KEY
 %token KEYSIGNATURE
+%token LYRIC
+%token MAEBTELP
 %token MARK
-%token MUSIC
-%token MUSICAL_PITCH
-%token NOTES
+%token MEASURES
 %token MIDI
-%token TIME_T
 %token MM_T
-
+%token MUSIC
+%token MUSICAL_PITCH
 %token NOTENAMES
+%token NOTES
 %token OCTAVE
 %token OUTPUT
 %token PAPER
 %token PARTIAL
+%token PENALTY
 %token PLET
-%token TELP
+%token PROPERTY
 %token PT_T
+%token RELATIVE
 %token SCORE
 %token SCRIPT
 %token SHAPE
 %token SKIP
 %token SPANDYNAMIC
-
-%token START_T
 %token SYMBOLTABLES
 %token TABLE
-%token TRANSPOSE
+%token TELP
 %token TEMPO
+%token TIME_T
+%token TRANSLATOR
+%token TRANSPOSE
 %token TYPE
-%token FONT
-%token MEASURES
-%token TITLE
-%token PROPERTY
 %token VERSION
 
 /* escaped */
@@ -204,7 +198,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %token <pitch> NOTENAME_PITCH
 %token <id>    DURATION_IDENTIFIER
 %token <id>    IDENTIFIER
-
+%token <id>    NOTENAME_TABLE_IDENTIFIER
 %token <id>    MUSIC_IDENTIFIER
 %token <id>    POST_REQUEST_IDENTIFIER
 %token <id>    SCRIPT_IDENTIFIER
@@ -248,7 +242,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <duration>       duration_length
 
 %type <scalar>  scalar
-%type <music>  Music transposed_music relative_music Sequential_music Simultaneous_music
+%type <music>  Music  relative_music Sequential_music Simultaneous_music
 %type <music>  property_def translator_change
 %type <music_list> Music_list
 %type <paper>  paper_block paper_body
@@ -271,24 +265,40 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <symtable>       symtable symtable_body
 %type <trans>  translator_spec translator_spec_body
 %type <tempo>  tempo_request
-
+%type <notenametab> notenames_body notenames_block
 %expect 1
 
 
 %%
 
 mudela:        /* empty */
-       | mudela mudela_header {
-               delete header_global_p;
-               header_global_p = $2;
-       }
-       | mudela score_block {
-               score_global_array.push ($2);
-       }
+       | mudela toplevel_expression {}
        | mudela add_declaration { }
        | mudela error
        | mudela check_version { }
-       | mudela add_notenames { }
+       ;
+
+toplevel_expression:
+       notenames_block                 {
+               THIS->lexer_p_->set_notename_table ($1);
+       }
+       | mudela_header {
+               delete header_global_p;
+               header_global_p = $1;
+       }
+       | score_block {
+               score_global_array.push ($1);
+       }
+       | paper_block {
+               Identifier * id = new
+                       Paper_def_identifier ($1, PAPER_IDENTIFIER);
+               THIS->lexer_p_->set_identifier ("$defaultpaper", id)
+       }
+       | midi_block {
+               Identifier * id = new
+                       Midi_def_identifier ($1, MIDI_IDENTIFIER);
+               THIS->lexer_p_->set_identifier ("$defaultmidi", id)
+       }
        ;
 
 check_version:
@@ -305,17 +315,23 @@ check_version:
        }
        ;
 
-add_notenames:
-       NOTENAMES '{' notenames_body '}'
+
+notenames_block:
+       NOTENAMES '{' notenames_body '}'  {  $$ = $3; }
        ;
+
+
+
 notenames_body:
        /**/    {
+               $$ = new Notename_table;
        }
-       | notenames_body CLEAR  {
-               THIS->clear_notenames ();
+       | NOTENAME_TABLE_IDENTIFIER     {
+               $$ = $1-> access_Notename_table();
        }
        | notenames_body STRING '=' explicit_musical_pitch {
-               THIS->add_notename (*$2, *$4);
+               (*$$)[*$2] = *$4;
+
                delete $4;
                delete $2;
        }
@@ -342,7 +358,6 @@ mudela_header:
 /*
        DECLARATIONS
 */
-
 add_declaration:
        STRING {
                THIS->remember_spot ();
@@ -359,6 +374,9 @@ identifier_init:
                $$ = new Score_identifier ($1, SCORE_IDENTIFIER);
 
        }
+       | notenames_block {
+               $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+       }
        | paper_block {
                $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER);
        }
@@ -681,7 +699,11 @@ Music:
        }
        | Simultaneous_music            { $$ = $1; }
        | Sequential_music              { $$ = $1; }
-       | transposed_music      { $$ = $1; }
+       | TRANSPOSE musical_pitch Music {
+               $$ = $3;
+               $$ -> transpose (*$2);
+               delete $2;
+       }
        | MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
        | NOTES
                { THIS->lexer_p_->push_note_state (); }
@@ -742,14 +764,6 @@ scalar:
        ;
 
 
-transposed_music:
-       TRANSPOSE musical_pitch Music {
-               $$ = $3;
-               $$ -> transpose (*$2);
-               delete $2;
-       }
-       ;
-
 
 request_chord:
        pre_requests simple_element post_requests       {

diff --git a/mudela-mode.el b/mudela-mode.el
index bd66bb4d4f83c1567508bb0a15b56aa4fd76fe2c..f6ea3233e75b1e5b6da49d000e9ae8021a0cdbeb 100644 (file)
--- a/mudela-mode.el
+++ b/mudela-mode.el
@@ -32,10 +32,10 @@
 
 (defconst mudela-font-lock-keywords
   (let* ((keywords '(
-                    "accepts" "accidentals" "break" "bar" "cadenza" "clear" 
+                    "accepts" "accidentals" "break" "bar" "cadenza" 
                     "clef" "cm" "consists" "contains" "duration" "absdynamic" 
-                    "in" "translator" "type" "lyric" "key" "maininput" "melodic"
-                    "musical_pitch" "meter" "midi" "mm" "multi" "header"
+                    "in" "translator" "type" "lyric" "key" "maininput" "notes"
+                    "musical_pitch" "meter" "midi" "mm" "header"
                     "notenames" "octave" "output" "partial" "paper" "plet"
                     "property" "pt" "shape" "relative" "include" "score"
                     "script" "skip"  "table" "spandynamic" "symboltables"

diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly
index a5dc6dd7dcd91c0ce37cc55301b371ed1a6dd448..f3e31235d1f6f5ff87cc4de41830b6e091373162 100644 (file)
--- a/mutopia/Coriolan/bassi-part.ly
+++ b/mutopia/Coriolan/bassi-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "violoncello.ly"

diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
index 352c0031d402b398359643ec04896927c22e0a73..0f3c74edf5781e272324a1c765d99cebdc41c64a 100644 (file)
--- a/mutopia/Coriolan/clarinetti-part.ly
+++ b/mutopia/Coriolan/clarinetti-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "clarinetti.ly"

diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
index 5456ca95735551dad0b29841e9937debf899ae34..7156bbdcb22d95136304b0af860f2d51aba31ed8 100644 (file)
--- a/mutopia/Coriolan/clarinetti.ly
+++ b/mutopia/Coriolan/clarinetti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"

diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
index 7c18d193f9dd5139e7fecbcfc4d3a883b878d0de..f7d4d6c0b6ddd45bca014626d3587e8ab7ec4d79 100644 (file)
--- a/mutopia/Coriolan/clarinetto-1.ly
+++ b/mutopia/Coriolan/clarinetto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 clarinetto1 = \notes \relative c {
        R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
index d87a791b58073fed7a5e5e0e15f11a1385aea633..87ae15613c993db9996148056e6332d5223f8f35 100644 (file)
--- a/mutopia/Coriolan/clarinetto-2.ly
+++ b/mutopia/Coriolan/clarinetto-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 clarinetto2 = \notes \relative c { 
        R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | 

diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly
index 72b14e59c627afa584c8e3c42bbbb92c4f5f4dc9..30697b2c73b48926984d220cc4bd39d395f8ec6e 100644 (file)
--- a/mutopia/Coriolan/contrabasso-part.ly
+++ b/mutopia/Coriolan/contrabasso-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "contrabasso.ly"

diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
index 0a272c9e337814d8b1f8ae4e99be421ea4a09185..d022c82b5d45f360fecdf63ed259d84053dd9418 100644 (file)
--- a/mutopia/Coriolan/contrabasso.ly
+++ b/mutopia/Coriolan/contrabasso.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 contrabasso = \notes \relative c {
 %      \translator Staff=violoncello

diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
index baed0a99b0391f7147519f5c8aef685782e96943..ac6f000eb41d7926f5776f34a084a3915d768d58 100644 (file)
--- a/mutopia/Coriolan/coriolan.ly
+++ b/mutopia/Coriolan/coriolan.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 
@@ -63,7 +63,7 @@ strijkers = \type StaffGroup = strijkers_group <
        \$bassi
 >
 
-default_paper = \include "score-paper.ly"
+ \include "score-paper.ly"
 \score{
        <
                \property Score . textstyle =  "italic"

diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
index 77231a65664a6c30f76b1cad26ff7e84c40ca270..e914ce3c8d4a09d7be77ecf888330158c33a3ac0 100644 (file)
--- a/mutopia/Coriolan/corni-part.ly
+++ b/mutopia/Coriolan/corni-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "corni.ly"

diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
index 2d85377244c3197cc98ad92fae00d990fe22edc6..09293eb75d81ac4f8b7a7fc42ff00c942a69e5c0 100644 (file)
--- a/mutopia/Coriolan/corni.ly
+++ b/mutopia/Coriolan/corni.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "corno-1.ly"
 \include "corno-2.ly"

diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
index 52f04de55acf9fee5706ce0806b401a569a0b283..8b7232ed2162c2f45401d1a1872803593f95b17b 100644 (file)
--- a/mutopia/Coriolan/corno-1.ly
+++ b/mutopia/Coriolan/corno-1.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 corno1 = \notes \relative c {
        R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
index 17d91e4c23511dcd2b2ef5725ab4be6cacfab044..80746b3df6c2783a1bbd72ab7e143b401b531b6b 100644 (file)
--- a/mutopia/Coriolan/corno-2.ly
+++ b/mutopia/Coriolan/corno-2.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 corno2 = \notes \relative c {
        R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
index 12acc984da47868fb355c3023768110749c01de9..f485eb00e26b8cdd88b12084085fb87c197953a3 100644 (file)
--- a/mutopia/Coriolan/fagotti-part.ly
+++ b/mutopia/Coriolan/fagotti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "fagotti.ly"

diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
index 88120d81b02c7a5311f911fb48c5d7808f911f62..b0cf8a0bb7921b41081e5b9ec7adee50f94d6970 100644 (file)
--- a/mutopia/Coriolan/fagotti.ly
+++ b/mutopia/Coriolan/fagotti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"

diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
index 8674d66d75aee094cde056b24ef52d6d5287563b..f9cdfb573e0c324b4fd6f619aef615b3e3e4a370 100644 (file)
--- a/mutopia/Coriolan/fagotto-1.ly
+++ b/mutopia/Coriolan/fagotto-1.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 fagotto1 = \notes \relative c {
        R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
index 2b4c5d59acb17d846fae7469a72fcace3c102baf..ed15d8b76c25f538bc9daeb98da82a16859fc16b 100644 (file)
--- a/mutopia/Coriolan/fagotto-2.ly
+++ b/mutopia/Coriolan/fagotto-2.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 fagotto2 = \notes \relative c {
        R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
index 92e2575a71786a5cc8edcda043ad983ee1f8a19d..9afed158c9cc015ca6990bbe0a1fc98a048b9d90 100644 (file)
--- a/mutopia/Coriolan/flauti-part.ly
+++ b/mutopia/Coriolan/flauti-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "flauti.ly"

diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
index 861a962152d6eb517815110112b2f8334a320dc2..7217b6f8313871e60098480c18cc5277c7066cf5 100644 (file)
--- a/mutopia/Coriolan/flauti.ly
+++ b/mutopia/Coriolan/flauti.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"

diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
index 84ca0c5e9da90fe24712052bcc00ddbd3698efd3..8841c9ca9569f7d57b7cf5d99d865dd08e9e13da 100644 (file)
--- a/mutopia/Coriolan/flauto-1.ly
+++ b/mutopia/Coriolan/flauto-1.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 flauto1 = \notes \relative c {
        R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
index 1efc09e28fdf288b1d5513e2f1799856a83de673..724e9e41746a4b9aa6e9063897d9395c0fdea0ac 100644 (file)
--- a/mutopia/Coriolan/flauto-2.ly
+++ b/mutopia/Coriolan/flauto-2.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 flauto2 = \notes \relative c {
        R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | 

diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
index 7e51a44d45f88d77e0df1101e0ba43958ccc158b..50fa87f4c84b488bb996620d987fa203bf362713 100644 (file)
--- a/mutopia/Coriolan/global.ly
+++ b/mutopia/Coriolan/global.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 global = \notes {
        \time 4/4;

diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
index 2bc57696a8dd640d89cecb6da21d6f225eee1c60..670f10fc2b2881bc70545b1710f98fe3669eb27f 100644 (file)
--- a/mutopia/Coriolan/oboe-1.ly
+++ b/mutopia/Coriolan/oboe-1.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 oboe1 = \notes \relative c'' {
        R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
index 2e66374c279af71164ddd0f68a8fa3de4efccf01..afcf54261005b09f3b93e70e43081c6dacf54b93 100644 (file)
--- a/mutopia/Coriolan/oboe-2.ly
+++ b/mutopia/Coriolan/oboe-2.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 oboe2 = \notes \relative c{
        R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
index f2153e900f14cff1963d43c1147c91c9127402f7..0209b433cb03fc5e2fdf0f736bb7c7e9796ca918 100644 (file)
--- a/mutopia/Coriolan/oboi-part.ly
+++ b/mutopia/Coriolan/oboi-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "oboi.ly"

diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
index 4df66776c70771b80cb20d3b002fd08c15bfbec1..543805266bcdb2406636e7a368782a45741d231f 100644 (file)
--- a/mutopia/Coriolan/oboi.ly
+++ b/mutopia/Coriolan/oboi.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"

diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
index 9eab4995724edcb0ba91abbfbcbc0f4b8e8bc345..5447bd60a6c2f3df7f3df8c774a4e4553c693978 100644 (file)
--- a/mutopia/Coriolan/timpani.ly
+++ b/mutopia/Coriolan/timpani.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 timpani = \notes \relative c {
        R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
index 75e41015dd4cb64196bd6d126e6b3341a1b6d556..1e69e439c47ca1c8254850267290b84c71fee040 100644 (file)
--- a/mutopia/Coriolan/trombe-part.ly
+++ b/mutopia/Coriolan/trombe-part.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "trombe.ly"

diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
index 6955a46757dc2737b6a0e6fa2d6b1fe2ca62380f..593801191c80d2d8646f8565b8b8b7d05291c4c6 100644 (file)
--- a/mutopia/Coriolan/trombe.ly
+++ b/mutopia/Coriolan/trombe.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"

diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
index 7b98c1f2c96617239bbab9f6f71fd74daab7ec78..65b362e2c54445ba0bd12913b898c89d3134c904 100644 (file)
--- a/mutopia/Coriolan/trombo-1.ly
+++ b/mutopia/Coriolan/trombo-1.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 trombo1 = \notes \relative c {
        R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
index d51c389d17714689682cbbe12218ce2bcb4c5132..cf1e6549339937e38093c73886684b6be9ee4d91 100644 (file)
--- a/mutopia/Coriolan/trombo-2.ly
+++ b/mutopia/Coriolan/trombo-2.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 trombo2 = \notes \relative c {
        R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |

diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly
index 29d873adf5f75a32149e3e9a40087d0f9b88fc02..3d69be4a38a4d3a01d95a1104ee5cdb21f5b3414 100644 (file)
--- a/mutopia/Coriolan/viola-1.ly
+++ b/mutopia/Coriolan/viola-1.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 viola1 = \notes \relative c {
        \type Voice=one

diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly
index f45118959ec5727efe24bd8a4a3961635e97d85f..d309d0d766c9ecd049abc6d7e7e0c9e1bb456ef7 100644 (file)
--- a/mutopia/Coriolan/viola-2.ly
+++ b/mutopia/Coriolan/viola-2.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 viola2 = \notes \relative c {
        % starts on (actualy, most part is on) same staff as viola1

diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly
index 072df6244a6905ae64c8981d6d5123f1ea428906..f6ff5bf220b6677bcb0503d14be6bbdb538c09a9 100644 (file)
--- a/mutopia/Coriolan/viola-part.ly
+++ b/mutopia/Coriolan/viola-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "viola-1.ly"

diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly
index 3dd9bbc20c02b0794d37413f976299451030617b..af23c50350279bf40cf50c3eec8373bb6b9a0a81 100644 (file)
--- a/mutopia/Coriolan/violino-1-part.ly
+++ b/mutopia/Coriolan/violino-1-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "violino-1.ly"

diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
index 6e71c6f065cff2dda7badd4398841ce58fd14819..0b32f8cedc921f57e790b1290047e62ce55eea40 100644 (file)
--- a/mutopia/Coriolan/violino-1.ly
+++ b/mutopia/Coriolan/violino-1.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 violino1 = \notes \relative c {
        c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |

diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly
index 0179102b870f424da1640f96028909770f242e55..6fe721a4a751c5961500b2935faeb3b9a92b12c0 100644 (file)
--- a/mutopia/Coriolan/violino-2-part.ly
+++ b/mutopia/Coriolan/violino-2-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "violino-2.ly"

diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
index b4a6d19ef5622e27b6bc648022392279cac0e20a..4a4b04496d44308c9f34148d9674df7a7352713c 100644 (file)
--- a/mutopia/Coriolan/violino-2.ly
+++ b/mutopia/Coriolan/violino-2.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 violino2 = \notes \relative c {
        c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | R1 |

diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly
index 677223d1110adb02bb5426580d51d1f6af164c3c..30720db5bab5e91ab575a3fd953f70edf249ecea 100644 (file)
--- a/mutopia/Coriolan/violoncello-part.ly
+++ b/mutopia/Coriolan/violoncello-part.ly
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "global.ly"
 \include "violoncello.ly"

diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
index 0f5941ca9b113e58bdf05694c287e1e5e64e18d3..e8d117e4fa1ae0d316df74d2e5776986587d17dd 100644 (file)
--- a/mutopia/Coriolan/violoncello.ly
+++ b/mutopia/Coriolan/violoncello.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 violoncello = \notes \relative c {
        c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 |

diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
index 5d6789756a972ef7123b3c86e35ea729d6544c37..d55183d9a2725a8dae4455303df7d195af665409 100644 (file)
--- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
+++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly
@@ -4,7 +4,7 @@
        piece = "Allemande";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 global = \notes{
        \time 4/4;

diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
index 98aa397f915fa01141a9b9093e822a15c766057b..c6527f5447c062557b1ef51f73d9b239aa3ac03e 100644 (file)
--- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
+++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly
@@ -10,7 +10,7 @@
   copyright =   "Public Domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 global = \notes {
        \time 4/4;

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
index 18084f2ccf1e9e3b09860ae7a342589ae008e676..2897e9c0dcc76b6dfd21d98632339122f9e6dbd5 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly
@@ -14,7 +14,7 @@ enteredby =    "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 one = \notes\relative c {
        \property Voice . textstyle =  "italic"

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
index 5b3e102358d44c80cf28090480144b626580ef58..17a74c61dafe1bec9d8407c21f99b221ac20dd1f 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly
@@ -14,7 +14,7 @@ enteredby =    "jcn";
 copyright =     "public domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 one = \notes\relative c{
        \property Voice . textstyle =  "italic"
        r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] |

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
index 19a5f1082d6a460df255fe6ca6f13b9d15bcfd8e..8fc766402b04b7e365c0e2981d06909fa4436f62 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
@@ -12,7 +12,7 @@ composer =     "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
-\version "1.0.3";
+\version "1.0.4";
 
 one = \notes\relative c{
        \property Voice . textstyle =  "italic"

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
index 3d4d462d25ef3fef42de9b5f850428e9a2e39a7b..142f047f458d6e3477fa2d86a526480bf5a9d6fb 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly
@@ -12,7 +12,7 @@ composer =     "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
-\version "1.0.3";
+\version "1.0.4";
 
 
 one = \notes\relative c{

diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
index db680f0af47e77fbe0f461dabbd1b6a599edd193..4455273075ec427fc8691304f836d8371c499528 100644 (file)
--- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
+++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly
@@ -12,7 +12,7 @@ composer =     "Johann Sebastian Bach (1685-1750)";
 enteredby =     "jcn";
 copyright =     "public domain";
 }
-\version "1.0.3";
+\version "1.0.4";
 
 
 one = \notes\relative c{

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 538ae831721fe95f922c8693d49cbbe289a0abfc..2a182ad2be562c5a1994994934b8bae5cb246767 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.0.3";
+\version "1.0.4";
 
 \include "allemande-urtext.ly";
 

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 a523205ecee8a463c51a4e52c88373a80e2060d7..a8536451d57806a2fd208dfdafefa2a0d7fc24d7 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.0.3";
+\version "1.0.4";
 
 \include "allemande-urtext.ly";
 

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 5d79e6204ba64482dd360bd64afd12b39cf57ab8..35c1cbdd51d9d2d80a3d83eb994473ac4c790fcb 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.0.3";
+\version "1.0.4";
 
 \include "courante-urtext.ly";
 

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 585b13464f8ff49819d716d77db3bf41c2bf5d45..e3b92a148d7730750951d3795fe4ccdfcf26b78c 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.0.3";
+\version "1.0.4";
 
 \include "courante-urtext.ly";
 

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 a864e15460b800853301367e4df042ceebb7e4b5..1dadeae3b6707f7ad34530dc6577afdca1fd97c7 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.0.3";
+\version "1.0.4";
 
 \include "gigue-urtext.ly";
 

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 9e3317146ac00bc43c9f55f05e72b47dfbcfe44d..cc075b3f729f5973c951deba30282f480a03045b 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.0.3";
+\version "1.0.4";
 
 \include "gigue-urtext.ly";
 

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 7b9a4b75ee42fa13063c339a6d8bd467105db8f3..33a843066caf5448935d18971fca70921df1aea3 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.0.3";
+\version "1.0.4";
 
 \include "menuetto-urtext.ly";
 

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 5e55a3571a3a8dc2396f482ba137e14e25f8b284..afc1078efb1b0f05341d7825d7ed0b857d7747f9 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.0.3";
+\version "1.0.4";
 
 \include "menuetto-urtext.ly";
 

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 6b0c12f7432125d95bdfa92719c5b110913849e3..9043a9cace3b1280795b899dafe6f67a5ef0be0b 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.0.3";
+\version "1.0.4";
 
 \include "prelude-urtext.ly";
 

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 99b826deaf48432fa261ebf84e3de84006bf198d..40f32886782e927b803ab5c0703c57df523d40cc 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.0.3";
+\version "1.0.4";
 
 \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 e3dbc0f64963a4f239051e74a456226b4fad9ebc..9e16f386d8437077115200dc1e34a997f86f3911 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.0.3";
+\version "1.0.4";
 
 \include "sarabande-urtext.ly";
 

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 99e82955f8f3ec1bdd6aeaaf99fab2db6938a378..1c7bf7ccf78f890bee2cd1c12a0c7a8bb69576b7 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.0.3";
+\version "1.0.4";
 
 \include "sarabande-urtext.ly";
 

diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly
index f6cacd4df46c07ae28cdb728f8179726805f04f9..e00ea800d39290637776b8bf8afbbaa38b458a93 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue1.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue1.ly
@@ -11,7 +11,7 @@ copyright =    "Public Domain";
 %{
        
 %}
-\version "1.0.3";
+\version "1.0.4";
 
 
 global = 

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index f8df5be8fb5f1ae8293183ba7041a8f8bd95b5de..8c36ac007b848760000dbb519be98ee0ab72d5c0 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -13,7 +13,7 @@
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "nederlands.ly"                 % for correct parsing of note names
 

diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly
index 179e70471b514a53061b5b9345b0eaab4a76736b..1ae74ec4aadfda5bfd0c482f748d33fedbc97238 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ b/mutopia/J.S.Bach/wtk1-prelude1.ly
@@ -8,7 +8,7 @@ enteredby =      "Shay Rojansky";
 copyright =     "Public Domain";
 }
 
-\version "1.0.3";
+\version "1.0.4";
 
 global = 
     \notes {

diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly
index 64eb8eda2207e7c0aa71dd4356e417be6a3e7d5f..a192b1afd9fe7d0fee738aeac2a24cfe88b18048 100644 (file)
--- a/mutopia/W.A.Mozart/cadenza.ly
+++ b/mutopia/W.A.Mozart/cadenza.ly
@@ -13,7 +13,7 @@ Tested Features: cadenza mode
 Ugh.. Wish we had grace notes....  It adds another dimension to this
 piece of music.  %}
 
-\version "1.0.3";
+\version "1.0.4";
 
 
 cad = \notes  \relative c' {

diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly
index 2e014d83cfabf381cfd740906b132d9532d319da..730f69b5aceae5ea6e40482c931eda3e6e29b651 100644 (file)
--- a/mutopia/W.A.Mozart/horn-concerto-3.ly
+++ b/mutopia/W.A.Mozart/horn-concerto-3.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 }
 
 
-\version "1.0.3";
+\version "1.0.4";
 
 allegro =
        \notes
@@ -359,7 +359,7 @@ rondo = \notes      \relative c'
        c4 r8 r4 r8
 }
 
-default_paper = \include "part-paper.ly"
+ \include "part-paper.ly"
 
 \score
 {

diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index cd7a5d0eb1b4370fc77c5a8acb536c3ef42822b3..978b8bcc899d6a8a2362013d1fb3aeb1a8a88f6d 100644 (file)
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
-\version "1.0.3";
+\version "1.0.4";
 
 vi1=\notes \relative c'' {
   \time 4/4;

diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly
index 29bc8a371efb6298acfee0a911fb2516fc9d2ce3..d3c21e22a9c0e7e0949f23530ec1d060c0050f8e 100644 (file)
--- a/mutopia/los-toros-oboe.ly
+++ b/mutopia/los-toros-oboe.ly
@@ -8,7 +8,7 @@ enteredby =      "jcn";
 copyright =     "public domain";
 latexheaders=    "headers";
 } 
-\version "1.0.3";
+\version "1.0.4";
 
 %{
 Silly latex file dropped; use ly2dvi

diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly
index 1525accfd8ee9edce4468e9d0c98b87cdc25a1f1..77b00acb9facd8c0709301fa762c00d209435d3f 100644 (file)
--- a/mutopia/standchen-16.ly
+++ b/mutopia/standchen-16.ly
@@ -9,6 +9,6 @@ description = "A schubert song in 16 pt";
 copyright =     "public domain";
 } 
 
-\version "1.0.3";
+\version "1.0.4";
 
 \include "standchen.ly"

diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly
index 4ffffeaae86dfe47085b72fd67064e9f65c1e7e1..15d0d84dc72064ce67a920d454df42ff63103f75 100644 (file)
--- a/mutopia/standchen-20.ly
+++ b/mutopia/standchen-20.ly
@@ -9,7 +9,7 @@ copyright =      "public domain";
 description = "A schubert song in 20 pt";
 } 
 
-\version "1.0.3";
+\version "1.0.4";
 
 % fool make-website
 % \include "standchen.ly";

diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly
index fdd3ee056e06701c9ebd88b6c2d7b3d2dfe0c44e..90997fbbe2af752d9fb00f6a2b1d38429fea5944 100644 (file)
--- a/mutopia/standchen.ly
+++ b/mutopia/standchen.ly
@@ -16,7 +16,7 @@ multiple \paper{}s in one \score
 Note: Original key F.
 %}
 
-\version "1.0.3";
+\version "1.0.4";
 
 $vocal_verse1 = \notes\relative c{
        % ugh: treble/bass

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index 4fa4ecdffb14df7aa4d1924241e0e4e05c209287..b12167c7eedf66325f84426b618cc87dc3f719a9 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -189,6 +189,16 @@ if 1:
                return newlines
        
        conversions.append ((1,0,3), conv, '\melodic -> \notes\n')
+if 1:
+       def conv(lines):
+               newlines =[]
+               for x in lines:
+                       x =  regsub.gsub ('default_paper *=', '',x)
+                       x =  regsub.gsub ('default_midi *=', '',x)                      
+                       newlines.append (x)
+               return newlines
+       
+       conversions.append ((1,0,4), conv, 'default_{paper,midi}\n')
 
 
 ############################
@@ -215,7 +225,6 @@ def do_conversion (infile, from_version, outfile, to_version):
                        lines = x[1] (lines)
                        last_conversion = x[0]
                        
-               sys.stderr.write ('\n')
 
        except FatalConversionError:
                sys.stderr.write ('Error while converting; I won\'t convert any further')
@@ -267,6 +276,7 @@ def do_one_file (infile_name):
                os.rename (infile_name, infile_name + '~')
                os.rename (infile_name + '.NEW', infile_name)
 
+       sys.stderr.write ('\n')
 
 edit = 0
 to_version = ()

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index 915ff84e5b0bad3243a879be7573b7c01a627237..df23a2fb43e5414e3946c2241ad1ba7d07274413 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -14,4 +14,4 @@ $(outdir)/%.log: %.mf
 $(outdir)/%.tfm: %.mf
        mf '\mode:=ljfour;  input $<;'
        mv $(@F) $(outdir)
-       rm $(basename $<).gf $(basename $<).log
+       rm $(basename $<).*gf $(basename $<).*log

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index bec5af39ffcd2f4e62c8fec5271f5f4b895e87b9..22411bb56fe90e6e406b6f447dfdf1b5de215e72 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -234,6 +234,6 @@
         \message{footer defined}%
         \csname lilyfooter\texsuffix\endcsname
 \else
-        \message{page empty!}
+        \message{footer empty!}
         \csname nolilyfooter\texsuffix\endcsname
 \fi