You need to do make clean first, because we've removed some source files. I should have mentioned that in the review request.
Thanks, Carl On 6/14/10 12:18 PM, "Trevor Daniels" <t.dani...@treda.co.uk> wrote: > Hi Carl > > I downloaded and applied Patch set 1, but make failed with > > make[2]: Leaving directory `/media/Data/flower/include' > make[1]: Leaving directory `/media/Data/flower' > make[1]: Entering directory `/media/Data/lily' > rm -f ./out/auto-beam-engraver.dep; > DEPENDENCIES_OUTPUT="./out/auto-beam-engraver.dep > ./out/auto-beam-engraver.o" > ++ -c -Woverloaded-virtual -I/usr/include/python2.6 -I/usr/include/python2.6 > -fno-strict-aliasing -g -fwrapv -DHAVE_CONFIG_H -DNDEBUG -I./include > -I./out -I../flower/include -I../flower/./out -I../flower/include > -O2 -finline-functions -g -pipe -pthread -I/usr/include/freetype2 > -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 > -I/usr/lib/glib-2.0/include -Wno-pmf-conversions -W -Wall -Wconversion > -o out/auto-beam-engraver.o auto-beam-engraver.cc > make[1]: *** No rule to make target `include/beam-settings.hh', > needed by `out/beaming-pattern.o'. Stop. > make[1]: Leaving directory `/media/Data/lily' > make: *** [all] Error 2 > > Trevor > > ----- Original Message ----- > From: <carl.d.soren...@gmail.com> > To: <carl.d.soren...@gmail.com> > Cc: <re...@codereview.appspotmail.com>; <lilypond-devel@gnu.org> > Sent: Sunday, June 13, 2010 2:47 AM > Subject: Redo autobeam settings to make resetting easier > (issue1667041) > > >> Reviewers: , >> >> Message: >> I have *finally* completed the autobeaming patch. >> >> The patch eliminates beamSettings as a major alist containing >> settings >> for various time signatures. >> >> Instead, autobeaming is controlled by some simple context >> properties: >> >> beamSettings, beatLength, and measureGrouping. >> >> In order to give a persistent setting for autobeaming, there is >> also a >> context property timeSignatureSettings that stores default values >> of >> measureGrouping, beatLength, and beamSettings for a given time >> signature. >> >> The defaults can be overridden and reverted with >> overrideTimeSignatureSettings and revertTimeSignatureSettings. >> >> To facilitate doing the override, there is a scheme function >> make-setting that constructs the appropriate timeSignatureSetting >> from a >> given beatLength, measureGrouping, and beamSettings. >> >> This patch contains lots of snippets because I needed to run >> makelsr in >> order to get the snippets out of Documentation/snippets/new/ in >> order to >> test the documentation build. >> >> Thanks, >> >> Carl >> >> >> Description: >> Redo autobeam settings to make resetting easier >> Autobeaming now depends on context properties that can be >> \set by the user. When the time signature is changed, default >> autobeam settings for the time signature are read and the context >> properties are changed to set the autobeaming properties. >> >> This change eliminates \overrideBeamSettings and >> \revertBeamSettings. >> >> New functions have been defined to set time signature default >> properties: >> \overrideTimeSignatureSettings >> and >> \revertTimeSignatureSettings >> in order to give autobeam settings persistence through time >> signature >> changes. >> >> A Scheme function make-setting has been defined to make it >> easier to create a time signature setting. >> >> Please review this at http://codereview.appspot.com/1667041/show >> >> Affected files: >> M Documentation/de/notation/rhythms.itely >> M Documentation/es/notation/rhythms.itely >> M Documentation/fr/notation/rhythms.itely >> M Documentation/notation/rhythms.itely >> M Documentation/snippets/accordion-discant-symbols.ly >> M >> Documentation/snippets/adding-a-figured-bass-above-or-below-the-notes.ly >> M Documentation/snippets/adding-ambitus-per-voice.ly >> M >> Documentation/snippets/adding-bar-lines-to-chordnames-context.ly >> M Documentation/snippets/adding-drum-parts.ly >> M Documentation/snippets/adding-fingerings-to-tablatures.ly >> M Documentation/snippets/adding-the-current-date-to-a-score.ly >> M >> Documentation/snippets/adding-volta-brackets-to-additional-staves.ly >> M >> Documentation/snippets/additional-voices-to-avoid-collisions.ly >> M Documentation/snippets/adjusting-lyrics-vertical-spacing.ly >> M >> Documentation/snippets/adjusting-the-shape-of-falls-and-doits.ly >> M Documentation/snippets/aligning-bar-numbers.ly >> M >> Documentation/snippets/aligning-marks-with-various-notation-objects.ly >> M >> Documentation/snippets/allowing-fingerings-to-be-printed-inside-the-staff.ly >> M Documentation/snippets/ambitus-with-multiple-voices.ly >> M Documentation/snippets/ancient-fonts.ly >> M Documentation/snippets/ancient-headword.ly >> M >> Documentation/snippets/ancient-notation-template----modern-transcription-of-g >> regorian-music.ly >> M >> Documentation/snippets/ancient-notation-template----modern-transcription-of-m >> ensural-music.ly >> M >> Documentation/snippets/applying-note-head-styles-depending-on-the-step-of-the >> -scale.ly >> M Documentation/snippets/arabic-improvisation.ly >> M Documentation/snippets/beam-endings-in-score-context.ly >> M Documentation/snippets/beam-grouping-in-7-8-time.ly >> M Documentation/snippets/beams-across-line-breaks.ly >> M Documentation/snippets/changing--flageolet-mark-size.ly >> M Documentation/snippets/changing-beam-knee-gap.ly >> M Documentation/snippets/changing-chord-separator.ly >> M Documentation/snippets/changing-form-of-multi-measure-rests.ly >> M Documentation/snippets/changing-partcombine-texts.ly >> M >> Documentation/snippets/changing-text-and-spanner-styles-for-text-dynamics.ly >> M Documentation/snippets/changing-the-breath-mark-symbol.ly >> M >> Documentation/snippets/changing-the-positions-of-figured-bass-alterations.ly >> M >> Documentation/snippets/changing-the-tempo-without-a-metronome-mark.ly >> M >> Documentation/snippets/changing-the-time-signature-without-affecting-the-beam >> ing.ly >> M Documentation/snippets/changing-the-tuplet-number.ly >> M Documentation/snippets/chord-name-exceptions.ly >> M Documentation/snippets/chord-name-major7.ly >> M Documentation/snippets/chordchanges-for-fretboards.ly >> M Documentation/snippets/chords-headword.ly >> M Documentation/snippets/clip-systems.ly >> M >> Documentation/snippets/combining-two-parts-on-the-same-staff.ly >> M Documentation/snippets/compound-time-signatures.ly >> M >> Documentation/snippets/conducting-signs,-measure-grouping-signs.ly >> M Documentation/snippets/contemporary-glissando.ly >> M >> Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly >> M >> Documentation/snippets/controlling-the-placement-of-chord-fingerings.ly >> M >> Documentation/snippets/controlling-the-vertical-ordering-of-scripts.ly >> M Documentation/snippets/creating-a-delayed-turn.ly >> M >> Documentation/snippets/creating-arpeggios-across-notes-in-different-voices.ly >> M >> Documentation/snippets/creating-cross-staff-arpeggios-in-a-piano-staff.ly >> M >> Documentation/snippets/creating-cross-staff-arpeggios-in-other-contexts.ly >> M >> Documentation/snippets/creating-metronome-marks-in-markup-mode.ly >> M Documentation/snippets/customizing-fretboard-fret-diagrams.ly >> M Documentation/snippets/customizing-markup-fret-diagrams.ly >> M >> Documentation/snippets/default-direction-of-stems-on-the-center-line-of-the-s >> taff.ly >> M >> Documentation/snippets/defining-predefined-fretboards-for-other-instruments.l>> y >> M >> Documentation/snippets/display-bracket-with-only-one-staff-in-a-system.ly >> M Documentation/snippets/displaying-complex-chords.ly >> M Documentation/snippets/displaying-grob-ancestry.ly >> M >> Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including >> -naturals.ly >> M Documentation/snippets/dynamics-custom-text-spanner-postfix.ly >> M Documentation/snippets/dynamics-text-spanner-postfix.ly >> M Documentation/snippets/editorial-headword.ly >> M Documentation/snippets/engraving-ties-manually.ly >> M >> Documentation/snippets/entering-several-tuplets-using-only-one--times-command >> .ly >> M Documentation/snippets/expressive-headword.ly >> M Documentation/snippets/faking-a-hammer-in-tablatures.ly >> M Documentation/snippets/figured-bass-headword.ly >> M >> Documentation/snippets/fingerings,-string-indications,-and-right-hand-fingeri >> ngs.ly >> M Documentation/snippets/flamenco-notation.ly >> M Documentation/snippets/flat-flags-and-beam-nibs.ly >> M Documentation/snippets/forcing-horizontal-shift-of-notes.ly >> M Documentation/snippets/fretted-headword.ly >> M >> Documentation/snippets/grid-lines--changing-their-appearance.ly >> M Documentation/snippets/grouping-beats.ly >> M Documentation/snippets/guitar-slides.ly >> M Documentation/snippets/guitar-strum-rhythms.ly >> M >> Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly >> M Documentation/snippets/incipit.ly >> M >> Documentation/snippets/indicating-cross-staff-chords-with-arpeggio-bracket.ly >> M Documentation/snippets/inserting-a-caesura.ly >> M Documentation/snippets/isolated-percent-repeats.ly >> M Documentation/snippets/jazz-combo-template.ly >> M Documentation/snippets/keyboard-headword.ly >> M Documentation/snippets/letter-tablature-formatting.ly >> M Documentation/snippets/makam-example.ly >> M >> Documentation/snippets/making-slurs-with-complex-dash-structure.ly >> M >> Documentation/snippets/making-some-staff-lines-thicker-than-the-others.ly >> M >> Documentation/snippets/mensurstriche-layout-bar-lines-between-the-staves.ly >> M Documentation/snippets/modern-tab-text-clef.ly >> M >> Documentation/snippets/modifying-default-values-for-articulation-shorthand-no >> tation.ly >> M Documentation/snippets/multi-measure-rest-markup.ly >> M Documentation/snippets/nesting-staves.ly >> M Documentation/snippets/new/beam-endings-in-score-context.ly >> M Documentation/snippets/new/beam-grouping-in-7-8-time.ly >> M >> Documentation/snippets/new/changing-the-time-signature-without-affecting-the- >> beaming.ly >> M Documentation/snippets/new/compound-time-signatures.ly >> M >> Documentation/snippets/new/conducting-signs,-measure-grouping-signs.ly >> M Documentation/snippets/new/fretted-headword.ly >> M Documentation/snippets/new/reverting-default-beam-endings.ly >> M Documentation/snippets/non-default-tuplet-numbers.ly >> M Documentation/snippets/non-traditional-key-signatures.ly >> M Documentation/snippets/numbers-as-easy-note-heads.ly >> M Documentation/snippets/orchestra,-choir-and-piano-template.ly >> M Documentation/snippets/ottava-text.ly >> M Documentation/snippets/percent-repeat-count-visibility.ly >> M Documentation/snippets/percent-repeat-counter.ly >> M >> Documentation/snippets/permitting-line-breaks-within-beamed-tuplets.ly >> M Documentation/snippets/piano-template-simple.ly >> M >> Documentation/snippets/piano-template-with-centered-dynamics.ly >> M Documentation/snippets/piano-template-with-centered-lyrics.ly >> M >> Documentation/snippets/piano-template-with-melody-and-lyrics.ly >> M Documentation/snippets/pitches-headword.ly >> M Documentation/snippets/placement-of-right-hand-fingerings.ly >> M Documentation/snippets/polyphony-in-tablature.ly >> M >> Documentation/snippets/positioning-grace-notes-with-floating-space.ly >> M Documentation/snippets/positioning-multi-measure-rests.ly >> M >> Documentation/snippets/positioning-text-markups-inside-slurs.ly >> M >> Documentation/snippets/preventing-extra-naturals-from-being-automatically-add >> ed.ly >> M >> Documentation/snippets/preventing-natural-signs-from-being-printed-when-the-k >> ey-signature-changes.ly >> M >> Documentation/snippets/printing-a-repeat-sign-at-the-beginning-of-a-piece.ly >> M >> Documentation/snippets/printing-bar-numbers-at-regular-intervals.ly >> M >> Documentation/snippets/printing-bar-numbers-inside-boxes-or-circles.ly >> M >> Documentation/snippets/printing-hairpins-using-al-niente-notation.ly >> M Documentation/snippets/printing-marks-on-every-staff.ly >> M >> Documentation/snippets/printing-metronome-and-rehearsal-marks-below-the-staff >> .ly >> M >> Documentation/snippets/printing-the-bar-number-for-the-first-measure.ly >> M >> Documentation/snippets/quoting-another-voice-with-transposition.ly >> M Documentation/snippets/quoting-another-voice.ly >> M >> Documentation/snippets/redefining-grace-note-global-defaults.ly >> M Documentation/snippets/removing-bar-numbers-from-a-score.ly >> M Documentation/snippets/removing-the-first-empty-line.ly >> M Documentation/snippets/repeats-headword.ly >> M Documentation/snippets/rest-styles.ly >> M Documentation/snippets/reverting-default-beam-endings.ly >> M Documentation/snippets/rhythms-headword.ly >> M Documentation/snippets/scheme-engraver-ambitus.ly >> M Documentation/snippets/screech-boink.ly >> M >> Documentation/snippets/setting-hairpin-behavior-at-bar-lines.ly >> M >> Documentation/snippets/setting-the-minimum-length-of-hairpins.ly >> M Documentation/snippets/shortening-volta-brackets.ly >> M Documentation/snippets/showing-chords-at-changes.ly >> M Documentation/snippets/simple-lead-sheet.ly >> M Documentation/snippets/simultaneous-headword.ly >> M >> Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.l>> y >> M >> Documentation/snippets/single-staff-template-with-notes-and-chords.ly >> M >> Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly >> M >> Documentation/snippets/single-staff-template-with-only-notes.ly >> M Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly >> M Documentation/snippets/staff-headword.ly >> M Documentation/snippets/stand-alone-two-column-markup.ly >> M Documentation/snippets/stem-and-beam-behavior-in-tablature.ly >> M Documentation/snippets/string-quartet-template-simple.ly >> M >> Documentation/snippets/string-quartet-template-with-separate-parts.ly >> M Documentation/snippets/sub-dividing-beams.ly >> M Documentation/snippets/text-headword.ly >> M >> Documentation/snippets/transposing-pitches-with-minimum-accidentals-smart-tra >> nspose.ly >> M Documentation/snippets/tweaking-clef-properties.ly >> M Documentation/snippets/tweaking-grace-layout-within-music.ly >> M Documentation/snippets/unfretted-headword.ly >> M >> Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly >> M Documentation/snippets/using-double-slurs-for-legato-chords.ly >> M >> Documentation/snippets/using-grace-note-slashes-with-normal-heads.ly >> M >> Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly >> M Documentation/snippets/using-the-whiteout-property.ly >> M Documentation/snippets/using-ties-with-arpeggios.ly >> M >> Documentation/snippets/vertically-aligned-dynamics-and-textscripts.ly >> M >> Documentation/snippets/vertically-aligning-ossias-and-lyrics.ly >> M >> Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction >> .ly >> M >> Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and- >> above-the-staves.ly >> M >> Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly >> M Documentation/snippets/vocal-ensemble-template.ly >> M Documentation/snippets/volta-below-chords.ly >> M Documentation/snippets/wind-headword.ly >> M input/regression/les-nereides.ly >> M lily/auto-beam-engraver.cc >> M lily/beam-setting-scheme.cc >> M lily/beaming-pattern.cc >> M lily/include/beam-settings.hh >> M lily/measure-grouping-engraver.cc >> M ly/bagpipe.ly >> M ly/engraver-init.ly >> M ly/music-functions-init.ly >> M python/convertrules.py >> M scm/auto-beam.scm >> M scm/define-context-properties.scm >> M scm/lily-library.scm >> M scm/lily.scm >> M scm/music-functions.scm >> A scm/time-signature-settings.scm >> >> >> >> _______________________________________________ >> lilypond-devel mailing list >> lilypond-devel@gnu.org >> http://lists.gnu.org/mailman/listinfo/lilypond-devel >> >> > > _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel