From: Jan Nieuwenhuizen Date: Tue, 15 Sep 1998 15:16:07 +0000 (+0200) Subject: patch::: 1.0.8.jcn1: lelie X-Git-Tag: release/1.0.9~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=be45833244069bb5856b6e6ebe7132e60d430299;p=lilypond.git 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 da3fe6bb3c..bbf1a8028b 100644 --- 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 0eff2fc942..ddb3c98fc2 100644 --- 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 fcd4d080ee..92a7f7e0e9 100644 --- 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 db7269b593..33a757b0b9 100644 --- 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 31f665f3e3..e69de29bb2 100644 --- 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 db7269b593..33a757b0b9 100644 --- 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 d309241e23..a03b01caf2 100644 --- 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 7625507554..1624a42b46 100644 --- 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 4adc7f4ef3..5467b79e21 100644 --- 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 8c692d5e70..7bc711f2ee 100644 --- 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 20e1866a43..79e559bafc 100644 --- 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);