From: hanwen Date: Mon, 13 May 2002 13:07:31 +0000 (+0000) Subject: * lily/parser.yy (My_lily_parser): uncomment code. (Causes X-Git-Tag: release/1.5.59~70 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d28f3146b0cf4b06be3bb29651e4e6a9e0e62e10;p=lilypond.git * lily/parser.yy (My_lily_parser): uncomment code. (Causes problems with recent bison releases). * make/lilypond.redhat.spec.in: add pfa fonts to X. --- diff --git a/ChangeLog b/ChangeLog index c73fa2d138..db78e92c1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-05-13 Han-Wen Nienhuys + + * lily/parser.yy (My_lily_parser): uncomment code. (Causes + problems with recent bison releases). + + * make/lilypond.redhat.spec.in: add pfa fonts to X. + +2002-05-07 Heikki Junes + + * lilypond-font-lock.el: Fixes the order of the note name list. + 2002-05-06 Jan Nieuwenhuizen * scripts/lilypond-book.py: Add html/dtml output, pseudo-filter diff --git a/VERSION b/VERSION index 6f9ba79be6..9b3ebc3c30 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=55 -MY_PATCH_LEVEL=hjj1 +MY_PATCH_LEVEL=hjj2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index e95a273378..34e9025e59 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -2,16 +2,16 @@ \header { dedication = "dedication" - title = "Title" - subtitle = "Subtitle" - subsubtitle = "Subsubtitle" - composer = "Composer (xxxx-yyyy)" - opus = "Opus 0" - piece = "Piece I" - instrument = "Instrument" - arranger = "Arranger" - poet = "Poet" - texttranslator = "Translator" + title = "title" + subtitle = "subtitle" + subsubtitle = "subsubtitle" + composer = "composer (xxxx-yyyy)" + opus = "opus 0" + piece = "piece i" + instrument = "instrument" + arranger = "arranger" + poet = "poet" + texttranslator = "translator" copyright = "public domain" enteredby = "jcn" source = "urtext" @@ -31,24 +31,24 @@ dynamics = \notes { } pedal = \notes { - s2\sustainDown s2\sustainUp + s2\sustaindown s2\sustainup } \score { - \context PianoStaff < - \context Staff=upper \upper - \context Dynamics=dynamics \dynamics - \context Staff=lower < + \context pianostaff < + \context staff=upper \upper + \context dynamics=dynamics \dynamics + \context staff=lower < \clef bass \lower > - \context Dynamics=pedal \pedal + \context dynamics=pedal \pedal > \paper { \translator { - \type "Engraver_group_engraver" - \name Dynamics - \consists "Output_property_engraver" + \type "engraver_group_engraver" + \name dynamics + \consists "output_property_engraver" Generic_property_list = #generic-voice-properties \consists "Property_engraver" MinimumVerticalExtent = #'(-1 . 1) diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index 8f40c63a40..4da5b6d886 100644 --- a/input/test/reverse-music.ly +++ b/input/test/reverse-music.ly @@ -6,15 +6,21 @@ Simple customised music apply. " } -music = \notes { c'4 d'4( e'4 f'4 } +music = \notes \relative c'' { c4 d4( e4 f4 } #(define (reverse-music music) (let* ((elements (ly-get-mus-property music 'elements)) (reversed (reverse elements)) + (e (ly-get-mus-property music 'element)) (span-dir (ly-get-mus-property music 'span-direction))) (ly-set-mus-property music 'elements reversed) + (if (music? e) + (ly-set-mus-property + music 'element + (reverse-music e))) + (if (dir? span-dir) (ly-set-mus-property music 'span-direction (- span-dir))) diff --git a/lily/clef.cc b/lily/clef.cc index 943f5e24d4..bac75e343f 100644 --- a/lily/clef.cc +++ b/lily/clef.cc @@ -1,4 +1,3 @@ - /* clef.cc -- implement Clef_item @@ -7,7 +6,6 @@ (c) 1997--2002 Han-Wen Nienhuys */ - #include "clef.hh" #include "string.hh" #include "molecule.hh" diff --git a/lily/paper-column.cc b/lily/paper-column.cc index fb22e1314e..248af8cabf 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -128,4 +128,4 @@ Paper_column::brew_molecule (SCM p) ADD_INTERFACE (Paper_column, "paper-column-interface", "", - "between-cols count between-system-string when bounded-by-me shortest-playing-duration shortest-starter-duration"); + "between-cols between-system-string when bounded-by-me shortest-playing-duration shortest-starter-duration"); diff --git a/lily/parser.yy b/lily/parser.yy index 88d34227b8..22d49dc65a 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -116,9 +116,6 @@ set_music_properties (Music *p, SCM a) #include -#ifndef NDEBUG -#define YYDEBUG 1 -#endif #define YYERROR_VERBOSE 1 @@ -1511,7 +1508,8 @@ close_request: $$ = $1; dynamic_cast ($$)->set_span_dir ( START); } - + ; + close_request_parens: '(' { Span_req* s= new Span_req; @@ -2115,9 +2113,9 @@ questions: %% void -My_lily_parser::set_yydebug (bool b) +My_lily_parser::set_yydebug (bool ) { -#ifdef YYDEBUG +#if 0 yydebug = b; #endif } diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index d99dc2ff50..57c2a1f4b5 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -558,7 +558,9 @@ Spacing_spanner::musical_column_spacing (Grob *me, Item * lc, Item *rc, Real inc bool ragged = to_boolean (me->paper_l ()->get_scmvar ("raggedright")); Real strength = (ragged) ? 1.0 : 1 / (max_note_space - max_fixed_note_space); Real distance = (ragged) ? max_fixed_note_space : max_note_space; - Spaceable_grob::add_spring (lc, rc, distance, strength, expand_only); + // Spaceable_grob::add_spring (lc, rc, distance, strength, expand_only); + + Spaceable_grob::add_spring (lc, rc, distance, strength, false); } void diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el index 308d3faaf9..aa3e21c794 100644 --- a/lilypond-font-lock.el +++ b/lilypond-font-lock.el @@ -153,7 +153,7 @@ (cons (concat "\\(" rwregex "\\)") 'font-lock-variable-name-face) ;; ... notes and rests, accidentals and duration (multiplied), e.g., b,?16.*3/4 - '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(flat\\(flat\\)?\\|sharp\\(sharp\\)?\\|ff?\\|ss?\\|is\\(siss\\|s\\|is\\)?\\|es\\(sess\\|s\\|es\\)?\\)?\\)\\|\\(as\\(as\\|es\\)?\\)\\|\\(es\\(es\\)?\\)\\|\\(bb\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9]+\\)?\\)?\\)?\\)" 2 font-lock-type-face) + '("\\(^\\|[ <\{[~(!)\t\\\|]\\)\\(\\(\\(\\(bb\\|as[ae]s\\|eses\\|\\(do\\|re\\|[ms]i\\|[fl]a\\|sol\\)\\(bb?\\|dd?\\|ss?\\)?\\)\\|\\([a-h]\\(\\(flat\\)+\\|\\(sharp\\)+\\|is\\(siss\\|i?s\\)?\\|es\\(sess\\|e?s\\)?\\|ff?\\|ss?\\)?\\)\\)[,']*[?!]?\\|[srR]\\)\\([ \t]*\\(128\\|6?4\\|3?2\\|16?\\|8\\|\\\\breve\\)[.]*\\([ \t]*[*][ \t]*[0-9]+\\(/[1-9][0-9]*\\)?\\)?\\)?\\)" 2 font-lock-type-face) ;; "on top", ... '{[]}'-brackets '("\\([][}{]\\)" 0 font-lock-warning-face t) diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 0fb954c137..abd9e1479e 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -89,6 +89,8 @@ rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp %endif +chkfontpath --add=/usr/share/lilypond/pfa/ + echo 'Please logout first before using LilyPond.' %preun @@ -99,6 +101,7 @@ if [ $1 = 0 ]; then fi %endif +chkfontpath --remove=/usr/share/lilypond/pfa/ %files %defattr(-, root, root) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 4390761f99..f9031e12a7 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -103,7 +103,6 @@ square of the inner notes involved.") (grob-property-description 'collapse-height number? "Minimum height of system start delimiter. If equal or smaller, the bracket is removed.") (grob-property-description 'columns list? "list of grobs, typically containing paper-columns.") -(grob-property-description 'count integer? "") (grob-property-description 'control-points list? "List of 4 offsets (number-pairs) that form control points for the tie/slur shape.") (grob-property-description 'damping integer? "amount of beam slope damping should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams .") (grob-property-description 'dash-length number? "the length of a dash.")