]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'issue3602' into staging
authorDavid Kastrup <dak@gnu.org>
Sun, 13 Oct 2013 11:53:22 +0000 (13:53 +0200)
committerDavid Kastrup <dak@gnu.org>
Sun, 13 Oct 2013 11:53:22 +0000 (13:53 +0200)
Done as a merge commit since otherwise the conversion rules and their
application would have required splitting into two parts in order to
keep all commits in master compilable: too much mess for too little
benefit.

14 files changed:
Documentation/cs/learning/fundamental.itely
Documentation/de/learning/fundamental.itely
Documentation/es/learning/fundamental.itely
Documentation/fr/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
Documentation/snippets/engravers-one-by-one.ly
lily/dynamic-engraver.cc
lily/new-dynamic-engraver.cc [deleted file]
ly/engraver-init.ly
python/convertrules.py

index a0eee4d3a1f300c7274423148e313add47297908..2f8cc035d2ccae84bd89952432019d1f0c74a9f2 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 @c Translators: Pavel Fric
 
 @node Základní pojmy
@@ -1735,8 +1735,7 @@ 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
+@item Dynamic_engraver
   @tab Erstellt Dynamik-Klammern und Dynamik-Texte.
 @item Forbid_line_break_engraver
   @tab Verbietet Zeilenumbrüche, solange ein musikalisches Element aktiv ist.
index bd96bfc91f58e6edf2f68599e5b1b447cced0bb1..77e3112483a18b7dadcabcd43184808172909c11 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 @c Translators: Till Paala, Reinhold Kainhofer
 
 @node Grundbegriffe
@@ -1770,8 +1770,7 @@ 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
+@item Dynamic_engraver
   @tab Erstellt Dynamik-Klammern und Dynamik-Texte.
 @item Forbid_line_break_engraver
   @tab Verbietet Zeilenumbrüche, solange ein musikalisches Element aktiv ist.
index a22a7441a466d5341a6d30e7ca7d7ba4241712b9..2f3bc52e40bfe386168d739b02fe1c6619fc7b38 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 
 @node Conceptos fundamentales
 @chapter Conceptos fundamentales
@@ -1682,8 +1682,7 @@ 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
+@item Dynamic_engraver
   @tab Crea reguladores e indicaciones dinámicas textuales
 @item Forbid_line_break_engraver
   @tab Evita los saltos de línea si queda algún elemento musical activo
index 4ff0b02a351f25df2d090ead7ffaa7a6adfa933f..523c2a9c50a4e628ce9e5d3debf8b4822745dd86 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 
 @c Translators: Valentin Villenave, Jean-Charles Malahieude
 @c Translation checkers: John Mandereau
@@ -1655,7 +1655,7 @@ partir du nom, et vice versa.
   @tab Grave les clefs
 @item Completion_heads_engraver
   @tab Divise les notes qui dépassent de la mesure
-@item New_dynamic_engraver
+@item Dynamic_engraver
   @tab Crée les soufflets et textes de nuance
 @item Forbid_line_break_engraver
   @tab Empêche un saut de ligne si un élément musical est toujours actif
index 39a50e5f6e8b0e306bba0bae8e3e6b039314840d..06ed20b8e0d6d52f787e3aa6952eabe6ea8797fa 100644 (file)
@@ -10,7 +10,7 @@
 
 
 @c -*- coding: utf-8; mode: texinfo; -*-
-@c \version "2.17.18"
+@c \version "2.17.29"
 @node Alapfogalmak
 @chapter Alapfogalmak
 @translationof Fundamental concepts
@@ -1749,8 +1749,7 @@ 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
+@item Dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
   @tab Prevents line breaks if a musical element is still active
index 009b343bd0f771d71f6d7a01622a471f04f3cdc0..8dd107751a110f7ebdbc177a95c5ce995fef05fe 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 
 @node Concetti fondamentali
 @chapter Concetti fondamentali
@@ -1611,8 +1611,7 @@ 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
+@item Dynamic_engraver
   @tab Crea le forcelle e i testi relativi alla dinamica
 @item Forbid_line_break_engraver
   @tab Impedisce l'a capo se un elemento musicale è ancora attivo
index 8072307308ed08101ca6371c85cb92c17f576d3b..5122a524b8a8888b2ce01acae971114414d17d2a 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 
 @c Translators: Yoshiki Sawada
 @c Translation status: post-GDP
@@ -1675,8 +1675,7 @@ LilyPond によって作成された楽譜上にあるすべての記号は
   @tab 音部記号を譜刻します。
 @item Completion_heads_engraver
   @tab 小節線をまたがる音符を分割します。
-@c The old Dynamic_engraver is deprecated. -jm
-@item New_dynamic_engraver
+@item Dynamic_engraver
   @tab 強弱記号 (クレッシェンド、デクレッシェンド) と強弱テキスト (p や f など)
 を作成します。
 @item Forbid_line_break_engraver
index bd08657bc841faeb90653dd123f9c27b7585e518..b8f001b3a282937f642510675e6e19666832f67f 100644 (file)
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 
 @node Fundamental concepts
 @chapter Fundamental concepts
@@ -1603,8 +1603,7 @@ 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
+@item Dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
   @tab Prevents line breaks if a musical element is still active
index 2589572db49c6f28157182c5765baeb37e187b0d..c68c506cf2865542d0f421e70676099f4cda896c 100644 (file)
@@ -12,7 +12,7 @@
 @c Translation checker:
 @c Translation checker committish:
 
-@c \version "2.17.18"
+@c \version "2.17.29"
 
 @node Fundamentele concepten
 @translationof Fundamental concepts
@@ -1628,8 +1628,7 @@ 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
+@item Dynamic_engraver
   @tab Creates hairpins and dynamic texts
 @item Forbid_line_break_engraver
   @tab Prevents line breaks if a musical element is still active
index 51f6f3ddeef08e9489eebabd50bd63cc62288208..bae30fb4402be3b6b3d429f0a94ee7a0f3dd603a 100644 (file)
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.17.14"
+\version "2.17.29"
 
 \header {
   lsrtags = "contexts-and-engravers, specific-notation"
@@ -160,6 +160,7 @@ MyVoice = \context {
   %}
   \consists "Text_engraver"
   \consists "Dynamic_engraver"
+  \consists "Dynamic_align_engraver"
   \consists "Fingering_engraver"
 
   \consists "Script_column_engraver"
index 0a718f8f025fde752d3ccac7dc92237cefc51bf9..a4d4e06f5a68fb6d7ceea97e708d3b0950c1ae48 100644 (file)
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2008--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   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 "item.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 "stream-event.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);
+  DECLARE_TRANSLATOR_LISTENER (break_span);
 
 protected:
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
   virtual void finalize ();
-  void stop_translation_timestep ();
-  void process_music ();
+
+private:
+  SCM get_property_setting (Stream_event *evt, char const *evprop,
+                            char const *ctxprop);
+  string get_spanner_type (Stream_event *ev);
+
+  Drul_array<Stream_event *> accepted_spanevents_drul_;
+  Spanner *current_spanner_;
+  Spanner *finished_spanner_;
+
+  Item *script_;
+  Stream_event *script_event_;
+  Stream_event *current_span_event_;
+  bool end_new_spanner_;
 };
 
 Dynamic_engraver::Dynamic_engraver ()
 {
+  script_event_ = 0;
+  current_span_event_ = 0;
   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;
+  finished_spanner_ = 0;
+  current_spanner_ = 0;
+  accepted_spanevents_drul_.set (0, 0);
+  end_new_spanner_ = false;
 }
 
 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);
+  ASSIGN_EVENT_ONCE (script_event_, ev);
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, span_dynamic);
@@ -116,337 +82,223 @@ 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);
+  ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[d], ev);
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_engraver, break_span);
 void
