From: Han-Wen Nienhuys Date: Wed, 17 Jan 2001 13:46:27 +0000 (+0100) Subject: release: 1.3.123 X-Git-Tag: release/1.3.123 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=85646c3e985f43a99bc23cfd28cbfbd46405a93f;p=lilypond.git release: 1.3.123 =========== * Added macro \turnOff to remove volta brackets or any other graphical objects, see input/test/volta.ly or mutopia/J.S.Bach/pa.ly * Removed the "none" clef, use Clef \override #'transparent = ##t instead. * Bugfix ly2dvi: paper variable orientation = "landscape" works. * Allow for wildcards in the font style alist to give more robust font selection handling. Ignore shape and series for the font families: braces, dynamic and music. * Bugfix: stem and dstem font symbol. 1.3.122.j --- diff --git a/CHANGES b/CHANGES index 1f55d48cc8..336570857f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,64 +1,43 @@ ---- ../lilypond-1.3.122.jcn3/CHANGES Tue Jan 16 22:33:27 2001 -++ b/CHANGES Wed Jan 17 14:13:30 2001 -@@ -1,7 +1,13 @@ -1.3.122.jcn4 -============ +1.3.122.mb2 +=========== -* More website link fixes, split and nonsplit. +* Added macro \turnOff to remove volta brackets or any other + graphical objects, see input/test/volta.ly or mutopia/J.S.Bach/pa.ly - 1.3.122.jcn3 - ============ - - * Non-splitting makeinfo website fix. +* Removed the "none" clef, use Clef \override #'transparent = ##t instead. - - 1.3.122.jcn2 - ============--- ../lilypond-1.3.122.jcn2/CHANGES Wed Jan 10 18:35:53 2001 -++ b/CHANGES Tue Jan 16 22:33:27 2001 -@@ -1,3 +1,8 @@ -1.3.122.jcn3 -============ - -* Non-splitting makeinfo website fix. - - 1.3.122.jcn2 - ============ - --- ../lilypond-1.3.122/CHANGES Tue Jan 9 20:00:34 2001 -++ b/CHANGES Thu Jan 11 01:26:23 2001 -@@ -1,3 +1,10 @@ -1.3.122.mb1 -=========== +* Bugfix ly2dvi: paper variable orientation = "landscape" works. * Allow for wildcards in the font style alist to give more robust font - selection handling. Ignore shape and series for the font families: - braces, dynamic and music. +selection handling. Ignore shape and series for the font families: +braces, dynamic and music. - 1.3.121.hwn1 - ============ - 1.3.122.jcn2 +* Bugfix: stem and dstem font symbol. + +1.3.122.jcn3 ============ +* More website link fixes, split and nonsplit. + +* Non-splitting makeinfo website fix. + * Doco fixes, included feature document into main documentation. -* lily/chord.cc (member_notename): - (lower_pitch): gh_member returns a list of which car is -the member! +* lily/chord.cc (member_notename, lower_pitch): gh_member returns a list of +which car is the member! * Bugfix: added equal_p to list of smob functions. This fixes behaviour of property chordChanges. * More guile-1.4.1 snapshot fixes, generated doco. -1.3.122.jcn1 -============ - * Doco fixes. * Small fixes for guile-1.4.1 snapshot which is more strict on symbols vs strings. -1.3.121.hwn1 -============ +1.3.122 +======= * Small lilypond-book cleanups. @@ -3508,8 +3487,5 @@ pl 15.hwn1 pl 15.jcn4 - direct #... to scm parser (Thanks to Gary Houston) -Local variables: -mode: change-log -left-margin: 0 -End: + diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 604b23b5b6..2259ace7e6 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -79,8 +79,8 @@ LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html deep-symlinks: cd $(outdir) && rm -f lilypond && ln -s . lilypond cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals - cd $(outdir) && $(foreach i, $(LILYPOND_LINKS), - rm -f $(i) && ln -s $(i) lilypond.html &&) && : + cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\ + rm -f $(i) && ln -s $(i) lilypond.html &&) true endif diff --git a/Documentation/user/features.tely b/Documentation/user/features.tely deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/ly2dvi.texi b/Documentation/user/ly2dvi.texi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/midi2ly.texi b/Documentation/user/midi2ly.texi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/VERSION b/VERSION index 9bd5603454..6509481f50 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=122 -MY_PATCH_LEVEL=jcn4 +PATCH_LEVEL=123 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index a4ee1e373d..339826fb6b 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -152,7 +152,7 @@ text = \lyrics { \context Staff=lower < \global \clef bass; - \property Staff.noVoltaBraces = ##t + \property Staff.VoltaBracket = \turnOff \context Voice = three { \stemUp \staffCVoiceB diff --git a/input/test/volta.ly b/input/test/volta.ly index 4a038334d4..927fe285d8 100644 --- a/input/test/volta.ly +++ b/input/test/volta.ly @@ -6,6 +6,8 @@ voiceE = \notes { \clef bass; \property Staff.instrument = "Bass" \property Staff.instr = "B" +% \property Staff.VoltaBracket = \turnOff + \time 4/4; f,2 ( ) f,8 r8 f8 e8 \repeat volta 2 { diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 51b98eef5c..c281756c45 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -203,7 +203,7 @@ Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain) warning (_("couldn't find any font satisfying ") ); scm_write (gh_list (name, point_sz, shape, series , family, rel_sz, SCM_UNDEFINED), scm_current_error_port ()); scm_flush(scm_current_error_port ()); - + return ly_str02scm ("cmr10"); } diff --git a/ly/property.ly b/ly/property.ly index f51b8c8519..95ba08ca18 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -86,3 +86,7 @@ autoBeamOn = \property Voice.noAutoBeaming = ##f emptyText = \property Voice.textNonEmpty = ##f fatText = \property Voice.textNonEmpty = ##t +% To remove a Volta bracet or some other graphical object, +% set it to turnOff. Example: \property Staff.VoltaBracket = turnOff + +turnOff = #'((meta . ((interfaces . ())))) diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 4c843c0fbf..399723d8dc 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.122 -Entered-date: 09JAN01 +Version: 1.3.123 +Entered-date: 17JAN01 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.122.tar.gz + 1000k lilypond-1.3.123.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.122.tar.gz + 1000k lilypond-1.3.123.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index ade526eb40..8439b52bee 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.122 +Version: 1.3.123 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.122.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.123.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 482d993f8f..4795c82513 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -17,11 +17,10 @@ right_downflag_space# = .2 downflag_width#; % Flags pointing down cannot overlap with the notehead in y-direction, % so they have less slant. -% % Because of optical illusion, the utmost flag (bottom for % down-pointing, top for up-pointing) should be smaller than the other -% flags. Adobe Sonata doesn't do this correctly. (Instead they have an -% extension flag. Yuck) +% flags. Adobe Sonata doesn't do this correctly. (Instead they have +% an extension flag, which looks less elegant) % save hip_thickness, foot_thickness; @@ -433,6 +432,12 @@ fet_beginchar("grace dash (down)", "dgrace", "dgracedash") fet_endchar; % ustem? +% +% +% Stem characters so we can compose metronome markings with Feta +% entirely. +% + fet_beginchar("stem (up)", "stem", "stem") set_char_box(stemthickness#/2, stemthickness#/2, 0, 3.5staff_space#); pickup pencircle scaled stemthickness; diff --git a/mutopia/J.S.Bach/pa.ly b/mutopia/J.S.Bach/pa.ly index 94132512ba..456e79f926 100644 --- a/mutopia/J.S.Bach/pa.ly +++ b/mutopia/J.S.Bach/pa.ly @@ -1,3 +1,4 @@ +\version "1.3.122" \header { filename = "pa.ly"; title = "Wachet auf, ruft uns die Stimme"; @@ -11,8 +12,8 @@ commands = \notes { \time 4/4; - \property Staff.timeSignatureStyle = "C" - \key es; + \property Staff.TimeSignature \override #'style = #'C + \key es \major; \partial 8; } @@ -24,7 +25,7 @@ right = \notes \relative c' { %if stable % \property Voice."beamAutoEnd_8" = "1/4" - \property Voice."beamAutoEnd_8" = #(make-moment 1 4) + \property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4) bes8 | es16 f g8 g f as g bes, as | \repeat "volta" 2 { @@ -34,7 +35,7 @@ right = \notes \relative c' { bes4 as16 g f es f es d c bes8 c16 d | es f g f as g f es g8 f r bes, | g' a4 bes8 \grace f8()es16 d es8 r c | - a'8 bes4 c8 \grace f,()es16 d es8 r \grace{\slurdown [c'16( d ]}\stemboth)es8 | + a'8 bes4 c8 \grace f,()es16 d es8 r \grace{\slurDown [c'16( d ]}\stemBoth)es8 | d16 c bes8 bes16\prall a bes8 ~bes16 a g f es d c bes| c d es8 \grace f()es16 d es8~es16 a bes c bes a g f | bes8 f d\trill c16 bes bes es d c d8 bes| @@ -50,11 +51,11 @@ right = \notes \relative c' { } \alternative { { g8 f r4 r r8 bes,| es16 f g8 g f as g bes, as } - { g'8 f r4 r r8 bes | } } - bes4 as16 g f es f es d c bes8 c16 d | + { g8 f r4 r r8 bes | } } + bes'4 as16 g f es f es d c bes8 c16 d | es f g f as g f es g8 f r bes, | - g' a4 bes8 \grace f() es16 d es8 r c | - a' bes4 c8 \grace f,()es16 d es8 r es' | + g' a4 bes8 \grace {f(}) es16 d es8 r c | + a' bes4 c8 \grace {f,(})es16 d es8 r es' | d16 c bes8 bes16\prall a bes8~bes16 a g f es d c bes| c d es8 es16\prall d es8~es16 a bes c bes a g f| bes8 f d\trill c16 bes bes es d c d8 bes| @@ -116,8 +117,9 @@ left = \notes \relative c { %if stable % \property Staff.noVoltaBraces = 1 % \property Voice."beamAutoEnd_8" = "1/4" - \property Voice."beamAutoEnd_8" = #(make-moment 1 4) - \property Staff.noVoltaBraces = ##t + \property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4) +% \property Staff.noVoltaBraces = ##t + \property Staff.VoltaBracket = \turnOff r8 R1 \repeat "volta" 2 { @@ -133,8 +135,8 @@ left = \notes \relative c { } \alternative { { c g8. as32 bes as8 g f4\trill| es2 r | } - { c'4 g8. as32 bes as8 g f4\trill |} } - es2 r | + { c4 g8. as32 bes as8 g f4\trill |} } + es,2 r | R1*6 | r2 r4 bes'4| bes as g f\trill | @@ -161,7 +163,8 @@ pedal = \notes \relative c, { \commands %if stable % \property Staff.noVoltaBraces = 1 - \property Staff.noVoltaBraces = ##t +% \property Staff.noVoltaBraces = ##t + \property Staff.VoltaBracket = \turnOff \clef "bass"; r8 | es4 es es g @@ -187,7 +190,7 @@ pedal = \notes \relative c, { bes as! g es |} \alternative { { as8 bes c4 f, bes8 as| g4 es' d es |} - { as,8 bes c4 f, bes8 as}} + { as8 bes c4 f, bes8 as}} g4 c bes as | g es bes' d| es d c es| @@ -248,8 +251,9 @@ pedal = \notes \relative c, { \paper { %textheight = 280.0 \mm; % landscape: - textheight = 160.0 \mm; - linewidth = 290.0 \mm; +% textheight = 160.0 \mm; + orientation = "landscape"; + linewidth = 280.0 \mm; %{ \translator { \OrchestralScoreContext diff --git a/scm/clef.scm b/scm/clef.scm index 1f90908b2e..75451eafe2 100644 --- a/scm/clef.scm +++ b/scm/clef.scm @@ -19,7 +19,6 @@ ("bass" . ("clefs-F" 2 0)) ("F" . ( "clefs-F" 2 0)) ("subbass" . ("clefs-F" 4 0)) - ("none" . ("" 0 0)) ;; should move mensural stuff to separate file? ("vaticana_do1" . ("clefs-vaticana_do" -1 0)) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 5df8c7ed28..00ce2e48af 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -143,13 +143,13 @@ class Input: varTable = [ # regexp set method # ------ ---------- - ( 'language', Props.setLanguage ), - ( 'latexheaders', Props.setHeader ), - ( 'orientation', Props.setOrientation ), - ( 'paperpapersize', Props.setPaperZize ), - ( 'papertextheight', Props.setTextHeight ), - ( 'paperlinewidth', Props.setLineWidth ), - ( 'filename', Props.setFilename ), + ( 'language', Props.setLanguage ), + ( 'latexheaders', Props.setHeader ), + ( 'paperorientation', Props.setOrientation ), + ( 'paperpapersize', Props.setPaperZize ), + ( 'papertextheight', Props.setTextHeight ), + ( 'paperlinewidth', Props.setLineWidth ), + ( 'filename', Props.setFilename ), ] titles={}