* lily/moment.cc (robust_scm2moment): new function.

* scm/titling.scm (default-score-title): remove caps for piece.

* lily/slur-scoring.cc (Slur_score_state): change static functions
to methods of Slur_score_state.

diff --git a/ChangeLog b/ChangeLog
index 50dfcfe2ef6dcdf081841b296e7721f8a930db93..c68ee31d0df0caa31f661f9e80922e6cd85a1be2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/moment.cc (robust_scm2moment): new function.
+
+       * scm/titling.scm (default-score-title): remove caps for piece.
+
        * lily/include/slur-scoring.hh (struct Slur_score_state): new file
 
        * lily/include/slur-configuration.hh (class Slur_configuration):

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index d09e7519e8acd9b2cb24975b29557f0da954863d..2f9fa0d6935d1928db0e8c3c3b2967684b18f501 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -320,9 +320,10 @@ Auto_beam_engraver::begin_beam ()
   beam_settings_ = updated_grob_properties (context (), ly_symbol2scm ("Beam"));
   
   beam_start_moment_ = now_mom ();
-  beam_start_location_ = *unsmob_moment (get_property ("measurePosition"));
+  beam_start_location_ =
+    robust_scm2moment (unsmob_moment (get_property ("measurePosition"), Moment(0));
   subdivide_beams_ = ly_scm2bool (get_property ("subdivideBeams"));
-  beat_length_ = *unsmob_moment (get_property ("beatLength"));
+  beat_length_ = robust_scm2moment (get_property ("beatLength"), Moment(1,4));
 }
 
 void

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index b735ce4c4d967c4d42b46f50832a44afd5ef7812..894c9d70179bc9612cb788937fedcedfcb6f6ab8 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -60,6 +60,7 @@ DECLARE_UNSMOB(Moment,moment);
 int compare (Moment const&,Moment const&);
 INSTANTIATE_COMPARE (Moment const&, Moment::compare);
 
+Moment robust_scm2moment (SCM, Moment);
 
 #ifdef STREAM_SUPPORT
 std::ostream & operator << (std::ostream &, Moment const &);

diff --git a/lily/moment.cc b/lily/moment.cc
index 72e138b4a9e0fa012127c9406c95920ea4d0ec09..f30f3613675eaed971f50356056f6efa478b22da 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -247,3 +247,13 @@ operator << (std::ostream &os, Moment const &m)
   return os;
 }
 #endif
+
+Moment
+robust_scm2moment (SCM m, Moment d)
+{
+  Moment * p = unsmob_moment (m);
+  if (!p)
+    return d;
+  else
+    return *p;
+}

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index d7e0129aa3c3ca089e3dee5f0a4f6e059a9ced10..4cc4490aafa4934b6c9ef4edd3b2c4fbf2d3a16c 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -124,6 +124,7 @@ Slur_score_parameters::fill (Grob *me)
   edge_slope_exponent_
     = get_detail (details, ly_symbol2scm ("edge-slope-exponent"));
 }
+
 Real
 broken_trend_y (Slur_score_state const &state, Direction hdir)
 {

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 991b13ea0fa29421fe1825a3e3b49857a63a6d7a..383207257730afae11b2cc632f964ebd2e4b5edd 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-09 03:01+0200\n"
+"POT-Creation-Date: 2004-10-09 12:49+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,6 +142,8 @@ msgstr ""
 #. for --output-format.
 #. Bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format.
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
 #: lilypond-book.py:89 main.cc:130 lily/main.cc:130
 msgid "EXT"
 msgstr ""
@@ -643,6 +645,7 @@ msgstr ""
 #. FIXME: broken sentence
 #. FIXME: broken sentence
 #. FIXME: broken sentence
+#. FIXME: broken sentence
 #: all-font-metrics.cc:95 lily/all-font-metrics.cc:95
 #, c-format
 msgid "checksum mismatch for font file: `%s'"
@@ -803,6 +806,12 @@ msgstr ""
 #.
 #. last->translator_id_string ()  = get_change ()->change_to_id_string ();
 #.
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
 #: change-iterator.cc:93 lily/change-iterator.cc:93
 msgid "I'm one myself"
 msgstr ""
@@ -1195,6 +1204,7 @@ msgstr ""
 #. No version number or newline here.  It confuses help2man.
 #. No version number or newline here.  It confuses help2man.
 #. No version number or newline here.  It confuses help2man.
+#. No version number or newline here.  It confuses help2man.
 #: main.cc:192 lily/main.cc:192
 #, c-format
 msgid "Usage: %s [OPTIONS]... FILE..."
@@ -1298,6 +1308,9 @@ msgstr ""
 #.
 #. music for the softenon children?
 #.
+#.
+#. music for the softenon children?
+#.
 #: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:155
 msgid "music for the martians."
 msgstr ""
@@ -1504,6 +1517,7 @@ msgstr ""
 #. FIXME:
 #. FIXME:
 #. FIXME:
+#. FIXME:
 #: script-engraver.cc:102 lily/script-engraver.cc:102
 msgid "Do not know how to interpret articulation: "
 msgstr ""
@@ -1520,6 +1534,7 @@ msgstr ""
 #. this shouldn't happen, but let's continue anyway.
 #. this shouldn't happen, but let's continue anyway.
 #. this shouldn't happen, but let's continue anyway.
+#. this shouldn't happen, but let's continue anyway.
 #: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
 #: lily/separation-item.cc:97
 msgid "Separation_item:  I've been drinking too much"
@@ -1561,6 +1576,7 @@ msgstr ""
 #. FIXME:
 #. FIXME:
 #. FIXME:
+#. FIXME:
 #: stem-engraver.cc:125 lily/stem-engraver.cc:125
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
@@ -1626,6 +1642,8 @@ msgstr ""
 #. more of a programming error.
 #. Not using ngettext's plural feature here, as this message is
 #. more of a programming error.
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
 #: tfm-reader.cc:108 lily/tfm-reader.cc:108
 #, c-format
 msgid "TFM header of `%s' has only %u word (s)"
@@ -1689,6 +1707,11 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
 #: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
 #, c-format
 msgid "Found strange time signature %d/%d."
@@ -1710,6 +1733,8 @@ msgstr ""
 #. (Here really with a warning!)
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
 #: time-signature.cc:91 lily/time-signature.cc:91
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"

diff --git a/scm/titling.scm b/scm/titling.scm
index b1cb6aa2eab564669b13e50bd6b61f3b2ab9c201..4a0eb678342c832fe7e89c8daf544b492b95422a 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -126,7 +126,7 @@
            '())
        (if (has 'piece)
            (list
-            (markup #:fill-line (#:large #:bigger #:caps (get 'piece) "")))
+            (markup #:fill-line (#:large #:bigger (get 'piece) "")))
            '())))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;