]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3602/1: Remove Dynamic_engraver.
authorDavid Kastrup <dak@gnu.org>
Sun, 6 Oct 2013 11:48:53 +0000 (13:48 +0200)
committerDavid Kastrup <dak@gnu.org>
Sat, 12 Oct 2013 09:40:56 +0000 (11:40 +0200)
Documentation/cs/learning/fundamental.itely
Documentation/de/learning/fundamental.itely
Documentation/es/learning/fundamental.itely
Documentation/hu/learning/fundamental.itely
Documentation/it/learning/fundamental.itely
Documentation/ja/learning/fundamental.itely
Documentation/learning/fundamental.itely
Documentation/nl/learning/fundamental.itely
lily/dynamic-engraver.cc [deleted file]
ly/engraver-init.ly
python/convertrules.py

index a0eee4d3a1f300c7274423148e313add47297908..f8696b91a78aad862fecc5239bebdeccb0d8f0e4 100644 (file)
@@ -1735,7 +1735,6 @@ abzuleiten.
   @tab Erstellt Notenschlüssel.
 @item Completion_heads_engraver
   @tab Teilt Noten in kleiner Werte, wenn sie über die Taktlinie reichen.
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Erstellt Dynamik-Klammern und Dynamik-Texte.
 @item Forbid_line_break_engraver
index bd96bfc91f58e6edf2f68599e5b1b447cced0bb1..db121c27e9f49fc57869e23c5b86021a55a817d7 100644 (file)
@@ -1770,7 +1770,6 @@ abzuleiten.
   @tab Erstellt Notenschlüssel.
 @item Completion_heads_engraver
   @tab Teilt Noten in kleiner Werte, wenn sie über die Taktlinie reichen.
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Erstellt Dynamik-Klammern und Dynamik-Texte.
 @item Forbid_line_break_engraver
index a22a7441a466d5341a6d30e7ca7d7ba4241712b9..8c8c42c6ff97ced0407bcb7547697e66fca545d2 100644 (file)
@@ -1682,7 +1682,6 @@ a partir del nombre (en inglés), y viceversa.
   @tab Graba las claves
 @item Completion_heads_engraver
   @tab Divide las notas que atraviesan una línea divisoria
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Crea reguladores e indicaciones dinámicas textuales
 @item Forbid_line_break_engraver
index 39a50e5f6e8b0e306bba0bae8e3e6b039314840d..009c12e0ce6acd4210e35cf7b1746a28fab970d9 100644 (file)
@@ -1749,7 +1749,6 @@ from the name, or vice versa.
   @tab Engraves clefs
 @item Completion_heads_engraver
   @tab Splits notes which cross bar lines
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
index 009b343bd0f771d71f6d7a01622a471f04f3cdc0..873bea4d2597338d91d1d545fbb1da017ce1b442 100644 (file)
@@ -1611,7 +1611,6 @@ partire dal nome, o viceversa.
   @tab Incide le chiavi
 @item Completion_heads_engraver
   @tab Separa le note che attraversano le stanghette
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Crea le forcelle e i testi relativi alla dinamica
 @item Forbid_line_break_engraver
index 8072307308ed08101ca6371c85cb92c17f576d3b..e6dd35111ef530fb65ac85c50bbf6b102db6be33 100644 (file)
@@ -1675,7 +1675,6 @@ LilyPond によって作成された楽譜上にあるすべての記号は
   @tab 音部記号を譜刻します。
 @item Completion_heads_engraver
   @tab 小節線をまたがる音符を分割します。
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab 強弱記号 (クレッシェンド、デクレッシェンド) と強弱テキスト (p や f など)
 を作成します。
index bd08657bc841faeb90653dd123f9c27b7585e518..eb078c750adf348db2f99d1316bf1b6a7d1336ac 100644 (file)
@@ -1603,7 +1603,6 @@ from the name, or vice versa.
   @tab Engraves clefs
 @item Completion_heads_engraver
   @tab Splits notes which cross bar lines
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
index 2589572db49c6f28157182c5765baeb37e187b0d..6bcff80840be198ced50d133ad2ab36a4591582c 100644 (file)
@@ -1628,7 +1628,6 @@ from the name, or vice versa.
   @tab Engraves clefs
 @item Completion_heads_engraver
   @tab Splits notes which cross bar lines
-@c The old Dynamic_engraver is deprecated. -jm
 @item New_dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
deleted file mode 100644 (file)
index 0a718f8..0000000
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-  This file is part of LilyPond, the GNU music typesetter.
-
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
-  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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "axis-group-interface.hh"
-#include "context.hh"
-#include "engraver.hh"
-#include "dimensions.hh"
-#include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "hairpin.hh"
-#include "international.hh"
-#include "interval.hh"
-#include "note-column.hh"
-#include "paper-column.hh"
-#include "pointer-group-interface.hh"
-#include "script-interface.hh"
-#include "self-alignment-interface.hh"
-#include "side-position-interface.hh"
-#include "staff-symbol-referencer.hh"
-#include "stream-event.hh"
-#include "warn.hh"
-#include "spanner.hh"
-#include "text-interface.hh"
-
-#include "translator.icc"
-
-/*
-  TODO:
-
-  * direction of text-dynamic-event if not equal to direction of
-  line-spanner
-
-  - TODO: this engraver is too complicated. We should split it into
-  the handling of the basic grobs and the linespanner
-
-  - TODO: the line-spanner is not killed after the (de)crescs are
-  finished.
-*/
-
-/**
-   print text & hairpin dynamics.
-*/
-class Dynamic_engraver : public Engraver
-{
-  Item *script_;
-  Spanner *line_spanner_;
-  Spanner *cresc_;
-
-  Spanner *finished_line_spanner_;
-  Spanner *finished_cresc_;
-
-  Stream_event *script_ev_;
-  Stream_event *current_cresc_ev_;
-
-  Drul_array<Stream_event *> accepted_spanevents_drul_;
-
-  vector<Note_column *> pending_columns_;
-  vector<Grob *> pending_elements_;
-
-  void typeset_all ();
-
-  TRANSLATOR_DECLARATIONS (Dynamic_engraver);
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
-  DECLARE_TRANSLATOR_LISTENER (span_dynamic);
-
-protected:
-  virtual void finalize ();
-  void stop_translation_timestep ();
-  void process_music ();
-};
-
-Dynamic_engraver::Dynamic_engraver ()
-{
-  script_ = 0;
-  finished_cresc_ = 0;
-  line_spanner_ = 0;
-  finished_line_spanner_ = 0;
-  current_cresc_ev_ = 0;
-  cresc_ = 0;
-
-  script_ev_ = 0;
-  accepted_spanevents_drul_[START] = 0;
-  accepted_spanevents_drul_[STOP] = 0;
-}
-
-IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, absolute_dynamic);
-void
-Dynamic_engraver::listen_absolute_dynamic (Stream_event *ev)
-{
-  /*
-    TODO: probably broken.
-  */
-  ASSIGN_EVENT_ONCE (script_ev_, ev);
-}
-
-IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, span_dynamic);
-void
-Dynamic_engraver::listen_span_dynamic (Stream_event *ev)
-{
-  Direction d = to_dir (ev->get_property ("span-direction"));
-
-  if (d == START)
-    ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[START], ev);
-
-  /* Cancel any ongoing crescendo, either explicitly by \! or
-     implicitly by a new crescendo. Also avoid warning if cresc is
-     canceled both implicitly and explicitly. */
-  if ((d == STOP || current_cresc_ev_) && !accepted_spanevents_drul_[STOP])
-    ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[STOP], ev);
-}
-
-void
-Dynamic_engraver::process_music ()
-{
-  if (accepted_spanevents_drul_[START] || accepted_spanevents_drul_[STOP] || script_ev_)
-    {
-      if (!line_spanner_)
-        {
-          Stream_event *rq = accepted_spanevents_drul_[START];
-          line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL);
-          if (script_ev_)
-            rq = script_ev_;
-        }
-    }
-
-  /*
-    During a (de)crescendo, pending event will not be cleared,
-    and a line-spanner will always be created, as \< \! are already
-    two events.
-
-    Note: line-spanner must always have at least same duration
-    as (de)crecsendo, b.o. line-breaking.
-  */
-
-  /*
-    maybe we should leave dynamic texts to the text-engraver and
-    simply acknowledge them?
-  */
-  if (script_ev_)
-    {
-      script_ = make_item ("DynamicText", script_ev_->self_scm ());
-      script_->set_property ("text",
-                             script_ev_->get_property ("text"));
-
-      if (Direction d = to_dir (script_ev_->get_property ("direction")))
-        set_grob_direction (line_spanner_, d);
-      else if (Direction d = to_dir (line_spanner_->get_property ("direction")))
-        set_grob_direction (script_, d);
-
-      Axis_group_interface::add_element (line_spanner_, script_);
-    }
-
-  if (accepted_spanevents_drul_[STOP] || script_ev_)
-    {
-      /*
-        finish side position alignment if the (de)cresc ends here, and
-        there are no new dynamics.
-      */
-
-      if (cresc_)
-        {
-          assert (!finished_cresc_ && cresc_);
-
-          if (script_)
-            {
-              cresc_->set_bound (RIGHT, script_);
-              add_bound_item (line_spanner_, script_);
-            }
-
-          finished_cresc_ = cresc_;
-          announce_end_grob (finished_cresc_, SCM_EOL);
-          cresc_ = 0;
-          current_cresc_ev_ = 0;
-        }
-      else if (accepted_spanevents_drul_[STOP])
-        accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("cannot find start of (de)crescendo"));
-    }
-
-  if (accepted_spanevents_drul_[START])
-    {
-      if (current_cresc_ev_)
-        {
-          string msg = _ ("already have a decrescendo");
-          if (current_cresc_ev_->in_event_class ("crescendo-event"))
-            msg = _ ("already have a crescendo");
-
-          accepted_spanevents_drul_[START]->origin ()->warning (msg);
-          current_cresc_ev_->origin ()->warning (_ ("cresc starts here"));
-        }
-      else
-        {
-          current_cresc_ev_ = accepted_spanevents_drul_[START];
-
-          if (Direction d = to_dir (current_cresc_ev_->get_property ("direction")))
-            set_grob_direction (line_spanner_, d);
-
-          /*
-            TODO: Use symbols.
-          */
-
-          SCM start_sym = scm_car (current_cresc_ev_->get_property ("class"));
-          string start_type;
-
-          if (start_sym == ly_symbol2scm ("decrescendo-event"))
-            start_type = "decrescendo";
-          else if (start_sym == ly_symbol2scm ("crescendo-event"))
-            start_type = "crescendo";
-          else
-            {
-              programming_error ("unknown dynamic spanner type");
-              return;
-            }
-
-          /*
-            UGH. TODO: should read from original event, so appearance
-            may be altered with \tweak.
-           */
-          SCM s = get_property ((start_type + "Spanner").c_str ());
-          if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
-            {
-              cresc_ = make_spanner ("Hairpin", accepted_spanevents_drul_[START]->self_scm ());
-              if (finished_cresc_)
-                {
-                  Pointer_group_interface::add_grob (finished_cresc_,
-                                                     ly_symbol2scm ("adjacent-hairpins"),
-                                                     cresc_);
-
-                  Pointer_group_interface::add_grob (cresc_,
-                                                     ly_symbol2scm ("adjacent-hairpins"),
-                                                     finished_cresc_);
-                }
-            }
-
-          /*
-            This is a convenient (and legacy) interface to TextSpanners
-            for use in (de)crescendi.
-            Hmm.
-          */
-          else
-            {
-              cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanevents_drul_[START]->self_scm ());
-              cresc_->set_property ("style", s);
-              context ()->set_property ((start_type
-                                         + "Spanner").c_str (), SCM_EOL);
-              s = get_property ((start_type + "Text").c_str ());
-              if (Text_interface::is_markup (s))
-                {
-                  cresc_->set_property ("text", s);
-                  context ()->set_property ((start_type + "Text").c_str (),
-                                            SCM_EOL);
-                }
-
-              if (script_)
-                {
-                  set_nested_property (cresc_,
-                                       scm_list_3 (ly_symbol2scm ("bound-details"),
-                                                   ly_symbol2scm ("left"),
-                                                   ly_symbol2scm ("attach-dir")
-                                                  ),
-                                       scm_from_int (RIGHT));
-                }
-            }
-
-          if (script_)
-            {
-              cresc_->set_bound (LEFT, script_);
-              add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
-            }
-          Axis_group_interface::add_element (line_spanner_, cresc_);
-        }
-    }
-}
-
-void
-Dynamic_engraver::stop_translation_timestep ()
-{
-  if (!current_cresc_ev_ && line_spanner_)
-    {
-      assert (!finished_line_spanner_);
-      finished_line_spanner_ = line_spanner_;
-      line_spanner_ = 0;
-    }
-
-  typeset_all ();
-
-  if (cresc_ && !cresc_->get_bound (LEFT))
-    {
-      cresc_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
-      add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
-    }
-
-  script_ev_ = 0;
-  accepted_spanevents_drul_[START] = 0;
-  accepted_spanevents_drul_[STOP] = 0;
-}
-
-void
-Dynamic_engraver::finalize ()
-{
-  typeset_all ();
-
-  if (line_spanner_
-      && !line_spanner_->is_live ())
-    line_spanner_ = 0;
-  if (line_spanner_)
-    {
-      finished_line_spanner_ = line_spanner_;
-      typeset_all ();
-    }
-
-  if (cresc_
-      && !cresc_->is_live ())
-    cresc_ = 0;
-  if (cresc_)
-    {
-      current_cresc_ev_->origin ()->warning (_ ("unterminated (de)crescendo"));
-      cresc_->suicide ();
-      cresc_ = 0;
-    }
-}
-
-void
-Dynamic_engraver::typeset_all ()
-{
-  if (finished_cresc_)
-    {
-      if (!finished_cresc_->get_bound (RIGHT))
-        {
-
-          Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn"));
-
-          finished_cresc_->set_bound (RIGHT, script_
-                                      ? script_
-                                      : column_bound);
-
-          if (finished_line_spanner_)
-            add_bound_item (finished_line_spanner_,
-                            finished_cresc_->get_bound (RIGHT));
-        }
-      finished_cresc_ = 0;
-    }
-
-  script_ = 0;
-  if (finished_line_spanner_)
-    {
-      /*
-        We used to have
-
-        extend-spanner-over-elements (finished_line_spanner_);
-
-        but this is rather kludgy, since finished_line_spanner_
-        typically has a staff-symbol field set , extending it over the
-        entire staff.
-
-      */
-
-      Grob *l = finished_line_spanner_->get_bound (LEFT);
-      Grob *r = finished_line_spanner_->get_bound (RIGHT);
-      if (!r && l)
-        finished_line_spanner_->set_bound (RIGHT, l);
-      else if (!l && r)
-        finished_line_spanner_->set_bound (LEFT, r);
-      else if (!r && !l)
-        {
-          /*
-            This is an isolated dynamic apparently, and does not even have
-            any interesting support item.
-          */
-          Grob *cc = unsmob_grob (get_property ("currentMusicalColumn"));
-          Item *ci = dynamic_cast<Item *> (cc);
-          finished_line_spanner_->set_bound (RIGHT, ci);
-          finished_line_spanner_->set_bound (LEFT, ci);
-        }
-      finished_line_spanner_ = 0;
-    }
-}
-
-void
-Dynamic_engraver::acknowledge_note_column (Grob_info info)
-{
-  if (!line_spanner_)
-    return;
-
-  if (line_spanner_
-      /* Don't refill killed spanner */
-      && line_spanner_->is_live ())
-    {
-      Side_position_interface::add_support (line_spanner_, info.grob ());
-      add_bound_item (line_spanner_, dynamic_cast<Item *> (info.grob ()));
-    }
-
-  if (script_ && !script_->get_parent (X_AXIS))
-    {
-      extract_grob_set (info.grob (), "note-heads", heads);
-      if (heads.size ())
-        {
-          Grob *head = heads[0];
-          script_->set_parent (head, X_AXIS);
-          Self_alignment_interface::set_center_parent (script_, X_AXIS);
-        }
-    }
-
-  if (cresc_)
-    {
-      if (!cresc_->get_bound (LEFT))
-        {
-          cresc_->set_bound (LEFT, info.grob ());
-          add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
-        }
-    }
-
-  if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
-    finished_cresc_->set_bound (RIGHT, info.grob ());
-}
-
-ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
-
-ADD_TRANSLATOR (Dynamic_engraver,
-                /* doc */
-                "Create hairpins, dynamic texts, and their vertical"
-                " alignments.  The symbols are collected onto a"
-                " @code{DynamicLineSpanner} grob which takes care of vertical"
-                " positioning.",
-
-                /* create */
-                "DynamicLineSpanner "
-                "DynamicTextSpanner "
-                "DynamicText "
-                "Hairpin ",
-
-                /* read */
-                "",
-
-                /* write */
-                ""
-               );
index 79ba6c17cd2f001f43e4e2eb7ba324c8841edeae..5af84df1f041bd9a1c77314961c0c92ef4fe5496 100644 (file)
@@ -254,7 +254,6 @@ multiple voices on the same staff."
   \consists "Text_engraver"
   \consists "New_dynamic_engraver"
   \consists "Dynamic_align_engraver"
-%  \consists "Dynamic_engraver"
   \consists "Fingering_engraver"
   \consists "Bend_engraver"
 
index 1ab911cca2c3f576f103e3eeee8566bfcd0bc481..91619737678fc3c130dcce4b8d6afa5266e0010d 100644 (file)
@@ -3672,6 +3672,17 @@ def conv(str):
         stderr_write (_ ("Staff-padding now controls the distance to the baseline, not the nearest point."))
     return str
 
+@rule((2, 17, 29), r'''Dynamic_engraver -> New_dynamic_engraver+Dynamic_align_engraver
+New_dynamic_engraver -> Dynamic_engraver''')
+def conv(str):
+    str = re.sub ("(\r?\n?[ \t]*\\\\(?:consists|remove)\\s*)(\"?)Dynamic_engraver\\2",
+                  r"\1\2New_dynamic_engraver\2\1\2Dynamic_align_engraver\2",
+                  str)
+# Should we warn about any remaining Dynamic_engraver?  Possibly it
+# will do the job just fine.
+    str = re.sub ("New_dynamic_engraver", "Dynamic_engraver", str)
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,