From: fred Date: Tue, 26 Mar 2002 22:25:09 +0000 (+0000) Subject: lilypond-1.2.3 X-Git-Tag: release/1.5.59~2179 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=267620f16e53ccf4cf2c600501e535417610028c;p=lilypond.git lilypond-1.2.3 --- diff --git a/CHANGES b/CHANGES index 03566b51e0..85ca28b417 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,22 @@ +pl 2.mk1 + - bf, tie.cc: handle postbreak left align correctly +pl 2.lec1 + - abc2ly fixes. + +pl 2.hwn1 + - rewrite of mudela-book. Now uses chunks, and you can put +\input, \include and \mudelagraphics in verbatim sections. + + +pl 2.jcn2 + - bf: auto-beamer: don't junk beam if manual beam shows up + +pl 2.jcn1 + - add-html-footer.py, ls-latex.py .tely updates and fixes + - tely (texinfo-lily) rules and test Documentation/metadoc/foo.tely + +************* + pl 1.uu2 - complete rewrite of mudela-book. Much cleaner now. Support for texinfo. diff --git a/Documentation/topdocs/AUTHORS.yo b/Documentation/topdocs/AUTHORS.yo index 5a1bb4b6cd..3d41246cb2 100644 --- a/Documentation/topdocs/AUTHORS.yo +++ b/Documentation/topdocs/AUTHORS.yo @@ -46,6 +46,8 @@ it()nemail(Jeffrey B. Reed)(daboys@austin.rr.com), Windows-NT support. it()Shay Rojanski Some mudela source. +it()Laura Conrad (lconrad@world.std.com) + fixes to abc2ly ) diff --git a/Documentation/topdocs/PATCHES.yo b/Documentation/topdocs/PATCHES.yo index 4827716c15..eee04b313b 100644 --- a/Documentation/topdocs/PATCHES.yo +++ b/Documentation/topdocs/PATCHES.yo @@ -16,7 +16,7 @@ goes like this: itemize( it()make your fix/add your code -it()Add changes to NEWS, and add yourself to Documentation/AUTHORS.yo +it()Add changes to NEWS, and add yourself to Documentation/topdocs/AUTHORS.yo it()generate a patch, it()e-mail your patch to one of the mailing lists gnu-music-discuss@gnu.org or bug-gnu-music@gnu.org diff --git a/NEWS b/NEWS index cb3928f8f9..ec51328dcd 100644 --- a/NEWS +++ b/NEWS @@ -26,4 +26,4 @@ WHAT'S NEW? * Lots of bugfixes. - +pl 1.2.2.lec1 fix to abc2ly for fermata and space following >; to paddy.abc to include X: header line (lec1); to PATCHES.yo to point to real authors.yo diff --git a/TODO b/TODO index 594ae3ad4a..dcef3fa46f 100644 --- a/TODO +++ b/TODO @@ -8,11 +8,54 @@ m Most of the items are marked in the code as well Grep -i for TODO, FIXME and ugh/ugr/urg. -.* TODO +.* TODO +. * don't take Dimension_cache::offset in Dimension_cache::extent . * Break_req handling is silly (break_forbid () + \break fucks up.) . * redo all --help messages. . * HaraKiriStaffContext removes bar lines and doesn't remove staff margin text on removed staff lines. +. * Mondrup: + +- I would like to avoid that ties across line breaks run _through_ the +clef on the new line + +- I would like the possibility of forcing clef- and key- changes to be +printed _after_ the new bar line + +- I would like an option to define the number of systems on which the +score must be distributed. As it is now it seems that I may only +influence that indirectly through the gourlay_maxmeasures property. + +- if I change the property minVerticalAlign in a multi staff score with +lyrics the change affects the lyrics too. I would like the change to +_only_ affect staves. + +- I would like to be able to influence the sloping of xtuplet brackets + +- for one of my test scores containing a modern edition of an early +17'th century composition I have a leading measure containing the +orginal clefs and note values of the original composition. I use the +"harmonic" and "diamond" note head styles for that measure and would +like to have the stems of these notes _centered_ on the notehead as in +the mensural music notation. + +- after the leading measure in the above mentioned score I want a double +bar line fully drawn across the staves and after that keep to the +ChoirStaff bar line types in the rest of the scores + +- I would like to be able to define invisible melismatic slurs in order +to avoid printing slurs conflicting with an original ms of printing. Of +course I can achieve that by just inserting empty syllables in the +lyrics. But this facility implemented in the MusiXTeX preprocessor M-tx +is nice so ... + +- if I explicitly beam notes in a staff with auto beaming disabled I +would like to have these beams also to be melismatic. + +- do I need to get warnings on 'No one to print a repeat brace' when I +issue a '\repeat fold 2 \alternative' statement with an empty leading +text item in a \lyrics context in order to achieve multiple lyrics lines +in a _section_ of a score ? . * make all Feta (including dynamics) available to the user in textual scripts. Examples: "D.S. al \coda", "\mf espress.". @@ -55,19 +98,7 @@ abc2ly, midi2ly? .* BUGS . * [c8. c16 c16 c16] in 6/8 timesig. . * staffside spanner (crescendo!) along with staffswitch. -. * --- 1, sometimes broken slurs start too early in the next line: - -\score { - \context Staff { - \clef "bass"; - \notes \relative c' { - \time 4/4; \key g; - a4 g8 fis a d c d ~ \break | d e d b a b a fis \break - } - } -} - ---- 2, margin notes don't work correctly for the pianostaff (in the +. * --- 2, margin notes don't work correctly for the pianostaff (in the following example, i expect the "piano" string to be centered vertically between the two staves): diff --git a/VERSION b/VERSION index 95a1009af5..d05f557d1e 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=2 -PATCH_LEVEL=2 +PATCH_LEVEL=3 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/input/paddy.abc b/input/paddy.abc index 0f917a2618..6b574944f5 100644 --- a/input/paddy.abc +++ b/input/paddy.abc @@ -1,4 +1,4 @@ - +X:1 T:Paddy O'Rafferty C:Trad. M:6/8 diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index e81ebaef01..1b7b0687e5 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -429,11 +429,15 @@ def parse_duration (str, parser_state): current_dots = parser_state.next_dots parser_state.next_dots = 0 + + while str[0] == ' ': + str = str [1:] + while str[0] == '>': str = str [1:] current_dots = current_dots + 1; parser_state.next_den = parser_state.next_den * 2 - + while str[0] == '<': str = str [1:] den = den * 2 @@ -474,6 +478,10 @@ def try_parse_articulation (str, state): state.next_articulation = state.next_articulation + '-\\trill' str = str[1:] + if str[:1] =='H': + state.next_articulation = state.next_articulation + '-\\fermata' + str = str[1:] + # s7m2 input doesnt care about spaces if re.match('[ \t]*\(', str): str = string.lstrip (str)