-Dynamic_engraver::process_music ()
+Dynamic_engraver::listen_break_span (Stream_event *event)
 {
-  if (accepted_spanevents_drul_[START] || accepted_spanevents_drul_[STOP] || script_ev_)
+  if (event->in_event_class ("break-dynamic-span-event"))
     {
-      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_;
-        }
+      // Case 1: Already have a start dynamic event -> break applies to new
+      //         spanner (created later) -> set a flag
+      // Case 2: no new spanner, but spanner already active -> break it now
+      if (accepted_spanevents_drul_[START])
+        end_new_spanner_ = true;
+      else if (current_spanner_)
+        current_spanner_->set_property ("spanner-broken", SCM_BOOL_T);
     }
+}
 
-  /*
-    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.
-  */
+SCM
+Dynamic_engraver::get_property_setting (Stream_event *evt,
+                                        char const *evprop,
+                                        char const *ctxprop)
+{
+  SCM spanner_type = evt->get_property (evprop);
+  if (spanner_type == SCM_EOL)
+    spanner_type = get_property (ctxprop);
+  return spanner_type;
+}
 
-  /*
-    maybe we should leave dynamic texts to the text-engraver and
-    simply acknowledge them?
-  */
-  if (script_ev_)
+void
+Dynamic_engraver::process_music ()
+{
+  if (current_spanner_
+      && (accepted_spanevents_drul_[STOP]
+          || script_event_
+          || accepted_spanevents_drul_[START]))
     {
-      script_ = make_item ("DynamicText", script_ev_->self_scm ());
-      script_->set_property ("text",
-                             script_ev_->get_property ("text"));
+      Stream_event *ender = accepted_spanevents_drul_[STOP];
+      if (!ender)
+        ender = script_event_;
 
-      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);
+      if (!ender)
+        ender = accepted_spanevents_drul_[START];
 
-      Axis_group_interface::add_element (line_spanner_, script_);
+      finished_spanner_ = current_spanner_;
+      announce_end_grob (finished_spanner_, ender->self_scm ());
+      current_spanner_ = 0;
+      current_span_event_ = 0;
     }
 
-  if (accepted_spanevents_drul_[STOP] || script_ev_)
+  if (accepted_spanevents_drul_[START])
     {
-      /*
-        finish side position alignment if the (de)cresc ends here, and
-        there are no new dynamics.
-      */
+      current_span_event_ = accepted_spanevents_drul_[START];
 
-      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"));
-    }
+      string start_type = get_spanner_type (current_span_event_);
+      SCM cresc_type = get_property_setting (current_span_event_, "span-type",
+                                             (start_type + "Spanner").c_str ());
 
-  if (accepted_spanevents_drul_[START])
-    {
-      if (current_cresc_ev_)
+      if (cresc_type == ly_symbol2scm ("text"))
         {
-          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"));
+          current_spanner_
+            = make_spanner ("DynamicTextSpanner",
+                            accepted_spanevents_drul_[START]->self_scm ());
+
+          SCM text = get_property_setting (current_span_event_, "span-text",
+                                           (start_type + "Text").c_str ());
+          if (Text_interface::is_markup (text))
+            current_spanner_->set_property ("text", text);
+          /*
+            If the line of a text spanner is hidden, end the alignment spanner
+            early: this allows dynamics to be spaced individually instead of
+            being linked together.
+          */
+          if (current_spanner_->get_property ("style") == ly_symbol2scm ("none"))
+            current_spanner_->set_property ("spanner-broken", SCM_BOOL_T);
         }
       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"))
+          if (cresc_type != 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_);
-                }
+              string as_string = ly_scm_write_string (cresc_type);
+              current_span_event_
+              ->origin ()->warning (_f ("unknown crescendo style: %s\ndefaulting to hairpin.", as_string.c_str ()));
             }
