From 277d986b4aa1172813b9a2a7a4daa86983d26d73 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 14 Aug 2000 10:00:14 +0200 Subject: [PATCH] release: 1.3.78 =========== * Added a devnull engraver, that junks (notehead) requests of the second stem when combined parts are in unison (a2). * Part-combine iterator identifies Soli and A2 parts in threads by looking at rhythm and pitches. It switches Voice context automagically, and communicates current state using a2/solo/solo2 properties. * Simple A2_engraver (`a due) prints `a2/Solo/Solo II. Soli seem to arrive one request late. * First try at combining parts: part-combine* * fixed problem with HaraKiri * fixed problem with dynamicDirection * fixed problem with nonEmptyText * `Fixed' chord notation, as per request of David Arnold, ie, Added a chord-name-mode, that only displays chord names when there's a change in the chord-name-scheme, Also, a chord name should always be displayed after a line break. See input/test/drarn-chords.ly * Reverted duration-iter change in midi2ly, moved printing of options. * warning bugfix in lexer.ll (Mats Bengtsson) 1.3 --- CHANGES | 47 ++--------------------------- Documentation/regression-test.tely | 16 ++++------ Documentation/user/glossary.tely | 4 +-- Documentation/user/mudela-book.tely | 20 ++++++------ Documentation/user/properties.itely | 4 +-- Documentation/user/refman.itely | 11 +++++-- VERSION | 4 +-- input/GNUmakefile | 2 +- input/test/non-empty-text.ly | 14 ++------- lily/lexer.ll | 2 +- lily/mark-engraver.cc | 2 +- make/out/lilypond.lsm | 8 ++--- make/out/lilypond.spec | 4 +-- 13 files changed, 45 insertions(+), 93 deletions(-) diff --git a/CHANGES b/CHANGES index a08e18215c..d46d267c6c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,20 +1,9 @@ ---- ../lilypond-1.3.77.jcn4/CHANGES Sun Aug 13 23:23:46 2000 -++ b/CHANGES Mon Aug 14 00:44:16 2000 -@@ -1,3 +1,9 @@ 1.3.77.jcn5 =========== * Added a devnull engraver, that junks (notehead) requests of the second stem when combined parts are in unison (a2). - 1.3.77.jcn4 - =========== - --- ../lilypond-1.3.77.jcn3/CHANGES Sun Aug 13 20:05:00 2000 -++ b/CHANGES Sun Aug 13 23:23:46 2000 -@@ -1,3 +1,14 @@ -1.3.77.jcn4 -=========== - * Part-combine iterator identifies Soli and A2 parts in threads by looking at rhythm and pitches. It switches Voice context automagically, and communicates current state using a2/solo/solo2 properties. @@ -22,38 +11,15 @@ * Simple A2_engraver (`a due) prints `a2/Solo/Solo II. Soli seem to arrive one request late. - - 1.3.77.jcn3 - =========== - --- ../lilypond-1.3.77.jcn2/CHANGES Sun Aug 13 15:50:59 2000 -++ b/CHANGES Sun Aug 13 20:05:00 2000 -@@ -1,3 +1,9 @@ -1.3.77.jcn3 -=========== - * First try at combining parts: part-combine* - * fixed problem with HaraKiri - - * fixed problem with dynamicDirection--- ../lilypond-1.3.77.jcn1/CHANGES Wed Aug 9 23:30:23 2000 -++ b/CHANGES Sun Aug 13 15:50:59 2000 -@@ -1,3 +1,10 @@ * fixed problem with HaraKiri * fixed problem with dynamicDirection * fixed problem with nonEmptyText - - 1.3.77.jcn1 - =========== - --- ../lilypond-1.3.77/CHANGES Tue Aug 8 16:14:36 2000 -++ b/CHANGES Wed Aug 9 23:30:23 2000 -@@ -1,3 +1,15 @@ -1.3.77.jcn1 -=========== - * `Fixed' chord notation, as per request of David Arnold, ie, Added a chord-name-mode, that only displays chord names when there's a change in the chord-name-scheme, Also, a chord @@ -63,14 +29,7 @@ * Reverted duration-iter change in midi2ly, moved printing of options. - 1.3.77 - ====== - 1.3.77.mb1 -========== - -* Minor documentation updates - -* Mark_engraver: has been broken since .73, fixed! +* warning bugfix in lexer.ll (Mats Bengtsson) 1.3.77 ====== @@ -111,14 +70,14 @@ 1.3.76 ====== -* Lyric_phrasing_engraver now adjusts for melisma. (Glenn Prideaux). +* Lyric_phrasing_engraver now adjusts for melisma. (Glen Prideaux). * Mudela-book fix for Windows95 (Mark Hindley) * Debian update (Anthony Fok) * Added beam melisma for when automaticMelismata and noAutoBeaming are both - #t (primarily for hymns). Courtesy Glenn Prideaux. + #t (primarily for hymns). Courtesy Glen Prideaux. * Bugfix: .pfa dependency on $(outdir)/mfplain.mem diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 92e800117b..b147b1d128 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -353,22 +353,18 @@ Fonts are available in a default set of sizes: 11, 13, 16, 20, 23 and 26pt staffheight. Sizes of the text fonts and symbol fonts are made to match the staff dimensions. -FIXME +@mudelafile[nonfragment]{size11.ly} -@ignore -@c nofly broken -@mudelafile[nofly]{size11.ly} +@mudelafile[nonfragment]{size13.ly} -@mudelafile[nofly]{size13.ly} +@mudelafile[nonfragment]{size16.ly} -@mudelafile[nofly]{size16.ly} +@mudelafile[nonfragment]{size20.ly} -@mudelafile[nofly]{size20.ly} +@mudelafile[nonfragment]{size23.ly} -@mudelafile[nofly]{size23.ly} +@mudelafile[nonfragment]{size26.ly} -@mudelafile[nofly]{size26.ly} -@end ignore @section Clefs and Time Signatures diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 96f04614f2..81e16eb771 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -147,10 +147,10 @@ the duration of the long a. is proportionate to that of the main note. \key d \major; \time 4/4; r -{ \property Grace.flagStyle = "" +{ \property Grace.stemStyle = "" \grace g16 } fis8 e16 fis -{ \property Grace.flagStyle = "" +{ \property Grace.stemStyle = "" \grace a16 } g8 fis16 g | a4 \bar "||"; } \notes\relative c'' { diff --git a/Documentation/user/mudela-book.tely b/Documentation/user/mudela-book.tely index e9953bcbce..6c7bdacef2 100644 --- a/Documentation/user/mudela-book.tely +++ b/Documentation/user/mudela-book.tely @@ -163,9 +163,9 @@ eps graphics and include it into the document with the The code used look like this: @example -@mudela[eps] +@@mudela[eps] -@end mudela +@@end mudela @end example You can also use the @code{eps} option if the block is a complete @@ -178,12 +178,12 @@ mudela source. This 5 cm long empty line, @end mudela was created with this code: @example -@mudela[eps] -\score{ - \notes{s} - \paper{ linewidth = 5.\cm;} -} -@end mudela +@@mudela[eps] +\score@{ + \notes@{s@} + \paper@{ linewidth = 5.\cm;@} +@} +@@end mudela @end example To avoid that La@TeX{} places the music on a line of its one, there should @@ -199,9 +199,9 @@ included in the middle of the text, 11pt or 13pt is probably better. The code can look like this: @example -@mudela[13pt, eps] +@@mudela[13pt, eps] -@end mudela +@@end mudela @end example The following options set the fontsize: diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely index 670b0add03..bf638acd41 100644 --- a/Documentation/user/properties.itely +++ b/Documentation/user/properties.itely @@ -87,7 +87,7 @@ TODO: @table @samp - @item @code{flagStyle}@indexcode{flagStyle} @propertytype{string} + @item @code{stemStyle}@indexcode{flagStyle} @propertytype{string} By default set to @code{"grace"} meaning that all unbeamed notes with flags are typeset with a slash through the flag. Setting to @code{""} gives standard flags. @@ -120,7 +120,7 @@ c'8 \property Voice.flagStyle = "grace" c'8 directions marked with `@code{^}' or `@code{_}' in the mudela file. @item @code{noAutoBeaming}@indexcode{beamAuto} @propertytype{boolean} - If set to true then beams are not generated automatically. + If set to 1 then beams are not generated automatically. @item @code{beamAutoEnd}@indexcode{beamAutoEnd} @propertytype{?} Specifies when automatically generated beams can end. See diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index c606b6cb5b..3d98430b1a 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1624,14 +1624,14 @@ example) have a separate time signature within grace notes. While in this score-within-a-score, you can create notes, beams, slurs, etc. Unbeamed eighth notes and shorter by default have a slash through the stem. This behavior can be controlled with the -@code{flagStyle}@indexcode{flagStyle} property. +@code{stemStyle}@indexcode{stemStyle} property. @quotation @mudela[fragment,verbatim] \relative c'' { \grace c8 c4 \grace { [c16 c16] } c4 - \grace { \property Grace.flagStyle = "" c16 } c4 + \grace { \property Grace.stemStyle = "" c16 } c4 } @end mudela @@ -2487,6 +2487,13 @@ Nevertheless, here are some variables you may want to use or change: @item @code{interscoreline}@indexcode{interscoreline} Sets the spacing between the score lines. Defaults to 16 pt. + @item @code{textheight}@indexcode{textheight} + Sets the total height of the music on each page. Only used by + ly2dvi. + + @item @code{interscoreline}@indexcode{interscoreline} + Sets the spacing between the score lines. Defaults to 16 pt. + @item @code{output}@indexcode{output} Specifies an alternate name for the the output @file{s}. A @file{.tex}, @file{.midi} or @file{.ps} extension will be diff --git a/VERSION b/VERSION index 5d097db96e..ba678f5afe 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=77 -MY_PATCH_LEVEL=jcn5 +PATCH_LEVEL=78 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/GNUmakefile b/input/GNUmakefile index b4ad54448b..f9ab946b3a 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -4,7 +4,7 @@ depth = .. SUBDIRS=test bugs tutorial -examples=trip star-spangled-banner paddy scarlatti-edited +examples=trip star-spangled-banner paddy scarlatti-test flexamples= LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly index 6244598991..7054d872f6 100644 --- a/input/test/non-empty-text.ly +++ b/input/test/non-empty-text.ly @@ -4,20 +4,10 @@ % \score{ \notes\relative c''{ - %\property Staff.textEmptyDimension=1 - a-"This text has no" - a - a - a-"width; the default" - \break \property Staff.textNonEmpty=##t - %\property Staff.textEmptyDimension=0 - a-"This text" - a-"is fat: notes are spaced" - a-"far apart and text" - a-"does not collide" + c4_"longlonglonglonglonglong" c4_"text" } \paper{ - linewidth=80.\mm; + linewidth=-80.\mm; } } diff --git a/lily/lexer.ll b/lily/lexer.ll index 9be2c94085..90f4ba43f4 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -325,7 +325,7 @@ HYPHEN -- } char c = s[s.length_i () - 1]; - if (c == '{' && c == '}') // brace open is for not confusing dumb tools. + if (c == '{' || c == '}') // brace open is for not confusing dumb tools. here_input ().warning ( "Brace found at end of lyric. Did you forget a space?"); yylval.scm = ly_str02scm (s.ch_C ()); diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index b57bafa3e2..0f2df8fcdf 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -163,7 +163,7 @@ Mark_engraver::do_process_music () */ SCM m = mark_req_l_->get_mus_property ("label"); - if (!gh_string_p (m)) + if (gh_string_p (m)) m = get_property ("rehearsalMark"); ; diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 5090147999..f2b42a8d39 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.77 -Entered-date: 08AUG00 +Version: 1.3.78 +Entered-date: 14AUG00 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.77.tar.gz + 1000k lilypond-1.3.78.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.77.tar.gz + 1000k lilypond-1.3.78.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 8488b4b3a3..2f5db13803 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.77 +Version: 1.3.78 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.77.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.78.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif -- 2.39.5