patch::: 1.0.8.jcn1: lelie

pl 8.jcn1
	- removed tutorial from texinfo, yodl2texinfo is still rather broken
	- bf: setlocale NUMERIC to 'C'
	- removed ugly space from print-dimen

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index da3fe6bb3cf90bad1f785e46a999d498fbbe5020..bbf1a8028bfcb4e96e7486f0a286b547783d1551 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -794,5 +794,3 @@ for example code("1.0.4").
 
 )
 
-
-

diff --git a/Documentation/topinfo.yo b/Documentation/topinfo.yo
index 0eff2fc942aab73156a73aff465db4bfe9005ab6..ddb3c98fc209fccabdb0ec7c4989e6d31869b9d0 100644 (file)
--- a/Documentation/topinfo.yo
+++ b/Documentation/topinfo.yo
@@ -17,6 +17,13 @@ redef(manpagesection)(1)(sect(ARG1))
 COMMENT(redef(includefile)(1)(INCLUDEFILE(man/ARG1)))
 includefile(programs.yo)
 
+COMMENT(
+
+  Urg fooling nodeprefix for tutorial article still doesn't work...
+
+  I guess this is broken anyway, yodl2texinfo-post should make sure
+  node names + (menu) references are unique and consistent.
+
 COMMENT(prepare for texinfoing articles)
 redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
 redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial))
@@ -24,6 +31,8 @@ redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial))
 redef(includefile)(1)(INCLUDEFILE(tex/ARG1))
 includefile(tutorial.yo)
 
+)
+
 COMMENT(prepare for texinfoing articles)
 redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1))
 redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia))

diff --git a/NEWS b/NEWS
index fcd4d080ee09c4e83843fad29d3f9c8aadb46acc..92a7f7e0e9f139750381ec9fed53758fa3a4769a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 8.jcn1
+       - removed tutorial from texinfo, yodl2texinfo is still rather broken
+       - bf: setlocale NUMERIC to 'C'
+       - removed ugly space from print-dimen
+
 pl 8
        - make website fixes.
 

diff --git a/VERSION b/VERSION
index db7269b5936056b25cfe62518242ca9261cb9988..33a757b0b9f640b4b510f5392da5c11ad866ac88 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/a.ly b/input/test/a.ly
index 31f665f3e3dcbd038a45a42b8fc1ad9f17c101ee..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/input/test/a.ly
+++ b/input/test/a.ly
@@ -1,54 +0,0 @@
-\header{
-enteredby =     "jcn";
-copyright =     "PD";
-TestedFeatures =        "This file tests Feta embedded slurs"
-        "(Feta definitively is not an abbreviation of Font-En-TjA)";
-}
-
-\version "1.0.2";
-
-shortlong = \melodic\transpose c'{
-       c4()c( c c  |
-       c c c c |
-       c c c c |
-       \break
-       c c c )c |
-}
-
-sl = \melodic\transpose c''{
-
-%      e4()e( a e  |
-       e4 e( a e  |
-       e e e e |
-       e e e a |
-       \break
-       e e g )e |
-}
-
-broken = \melodic\transpose  c'' {
-      c c c c()
-      c c c c(
-      c )c c c(
-      c c )c c(
-      )a' a' a' a'()
-      a' a' a' a'()
-      c( c c )c 
-      c( c c )f, 
-      f,( c c )c 
-      f,( c c )f,
-}
-
-\score{
-       \melodic{ 
-               \shortlong
-               \sl
-               \broken
-       }
-       \paper{ 
-             indent = 0.0\pt;
-               %for broken!
-%              linewidth= 30.\mm;
-               castingalgorithm = \Wordwrap;
-       }
-}
-

diff --git a/lily/VERSION b/lily/VERSION
index db7269b5936056b25cfe62518242ca9261cb9988..33a757b0b9f640b4b510f5392da5c11ad866ac88 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/dimen.cc b/lily/dimen.cc
index d309241e23e94b7c62b34d37a33fdad713bf9bf6..a03b01caf2a210a61ac9f2b527c5dbf021e80647 100644 (file)
--- a/lily/dimen.cc
+++ b/lily/dimen.cc
@@ -40,7 +40,7 @@ print_dimen (Real r)
       warning (_ ("NaN"));
       s = "0.0";
     }
-  s += "pt ";
+  s += "pt";
   return s;
 }
 

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 76255075541ea97b08a04c145e92575f3aad7024..1624a42b467f482c1a4b5940f5a2bc166d67fb33 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -337,13 +337,13 @@ Lookup::vbrace (Real &y) const
   if (y < min_y)
     {
       warning (_ ("piano brace") 
-       + " " + _ ("too small") +  "(" + print_dimen (y) + ")");
+       + " " + _ ("too small") +  " (" + print_dimen (y) + ")");
       y = min_y;
     }
   if (y > max_y)
     {
       warning (_ ("piano brace")
-       + " " + _ ("too big") + "(" + print_dimen (y)+ ")");
+       + " " + _ ("too big") + " (" + print_dimen (y) + ")");
       y = max_y;
     }
 
@@ -388,13 +388,13 @@ Lookup::vbracket (Real &y) const
   if (y < min_y)
     {
       warning (_ ("bracket")
-       + " " + _ ("too small") +  "(" + print_dimen (y) + ")");
+       + " " + _ ("too small") +  " (" + print_dimen (y) + ")");
       y = min_y;
     }
   if (y > max_y)
     {
       warning (_ ("bracket")
-       + " " + _ ("too big") + "(" + print_dimen (y)+ ")");
+       + " " + _ ("too big") + " (" + print_dimen (y) + ")");
       y = max_y;
     }
 

diff --git a/lily/main.cc b/lily/main.cc
index 4adc7f4ef3f8c4fd0c5122fbd2bab32c59044be4..5467b79e21080151d91b05299eb290a48604e5c1 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -189,8 +189,8 @@ main (int argc, char **argv)
     prefix_directory = env_lily;
 
 #if HAVE_GETTEXT
-  setlocale (LC_ALL, "");
-//  setlocale (LC_MESSAGES, "");
+  setlocale (LC_ALL, ""); /* enable locales */
+  setlocale (LC_NUMERIC, "C"); /* musn't have comma's in TeX output... */
   String lily_locale_dir;
   String name (PACKAGE);
   name.to_lower ();

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index 8c692d5e702f82ad6e3f58715d14391117d72b3b..7bc711f2eeeb9e6c58a4c43a2bca20d7e98c3a3a 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -77,3 +77,4 @@
 1.0.7.uu1
 1.0.8.uu1
 1.0.8
+1.0.8.jcn1

diff --git a/mi2mu/main.cc b/mi2mu/main.cc
index 20e1866a43d898db08c51ec2ce9d97d32d736536..79e559bafc752dcad63687728bf997d37d598399 100644 (file)
--- a/mi2mu/main.cc
+++ b/mi2mu/main.cc
@@ -130,8 +130,8 @@ main (int argc_i, char* argv_sz_a[])
 {
 
 #if HAVE_GETTEXT
-  setlocale (LC_ALL, "");
-//  setlocale (LC_MESSAGES, "");
+  setlocale (LC_ALL, ""); /* enable locales */
+  setlocale (LC_NUMERIC, "C"); /* musn't have comma's in output */
   String name (PACKAGE);
   name.to_lower ();
   bindtextdomain (name.ch_C (), DIR_LOCALEDIR);