+          current_spanner_ = make_spanner ("Hairpin",
+                                           current_span_event_->self_scm ());
+        }
+      // if we have a break-dynamic-span event right after the start dynamic, break the new spanner immediately
+      if (end_new_spanner_)
+        {
+          current_spanner_->set_property ("spanner-broken", SCM_BOOL_T);
+          end_new_spanner_ = false;
+        }
+      if (finished_spanner_)
+        {
+          if (Hairpin::has_interface (finished_spanner_))
+            Pointer_group_interface::add_grob (finished_spanner_,
+                                               ly_symbol2scm ("adjacent-spanners"),
+                                               current_spanner_);
+          if (Hairpin::has_interface (current_spanner_))
+            Pointer_group_interface::add_grob (current_spanner_,
+                                               ly_symbol2scm ("adjacent-spanners"),
+                                               finished_spanner_);
+        }
+    }
 
-          /*
-            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_event_)
+    {
+      script_ = make_item ("DynamicText", script_event_->self_scm ());
+      script_->set_property ("text",
+                             script_event_->get_property ("text"));
 
-          if (script_)
-            {
-              cresc_->set_bound (LEFT, script_);
-              add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
-            }
-          Axis_group_interface::add_element (line_spanner_, cresc_);
-        }
+      if (finished_spanner_)
+        finished_spanner_->set_bound (RIGHT, script_);
+      if (current_spanner_)
+        current_spanner_->set_bound (LEFT, script_);
     }
 }
 
 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;
+  if (finished_spanner_ && !finished_spanner_->get_bound (RIGHT))
+    finished_spanner_
+    ->set_bound (RIGHT,
+                 unsmob_grob (get_property ("currentMusicalColumn")));
+
+  if (current_spanner_ && !current_spanner_->get_bound (LEFT))
+    current_spanner_
+    ->set_bound (LEFT,
+                 unsmob_grob (get_property ("currentMusicalColumn")));
+  script_ = 0;
+  script_event_ = 0;
+  accepted_spanevents_drul_.set (0, 0);
+  finished_spanner_ = 0;
+  end_new_spanner_ = false;
 }
 
 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_)
+  if (current_spanner_
+      && !current_spanner_->is_live ())
+    current_spanner_ = 0;
+  if (current_spanner_)
     {
-      current_cresc_ev_->origin ()->warning (_ ("unterminated (de)crescendo"));
-      cresc_->suicide ();
-      cresc_ = 0;
+      current_span_event_
+      ->origin ()->warning (_f ("unterminated %s",
+                                get_spanner_type (current_span_event_)
+                                .c_str ()));
+      current_spanner_->suicide ();
+      current_spanner_ = 0;
     }
 }
 
-void
-Dynamic_engraver::typeset_all ()
+string
+Dynamic_engraver::get_spanner_type (Stream_event *ev)
 {
-  if (finished_cresc_)
-    {
-      if (!finished_cresc_->get_bound (RIGHT))
-        {
+  string type;
+  SCM start_sym = scm_car (ev->get_property ("class"));
 
-          Grob *column_bound = unsmob_grob (get_property ("currentMusicalColumn"));
+  if (start_sym == ly_symbol2scm ("decrescendo-event"))
+    type = "decrescendo";
+  else if (start_sym == ly_symbol2scm ("crescendo-event"))
+    type = "crescendo";
+  else
+    programming_error ("unknown dynamic spanner type");
 
-          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;
-    }
+  return type;
 }
 
 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 *stem = unsmob_grob (info.grob ()->get_object ("stem"));
+      /*
+        Spacing constraints may require dynamics to be aligned on rests,
+        so check for a rest if this note column has no note heads.
+      */
+      Grob *x_parent = (heads.size ()
+                        ? heads[0]
+                        : unsmob_grob (info.grob ()->get_object ("rest")));
+      if (x_parent)
         {
-          Grob *head = heads[0];
-          script_->set_parent (head, X_AXIS);
+          script_->set_parent (x_parent, X_AXIS);
           Self_alignment_interface::set_center_parent (script_, X_AXIS);
         }
+      if (stem)
+        Pointer_group_interface::add_grob (script_, ly_symbol2scm ("potential-X-colliding-grobs"), stem);
     }
 
