From eff4b7abcc0cbc548c7ba252c073c3e26ea1ae45 Mon Sep 17 00:00:00 2001 From: Mike Solomon Date: Sun, 27 Feb 2011 08:35:37 -0500 Subject: [PATCH] Revert "bad" This reverts commit f28aa78743eb5fe9444193748da69cdc32d077da. --- input/regression/footnotes.ly | 33 --------- lily/footnote-engraver.cc | 126 ---------------------------------- 2 files changed, 159 deletions(-) delete mode 100644 input/regression/footnotes.ly delete mode 100644 lily/footnote-engraver.cc diff --git a/input/regression/footnotes.ly b/input/regression/footnotes.ly deleted file mode 100644 index 555c4dca7a..0000000000 --- a/input/regression/footnotes.ly +++ /dev/null @@ -1,33 +0,0 @@ -\version "2.13.52" -\header { - texidoc = "Lilypond does footnotes." -} - -#(set-default-paper-size "a6") -\book { } - -\markup { - a \footnote \concat { b \super 1 } "1. c" - \footnote \concat { d \super 2 } "2. e" - \footnote \line { f \super 3 } "3. g" -} - -\markup { h i } - -\relative c' { -\footnoteGrob #'NoteHead #'(1 . -1) \markup { \tiny 4 } \markup { 4. j } -a b c d } - -\pageBreak - -\markup { k \footnote \concat { l \super 5 } \line { 5. m } } - -\relative c' { a1 } - -\relative c' { - d4 e - < f a-\footnote #'(1 . -1) \markup { \tiny 6 } \markup { 6. n } c > - \footnoteGrob #'Beam #'(1 . 1) \markup { \tiny 7 } \markup { 7. o } - \footnoteGrob #'Hairpin #'(1 . 1) \markup { \tiny 8 } \markup { 8. p } - a8\< [ b c d\f ] r2. | -} \ No newline at end of file diff --git a/lily/footnote-engraver.cc b/lily/footnote-engraver.cc deleted file mode 100644 index 116c744314..0000000000 --- a/lily/footnote-engraver.cc +++ /dev/null @@ -1,126 +0,0 @@ -/* - This file is part of LilyPond, the GNU music typesetter. - - Copyright (C) 2006--2011 Han-Wen Nienhuys - - LilyPond is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - LilyPond is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with LilyPond. If not, see . -*/ - -#include "engraver.hh" - -#include "stream-event.hh" -#include "item.hh" -#include "spanner.hh" - -#include "translator.icc" - -class Footnote_engraver : public Engraver -{ - TRANSLATOR_DECLARATIONS (Footnote_engraver); - - DECLARE_TRANSLATOR_LISTENER (footnote); - DECLARE_ACKNOWLEDGER (grob); - vector events_; - - void stop_translation_timestep (); - - void footnotify (Grob *, Stream_event *); -}; - -IMPLEMENT_TRANSLATOR_LISTENER (Footnote_engraver, footnote); -void -Footnote_engraver::listen_footnote (Stream_event *ev) -{ - events_.push_back (ev); -} - -void -Footnote_engraver::stop_translation_timestep () -{ - events_.clear (); -} - -Footnote_engraver::Footnote_engraver () -{ -} - -void -Footnote_engraver::footnotify (Grob *g, Stream_event *event) -{ - Spanner *s = dynamic_cast(g); - - if (s) - { - Spanner *b = make_spanner ("FootnoteSpanner", event->self_scm ()); - b->set_property ("footnote-text", event->get_property ("footnote-text")); - b->set_property ("text", event->get_property ("text")); - b->set_parent (s, Y_AXIS); - b->set_parent (s, X_AXIS); - bool bar = scm_is_string (get_property ("whichBar")); - Grob *bound = unsmob_grob (bar - ? get_property ("currentCommandColumn") - : get_property ("currentMusicalColumn")); - b->set_bound (LEFT, bound); - b->set_bound (RIGHT, bound); - b->set_property ("parent-spanner", s->self_scm ()); - } - else - { - Grob *b = make_item ("Footnote", event->self_scm ()); - b->set_property ("footnote-text", event->get_property ("footnote-text")); - b->set_property ("text", event->get_property ("text")); - b->set_parent (g, Y_AXIS); - b->set_parent (g, X_AXIS); - } -} - -void -Footnote_engraver::acknowledge_grob (Grob_info info) -{ - Stream_event *cause = info.event_cause (); - - SCM arts = cause ? cause->get_property ("articulations") : SCM_EOL; - for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s)) - { - Stream_event *e = unsmob_stream_event (scm_car (s)); - if (e->in_event_class ("footnote-event")) - { - footnotify (info.grob (), e); - } - } - - for (vsize i = 0; i < events_.size (); i++) - { - if (info.grob ()->name () == ly_symbol2string (events_[i]->get_property ("symbol"))) - footnotify (info.grob (), events_[i]); - } -} - - - -ADD_ACKNOWLEDGER (Footnote_engraver, grob); - -ADD_TRANSLATOR (Footnote_engraver, - /* doc */ - "Create footnote texts.", - - /* create */ - "Footnote ", - - /*read*/ - "", - - /*write*/ - "" - ); -- 2.39.5