From 59c3283543bff48ba7fabbf85e562cb3b99a4f78 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 18 Dec 1998 17:50:58 +0100 Subject: [PATCH] release: 1.1.16 --- Documentation/index.yo | 2 +- Documentation/tex/computer-notation.bib | 3 +- Documentation/tex/mudela-book-doc.doc | 34 +++--- Documentation/tex/other-packages.bib | 11 +- Documentation/tex/tutorial.yo | 7 +- NEWS | 13 +-- TODO | 11 -- VERSION | 4 +- init/engraver.ly | 2 +- input/praeludium-fuga-E.ly | 9 +- lily/include/my-lily-parser.hh | 3 - lily/local-key-engraver.cc | 4 + lily/my-lily-parser.cc | 20 +--- lily/parser.yy | 4 - lily/staff-sym-engraver.cc | 2 +- lily/stem.cc | 1 + lily/text-item.cc | 7 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mutopia/F.Schubert/standchen.ly | 136 ++++++++++++------------ mutopia/W.A.Mozart/cadenza.ly | 2 +- scripts/convert-mudela.py | 2 +- scripts/ly2dvi.py | 2 +- 24 files changed, 141 insertions(+), 158 deletions(-) diff --git a/Documentation/index.yo b/Documentation/index.yo index 18c6352956..8fc8a4aed9 100644 --- a/Documentation/index.yo +++ b/Documentation/index.yo @@ -20,7 +20,7 @@ it()url(DEDICATION)(DEDICATION.html) it()url(FAQs)(faq.html) it()url(The README)(DOEXPAND(tops)/README.html) it()url(The installation instructions)(DOEXPAND(tops)/INSTALL.html) -it()url(But i'm using Windows, am i concerned now?)(README-W32.html) +it()url(Microsoft Windows instructions)(README-W32.html) ) nsubsect(Why: Background Information) diff --git a/Documentation/tex/computer-notation.bib b/Documentation/tex/computer-notation.bib index eaa4ba8043..0f6e4defe6 100644 --- a/Documentation/tex/computer-notation.bib +++ b/Documentation/tex/computer-notation.bib @@ -64,8 +64,7 @@ exhibit intelligent behaviour. HWN} year = 1975, volume = 9, number = 6, - pages = {291--298} - + pages = {291--298}, note = {Gourlay\cite{gourlay86} writes: A discussion of the design and potential uses of the DARMS music-description language.} } diff --git a/Documentation/tex/mudela-book-doc.doc b/Documentation/tex/mudela-book-doc.doc index 5282037d0b..386417f39d 100644 --- a/Documentation/tex/mudela-book-doc.doc +++ b/Documentation/tex/mudela-book-doc.doc @@ -1,8 +1,4 @@ -% -% written by Tom Cato Amundsen -% send questions/patches to: -% gnu-music-discuss@gnu.org - +% -*-LaTeX-*- \documentclass[a4paper, 12pt]{article} \usepackage{t1enc,isolatin1} @@ -254,10 +250,11 @@ and marginspars just as any other included eps graphics. \begin{mudela} \score{ \notes\relative c'{ - \time 12/8; - r4-\fermata [b16-.( )b-.] [f'8-- dis16-.( )dis-. gis8--] - [f16-.( )f-. dis8-- gis16-.( )gis-.] cis4.-\fermata | - r4.-\fermata [cis,16 cis g'8 f16 f b8][g16 g f8 b16 b] dis4.-\fermata + \time 12/8; + r4-\fermata [b16-.( )b-.] [f'8-- dis16-.( )dis-. gis8--] + [f16-.( )f-. dis8-- gis16-.( )gis-.] cis4.-\fermata | + + r4.-\fermata [cis,16 cis g'8 f16 f b8][g16 g f8 b16 b] dis4.-\fermata } \paper{linewidth = 7.\cm;} } @@ -271,21 +268,21 @@ danish composer Andy Pape. The music is put inside a the right marging if you set floatingfigure width and mudela linewidth to the same value. The code looks like this: -\begin{verbatim} -\begin{floatingfigure}[r]{7cm} -\begin{mudela} +\verb|\begin{floatingfigure}{7cm}| +\begin{mudela}[verbatim] \score{ \notes\relative c'{ \time 12/8; - r4-\fermata [b16-.( )b-.] [f'8-- dis16-.( )dis-. gis8--] - [f16-.( )f-. dis8-- gis16-.( )gis-.] cis4.-\fermata | - r4.-\fermata [cis,16 cis g'8 f16 f b8][g16 g f8 b16 b] dis4.-\fermata + r4.-\fermata [b16-.( )b-.] [f'8-- dis16-.( )dis-. gis8--] + [f16-.( )f-. dis8-- gis16-.( )gis-.] cis8.-\fermata | + + r4.-\fermata [cis,16 cis g'8 f16 f b8] + [g16 g f8 b16 b] dis4.-\fermata } \paper{linewidth = 7.\cm;} } \end{mudela} -\end{floatingfigure} -\end{verbatim} +\verb|\end{floatingfigure}| \twocolumn[\large The following is written in two columns just to show what mudela-book can do..\normalsize] @@ -352,3 +349,6 @@ environment when you don't want \LaTeX~to do any linebreaking) \end{document} +\begin{verbatim} + +\end{verbatim} diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib index a1fc1732d8..97e6aa638b 100644 --- a/Documentation/tex/other-packages.bib +++ b/Documentation/tex/other-packages.bib @@ -237,12 +237,13 @@ author = {Arkkra Enterprises}, @misc{Sibelius, title = {Sibelius}, - HTML={http://www.acorn.co.uk/developers/sibelius/Home}, - note={Notation editor on Acorn machines. Their developers call it ``best - notation program available''. In any case, - they are good at bragging.}, + author={Sibelius Software Ltd.}, + publisher={Sibelius Software Ltd.}, + address={Cambridge, Great Britain}, + HTML={http://www.sibelius.com/}, + note={Notation editor originally on Acorn, nowadays on W32 and mac as well.} } - + @misc{schott-urw, title={``EDV-Notensatz''}, note={URW's music-engraving system described by [Wanske]. (Although URW diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index 3aef3a0891..33add0a7ec 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -1214,7 +1214,7 @@ COMMENT( \type Lyrics \lyrics { 'got8 me on my knees,4 Le-8 lie! })COMMENT( )The result is technically correct, but it needs a melody to make it -performable: COMMENT( +perfor0mable: COMMENT( )mudela(fragment,verbatim)( < @@ -1601,7 +1601,7 @@ The notes in a triplet take 2/3 of their notated duration. The syntax for triplet in LilyPond reflects this. To make a triplet, you enter COMMENT( -)mudela(fragment,center)( +)mudela(verbatim,fragment,center)( \type Voice \times 2/3 { c''4 c''4 c''4 } )COMMENT( @@ -1612,7 +1612,7 @@ don't need this, if a Voice context is already instantiated, like in the following example: COMMENT( -)mudela(fragment,center)( +)mudela(fragment,verbatim,center)( c''4 \times 2/3 { c''4 c''4 c''4 } c''4 )COMMENT( @@ -1628,3 +1628,4 @@ the bracket, the bracket is omitted. sect(Repeats) +[todo] diff --git a/NEWS b/NEWS index ac974362f4..a2c9b3d6a0 100644 --- a/NEWS +++ b/NEWS @@ -1,18 +1,19 @@ ---- ../lilypond-1.1.15/NEWS Mon Dec 14 15:30:19 1998 -++ b/NEWS Tue Dec 15 00:10:45 1998 -@@ -1,3 +1,7 @@ +pl 15.uu1 + - dynamic fix. + - junked abbrev stuff from parser. + pl15.tca1 - fixed verbatim option behaviour for mudela-book. - added mudela-book option intertext="some text" - mudela-book now understand latex \begin{verbatim} - pl 15 - - pl 14.hwn1pl 15.jcn1 + +pl 15.jcn1 - chord inversion: * enter C/E * display chord names according to boolean property \property Score.chordInversion; +********* pl 15 pl 14.hwn1 diff --git a/TODO b/TODO index 16fe362e57..a5006302d9 100644 --- a/TODO +++ b/TODO @@ -21,9 +21,6 @@ BUGS: - repeat bars span staffs - placement alternative number - * who is trying to print too (small/big) piano braces all the time? - warning: piano brace too small (16.000pt) - * latex bla.tex broken (titles / \lilyfooter stuff?) * msgfmt -o check? @@ -54,8 +51,6 @@ BUGS: * repeat bars: need distance after ":|" and before "|:" - * The time signature warnings still remain, will be fixed later. - Summary of minor spelling irregularities: - capitalization/use of underscores in property names @@ -141,8 +136,6 @@ STUFF gs: Error: /undefined in draw_beam gs: Operand stack: - * run texhash after installing .tex - * fix vertical alignment and stafflines * GrandStaff needs more work -- I want a single word @@ -153,8 +146,6 @@ STUFF through, so the \property Voice.Instrument would be a stop, and \property GrandStaff.instrument would be PipeOrgan...) - * make Tie_req a "command" { ~ } - * revise the Score_priority_align_engraver concept. It sucks. * make new VoiceOne, VoiceTwo, VoiceThree contexts with @@ -184,8 +175,6 @@ ydirection and hshift preset * fix audio-items (don't use (input) requests, but copy data) - * junk My_lily_parser::abbrev_beam_type_i_ - * make sure all ex's have a mudela-version * do rest-collisions for Multi_measure_rests as well. diff --git a/VERSION b/VERSION index d556a6114f..bf0c2ee231 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=15 -MY_PATCH_LEVEL=tca1 +PATCH_LEVEL=16 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/init/engraver.ly b/init/engraver.ly index 044beade24..c15b6ae476 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -74,7 +74,7 @@ StaffContext=\translator { RhythmicStaffContext=\translator{ \type "Line_group_engraver_group"; - nolines = "1"; + numberOfStaffLines = "1"; \consists "Pitch_squash_engraver"; \consists "Separating_line_group_engraver"; \name RhythmicStaff; diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index c8d3c86919..d9c5e8dbd8 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -214,7 +214,14 @@ breakmusic = \notes { ydirection = "-1"; hshift = "1"; } - + \translator { + \StaffContext + + \accepts VoiceFour; + \accepts VoiceThree; + \accepts VoiceTwo; + \accepts VoiceOne; + } } \midi { diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index 918e61d0e0..889ccf1bb7 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -30,8 +30,6 @@ public: void set_version_check (bool ignore); public: - int abbrev_beam_type_i_; - int default_abbrev_i_; Duration default_duration_; Extender_req* extender_req; Scope *default_header_p_; @@ -74,7 +72,6 @@ private: Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes); String notename_str (Melodic_req* melodic); void set_last_duration (Duration const *); - void set_abbrev_beam (int type_i); friend int yyparse (void*); }; diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 88042137b5..be9ad274a4 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -67,6 +67,10 @@ Local_key_engraver::process_acknowledged () key_item_p_ = new Local_key_item; announce_element (Score_element_info (key_item_p_, 0)); } + + /* + UGH! Changes input ! + */ if (note_l->cautionary_b_) { note_l->pitch_.cautionary_b_ = true; diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 5dbe0e69c2..5f733ef6db 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -26,9 +26,7 @@ My_lily_parser::My_lily_parser (Sources * source_l) first_b_ = true; source_l_ = source_l; lexer_p_ = 0; - abbrev_beam_type_i_ = 0; default_duration_.durlog_i_ = 2; - default_abbrev_i_ = 0; error_level_i_ = 0; extender_req = 0; fatal_error_i_ = 0; @@ -94,11 +92,6 @@ My_lily_parser::parser_error (String s) exit_status_i_ = 1; } -void -My_lily_parser::set_abbrev_beam (int type_i) -{ - abbrev_beam_type_i_ = type_i; -} void @@ -344,18 +337,7 @@ My_lily_parser::get_parens_request (int t) case '[': case ']': { - if (!abbrev_beam_type_i_) - { - reqs.push (new Beam_req); - } - else - { - Abbreviation_beam_req* a = new Abbreviation_beam_req; - a->type_i_ = abbrev_beam_type_i_; - if (t==']') - abbrev_beam_type_i_ = 0; - reqs.push (a); - } + reqs.push (new Beam_req); } break; diff --git a/lily/parser.yy b/lily/parser.yy index 202adcfcc2..319fddd88d 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -523,7 +523,6 @@ translator_spec_body: */ score_block: SCORE { THIS->remember_spot (); - THIS->error_level_i_ =0; } /*cont*/ '{' score_body '}' { $$ = $4; @@ -531,9 +530,6 @@ score_block: if (!$$->def_p_arr_.size ()) $$->add_output (THIS->default_paper_p ()); - /* handle error levels. */ - $$->errorlevel_i_ = THIS->error_level_i_; - THIS->error_level_i_ = 0; } ; diff --git a/lily/staff-sym-engraver.cc b/lily/staff-sym-engraver.cc index a83032eba0..d18374277b 100644 --- a/lily/staff-sym-engraver.cc +++ b/lily/staff-sym-engraver.cc @@ -39,7 +39,7 @@ Staff_symbol_engraver::do_creation_processing() void Staff_symbol_engraver::do_removal_processing() { - Scalar l (get_property ("nolines")); + Scalar l (get_property ("numberOfStaffLines")); if (l.isnum_b ()) { span_p_->no_lines_i_ = l; diff --git a/lily/stem.cc b/lily/stem.cc index 2f1f141a12..69dbd33776 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -43,6 +43,7 @@ Stem::Stem () staff_size_i_ = 8; beam_gap_i_ = 0; + beam_l_ = 0; } Interval_t diff --git a/lily/text-item.cc b/lily/text-item.cc index 1cc4105f69..04f6ec6997 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -70,12 +70,17 @@ Text_item::brew_molecule_p () const if (!fat_b_) a.dim_[X_AXIS] = Interval (0,0); Molecule* mol_p = new Molecule (a); - +#if 0 if (dir_<0) // should do something better anyway. mol_p->translate_axis (mol_p->extent ().y ().left , Y_AXIS); +#endif + mol_p->translate_axis (coordinate_offset_f_, Y_AXIS); + +#if 0 // fine for one lyric, urg for lyric chord mol_p->translate_axis (a.dim_.y ().length (), Y_AXIS); +#endif return mol_p; } diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index ac80176182..24680cd226 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.15 -Inschrijf datum: 14DEC98 +Versie: 1.1.16 +Inschrijf datum: 18DEC98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.15.tar.gz + 770k lilypond-1.1.16.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.15.tar.gz + 770k lilypond-1.1.16.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 897c5fbf61..61828cf697 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.15 -Entered-date: 14DEC98 +Version: 1.1.16 +Entered-date: 18DEC98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.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 - 770k lilypond-1.1.15.tar.gz + 770k lilypond-1.1.16.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.15.tar.gz + 770k lilypond-1.1.16.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index e59b099c78..72a7498c8d 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.15 +Version: 1.1.16 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.15.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.16.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 0e2b89d72c..3a9d9a039f 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -170,44 +170,44 @@ $treble_intro = \notes\relative c{ \clef violin; % ugh: id like to type this! %r8\pp [ ] | - r8^"\bf m\\\"assig"\pp <[g'-. c-.> ] | - r8 <[as-. c-.> ] | - r8 <[as-. c-.> ] | - r8 <[g-. b-.> ] | + r8^"\bf m\\\"assig"\pp [ ] | + r8 [ ] | + r8 [ ] | + r8 [ ] | \break } $treble_verse1 = \notes\relative c{ % \clef violin; %5 - r8 <[g' c> ] | - r8 <[f c'> ] | - r8 <[f g b> ] | - r8 <[es g c> ] | + r8 [ ] | + r8 [ ] | + r8 [ ] | + r8 [ ] | <)f8 d> \times 2/3 { < [ f( d> <)d b] > } | %10 | - r8 <[g, c> ] | - r8 <[f c'> ] | - r8 <[f as bes> ] | - r8 <[es g bes> ] + r8 [ ] | + r8 [ ] | + r8 [ ] | + r8 [ ] <{ es'~ | d4. ~ f8}{ c'~ | bes4. ~ as8 } > \times 2/3 { < [f( as> <)d f] > } | %16 | - r8 <[f, g> ] | - r8 <[es g> ] | - r8\pp <[es as c> ] | + r8 [ ] | + r8 [ ] | + r8\pp [ ] | %20 - r8 <[es g bes> ] | + r8 [ ] | % \times 2/3 { [ as\grace( bes ) \times 2/3 { [ as'8( g as] } c4.-> ) as8 | g2. | - r8 <[f, g> ] | - r8 <[e g> ] | - r8 <[f a c> ] | - r8 <[e g c> ] | + r8 [ ] | + r8 [ ] | + r8 [ ] | + r8 [ ] | \times 2/3 < { [ f'8\f( e f] } { f' e f } > @@ -216,13 +216,13 @@ $treble_verse1 = \notes\relative c{ $treble_eentje = \notes \relative c'{ | - <[as8.->( c> <)f16 )as>] | - <[e8-. g-.(> ] | - <[b,8-. g'-.(> ] | + [( c> <)f16 )as>] | + [ ] | + [ ] | | - <[a8. c> ] | - <[e8-. g-.(> ] | - <[b,8-. g'-.(> ] | + [ ] | + [ ] | + [ ] | %60 | } @@ -231,10 +231,10 @@ $treble_through = \notes \relative c'{ | %61 R2. | - <[g,8.\< g'> <\! b16\> b'16> ] | + [ <\! b16\> b'16> ] | < { c4( )b } { c'4( )b } > \!r | % ugh -% <[d8.-> d->> c16] | +% [ d->> c16] | [ d,-> > c16] | % ugh ugh: connecting chords %65 @@ -252,9 +252,9 @@ $treble_through = \notes \relative c'{ } > % 4 bars copied from end verse1 - r8 <[f, a c> ] | + r8 [ ] | %70 - r8 <[e g c> ] | + r8 [ ] | \times 2/3 < { [ f'8\f( e f] } { f' e f }> < { a4.-> )f8 } { a4. f8 } > | @@ -267,9 +267,9 @@ $treble_through = \notes \relative c'{ | % four copied from begin eentje - <[as8.-> c> ] | - <[e8-. g-.(> ] | - <[b,8-. g'-.(> ] | + [ c> ] | + [ ] | + [ ] | %80 \property Voice . textstyle = "italic" | @@ -295,73 +295,73 @@ $bass_verse1 = \notes\relative c{ r4 | r4 | r4 | - <[g'' d'> ] | + [ ] | %10 - <[g'' c> ] | + [ ] | r4 | r4 | r4 | r4 | %15 - bes'8 <[bes' f'> ] | - es,8 <[bes' es> ] | + bes'8 [ ] | + es,8 [ ] | r4 | r4 | r4 | r4 | - <[f'' bes> ] | - <[es'' g bes> ] | + [ ] | + [ ] | r4 | r4 | r4 | r4 | - <[d'' g> ] | - c,8 <[c' e g> ] | + [ ] | + c,8 [ ] | } $bass_eentje = \notes\relative c{ \property Voice.dynamicdir=1 - <[c' f as!> ] | - c,8 <[c' e g> ] | - <[d'' g> ] | - c,8 <[e' g> ] | - <[c' f a> ] | - c,8 <[c' e g> ] | - <[d'' g> ] | - c,8 <[e' g> ] | + [ ] | + c,8 [ ] | + [ ] | + c,8 [ ] | + [ ] | + c,8 [ ] | + [ ] | + c,8 [ ] | } $bass_through = \notes\relative c{ \property Voice.dynamicdir=1 %61 - <[g' b d> b-> d->> ] | - <[g' d'> b-> d->> ] | + [ b-> d->> ] | + [ b-> d->> ] | % copied - <[g' d'> b-> d->> ] | - <[g' d' e> b-> d->> ] | + [ b-> d->> ] | + [ b-> d->> ] | %65 - <[d''\> e> ] | - <[c' e> ] | - <[a' d f> ] | - <[a' c e> ] | + [ e> ] | + [ ] | + [ ] | + [ ] | % 4 bars copied from end verse1 r4 | %70 r4 | - <[d'' g> ] | - c,8\> <[c' e g> < \! e g c> ] | + [ ] | + c,8\> [ < \! e g c> ] | - <[c' es! g> ] | - <[d'' f> ] | + [ ] | + [ ] | %75 - <[d'' f> ] | - c,8 <[c' e> ] | - c,8 <[c' f> ] | - c,8 <[c' e> ] | - <[g' d'> ] | + [ ] | + c,8 [ ] | + c,8 [ ] | + c,8 [ ] | + [ ] | %80 - c,8 <[c' e> ] | - c,8 <[c' g> ] | + c,8 [ ] | + c,8 [ ] | | } diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly index 1d521bc14c..6f32f626cd 100644 --- a/mutopia/W.A.Mozart/cadenza.ly +++ b/mutopia/W.A.Mozart/cadenza.ly @@ -44,7 +44,7 @@ cad = \notes \relative c' { r8 a [b cis] [d16 cis d e] - f4() [f16 e d c] + f4( [ )f16 e d c] b4-\turn \times 2/3 { [ d8 c8 a8] } g2 diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 69feb53f57..d3c89edec7 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -274,7 +274,7 @@ if 1: def conv(lines): newlines =[] for x in lines: - x = re.sub ('<\\[ ','[<', x) + x = re.sub ('<\\[','[<', x) x = re.sub ('\\]>','>]', x) newlines.append (x) return newlines diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index a36afe5832..b051fef3d5 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -102,7 +102,7 @@ class Input: firstline = this.__fd.readline() this.__fd.seek(0) - if re.match('% Creator: GNU LilyPond [0-9]+[.0-9]+',firstline ): + if re.match('%created by: GNU LilyPond [0-9]+[.0-9]+',firstline ): return 'output' else: return 'source' -- 2.39.5