-  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 ());
+  if (current_spanner_ && !current_spanner_->get_bound (LEFT))
+    current_spanner_->set_bound (LEFT, info.grob ());
+  if (finished_spanner_ && !finished_spanner_->get_bound (RIGHT))
+    finished_spanner_->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 hairpins, dynamic texts and dynamic text spanners.",
 
                 /* create */
-                "DynamicLineSpanner "
                 "DynamicTextSpanner "
                 "DynamicText "
                 "Hairpin ",
 
                 /* read */
-                "",
+                "crescendoSpanner "
+                "crescendoText "
+                "currentMusicalColumn "
+                "decrescendoSpanner "
+                "decrescendoText ",
 
                 /* write */
                 ""
diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc
deleted file mode 100644 (file)
index cd7db64..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-  This file is part of LilyPond, the GNU music typesetter.
-
-  Copyright (C) 2008--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
-
-  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 "engraver.hh"
-#include "hairpin.hh"
-#include "international.hh"
-#include "item.hh"
-#include "note-column.hh"
-#include "pointer-group-interface.hh"
-#include "self-alignment-interface.hh"
-#include "spanner.hh"
-#include "stream-event.hh"
-#include "text-interface.hh"
-
-#include "translator.icc"
-
-class New_dynamic_engraver : public Engraver
-{
-  TRANSLATOR_DECLARATIONS (New_dynamic_engraver);
-  DECLARE_ACKNOWLEDGER (note_column);
-  DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
-  DECLARE_TRANSLATOR_LISTENER (span_dynamic);
-  DECLARE_TRANSLATOR_LISTENER (break_span);
-
-protected:
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
-  virtual void finalize ();
-
-private:
-  SCM get_property_setting (Stream_event *evt, char const *evprop,
-                            char const *ctxprop);
-  string get_spanner_type (Stream_event *ev);
-
-  Drul_array<Stream_event *> accepted_spanevents_drul_;
-  Spanner *current_spanner_;
-  Spanner *finished_spanner_;
-
-  Item *script_;
-  Stream_event *script_event_;
-  Stream_event *current_span_event_;
-  bool end_new_spanner_;
-};
-
-New_dynamic_engraver::New_dynamic_engraver ()
-{
-  script_event_ = 0;
-  current_span_event_ = 0;
-  script_ = 0;
-  finished_spanner_ = 0;
-  current_spanner_ = 0;
-  accepted_spanevents_drul_.set (0, 0);
-  end_new_spanner_ = false;
-}
-
-IMPLEMENT_TRANSLATOR_LISTENER (New_dynamic_engraver, absolute_dynamic);
-void
-New_dynamic_engraver::listen_absolute_dynamic (Stream_event *ev)
-{
-  ASSIGN_EVENT_ONCE (script_event_, ev);
-}
-
-IMPLEMENT_TRANSLATOR_LISTENER (New_dynamic_engraver, span_dynamic);
-void
-New_dynamic_engraver::listen_span_dynamic (Stream_event *ev)
-{
-  Direction d = to_dir (ev->get_property ("span-direction"));
-
-  ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[d], ev);
-}
-
-IMPLEMENT_TRANSLATOR_LISTENER (New_dynamic_engraver, break_span);
-void
-New_dynamic_engraver::listen_break_span (Stream_event *event)
-{
-  if (event->in_event_class ("break-dynamic-span-event"))
-    {
-      // Case 1: Already have a start dynamic event -> break applies to new
-      //         spanner (created later) -> set a flag
-      // Case 2: no new spanner, but spanner already active -> break it now
-      if (accepted_spanevents_drul_[START])
-        end_new_spanner_ = true;
-      else if (current_spanner_)
-        current_spanner_->set_property ("spanner-broken", SCM_BOOL_T);
-    }
-}
-
-SCM
-New_dynamic_engraver::get_property_setting (Stream_event *evt,
-                                            char const *evprop,
-                                            char const *ctxprop)
-{
-  SCM spanner_type = evt->get_property (evprop);
-  if (spanner_type == SCM_EOL)
-    spanner_type = get_property (ctxprop);
-  return spanner_type;
-}
-
-void
-New_dynamic_engraver::process_music ()
-{
-  if (current_spanner_
-      && (accepted_spanevents_drul_[STOP]
-          || script_event_
-          || accepted_spanevents_drul_[START]))
-    {
-      Stream_event *ender = accepted_spanevents_drul_[STOP];
-      if (!ender)
-        ender = script_event_;
-
-      if (!ender)
-        ender = accepted_spanevents_drul_[START];
-
-      finished_spanner_ = current_spanner_;
-      announce_end_grob (finished_spanner_, ender->self_scm ());
-      current_spanner_ = 0;
-      current_span_event_ = 0;
-    }
-
-  if (accepted_spanevents_drul_[START])
-    {
-      current_span_event_ = accepted_spanevents_drul_[START];
-
-      string start_type = get_spanner_type (current_span_event_);
-      SCM cresc_type = get_property_setting (current_span_event_, "span-type",
-                                             (start_type + "Spanner").c_str ());
-
-      if (cresc_type == ly_symbol2scm ("text"))
-        {
-          current_spanner_
-            = make_spanner ("DynamicTextSpanner",
-                            accepted_spanevents_drul_[START]->self_scm ());
-
-          SCM text = get_property_setting (current_span_event_, "span-text",
-                                           (start_type + "Text").c_str ());
-          if (Text_interface::is_markup (text))
-            current_spanner_->set_property ("text", text);
-          /*
-            If the line of a text spanner is hidden, end the alignment spanner
-            early: this allows dynamics to be spaced individually instead of
-            being linked together.
-          */
-          if (current_spanner_->get_property ("style") == ly_symbol2scm ("none"))
-            current_spanner_->set_property ("spanner-broken", SCM_BOOL_T);
-        }
-      else
-        {
-          if (cresc_type != ly_symbol2scm ("hairpin"))
-            {
-              string as_string = ly_scm_write_string (cresc_type);
-              current_span_event_
-              ->origin ()->warning (_f ("unknown crescendo style: %s\ndefaulting to hairpin.", as_string.c_str ()));
-            }
-          current_spanner_ = make_spanner ("Hairpin",
-                                           current_span_event_->self_scm ());
-        }
-      // if we have a break-dynamic-span event right after the start dynamic, break the new spanner immediately
-      if (end_new_spanner_)
-        {
-          current_spanner_->set_property ("spanner-broken", SCM_BOOL_T);
-          end_new_spanner_ = false;
-        }
-      if (finished_spanner_)
-        {
-          if (Hairpin::has_interface (finished_spanner_))
-            Pointer_group_interface::add_grob (finished_spanner_,
-                                               ly_symbol2scm ("adjacent-spanners"),
-                                               current_spanner_);
-          if (Hairpin::has_interface (current_spanner_))
-            Pointer_group_interface::add_grob (current_spanner_,
-                                               ly_symbol2scm ("adjacent-spanners"),
-                                               finished_spanner_);
-        }
-    }
-
-  if (script_event_)
-    {
-      script_ = make_item ("DynamicText", script_event_->self_scm ());
-      script_->set_property ("text",
-                             script_event_->get_property ("text"));
-
-      if (finished_spanner_)
-        finished_spanner_->set_bound (RIGHT, script_);
-      if (current_spanner_)
-        current_spanner_->set_bound (LEFT, script_);
-    }
-}
-
-void
-New_dynamic_engraver::stop_translation_timestep ()
-{
-  if (finished_spanner_ && !finished_spanner_->get_bound (RIGHT))
-    finished_spanner_
-    ->set_bound (RIGHT,
-                 unsmob_grob (get_property ("currentMusicalColumn")));
-
-  if (current_spanner_ && !current_spanner_->get_bound (LEFT))
-    current_spanner_
-    ->set_bound (LEFT,
-                 unsmob_grob (get_property ("currentMusicalColumn")));
-  script_ = 0;
-  script_event_ = 0;
-  accepted_spanevents_drul_.set (0, 0);
-  finished_spanner_ = 0;
-  end_new_spanner_ = false;
-}
-
-void
-New_dynamic_engraver::finalize ()
-{
-  if (current_spanner_
-      && !current_spanner_->is_live ())
-    current_spanner_ = 0;
-  if (current_spanner_)
-    {
-      current_span_event_
-      ->origin ()->warning (_f ("unterminated %s",
-                                get_spanner_type (current_span_event_)
-                                .c_str ()));
-      current_spanner_->suicide ();
-      current_spanner_ = 0;
-    }
-}
-
-string
-New_dynamic_engraver::get_spanner_type (Stream_event *ev)
-{
-  string type;
-  SCM start_sym = scm_car (ev->get_property ("class"));
-
-  if (start_sym == ly_symbol2scm ("decrescendo-event"))
-    type = "decrescendo";
-  else if (start_sym == ly_symbol2scm ("crescendo-event"))
-    type = "crescendo";
-  else
-    programming_error ("unknown dynamic spanner type");
-
-  return type;
-}
-
-void
-New_dynamic_engraver::acknowledge_note_column (Grob_info info)
-{
-  if (script_ && !script_->get_parent (X_AXIS))
-    {
-      extract_grob_set (info.grob (), "note-heads", heads);
-      Grob *stem = unsmob_grob (info.grob ()->get_object ("stem"));
-      /*
-        Spacing constraints may require dynamics to be aligned on rests,
-        so check for a rest if this note column has no note heads.
-      */
-      Grob *x_parent = (heads.size ()
-                        ? heads[0]
-                        : unsmob_grob (info.grob ()->get_object ("rest")));
-      if (x_parent)
-        {
-          script_->set_parent (x_parent, X_AXIS);
-          Self_alignment_interface::set_center_parent (script_, X_AXIS);
-        }
-      if (stem)
-        Pointer_group_interface::add_grob (script_, ly_symbol2scm ("potential-X-colliding-grobs"), stem);
-    }
-
-  if (current_spanner_ && !current_spanner_->get_bound (LEFT))
-    current_spanner_->set_bound (LEFT, info.grob ());
-  if (finished_spanner_ && !finished_spanner_->get_bound (RIGHT))
-    finished_spanner_->set_bound (RIGHT, info.grob ());
-}
-
-ADD_ACKNOWLEDGER (New_dynamic_engraver, note_column);
-ADD_TRANSLATOR (New_dynamic_engraver,
-                /* doc */
-                "Create hairpins, dynamic texts and dynamic text spanners.",
-
-                /* create */
-                "DynamicTextSpanner "
-                "DynamicText "
-                "Hairpin ",
-
-                /* read */
-                "crescendoSpanner "
-                "crescendoText "
-                "currentMusicalColumn "
-                "decrescendoSpanner "
-                "decrescendoText ",
-
-                /* write */
-                ""
-               );
index 79ba6c17cd2f001f43e4e2eb7ba324c8841edeae..9c8547dd7d024f8e6b0f6b07d9683e7ede62dd94 100644 (file)
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.17.11"
+\version "2.17.29"
 
 \context {
   \name "Global"
@@ -252,9 +252,8 @@ multiple voices on the same staff."
   \consists "Part_combine_engraver"
 
   \consists "Text_engraver"
-  \consists "New_dynamic_engraver"
+  \consists "Dynamic_engraver"
   \consists "Dynamic_align_engraver"
-%  \consists "Dynamic_engraver"
   \consists "Fingering_engraver"
   \consists "Bend_engraver"
 
@@ -398,7 +397,7 @@ a collection of staves, with a bracket in front and spanning bar lines."
   \consists "Bar_engraver"
   \consists "Piano_pedal_engraver"
   \consists "Script_engraver"
-  \consists "New_dynamic_engraver"
+  \consists "Dynamic_engraver"
   \consists "Dynamic_align_engraver"
   \consists "Text_engraver"
   \consists "Text_spanner_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,