]> git.donarmstrong.com Git - lilypond.git/commitdiff
release: 1.3.142 release/1.3.142
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Sat, 24 Mar 2001 23:48:29 +0000 (00:48 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sat, 24 Mar 2001 23:48:29 +0000 (00:48 +0100)
============

* some mup2ly progress.

* Bugfix: ly2dvi: don't include empty set fo latexheaders, don't use
python-1.5.2 abspath func.

* Setup for new mup converter, based on pmx2ly.

* Bugfix: lilypond-book: accept \documentclass{article}.

* scripts/update-lily.py: fancy source rebuild update tool that we're
probably not going to use on www.lilypond.org.  Check it out!

* Bugfix: building of topdocs.

1.3.141.h

92 files changed:
CHANGES
Documentation/regression-test.tely
Documentation/user/refman.itely
Documentation/user/tutorial.itely
FAQ.txt
INSTALL.txt
VERSION
buildscripts/mf-to-table.py
input/GNUmakefile
input/ascii-art/GNUmakefile [new file with mode: 0644]
input/ascii-art/asciscript5.ly [new file with mode: 0644]
input/ascii-art/r-as.ly [new file with mode: 0644]
input/ascii-art/standchen-as5.ly [new file with mode: 0644]
input/ascii-art/standchen-as9.ly [new file with mode: 0644]
input/ascii-art/twinkle-as5.ly [new file with mode: 0644]
input/bugs/gr-instrument.ly [deleted file]
input/bugs/p.ly [deleted file]
input/denneboom.ly [deleted file]
input/les-nereides.ly
input/minimal.ly [deleted file]
input/no-notation/GNUmakefile [new file with mode: 0644]
input/no-notation/parse.ly [new file with mode: 0644]
input/no-notation/parse2.ly [new file with mode: 0644]
input/no-notation/parse3.ly [new file with mode: 0644]
input/no-notation/parse4.ly [new file with mode: 0644]
input/praeludium-fuga-E.ly
input/regression/arpeggio-collision.ly
input/regression/hairpin-ending.ly [new file with mode: 0644]
input/regression/volta-broken-left-edge.ly
input/scarlatti-paper.ly
input/scarlatti-properties.ly
input/star-spangled-banner.ly
input/test/ac-extra-voice.ly
input/test/as2.ly
input/test/asciscript5.ly [deleted file]
input/test/different-time-signatures.ly
input/test/equaliser.ly
input/test/fake-grace.ly [new file with mode: 0644]
input/test/font-body.ly
input/test/font11.ly
input/test/font13.ly
input/test/font16.ly
input/test/font20.ly
input/test/font26.ly
input/test/hara-kiri.ly
input/test/keys2.ly
input/test/multi-rest.ly [deleted file]
input/test/parse.ly [deleted file]
input/test/parse2.ly [deleted file]
input/test/parse3.ly [deleted file]
input/test/parse4.ly [deleted file]
input/test/pushproperty.ly [deleted file]
input/test/r-as.ly [deleted file]
input/test/repeatbar.ly [deleted file]
input/test/sizes.ly [deleted file]
input/test/slur-mininum.ly
input/test/spacing.ly
input/test/standchen-as5.ly [deleted file]
input/test/standchen-as9.ly [deleted file]
input/test/stem.ly
input/test/tchaikovsky.ly
input/test/tie-minimum.ly [deleted file]
input/test/twinkle-as5.ly [deleted file]
input/test/updown.ly [deleted file]
input/tricks/fragment.ly [deleted file]
input/tricks/smart-transpose.ly
input/tricks/staff-container.ly
input/tutorial/os-music.ly
lily/dynamic-engraver.cc
lily/font-metric.cc
lily/grace-engraver-group.cc
lily/grace-performer-group.cc
lily/hairpin.cc
lily/include/translator.hh
lily/instrument-name-engraver.cc
lily/lexer.ll
lily/note-heads-engraver.cc
lily/parser.yy
lily/score-engraver.cc
lily/score-performer.cc
lily/stem.cc
lily/translator-group.cc
lily/translator.cc
ly/dynamic-scripts.ly
make/out/lilypond.lsm
make/out/lilypond.spec
mf/GNUmakefile
scm/grob-description.scm
scm/grob-property-description.scm
scm/interface-description.scm
scm/translator-property-description.scm
scripts/mup2ly.py

diff --git a/CHANGES b/CHANGES
index 20f294c3525eef303a88e7dea8fb9fdf7ad4fb08..136562020896d35c31d672326a8ecf017a8565e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,4 @@
---- ../lilypond-1.3.141.hwn2/CHANGES   Sun Mar 25 00:23:24 2001
-++ b/CHANGES   Sun Mar 25 13:30:43 2001
-@@ -1,6 +1,11 @@
- 1.3.141.hwn2
- ============
-* property silencedNotes 
-
-1.3.141.hwn2
-============
-
- * Fix: instrument names on piano staffs.
- * Bugfix: don't left-align absolute dynamics.1.3.141.jcn3
+1.3.141.jcn3
 ============
 
 * some mup2ly progress.
@@ -19,9 +6,6 @@
 * Bugfix: ly2dvi: don't include empty set fo latexheaders, don't use
 python-1.5.2 abspath func.
 
-1.3.141.jcn2
-============
-
 * Setup for new mup converter, based on pmx2ly.
 
 * Bugfix: lilypond-book: accept \documentclass{article}.
@@ -31,15 +15,32 @@ probably not going to use on www.lilypond.org.  Check it out!
 
 * Bugfix: building of topdocs.
 
-1.3.141.hwn1
+1.3.141.hwn2
 ============
 
-* doco fixes.
+* Fix: instrument names on piano staffs.
+
+* Bugfix: don't left-align absolute dynamics.
+
+* Bugfix: don't make spacing rods for absolute dynamics.
+
+* Various bugfixes for examples (thanks Laura!).
+
+* Bugfix: clean up of hairpin ending logic. Crescendi start under
+notes now.
+
+* Don't substitute  '\ ' for  '\_' in lyrics. (Suggestion by Roy Rankin)
+
+* In computing text lengths handle the following cases \['`"^_]. (the same)
+
+* Made directories input/no-notation, input/ascii-art
+
+* Doco fixes.
 
 * Beat repeats, double measure repeats; removed repeat sign character
 from the font (WARNING: FONT CHANGED).
 
-* cleanups in (de)crescendo code, fixed continued (de)crescendi.
+* Cleanups in (de)crescendo code, fixed continued (de)crescendi.
 
 * German chords (Rune Zedler)
 
index 0e0180f72f3308dae8c319b4d8d31f24133779bd..7cfcc81e5747e627e678e2607d9b3e54edcd25fc 100644 (file)
@@ -38,7 +38,6 @@ and documenting bugfixes.
 @lilypondfile[printfilename]{accidental-single-double.ly}
 
 
-
 @section Stems
 
 @lilypondfile[printfilename]{stem-tremolo.ly}
@@ -55,15 +54,17 @@ and documenting bugfixes.
 
 @lilypondfile[printfilename]{staccato-pos.ly}
 
-@lilypondfile[printfilename]{dynamics-line.ly}
-
-@lilypondfile[printfilename]{dynamics-broken-hairpin.ly}
-
 @lilypondfile[printfilename]{arpeggio.ly}
 
 @lilypondfile[printfilename]{glissando.ly}
 
-@lilypondfile[printfilename]{follow-thread.ly}
+@section Dynamics
+
+@lilypondfile[printfilename]{dynamics-line.ly}
+
+@lilypondfile[printfilename]{hairpin-ending.ly}
+
+@lilypondfile[printfilename]{dynamics-broken-hairpin.ly}
 
 
 
@@ -80,7 +81,7 @@ and documenting bugfixes.
 
 
 
-@section Beams, slurs and other spanners
+@section Beams
 
 @lilypondfile[printfilename]{beaming.ly}
 
@@ -102,9 +103,12 @@ and documenting bugfixes.
 
 @lilypondfile[printfilename]{triplets.ly}
 
+@section  Slurs 
 
 @lilypondfile[printfilename]{slur-nice.ly}
+
 @lilypondfile[printfilename]{slur-symmetry.ly}
+
 @lilypondfile[printfilename]{slur-symmetry-1.ly}
 
 @lilypondfile[printfilename]{slur-broken-trend.ly}
@@ -117,15 +121,14 @@ and documenting bugfixes.
 
 @lilypondfile[printfilename]{phrasing-slur.ly}
 
+@section Ties
+
 @lilypondfile[printfilename]{tie.ly}
 
 @lilypondfile[printfilename]{tie-chord.ly}
 
 @lilypondfile[printfilename]{tie-accidental.ly}
 
-@lilypondfile[printfilename]{beam-cross-staff.ly}
-
-@lilypondfile[printfilename]{slur-cross-staff.ly}
 
 @lilypondfile[printfilename]{tup.ly}
 
@@ -147,11 +150,7 @@ and documenting bugfixes.
 
 @lilypondfile[printfilename]{repeat-line-break.ly}
 
-@lilypondfile[printfilename]{percent-repeat.ly}
-
-@lilypondfile[printfilename]{auto-change.ly}
-
-
+@lilypondfile[printfilename]{volta-broken-left-edge.ly}
 
 @section Lyrics
 
@@ -189,6 +188,14 @@ and documenting bugfixes.
 
 @section PianoStaff
 
+@lilypondfile[printfilename]{beam-cross-staff.ly}
+
+@lilypondfile[printfilename]{slur-cross-staff.ly}
+
+@lilypondfile[printfilename]{auto-change.ly}
+
+@lilypondfile[printfilename]{follow-thread.ly}
+
 
 
 @section Global stuff
@@ -228,24 +235,6 @@ and documenting bugfixes.
 
 @lilypondfile[printfilename]{keys.ly}
 
-
-@ignore
-@c the input file is too long and does not test for specific bugs
-
-By default, time signatures are written with two numbers. With style
-``C'', 4/4 and 2/2 are written with their corresponding symbols and
-with style ``old'', 2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and
-9/8 are typeset with symbols, all other signatures retain the default
-layout. The style ``1'', gives single number signatures for all
-signatures. 
-%
-\mu delafile{time.ly}
-@end ignore
-
-
-
-
-
 @section Hacks and Features
 
 @lilypondfile[printfilename]{generic-output-property.ly}
index d4c7585affa7df19e4f4f5325ef8ad687e17fc25..ee400db07aa56a89ea7a4efbff59ea6bd58264d3 100644 (file)
@@ -3297,10 +3297,7 @@ relocated, so this can also be used to shorten measures.
 
 A bar check is entered using the bar symbol, @code{|}
 
-@node Speeding up debugging 
-@subsection Speeding up debugging
 
-[TODO: describe skipTypesetting here]
 
 @c .  {Point and click}
 @node Point and click
index 415d95ac8ceb5a59537c9d2ba4620cff276bf91c..f4172bdda125539d88fd11d4f3ddd5e6ee5d4e55 100644 (file)
@@ -13,6 +13,7 @@
 * An orchestral score::         
 * Part extraction::             
 * end of tutorial::             The end
+* Pre-cooked makefile::         
 @end menu
 
 @node Introduction
@@ -1830,12 +1831,9 @@ Music (TM), have a look at the @ref{Mutopia project}.
 
 [TODO figure out what to do with this: ]
 
-@menu
-* Pre-cooked makefile::         
-@end menu
 
 @node Pre-cooked makefile
-@subsection Pre-cooked makefile
+@section Pre-cooked makefile
 
 @c waar deze info?  is uiteindelijk wel handig, schat ik.
 [TODO: cut blabla]
diff --git a/FAQ.txt b/FAQ.txt
index 74053fd0d6b543de250b2550c85bd3796ed4ac93..41feee5f3b31e44d928d3e8e7a58b6de190286b8 100644 (file)
--- a/FAQ.txt
+++ b/FAQ.txt
@@ -68,3 +68,11 @@ releases, in particular the windows32 binaries, are only made every
 once in a while.  They may lag several versions behind the latest
 version.
 
+Beams, slurs and crescendi are not displayed at all!
+----------------------------------------------------
+
+   XDvi uses GhostScript for displaying PostScript, check that you have
+GhostScript installed.  If you use a different DVI viewer (eg, on
+Windows), check if it will display embedded PostScript.  Don't worry,
+the symbols should appear on the printout.
+
index 04c5df23e86ac926b4931d5e03d0c64ba61e7567..386e18a831f70be64944dbcf294b071602f5319d 100644 (file)
@@ -240,6 +240,22 @@ accordingly.
 resulting binaries can be found in the subdirectories `out/' (which
 contain all files generated during compilation).
 
+Emacs mode
+==========
+
+   An emacs mode for LilyPond is included with the source archive as
+`lilypond-mode.el' and `lilypond-font-lock.el'.  If you have an RPM, it
+is in `/usr/share/doc/lilypond-X/'.  You have to install it yourself.
+
+   Add this to your ~/.emacs or ~/.emacs.el:
+         (load-library "lilypond-mode.el")
+         (setq auto-mode-alist
+           (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
+         (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))
+
+   If you have the latest LilyPond-1.3.x Debian package, LilyPond-mode
+is automatically loaded, so you need not modify your ~/.emacs file.
+
 Configuring for multiple platforms
 ==================================
 
@@ -305,6 +321,13 @@ addition to the those needed for running:
 
    * tetex-devel
 
+SuSE
+====
+
+   [TODO: document this]
+
+   Install `tetex', `te_mpost', `te_kpath'.
+
 Debian GNU/Linux
 ================
 
diff --git a/VERSION b/VERSION
index 6c19d310bb14b11dc952004ce66b00e8c2505171..7882a31f642139cb89410c90d6dcb9bc2f09406d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=141
-MY_PATCH_LEVEL=hwn3
+PATCH_LEVEL=142
+MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
index 1dfb64f4e2462a8531109e549b1e46e984a4cf4e..8feec727d6e5a0ac84aec30db29aa3711ce38b6b 100755 (executable)
@@ -44,6 +44,7 @@ class Char_metric:
 
 
 def tfm_checksum (fn):
+       sys.stderr.write ("Reading checksum from `%s'\n" % fn) 
        s = open (fn).read ()
        s = s[ 12 * 2 : ]
        cs_bytes = s[:4]
index e49533f0760c1050b097d3a03ffae130872c959e..b3ceba7c44dece5e15266ea2d08bd152a58217ac 100644 (file)
@@ -2,7 +2,7 @@
 
 depth = ..
 
-SUBDIRS=bugs tricks test regression tutorial
+SUBDIRS=bugs tricks test regression tutorial no-notation ascii-art
 
 examples=trip  star-spangled-banner paddy scarlatti-test
 flexamples=
diff --git a/input/ascii-art/GNUmakefile b/input/ascii-art/GNUmakefile
new file mode 100644 (file)
index 0000000..659a10c
--- /dev/null
@@ -0,0 +1,8 @@
+# input/bugs/Makefile
+
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+include $(depth)/make/stepmake.make 
+
+
diff --git a/input/ascii-art/asciscript5.ly b/input/ascii-art/asciscript5.ly
new file mode 100644 (file)
index 0000000..726b0ca
--- /dev/null
@@ -0,0 +1,19 @@
+
+% ascii art
+
+\include "paper-as5.ly"
+
+\score {
+       \notes\relative c''{
+               \time 4/4;
+               g1 a b c 
+               g2 a b c
+               g4 a b c
+       }
+       \paper {
+               \paperAs_five
+               \translator { \StaffContext barSize = #5 }
+       }
+
+}
+
diff --git a/input/ascii-art/r-as.ly b/input/ascii-art/r-as.ly
new file mode 100644 (file)
index 0000000..09ab543
--- /dev/null
@@ -0,0 +1,19 @@
+
+\score{
+       <
+                 \context Staff \notes\relative c'{ 
+                         c d e f
+                         \repeat "volta" 2 { g a b c }
+                         \alternative { { c b a g } { f e d c } }
+                 }
+                 \context Lyrics \lyrics {
+                         De eer- ste < { maat } { moet } >
+                         \repeat fold 2 { }
+                         \alternative {
+                                 { en dan twee keer } 
+                                 { een koe- plet _ } 
+                         }
+                         en dan nog dit er ach- ter aan
+                 }
+       >
+}
diff --git a/input/ascii-art/standchen-as5.ly b/input/ascii-art/standchen-as5.ly
new file mode 100644 (file)
index 0000000..876c449
--- /dev/null
@@ -0,0 +1,40 @@
+
+% asci art output
+
+
+
+\include "paper-as5.ly"
+
+\score {
+       \context StaffGroup <
+               \context Staff=upper \notes\relative c{
+                       \key f \major;
+                       \time 3/4;
+                       r8^"Moderato" %\pp 
+                       <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
+                       r8 <as-. c-.> <c-. es-.>
+               }
+               \context Staff=lower \notes\relative c{
+                       \key f \major;
+                       \time 3/4;
+                       \clef "bass";
+                       <c,2 c'> r4 
+                       <as2 as'> r4
+               }
+       >
+       \paper {
+%              \paperAs_nine
+               indent=4.0\char;
+               linewidth=78.0\char;
+               \translator { \StaffContext barSize = #4.5 }
+               %\translator { \VoiceContext beamHeight = #0 }
+               \translator { 
+                       \VoiceContext 
+                       beamHeight = ##f 
+                       autoBeamSettings \override (begin * * * *) = #(make-moment 0 1)
+                       textNonEmpty = ##f
+               }
+       }
+
+}
+
diff --git a/input/ascii-art/standchen-as9.ly b/input/ascii-art/standchen-as9.ly
new file mode 100644 (file)
index 0000000..00a7b25
--- /dev/null
@@ -0,0 +1,38 @@
+
+% asci-art output, TODO: include how-to-use-this 
+
+\include "paper-as9.ly"
+
+\score {
+       \context GrandStaff <
+               \context Staff=upper \notes\relative c{
+                       \key f \major;
+                       \time 3/4;
+                       r8^"Moderato" %\pp 
+                       <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
+                       r8 <as-. c-.> <c-. es-.>
+               }
+               \context Staff=lower \notes\relative c{
+                       \key f \major;
+                       \time 3/4;
+                       \clef "bass";
+                       <c,2 c'> r4 
+                       <as2 as'> r4
+               }
+       >
+       \paper {
+%              \paperAs_nine
+               indent=4.0\char;
+               linewidth=78.0\char;
+               %\translator { \StaffContext barSize = #9 }
+               %\translator { \VoiceContext beamHeight = #0 }
+               \translator { 
+                       \VoiceContext 
+                       beamHeight = ##f 
+                       autoBeamSettings \override #(begin * * * *) = #(make-moment 0 1)
+                       textNonEmpty = ##f
+               }
+       }
+
+}
+
diff --git a/input/ascii-art/twinkle-as5.ly b/input/ascii-art/twinkle-as5.ly
new file mode 100644 (file)
index 0000000..f99d5a5
--- /dev/null
@@ -0,0 +1,69 @@
+% ascii art output
+\header{
+filename =     "twinkle.ly";
+title =                "Twinkle Twinkle Little Star";
+composer =     "Traditional";
+enteredby =    "hwn and jcn";
+copyright =    "public domain";
+}
+
+
+
+\include "paper-as5.ly"
+
+melody =  \notes \relative c'' {
+       \time 2/4;
+       c4 c | g' g | a a | g g |
+%{
+       f f | e e | d d8.( e16 | )c2 |
+
+       g'4 g | f f | e e | d d |
+       g g | f f | e( e8. f16 | e4 )d |
+
+       c c | g' g | a a | g g |
+       f f | e e | d d8.( e16 | )c2 |
+%}
+}
+
+accompany =  \notes \relative c {
+       \clef "bass";
+       \time 2/4;
+       c4 c' | e c | f c | e c | 
+%{
+       d b | c a | f g | c,2 | 
+
+       e'4 g, | d' g, | c g | b g | 
+       e' g, | d' g, | c c8.( d16 | c4 )b |
+
+       c, c' | e c | f c | e c | 
+       d b | c a | f g | c,2 
+%}
+}
+
+
+text =  \lyrics{
+       Twin -- kle, twin -- kle, lit -- tle star, " "
+%{
+       How I won -- der what you  " " are.
+       Up a -- bove the world so high, " "
+       Like a dia -- mond in the  " " sky. " "
+       Twin -- kle, twin -- kle, lit -- tle star, " "
+       How I won -- der what you  " " are!
+%}
+}
+
+\score{
+       \context GrandStaff <
+               \addlyrics
+                       \context Staff=upper \melody
+               \context Lyrics=between \text
+               \context Staff=lower \accompany 
+       >
+       \paper{
+               \translator { \GrandStaffContext \accepts "Lyrics"; }
+               indent=4.0\char;
+               linewidth=78.0\char;
+       }
+}
+
diff --git a/input/bugs/gr-instrument.ly b/input/bugs/gr-instrument.ly
deleted file mode 100644 (file)
index f48cf46..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-%{
-instrument names on grandstaffs. GR is centered on entire score
-%}
-
-
-\include "paper20.ly"
-\header{
-        latexpackages = "amsmath";
-}
-
-\score{
-  \notes <
-  \context Staff = sa {\property Staff.instrument = "A" g,2 c''''2}
-  \context Staff = sb {\property Staff.instrument = "B" g,2 c''''2}
-  \context GrandStaff=gs <
-    \property GrandStaff.instrument = "Gr"
-    \context Staff = ga {\property Staff.instrument = "" c''1 }
-    \context Staff = gb {\property Staff.instrument = "" c''1 }
-  >
-  \context Staff = sc {\property Staff.instrument = "foobar"
-% "\small$\mathrm{\genfrac{}{}{0pt}{0}{C}{D}}$"
-
-<g'1 c''> }
-  \context Staff = sd {\property Staff.instrument = "E" c''1 }
-
-  >
-  \paper{
-    \translator { 
-      \StaffContext
-      \consists "Instrument_name_engraver";
-    }
-    \translator { 
-      \GrandStaffContext
-      \consists "Instrument_name_engraver";
-    }
-
-  }
-}
-
-
-
-
diff --git a/input/bugs/p.ly b/input/bugs/p.ly
deleted file mode 100644 (file)
index a63e8ef..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-%
-% mmrests of second voice should not disappear
-%
-% the problem is more complex: the mmrest-engraver lives at staff level,
-% but it seems that we need one per voice.
-%
-\score {
-  \notes <
-    \context Staff = Viole <
-       \context Voice=one \partcombine Voice
-
-       % ordering significant ??
-               \context Thread=two \relative c''{ R1 c2 c2  }
-               \context Thread=one { R1*2  }
-    >
-  >
-  \paper {
-% {
-    \translator {
-      \StaffContext
-      \remove Multi_measure_rest_engraver;
-      \remove Bar_engraver;
-    }
-    \translator {
-      \VoiceContext
-      \consists Multi_measure_rest_engraver;
-      \consists Bar_engraver;
-    }
-% }
-  }
-}
\ No newline at end of file
diff --git a/input/denneboom.ly b/input/denneboom.ly
deleted file mode 100644 (file)
index a29abcf..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-\header{
-filename =      "denneboom.ly";
-enteredby =     "jcn";
-copyright =     "public domain";
-}
-%{ file tests silly line shapes %}
-% Broken since 1.3.55
-
-\include "paper20.ly"
-
-
-
-oden =  \lyrics{ 
-       O |
-       den- ne- boom, o | 
-       den- ne- boom  Wat |
-       zijn uw tak- ken | 
-       won- der- schoon 
-}
-
-ikheb =  \lyrics{
-       Ik | 
-       heb u laatst in_'t |
-       bos zien staan  toen |
-       zat- en er geen |
-       kaars- jes aan 
-}
-
-ugloeit =  \lyrics{
-       U |
-       gloeit in bar- re | 
-       win- ter- tijd, als |
-       sneeuw op aar- de | 
-       licht ge- spreid 
-}
-
-oboom =  \notes\transpose c''{
-       g,8 |
-       c8. c16 c4. d8 | 
-       e8. e16 e4. e8 | 
-       d  e f4 b, | 
-       d8. c16 c4 r8
-}
-
-bos =  \notes\transpose c''{
-       g8 | 
-       g e a4. g8 | 
-       g8. f16 f4 r8 f8 |
-       f d g4. f8 | 
-       f8. e16 e4 r8
-}
-
-
-melody =  \notes{
-       \oboom
-       \oboom
-       \bos
-       \oboom
-}
-
-
-verseOne =  \notes{
-       \oden
-       \oden
-       \ikheb
-       \oden
-}
-
-verseOneStaff =  \context Lyrics = one 
-       \$verse_one
-
-
-verseTwo =  \notes{
-       \oden
-       \oden
-       \ugloeit
-       \oden
-}
-
-verseTwoStaff =  \context Lyrics = two 
-       \$verse_two
-
-
-denneboomShape =  \paper{ 
-       \paperTwenty
-       indent = 20. \mm;
-
-       % UGH -- THIS IS HAIRY 
-       #'margin-shape = #(map
-               (lambda (x) (cons-map mm-to-pt x)) 
-               '((70.0 .  20.)
-                (65.0 .  30.0)
-                (57.5  .  45.0)
-                (50.0 .  60.0) 
-                (42.5  .  75.)  
-                (35.0 .  90.)
-                (27.5  .  105.)
-                (20.0 .  120.0)
-                (10.0 .  140.0) 
-                (65.0 .  30.0))
-       )
-
-       gourlay_maxmeasures = 30.;
-       arithmetic_basicspace = 3.8;
-       arithmetic_multiplier = 8.\pt;
-}
-
-\score{
-       \addlyrics
-               \context Staff { \time 3/4; \melody }
-               \context Lyrics \$verse_one
-       \paper{ 
-               \$denneboom_shape 
-       }
-       \midi{ \tempo 4 = 90; }
-}
index d4efc7d03711dac88d58188f30e076d101b0868e..2bae5fe9008e1ca8ccb5588b8229325ec02b9fd7 100644 (file)
@@ -1,6 +1,16 @@
 %{
+
+You should preprocess this file with the C preprocessor.  The one with
+FAKE_GRACE looks best.
+
+1.
+
 cpp -P -traditional -o l.ly les-nereides.ly
+
+2.
+
 cpp -P -traditional -o l-fake.ly  -DFAKE_GRACE les-nereides.ly
+
 %}
 
 
diff --git a/input/minimal.ly b/input/minimal.ly
deleted file mode 100644 (file)
index 1bbd71a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-\score{ \sequential {\clef bass ; }
-\paper { \translator { \type Score_engraver ; \name "Score";  }
-       linewidth =1.5\cm;
-
-} 
-
-}
diff --git a/input/no-notation/GNUmakefile b/input/no-notation/GNUmakefile
new file mode 100644 (file)
index 0000000..659a10c
--- /dev/null
@@ -0,0 +1,8 @@
+# input/bugs/Makefile
+
+depth = ../..
+
+LOCALSTEPMAKE_TEMPLATES=mutopia
+include $(depth)/make/stepmake.make 
+
+
diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly
new file mode 100644 (file)
index 0000000..1c16582
--- /dev/null
@@ -0,0 +1,4 @@
+
+% Test parser error
+
+\score{
diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly
new file mode 100644 (file)
index 0000000..8339c27
--- /dev/null
@@ -0,0 +1,8 @@
+
+% Test parser error
+
+foo = \notes{
+
+
+\score{
+}
diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly
new file mode 100644 (file)
index 0000000..b167ae4
--- /dev/null
@@ -0,0 +1,8 @@
+
+% Test parser error
+
+foo = \notes{
+
+
+\score{
+
diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly
new file mode 100644 (file)
index 0000000..ecb5abd
--- /dev/null
@@ -0,0 +1,11 @@
+
+% Test parser error
+
+foo = \notes{
+}
+
+
+\score{
+  burp
+}
+
index b63607a78d55dd3c81f3a85449157f51f92254f2..bd43a715a143c039e070c8a8f530a292ad45da3d 100644 (file)
@@ -130,7 +130,7 @@ fugaIIRight =  \notes   \relative c''   {
        }
        \context Voice=four {
          \stemDown\slurDown\tieDown 
-         \property Voice.horizontalNoteShift=-1
+         \property Voice.NoteColumn \override #'horizontal-shift = #-1
          fis
        }
   >
index 7a8d7f0aeead280ee91a8ffe0069ea78bbdfc4c6..82a4ff48dcfa30e986d7834f8fdbc75730304431 100644 (file)
@@ -1,8 +1,8 @@
 
-header = {
+\header  {
 texidoc = "arpeggio stays clear of accidentals and flipped note heads.
-Since Arpeggio engraver is Voice, it does nothing for voice collisions."
-};
+Since Arpeggio engraver is Voice, it does nothing for voice collisions.";
+}
 
 hairyChord = \context Staff \notes\relative c' <
     \context Voice=one {
diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
new file mode 100644 (file)
index 0000000..3d510d1
--- /dev/null
@@ -0,0 +1,14 @@
+
+\header {
+
+texidoc = "Hairpin dynamics start under notes if there are
+no text-dynamics. If there are text dynamics, the hairpin does not run
+into them.";
+
+}
+
+
+\score {
+\notes \relative c'' { c4 \> c4 \! c4 c4_\ff \> c4 \! c4 \p }
+\paper { linewidth = -1.;} 
+}
index 1eeef6e00344ab4cd6873679eb01bbcc36e54dc4..f0998be1ed851c63c15349637e9fa34d2568d68d 100644 (file)
@@ -1,7 +1,8 @@
 
 \header {
-texidoc ="Broken volta spanners behave correctly at left edge in all cases."
-};
+texidoc ="Broken volta spanners behave correctly at left edge in all cases.";
+
+}
 
 %{
 
index 8627c7b475354736d94506f32f1dfa39045a4d4c..7836ecff3de6180aad5d616278c91705ff642491 100644 (file)
@@ -2,30 +2,30 @@
 \paper{
        %my standard paper block
 
-       % figure out a way to do this cleanly.
 
 %      0=\font "feta19"
 %      -1=\font "feta16"
 %      \stylesheet #(make-style-sheet 'paper19)
 
-       arithmetic_multiplier=7.\pt;
        indent=0.;
        linewidth=188.\mm;
-       forced_stem_shorten0=0.;
-       forced_stem_shorten1=0.;
-       forced_stem_shorten2=0.;
-       forced_stem_shorten3=0.;
+
        \translator{
                \PianoStaffContext
-               maxVerticalAlign=8.4;
-               minVerticalAlign=8.4;
+               VerticalAlignment \set #'forced-distance = #8.4
        }
        \translator{\StaffContext
                TimeSignature \override #'style = #'C
        }
-       \translator{\VoiceContext
+       \translator {
+         \ScoreContext
+         SpacingSpanner \override #'arithmetic-multiplier = #1.4
+       }
+       \translator{
+               \VoiceContext
                noStemExtend = ##t
                tupletVisibility = ##f
+               Stem \override #'stem-shorten = #'(0.0)
        }
 }
 
index aa7d6611e07c0e6f16f441b2d8017f9aa2d98710..67701eb6d8c4570759669fd2307012d68a16bc0f 100644 (file)
@@ -1,7 +1,4 @@
-
-
-
-
+%  include file for scarlatti-test
 
 rh=\property Thread.NoteHead \override #'style = #'default
 lh=\property Thread.NoteHead \override #'style = #'diamond
index 4f79f9dafbb8b601e590221304eee0f719822045..c72646beff84e56c4be35d04cacef5282fb55884 100644 (file)
@@ -1,7 +1,7 @@
 %{
-Converted from star.mup with the aid of the old mup2ly.py
-http://www.arkkra.com/doc/star.html
-http://www.arkkra.com/doc/star.ps
+Converted from star.mup with the aid of mup2ly.py
+http://www.Arkkra.com/doc/star.html
+http://www.Arkkra.com/doc/star.ps
 %}
 
 
index ca1dc4e8b0dcd70559825a093718eb5a264adfba..07277383f7f3846efa01e64b130e713bb3a58fd2 100644 (file)
@@ -1,4 +1,6 @@
-
+%
+% TODO: what's this?
+%
 
 
 global =  \notes {
@@ -39,18 +41,14 @@ accompany =  \notes \relative c{
                \context Staff=down <
                        \global
                        \clef bass;
-                       \autochange Staff \accompany
+                       \autochange Staff \context Voice \accompany
                >
        >
 
        \paper {
-               gourlay_maxmeasures = 4.;
                indent = 8.\mm;
                textheight = 295.\mm;
 
-               % ugly is beautiful
-               slur_beautiful = 5.0;
-
                \translator{ 
                        \PianoStaffContext
                        defaultBarType = #"" 
@@ -63,8 +61,9 @@ accompany =  \notes \relative c{
                        defaultBarType = #"" 
                        \remove "Time_signature_engraver";
 
-                       slurVerticalDirection = #1
-                       verticalDirection = -1
+                       Slur \override #'direction = #1
+
+                       
                        autoBeamSettings \override #'(end * * * *)  = #(make-moment 1 2)
                }
        }
index 1dc7fef399d48f86d27d028a39c347975e7cf444..71995c12dcaf13a283da2357026fd4af3f060173 100644 (file)
@@ -1,4 +1,5 @@
 
+% test for ascii-art output
 
 \include "paper-as9.ly"
 
diff --git a/input/test/asciscript5.ly b/input/test/asciscript5.ly
deleted file mode 100644 (file)
index 0d93789..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-\include "paper-as5.ly"
-
-\score {
-       \notes\relative c''{
-               \time 4/4;
-               g1 a b c 
-               g2 a b c
-               g4 a b c
-       }
-       \paper {
-               \paperAs_five
-               \translator { \StaffContext barSize = #5 }
-       }
-
-}
-
index 954268be9cc767f5c17b9b7b124bf3bf6ca98eaa..b4a04ae5e209b0b5e88ff7025d635b07ef94babc 100644 (file)
@@ -2,22 +2,21 @@
 
 % barline spacing  disrupts visual rhythm.
 
-#(set! space-alist (assoc-set! space-alist '("Staff_bar" "begin-of-note") '(minimum_space 0.0)))
-#(set! space-alist (assoc-set! space-alist '("Staff_bar") '(minimum_space 0.0)))
+#(define nbal (acons '("Staff_bar" "begin-of-note") '(minimum_space 0.0) default-break-align-space-alist))
 
 \score{
     \notes \relative c'  <
        \context Staff= AS {
-           \time 3/4;
+           \property Staff.timeSignatureFraction = #'(3 . 4) 
            c4 c c | c c c |
        }
        \context Staff=BS {
-           \time 2/4;
+           \property Staff.timeSignatureFraction = #'(2  . 4)      
            c4 c | c c | c c
        }
        % TODO: make c4. here align  with c4 there.
        \context Staff =CS {
-           \time 3/8;
+           \property Staff.timeSignatureFraction = #'(3 . 8) 
            c4. c8 c c   c4. c8 c c
        }
     >
@@ -26,6 +25,7 @@
        linewidth = -1.0\cm;
        \translator{
            \ScoreContext
+           BreakAlignment \override #'space-alist = #nbal
            \remove Timing_engraver;
        }
        \translator{
index 6a4d8588daa8143c08640bd8423dcd2e4c6cf8cc..68533109b896f150a99d30809d8b8ab2949112c7 100644 (file)
@@ -1,3 +1,6 @@
+%
+% TODO: junkme.
+%
 
 
 flauti = \notes \relative c' {
diff --git a/input/test/fake-grace.ly b/input/test/fake-grace.ly
new file mode 100644 (file)
index 0000000..cebfdf4
--- /dev/null
@@ -0,0 +1,18 @@
+\score { 
+  \context Voice \notes\relative c {
+    % to see the magic: uncomment size stuff in init/paper20.ly
+       
+       c'4 c4
+       
+       \property Voice.fontSize= #-2
+       b16 (*1/2 
+       \property Voice.fontSize= #0
+       
+       ) g4 *31/32
+       
+       a a g2
+       
+  }
+  \paper { }  
+  \midi { }
+}
index a2536530ef7ac10a9dc1047d691f027eb5533376..157531acbacccb93b325fbc0a2442fb3df3d4084 100644 (file)
@@ -1,4 +1,6 @@
 
+% body for the font test. Does not work standalone
+
 
 FontBody=      \notes\transpose c''{ 
                \bar "|:";
@@ -65,3 +67,6 @@ c\longa*1/4 c\breve*1/2 c1 c2 c4 c8
                        c2\sustainDown c\sustainUp |
                }
 }
+\score {
+       \FontBody
+}
index c283b7aab099f186c01ebac20a08bad5cb76d69a..c978c0aa9932296eb2b8700ab082c2e252d7c39f 100644 (file)
@@ -17,7 +17,7 @@ description = "This file tests the Feta music font, 11pt";
        \paper{
            \paperEleven
            linewidth = 17.5 \cm;
-           gourlay_maxmeasures =5.;
+
        }
 }
 
index d738759ac091587472fa811f4963d02023b86db5..47e38188f7bd098ba465d660f8900e7e21107c35 100644 (file)
@@ -1,5 +1,3 @@
-
-
 \header{
 title= "The Feta Font";
 subtitle = "proofsheet"; 
@@ -11,13 +9,8 @@ description = "This file tests the Feta music font, 11pt";
 
 
 \include "paper13.ly"
-\include "font-body.ly"
-\score{
-       \FontBody
-       \paper{
-           \paperThirteen
-           linewidth = 17.5 \cm;
-           gourlay_maxmeasures =5.;
-       }
+\paper{
+linewidth = 17.5 \cm;
 }
+\include "font-body.ly"
 
index 54ce1e0cefc614c622197db068490cf16637f82c..9ef98f46e4be1bd65a10a86eebea8063945953eb 100644 (file)
@@ -9,16 +9,10 @@ description =  "This file tests the Feta music font";
 
 
 \include "paper16.ly"
-\include "font-body.ly"
-
-\score{
-       \FontBody
        \paper{ 
            % don't change this.
            % otherwise 16pt and 20pt layouts differ.
-           \paperSixteen
-           linewidth = 12.5 \cm;
-           gourlay_maxmeasures =5.;
-       }
-}
-
+           
+           linewidth = 12.5 \cm;}
+           
+           \include "font-body.ly"
index 8233c2c68a295ca766952d0808491feb8950b712..7ee14b33d441d7be1cee6de6e88c84d12b83878e 100644 (file)
@@ -8,14 +8,10 @@ TestedFeatures =
         "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\include "font-body.ly"
-
-\score{
-       \context Staff { \FontBody}
        \paper{
            linewidth = 17.5 \cm;
-           gourlay_maxmeasures =5.;
        }
-}
+
+\include "font-body.ly"
 
 
index d30ec2c093b29245687afb8104e62c4a5ebc3f3a..69aaede9843e53e2e10d0e8c66845c3f6ad6ea81 100644 (file)
@@ -9,14 +9,11 @@ description = "This file tests the Feta music font";
 }
 
 \include "paper26.ly"
-\include "font-body.ly"
-
-\score{
-       \FontBody
        \paper{
-           \paperTwentysix
+       
            linewidth = 17.5 \cm;
-           gourlay_maxmeasures =5.;
+
        }
-}
+
+       \include "font-body.ly"
 
index c67a6648f71758c16ac000c3f4ec799d11e83c40..579935774021218e55191f23211bf0aae419f149 100644 (file)
@@ -1,4 +1,10 @@
 
+\header {
+texidoc = "Hara kiri staffs disappear when empty ";
+}
+
+
+% todo: use partcombine?, junk?
 
 toeterI =  \notes\relative c <{
                \property Staff.instrument = #"Toeters"
@@ -29,8 +35,8 @@ toeterIi =  \notes \relative c \context Voice = together {
 }
 
 toeters =  \context Staff = toeters <
-       \toeter_i
-       \toeter_ii
+       \toeterI
+       \toeterIi
 >
  
 zager =  \context Staff = zager \notes \relative c'' {
index caf59fe006eb0c895f500f1b790e7fb003c4c393..b28b04f643122b019e912540f228c8ed20be9eeb 100644 (file)
@@ -1,25 +1,3 @@
 
 
 
-blah =  \notes {
-
-\transpose c'' {
-       \time 4/4;
-       \keysignature  es;
-       [cis8 d e f] [e! a b cis'] |
-       es e f e a a' a  a' |
- \clef "bass";  }
-  [es16 c' b a] [g f es d] [c d es d] [c bes, as, g,] |
-
-\clef "violin";
-       \keysignature  c;
-       cis4 c cis cis |
-       <cis dis eis fes ges> cis dis2 ~ | 
-               \time 2/4 ;
-       dis4 dis ~ | c cis~ | c
-}
-
-\score{
-       \context Staff \blah
-       
-}
diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly
deleted file mode 100644 (file)
index 6d0781c..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-voiceOne =  \notes\transpose c''{  \stemUp
-       R1 * 2 | f'4-. r r2 | R1 * 3 |
-       f'4-. r r2 | R1 * 3 |
-       es'4-. r r2 | r1 |
-       \property Score.skipBars = ##t6
-       g4-. r r2 | g4-. r r2 |
-       R1 * 5 |
-       r2 r4 g4-. |
-       }
-
-voiceTwo =  \notes
-       { \transpose c' { \stemDown
-       R1 * 2 | f'4-. r r2 | R1 * 3 |
-       f'4-. r r2 | R1 * 3 |
-       es'4-. r r2 | r1 |
-       \property Score.skipBars = ##t6
-       g4-. r r2 | g4-. r r2 |
-       R1 * 5 |
-       r2 r4 g4-. |
-
-       }}
-
-\score {  \notes
-       \context Staff <
-               \voiceTwo
-               \voiceOne
-               >
-
- }
-
diff --git a/input/test/parse.ly b/input/test/parse.ly
deleted file mode 100644 (file)
index 1c16582..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-
-% Test parser error
-
-\score{
diff --git a/input/test/parse2.ly b/input/test/parse2.ly
deleted file mode 100644 (file)
index 8339c27..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-
-% Test parser error
-
-foo = \notes{
-
-
-\score{
-}
diff --git a/input/test/parse3.ly b/input/test/parse3.ly
deleted file mode 100644 (file)
index b167ae4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-
-% Test parser error
-
-foo = \notes{
-
-
-\score{
-
diff --git a/input/test/parse4.ly b/input/test/parse4.ly
deleted file mode 100644 (file)
index ecb5abd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-% Test parser error
-
-foo = \notes{
-}
-
-
-\score{
-  burp
-}
-
diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly
deleted file mode 100644 (file)
index c532bef..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-%{
-
-Look at ly/engraver.ly for inspiration on which XXXX
-there are.
-
-Generally, you can find interesting element properties associated with
-\property in scm/generic-property.scm. For example, this file contains
-
-       (define generic-stem-properties
-         (cons 'stem-interface
-               (list
-                (list 'stemVerticalDirection dir? 'direction)
-                (list 'verticalDirection dir? 'direction)       
-                (list 'stemLength number? 'length)
-                (list 'flagStyle string? 'flag-style)
-       )))
-
-
-which means that setting \property stemVerticalDirection overrides
-setting \property verticalDirection, and that both have the effect of
-setting `direction' in Stem object. You can use \overrideproperty for
-setting stem directions by doing.
-
-
-       \overrideproperty #'(Stem) #'direction #1
-
-(#-1 if you want down).  
-
-A modest amount of memory is involved each time you do a
-\overrideproperty. If you do \revertproperty in the right order (reversed
-from \overrideproperty), then \revertproperty doesn't cost memory.
-
-Correct:
-
-       \overrideproperty #'(  ... ) #'symbolA #valueA
-       \overrideproperty #'(  ... ) #'symbolB #valueB
-       \revertproperty #'(  ... ) #'symbolB 
-       \revertproperty #'(  ... ) #'symbolA 
-
-Incorrect (\revertproperty costs memory):
-
-       \overrideproperty #'(  ... ) #'symbolA #valueA
-       \overrideproperty #'(  ... ) #'symbolB #valueB
-       \revertproperty #'(  ... ) #'symbolA 
-       \revertproperty #'(  ... ) #'symbolB 
-
-You can use identifiers, eg.
-
-    slursUp = \context Voice \overrideproperty '(Slur)
-           #'direction  #1
-    slursBoth = \context Voice \revertproperty '(Slur)
-
-%}
-
-\score { \notes
-\relative c' {
-       c4-.(
-       \property Voice.Dots \override #'direction =  #-1
-       \property Voice.Stem \override #'direction =  #-1
-       \property Voice.noteColumnProperties \override #'direction =  #-1
-       \property Voice.Stem \override #'direction =  #-1               
-       
-       ) c4-. (
-       ) c4-. (        
-        \property Voice.Slur \override #'direction =  #-1
-       ) c4-. (
-
-       \property Dots \revert  #'direction
-       \property Stem \revert #'direction
-       \property Script \revert #'direction
-       \property Text \revert #'direction
-
-        ) c4-.  () c4-. 
-}
-
-\paper {
-\translator { \VoiceContext
-       NoteHead \override #'font-relative-size =  #-2
-}
-}
-}
diff --git a/input/test/r-as.ly b/input/test/r-as.ly
deleted file mode 100644 (file)
index 09ab543..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-\score{
-       <
-                 \context Staff \notes\relative c'{ 
-                         c d e f
-                         \repeat "volta" 2 { g a b c }
-                         \alternative { { c b a g } { f e d c } }
-                 }
-                 \context Lyrics \lyrics {
-                         De eer- ste < { maat } { moet } >
-                         \repeat fold 2 { }
-                         \alternative {
-                                 { en dan twee keer } 
-                                 { een koe- plet _ } 
-                         }
-                         en dan nog dit er ach- ter aan
-                 }
-       >
-}
diff --git a/input/test/repeatbar.ly b/input/test/repeatbar.ly
deleted file mode 100644 (file)
index 9c23cc4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-\score { 
-  \context Voice \notes\relative c {
-    c'' d e f | \repetitions1*3 | 
-       \time 3/4;
-       g4 a b | R2.*2 |
-       
-  }
-  \paper { }  
-  \midi { }
-}
diff --git a/input/test/sizes.ly b/input/test/sizes.ly
deleted file mode 100644 (file)
index a0779c3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-
-\score { 
-  \context Voice \notes\relative c {
-    % to see the magic: uncomment size stuff in init/paper20.ly
-       
-       c'4 c4
-       
-       \property Voice.fontsize= -2
-       b16 * 1 / 2 (
-       \property Voice.fontsize= 0 )
-       g4 *31/32
-       
-       a a g2
-       
-  }
-  \paper { }  
-  \midi { }
-}
index f12280b73ceabf67610fbb97cae130740821e74f..83a153caa57273c42c8c2efc3b69513619f21a62 100644 (file)
@@ -1,12 +1,12 @@
+\header {
+texidoc = "" ;
+}
 
 \score{
        \notes\relative c''{
                \time 2/4;
+               \property Voice.Slur \set #'minimum-length = #40
                c()c
                c~c\break
                }
-       \paper{
-               linewidth=-1.\mm;
-               slur_x_minimum=40.0*\interline;
-       }
 }
index 46e752aa124776a30e87d947b85bb76c56f51987..809dc44a26a511dd801653279f816b730760aaef 100644 (file)
@@ -91,6 +91,6 @@ singlepart =  \notes{
     }
     \paper {
 %    linewidth= 18.\cm;
-%      gourlay_maxmeasures = 4.0
+
     }
 }
diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly
deleted file mode 100644 (file)
index cb8660d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-\include "paper-as5.ly"
-
-\score {
-       \context StaffGroup <
-               \context Staff=upper \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       r8^"Moderato" %\pp 
-                       <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
-                       r8 <as-. c-.> <c-. es-.>
-               }
-               \context Staff=lower \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       \clef "bass";
-                       <c,2 c'> r4 
-                       <as2 as'> r4
-               }
-       >
-       \paper {
-%              \paperAs_nine
-               indent=4.0\char;
-               linewidth=78.0\char;
-               \translator { \StaffContext barSize = #4.5 }
-               %\translator { \VoiceContext beamHeight = #0 }
-               \translator { 
-                       \VoiceContext 
-                       beamHeight = ##f 
-                       autoBeamSettings \override (begin * * * *) = #(make-moment 0 1)
-                       textNonEmpty = ##f
-               }
-       }
-
-}
-
diff --git a/input/test/standchen-as9.ly b/input/test/standchen-as9.ly
deleted file mode 100644 (file)
index bae5a86..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-\include "paper-as9.ly"
-
-\score {
-       \context GrandStaff <
-               \context Staff=upper \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       r8^"Moderato" %\pp 
-                       <g'-. c-.> <c-. es-.> <g-. c-.> <c-. es-.> <g-. c-.> |
-                       r8 <as-. c-.> <c-. es-.>
-               }
-               \context Staff=lower \notes\relative c{
-                       \key f \major;
-                       \time 3/4;
-                       \clef "bass";
-                       <c,2 c'> r4 
-                       <as2 as'> r4
-               }
-       >
-       \paper {
-%              \paperAs_nine
-               indent=4.0\char;
-               linewidth=78.0\char;
-               %\translator { \StaffContext barSize = #9 }
-               %\translator { \VoiceContext beamHeight = #0 }
-               \translator { 
-                       \VoiceContext 
-                       beamHeight = ##f 
-                       autoBeamSettings \override (begin * * * *) = #(make-moment 0 1)
-                       textNonEmpty = ##f
-               }
-       }
-
-}
-
index cdba9179ba3c1645ded9dea11675a2ac4902ef34..0831f3b074a161794eca9617947fbd48e3e37465 100644 (file)
@@ -41,7 +41,4 @@ beamintervals =  \notes{
                \transpose a \beamintervals
                \transpose b \beamintervals
        }
-       \paper{
-               gourlay_maxmeasures = 2.;
-       }
 }
index a57f7035f1a9628546a1ece68704614df0d0a927..42387d2570d5f583e9ae6f56c45056b01422d3b8 100644 (file)
@@ -34,7 +34,7 @@ instrument=   "Violoncello";
                \clef "bass";
                \key c \major;
                <e1\sff cis'^\downbow> | <cis\sff a'^\downbow> | 
-               <d,\ffff\decr g> ~ <d2 g> ~ <d8\p\rced g> |
+               <d,\ffff\decr g> | ~ <d2 g> ~ <d8\p\rced g> 
        }
        \header{ 
        piece="example 2";
diff --git a/input/test/tie-minimum.ly b/input/test/tie-minimum.ly
deleted file mode 100644 (file)
index 7f0f785..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-\score{
-       \notes\relative c''{
-               \time 2/4;
-               c~c\break
-               c()c
-               }
-       \paper{
-               linewidth=-1.\mm;
-               tie_x_minimum=40.0*\interline;
-       }
-}
diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly
deleted file mode 100644 (file)
index 3872365..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-\header{
-filename =     "twinkle.ly";
-title =                "Twinkle Twinkle Little Star";
-composer =     "Traditional";
-enteredby =    "hwn and jcn";
-copyright =    "public domain";
-}
-
-
-
-\include "paper-as5.ly"
-
-melody =  \notes \relative c'' {
-       \time 2/4;
-       c4 c | g' g | a a | g g |
-%{
-       f f | e e | d d8.( e16 | )c2 |
-
-       g'4 g | f f | e e | d d |
-       g g | f f | e( e8. f16 | e4 )d |
-
-       c c | g' g | a a | g g |
-       f f | e e | d d8.( e16 | )c2 |
-%}
-}
-
-accompany =  \notes \relative c {
-       \clef "bass";
-       \time 2/4;
-       c4 c' | e c | f c | e c | 
-%{
-       d b | c a | f g | c,2 | 
-
-       e'4 g, | d' g, | c g | b g | 
-       e' g, | d' g, | c c8.( d16 | c4 )b |
-
-       c, c' | e c | f c | e c | 
-       d b | c a | f g | c,2 
-%}
-}
-
-
-text =  \lyrics{
-       Twin -- kle, twin -- kle, lit -- tle star, " "
-%{
-       How I won -- der what you  " " are.
-       Up a -- bove the world so high, " "
-       Like a dia -- mond in the  " " sky. " "
-       Twin -- kle, twin -- kle, lit -- tle star, " "
-       How I won -- der what you  " " are!
-%}
-}
-
-\score{
-       \context GrandStaff <
-               \addlyrics
-                       \context Staff=upper \melody
-               \context Lyrics=between \text
-               \context Staff=lower \accompany 
-       >
-       \paper{
-               \translator { \GrandStaffContext \accepts "Lyrics"; }
-               indent=4.0\char;
-               linewidth=78.0\char;
-       }
-}
-
diff --git a/input/test/updown.ly b/input/test/updown.ly
deleted file mode 100644 (file)
index 5586979..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-\score { 
-  \context Voice \notes\relative c {
-    % this used to work (long time ago):
-       % <{\voiceOne e}
-       % {\voiceTwo c}>
-       
-       % now we need:
-       <\context Voice=one {\voiceOne e}
-       \context Voice=two {\voiceTwo c}>
-       
-  }
-  \paper { }  
-  \midi { }
-}
diff --git a/input/tricks/fragment.ly b/input/tricks/fragment.ly
deleted file mode 100644 (file)
index b4865d6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-fragment = \notes {
-
-}
-
-\paper { linewidth = -1.; } 
-
-\score {
-  \notes\relative c \fragment
-  \paper { }  
-}
index 27d4df98b6191ed7078b165aa287a34ed3e85f54..05170116f21a0f2cb8ac72924ee96ee6948ec168 100644 (file)
@@ -6,8 +6,8 @@ texidoc="
 @quotation
         Your task, if you accept it is to implement a \smarttranspose
         command> that would translate such oddities into more natural
-        notations. Double accidentals should be removed, as well as #E
-        (-> F), bC (-> B), bF (-> E), #B (-> C).
+        notations. Double accidentals should be removed, as well as E-sharp
+        (-> F), bC (-> B), bF (-> E), B-sharp (-> C).
 @end quotation
 
 You mean like this. (Sorry 'bout the nuked indentation.)
@@ -15,14 +15,6 @@ You mean like this. (Sorry 'bout the nuked indentation.)
 ";
 }
 
-% Btw, I've leant an el-neato trick for formatting code in email messages,
-% using inderect buffers.
-%
-% M-x make-indirect-buffer RET RET foo RET C-x b foo RET
-% Select region and then narrow: C-x n n
-% Set mode, eg: M-x sch TAB RET
-%
-
 #(define  (unhair-pitch p)
   (let* ((o (pitch-octave p))
          (a (pitch-alteration p))
index 647a3765ceee723935e327955e7717b8e2a3f4c6..baa7cd25187cc53c8e05992fc456e8fa8ad88643 100644 (file)
@@ -35,3 +35,5 @@ interesting things. You can also drop the \consistsend feature.";
                \remove Axis_group_engraver;
        }
 }
+}
+
index 4625b12d72348496d0f66dcbde7fafa55a43a4e2..b20a12288b9f9a56bf129e1ea5a1c7900115c372 100644 (file)
@@ -1,3 +1,5 @@
+% include file for tutorial
+
 \header {
   title = "Zo, goed lieverd?";
   subtitle = "How's, this babe?";
index ee563516c04297d85b507703815d58b4808034fc..1bda7ea01f73fb45f7a981e6c8fa276bc2082c77 100644 (file)
@@ -175,8 +175,7 @@ Dynamic_engraver::process_music ()
                                   script_req_l_->get_mus_property ("text"));
       
       Side_position_interface::set_direction (script_p_, LEFT);
-      Side_position_interface::set_axis (script_p_, X_AXIS);
-      
+
       if (Direction d = script_req_l_->get_direction ())
        Directional_element_interface::set (line_spanner_, d);
 
index 7ce615a85926fd9f6fdbf290cb2c74b8fe0f0855..b421075119a2b9fcd61e7a33e999f49aa4d23999 100644 (file)
@@ -29,6 +29,22 @@ Font_metric::text_dimension (String text) const
       switch (text[i]) 
        {
        case '\\':
+  // accent marks use width of base letter
+         if (i +1 < text.length_i ())
+          {
+            if (text[i+1]=='\'' || text[i+1]=='`' || text[i+1]=='"' ||
+                text[i+1]=='^')
+              {
+                i++;
+                break;
+              }
+            // for string width \\ is a \ and \_ is a _.
+            if (text[i+1]=='\\' || text[i+1]=='_')        
+              {
+                break;
+              }
+          }
+         
          for (i++; (i < text.length_i ()) && !isspace (text[i]) 
                 && text[i]!='{' && text[i]!='}'; i++)
            ;
index edbaac80098ffe450821b8f72300ad39af77c085..fd60e0de66c3b44de5cbbd05834b550a87aad674 100644 (file)
@@ -71,7 +71,7 @@ Grace_engraver_group::one_time_step ()
   calling_self_b_  = true;
   process_music ();
   announces ();
-  stop_translation_timestep ();
+  pre_move_processing ();
   check_removal ();
   calling_self_b_ = false;
 }
index 58a3f1fdde2373940c549ca39efc614777cbb454..54fbce92d94e1f169287f5ab313b3fd58ea525f2 100644 (file)
@@ -73,7 +73,7 @@ Grace_performer_group::one_time_step ()
   calling_self_b_  = true;
   // process_music ();
   announces ();
-  stop_translation_timestep ();
+  pre_move_processing ();
   check_removal ();
   calling_self_b_ = false;
 }
index 4fc4bce8d3c66538e5f19bf149cf1e0c15b31d75..6471957ecf240180bfe8f151d68f04b6e8fb89fc 100644 (file)
@@ -37,35 +37,54 @@ Hairpin::brew_molecule (SCM smob)
 
   /* Ugh, must be same as Text_spanner::brew_molecule.  */  
   Real padding = gh_scm2double (me->get_grob_property ("if-text-padding"));
-  Real broken_left =  spanner->get_broken_left_end_align ();
-  Real width = spanner->spanner_length ();
-  width -= broken_left;
-
   Drul_array<bool> broken;
-  Drul_array<Real> extra_off;
+  Drul_array<Item*> bounds ;
   Direction d = LEFT;
   do
     {
-      Item *b = spanner->get_bound (d);
-      broken[d] = b->break_status_dir () != CENTER;
+      bounds[d] =spanner->get_bound (d);
+      broken[d] = bounds[d]->break_status_dir () != CENTER;
+    }
+  while (flip (&d) != LEFT);
 
-      if (!broken [d])
+  Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
+  Drul_array<Real> x_points ;
+  
+  do
+    {
+      Item *b = bounds[d];
+      x_points[d]  = b->relative_coordinate (common, X_AXIS);
+      if (broken [d])
        {
-
-         Interval e =b->extent (b, X_AXIS);
-         Real r = 0.0;
-         if (!e.empty_b ())
-           r = e[-d] + padding;
-         width += d * r;
-         extra_off[d] = r;
+         if (d == LEFT)
+           x_points[d] = b->extent (common,X_AXIS)[RIGHT] ;
+       }
+      else
+       {
+         if (dynamic_cast<Paper_column*> (b))
+           {
+             /*
+               If we're hung on a paper column, that means we're not
+               adjacent to a text-dynamic, and we may move closer. We
+               make the padding a little smaller, here.
+             */
+             Interval e =b->extent (common, X_AXIS);
+             x_points[d] = e.center () - d  * padding /3; // ugh.
+           }
+         else
+           {
+             Interval e =b->extent (common, X_AXIS);
+             if (!e.empty_b ())
+               x_points[d] = e[-d] - d*padding;
+           }
        }
     }
   while (flip (&d) != LEFT);
 
-  // FIXME: ecs tells us
-  width += gh_scm2double (me->get_grob_property ("width-correct"));
-  /* /Ugh */
-  
+
+  Real width = x_points[RIGHT] - x_points[LEFT];
+
   if (width < 0)
     {
       warning (_ ((grow_dir < 0) ? "decrescendo too small"
@@ -101,10 +120,17 @@ Hairpin::brew_molecule (SCM smob)
                         gh_double2scm (endh),
                         SCM_UNDEFINED);
 
+  /*
+    We make the hairpin too large in Y direction, so it stays at
+    proper distance from the staff.
+  */
   Interval yext = 2* height  * Interval (-1,1);
   Box b (Interval (0, width), yext);
   Molecule mol (b, hairpin);
-  mol.translate_axis (broken_left + extra_off[LEFT], X_AXIS);
+  
+  mol.translate_axis (x_points[LEFT]
+                     - bounds[LEFT]->relative_coordinate (common, X_AXIS),
+                     X_AXIS);
 
   return mol.smobbed_copy ();
 }
index 112c21496f0e02d286b337dfa61de75286170e54..d0c14c1424ae14f3a36081cf5a9f2e79cdfcd42e 100644 (file)
@@ -38,8 +38,9 @@ public:
   Translator_group * daddy_trans_l_ ;
  
 
+  void pre_move_processing ();
   void announces ();
-
+  void post_move_processing ();
   void removal_processing ();
   /**
     ask daddy for a feature
index 261cb2e0545d23b9a1db6b2c23786093f1bd0aae..e58439dc9b66fb1b207ff01364083b7503a19a49 100644 (file)
@@ -95,12 +95,18 @@ Instrument_name_engraver::acknowledge_grob (Grob_info i)
   if (dynamic_cast<Spanner*> (i.elem_l_)
       && i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface")))
     return;
-  
+
+  /*
+    Hang the instrument names on the staffs, but not on the alignment
+    groups enclosing that staff. The alignment has no real location,
+    but is only a vehicle for the placement routine it contains, and
+    therefore the location of its refpoint won't be very useful.
+    
+  */
   if (dynamic_cast<Spanner*> (i.elem_l_)
       && ((Axis_group_interface::has_interface (i.elem_l_)
-        && Axis_group_interface::axis_b (i.elem_l_, Y_AXIS))
-        || (Align_interface::has_interface (i.elem_l_)
-            && Align_interface::axis (i.elem_l_) == Y_AXIS)))
+          && Axis_group_interface::axis_b (i.elem_l_, Y_AXIS)))
+      && !Align_interface::has_interface (i.elem_l_))
     {
       SCM nl = gh_cons (i.elem_l_->self_scm (),
                        get_property ("instrumentSupport"));
index d08ee082cf30fd74f1ecd4f2cdc63d9a847789df..7deca514b0a9e5aebb3944ebba3e64f7ffcc3173 100644 (file)
@@ -49,6 +49,7 @@ RH 7 fix (?)
 
 void strip_trailing_white (String&);
 void strip_leading_white (String&);
+String lyric_fudge (String s);
 
 
 bool
@@ -321,14 +322,7 @@ HYPHEN             --
                        return yylval.i = EXTENDER;
                if (s == "--")
                        return yylval.i = HYPHEN;
-               int i = 0;
-                       while ((i=s.index_i ("_")) != -1) // change word binding "_" to " "
-                       * (s.ch_l () + i) = ' ';
-               if ((i=s.index_i ("\\,")) != -1)   // change "\," to TeX's "\c "
-                       {
-                       * (s.ch_l () + i + 1) = 'c';
-                       s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2);
-                       }
+               s = lyric_fudge (s);
 
                char c = s[s.length_i () - 1];
                if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
@@ -607,3 +601,27 @@ valid_version_b (String s)
   return true;
 }
        
+
+String
+lyric_fudge (String s)
+{
+  char  * chars  =s.copy_ch_p ();
+
+  for (char * p = chars; *p ; p++)
+    {
+      if (*p == '_' && (p == chars || *(p-1) != '\\'))
+       *p = ' ';
+    }
+  
+  s = String (chars);
+  delete[] chars;
+
+  int i =0;    
+  if ((i=s.index_i ("\\,")) != -1)   // change "\," to TeX's "\c "
+    {
+      * (s.ch_l () + i + 1) = 'c';
+      s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2);
+    }
+
+  return s;
+}
index 2d13e7a7a87b7429762531ca63472fd350416800..2b3b9e082732853dc343439a189a34b680c65e25 100644 (file)
@@ -26,7 +26,7 @@ class Note_heads_engraver : public Engraver
   Moment note_end_mom_;
 public:
   VIRTUAL_COPY_CONS (Translator);
-
+  
 protected:
   virtual void start_translation_timestep ();
   virtual bool try_music (Music *req_l) ;
@@ -35,6 +35,7 @@ protected:
   virtual void stop_translation_timestep ();
 };
 
+
 bool
 Note_heads_engraver::try_music (Music *m) 
 {
@@ -130,7 +131,6 @@ Note_heads_engraver::stop_translation_timestep ()
 void
 Note_heads_engraver::start_translation_timestep ()
 {
-  
   /* TODO:make this settable?
    */
   if (note_end_mom_ > now_mom ())
@@ -147,8 +147,6 @@ Note_heads_engraver::start_translation_timestep ()
       else
        e->forbid_breaks ();    // guh. Use properties!
     }
-
-  
 }
 
 
index 966edc80bafd1d1bd6010b68c1cb3dbf4d0cf389..54d0ce94000943bfeec744dee367af01d05dc784 100644 (file)
@@ -1122,6 +1122,11 @@ command_element:
                scm_unprotect_object (p->self_scm ());
 
                $$ = sp;
+
+/*
+ TODO: should make alias TimingContext for Score
+*/
+
                sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
        }
        ;
index c387a33959065ac0c1c7145db0bce2a06a8e2713..a85c72c8952a2855197880a05376232baa89c5dc 100644 (file)
@@ -59,7 +59,7 @@ Score_engraver::prepare (Moment w)
   Global_translator::prepare (w);
   make_columns (w);
 
-  start_translation_timestep ();
+  post_move_processing ();
 }
 
 void
@@ -115,14 +115,9 @@ Score_engraver::finalize ()
 void
 Score_engraver::one_time_step ()
 {
-  if (!to_boolean (get_property (ly_symbol2scm("skipTypesetting"))))
-    {
-      process_music ();
-      announces ();
-    }
-
-  
-  stop_translation_timestep ();
+  process_music ();
+  announces ();
+  pre_move_processing ();
   check_removal ();
 }
 
index 63af656abedbe03fbb08e34d87c5c5826b0912a4..e3d966e6e806661011390e827dd294bf934b45ef 100644 (file)
@@ -60,7 +60,7 @@ Score_performer::prepare (Moment m)
   Global_translator::prepare (m);
   audio_column_l_ = new Audio_column (m);
   play_element (audio_column_l_);
-  start_translation_timestep ();
+  post_move_processing ();
 }
 
 
@@ -70,7 +70,7 @@ Score_performer::one_time_step ()
   // fixme: put this back.
   // process_music ();
   announces ();
-  stop_translation_timestep ();
+  pre_move_processing ();
   check_removal ();
 }
 
index f17dcae0b29a749b0d906d3f5f191f14bbb17019..13272bc71bc267c02e326d161dda42e9f02ae644 100644 (file)
@@ -456,7 +456,7 @@ Stem::dim_callback (SCM e, SCM ax)
     }
   return ly_interval2scm (r);
 }
-
 
 
 MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1);
@@ -478,14 +478,39 @@ Stem::brew_molecule (SCM smob)
   Real dy = Staff_symbol_referencer::staff_space (me)/2.0;
   Real head_wid = 0;
 
-  Real angle =0.0;
+  /*
+TODO:
+
+    I don't really get the idea of the attachment-angle.
+    It seems like that you attach the Stem to the NoteHead at point
+    (1,tan(aa)/2), making it still nessesary to have special CENTER-STEMS
+    option - and if I would like to attach stem i.e. here:
+
+      |
+      |
+      |
+    XXX
+   XXXXX
+   XXXXX
+    XXX
+
+   That would be impossible.
+   Why haven't you just made ATTACHMENT-COORDINATES as a pair of reals,
+   with (0 . 0) meaning CENTER, (1 . 1) upper right, etc...?
+   
+-Rune
+
+  */
+    
+  Real slope =0.0;
   if (Grob *hed = support_head (me))
     {
       head_wid = hed->extent (hed,X_AXIS).length ();
 
-      angle = gh_scm2double (hed->get_grob_property ("attachment-angle"));
+      slope = gh_scm2double (hed->get_grob_property ("attachment-slope"));
     }
-  stem_y[Direction (-d)] += d * head_wid * tan (angle)/ (2*dy);
+  stem_y[Direction (-d)] += d * head_wid * slope/ (2*dy);
   
   if (!invisible_b (me))
     {
index 6bda7b9030505e1e86c4b31c3a5853cdaaf3f4e3..ff63c26e16a2d89338745a23fe9aa1d39a4487ec 100644 (file)
@@ -372,13 +372,13 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va
 void
 Translator_group::stop_translation_timestep ()
 {
-  each (&Translator::stop_translation_timestep);
+  each (&Translator::pre_move_processing);
 }
 
 void
 Translator_group::start_translation_timestep ()
 {
-  each (&Translator::start_translation_timestep);
+  each (&Translator::post_move_processing);
 }
 
 void
index 03adb249f91a22bb4065e746183fab71e21248e4..6183057b85cbab2bc649302246d68fb8e9e8f549 100644 (file)
@@ -82,6 +82,11 @@ Translator::now_mom () const
 
 
 
+void
+Translator::post_move_processing ()
+{
+  start_translation_timestep ();
+}
 
 void
 Translator::removal_processing ()
@@ -97,6 +102,14 @@ Translator::announces ()
 }
 
 
+void
+Translator::pre_move_processing ()
+{
+  stop_translation_timestep ();
+}
+
+
+
 Music_output_def *
 Translator::output_def_l () const
 {
index bf6c3e74f93741317cd545daa7ea697ba2cb1075..94d9b9bab2e41d34dd145219d52f9b4b4e214b89 100644 (file)
@@ -2,7 +2,7 @@
 %
 % declare the standard dynamic identifiers.
 %
-
+ppppp = \dynamicscript #"ppppp"
 pppp = \dynamicscript #"pppp"
 ppp = \dynamicscript #"ppp"
 pp = \dynamicscript #"pp"
index dac8402f0693feaafe4c0056bf482ae50f5874bf..54d0ab1b2f260b9416da0fc701858c3be3b63a37 100644 (file)
@@ -1,15 +1,15 @@
 Begin3
 Title: LilyPond
-Version: 1.3.141
-Entered-date: 22MAR01
+Version: 1.3.142
+Entered-date: 25MAR01
 Description: @BLURB@
 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.141.tar.gz 
+       1000k lilypond-1.3.142.tar.gz 
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-       1000k lilypond-1.3.141.tar.gz 
+       1000k lilypond-1.3.142.tar.gz 
 Copying-policy: GPL
 End
index a75b14238bb008328867918acfe4b25b5d3ffa75..6964856c54a026c8ab420ad287d765cfc69a926a 100644 (file)
@@ -1,11 +1,11 @@
 %define info yes
 
 Name: lilypond
-Version: 1.3.141
+Version: 1.3.142
 Release: 1
 License: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.141.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.142.tar.gz
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 # Icon: lilypond-icon.gif
index 18da207eec9b589487d3efb2c001ad806d7f5503..a2a9463991b640476edff63c028ce5eaeb4ae937 100644 (file)
@@ -55,7 +55,9 @@ export MFINPUTS:=.:$(MFINPUTS)
 
 default: $(ALL_GEN_FILES)
 
-$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
+##
+## todo: this also depends on .tfm, FIXME.
+$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
        $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
 local-clean:
index a1fdc784cf8f95a6ff418405c76c343fb053b63f..0ad01c0ff7d554d4fd353db2b6b92b3b64467243 100644 (file)
        (DynamicText . (
                (Y-offset-callbacks . (,Side_position_interface::aligned_on_self))
                (molecule-callback . ,Text_item::brew_molecule)
+               (no-spacing-rods . #t)
                (script-priority . 100)
                (font-series . bold)
                (font-family . dynamic)
                (style . default)
                (molecule-callback . ,Note_head::brew_molecule)
                (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
-               (attachment-angle . ,(* 20/360 3.14159))
+               (attachment-slope . 0.17)
                (meta . ,(grob-description  "NoteHead"
                        rhythmic-head-interface font-interface 
                        note-head-interface ))
                (no-spacing-rods . #t)
                (direction . -1)
                (padding . 0.5)
+;; todo: add X self alignment?
                (baseline-skip . 2)
                (font-family . roman)
                (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface ))
index 1b5dfc0d437cd1bcee207a29f5faa7a1f3da0b6b..dbad3eee0a209334a1d7167ccd52aef6f063bb84 100644 (file)
@@ -43,7 +43,7 @@ This procedure is called (using dependency resolution) after line breaking. Retu
 (grob-property-description 'arithmetic-multiplier number? "see @ref{spacing-spanner-interface}.")
 (grob-property-description 'attachment pair? "cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where both types may be alongside-stem, stem, head or loose-end.")
 
-(grob-property-description 'attachment-angle number? "Where does the stem
+(grob-property-description 'attachment-slope number? "Where does the stem
 attach to the notehead?")
 (grob-property-description 'attachment-offset pair? "cons of offsets,
 '(LEFT-offset . RIGHT-offset).  This offset is added to the
@@ -241,7 +241,9 @@ reference point.
 (grob-property-description 'shortest-starter-duration moment? "duration of the shortest notes that starts exactly in this column.")
 (grob-property-description 'side-relative-direction dir? "if set: get the direction from a different object, and multiply by this.")
 (grob-property-description 'side-support list? "the support, a list of grobs.")
+(grob-property-description 'slope number? "some kind of slope")
 (grob-property-description 'slope-limit number? "set slope to zero if slope is running away steeper than this.")
+(grob-property-description 'space-alist list? "Alist of break align spacing tuples. See basic-property.scm")
 (grob-property-description 'space-function procedure? "function of type multiplicity -> real (in staffspace).")
 (grob-property-description 'spacing-procedure procedure? "procedure
 taking grob as argument. This is called after
index 61f746d6f01b5ca0727a3ebd6894035c1f4263f6..ef657ad6a400176bc337ab083968f31effc81a55 100644 (file)
@@ -217,7 +217,7 @@ object."
  'note-head-interface
  "Note head"
  '(
-   style attachment-angle note-character
+   style attachment-slope note-character
         ))
 
 
@@ -761,7 +761,7 @@ direction = Forced direction for all ties"
 (lily-interface
  'percent-repeat-interface
  "Repeats that look like percent signs"
- '(angle thickness))
+ '(slope thickness))
 
 (lily-interface
  'volta-bracket-interface
index cf2bd96fa50592920ef63dafe64332e991bb9261..ba69b79bd01010441ff139a51eb0189dee126792 100644 (file)
@@ -259,11 +259,6 @@ r1 r1*3 R1*3  \\\\property Score.skipBars= ##t r1*3 R1*3
 @end example
 
 ")
-(translator-property-description 'skipTypesetting boolean?
-                                "When true, all no typesetting is done at
-this moment, causing  the interpretation phase to go a lot faster. This can
-help with debugging large scores.")
-
 (translator-property-description 'slurBeginAttachment symbol?
 "translates to the car of grob-property 'attachment of NoteColumn. See
 @ref{Slur}.")
index fd71484b1c3c7374a760632a541c0b5b890afe38..2808dc1b653f571ee803678ec8402998790d591d 100644 (file)
@@ -795,7 +795,7 @@ class Parser:
                debug ('voice: ' + line)
 
        def init_context_grids (self, line):
-               self.parse_function = self.parse_context_grids
+               self.parse_function = self.parse_context_line
 
        def parse_context_grids (self, line):
                debug ('grids: ' + line)