From 3484ff062a7402ddeb4b73fcc155afddcf6fea3f Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 4 Aug 2010 10:50:20 +0200
Subject: [PATCH] Whitespace, minor formatting.
---
lily/bar-line.cc | 4 ++--
lily/context-mod-scheme.cc | 6 +++--
lily/directional-element-interface.cc | 3 ++-
lily/engraver-scheme.cc | 8 +++----
lily/general-scheme.cc | 14 +++++------
lily/ligature-engraver.cc | 5 ++--
lily/mensural-ligature.cc | 8 +++----
lily/music-function-scheme.cc | 4 ++--
lily/page-turn-page-breaking.cc | 4 ++--
lily/scheme-engraver.cc | 4 ++--
lily/script-engraver.cc | 4 ++--
lily/tie-column.cc | 3 ++-
lily/vaticana-ligature-engraver.cc | 34 ++++++++++++++-------------
13 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 34e2e16622..2a9cf9d17d 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -441,9 +441,9 @@ ADD_INTERFACE (Bar_line,
" line without special bar lines.\n"
"\n"
"@code{S|:} and @code{:|S} are used for repeat/segno combinations that are"
- " separated at line breaks. Alternatively, @code{.S|:} and @code{:|S.}"
+ " separated at line breaks. Alternatively, @code{.S|:} and @code{:|S.}"
" may be used which combine repeat signs and segno at the same line in"
- " case of a line break. @code{:|S|:} is a combination of a left repeat"
+ " case of a line break. @code{:|S|:} is a combination of a left repeat"
" (@code{:|}), a segno (@code{S}) and a right repeat @code{|:} which"
" splits before the segno at line breaks; @code{:|S.|:} splits after"
" the segno sign.\n"
diff --git a/lily/context-mod-scheme.cc b/lily/context-mod-scheme.cc
index 245749604a..f63d02887f 100644
--- a/lily/context-mod-scheme.cc
+++ b/lily/context-mod-scheme.cc
@@ -24,7 +24,8 @@
LY_DEFINE (ly_get_context_mods,
"ly:get-context-mods",
1, 0, 0, (SCM contextmod),
- "Returns the list of context modifications stored in @var{contextmod}.")
+ "Returns the list of context modifications stored in"
+ " @var{contextmod}.")
{
Context_mod *tr = unsmob_context_mod (contextmod);
LY_ASSERT_SMOB (Context_mod, contextmod, 1);
@@ -34,7 +35,8 @@ LY_DEFINE (ly_get_context_mods,
LY_DEFINE (ly_add_context_mod,
"ly:add-context-mod",
2, 0, 0, (SCM contextmods, SCM modification),
- "Adds the given context @var{modification} to the list @var{contextmods} of context modifications.")
+ "Adds the given context @var{modification} to the list"
+ " @var{contextmods} of context modifications.")
{
Context_mod *ctxmod = unsmob_context_mod (contextmods);
LY_ASSERT_SMOB (Context_mod, contextmods, 1);
diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index befbc29d7e..2c6ae06185 100644
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -27,7 +27,8 @@ get_grob_direction (Grob *me)
SCM d = me->get_property ("direction");
if (d == ly_symbol2scm ("calculation-in-progress"))
{
- programming_error ("Grob direction requested while calculation in progress. ");
+ programming_error ("Grob direction requested while calculation in"
+ " progress. ");
return UP;
}
if (!is_direction (d))
diff --git a/lily/engraver-scheme.cc b/lily/engraver-scheme.cc
index c2cbe1ace4..61d5b7d180 100644
--- a/lily/engraver-scheme.cc
+++ b/lily/engraver-scheme.cc
@@ -22,10 +22,10 @@
LY_DEFINE (ly_engraver_make_grob, "ly:engraver-make-grob",
3, 0, 0, (SCM engraver, SCM grob_name, SCM cause),
- "Creates a grob originating from given engraver instance, "
- "with give @code{grob_name}, a symbol. "
- "@code{cause} should either be another grob "
- "or a music event.")
+ "Create a grob originating from given @var{engraver} instance,"
+ " with given @var{grob_name}, a symbol."
+ " @var{cause} should either be another grob"
+ " or a music event.")
{
LY_ASSERT_TYPE (unsmob_engraver, engraver, 1);
LY_ASSERT_TYPE (ly_is_symbol, grob_name, 2);
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index c8816b43a7..53b0564ceb 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -146,8 +146,8 @@ LY_DEFINE (ly_programming_error, "ly:programming-error",
LY_DEFINE (ly_success, "ly:success",
1, 0, 1, (SCM str, SCM rest),
- "A Scheme callable function to issue a success message @code{str}."
- " The message is formatted with @code{format} and @code{rest}.")
+ "A Scheme callable function to issue a success message @var{str}."
+ " The message is formatted with @code{format} and @var{rest}.")
{
LY_ASSERT_TYPE (scm_is_string, str, 1);
str = scm_simple_format (SCM_BOOL_F, str, rest);
@@ -157,8 +157,8 @@ LY_DEFINE (ly_success, "ly:success",
}
LY_DEFINE (ly_warning, "ly:warning",
1, 0, 1, (SCM str, SCM rest),
- "A Scheme callable function to issue the warning @code{str}."
- " The message is formatted with @code{format} and @code{rest}.")
+ "A Scheme callable function to issue the warning @var{str}."
+ " The message is formatted with @code{format} and @var{rest}.")
{
LY_ASSERT_TYPE (scm_is_string, str, 1);
str = scm_simple_format (SCM_BOOL_F, str, rest);
@@ -574,8 +574,8 @@ format_single_argument (SCM arg, int precision, bool escape = false)
LY_DEFINE (ly_format, "ly:format",
1, 0, 1, (SCM str, SCM rest),
- "LilyPond specific format, supporting @code{~a} and @code{~[0-9]f}. "
- "Basic support for @code{~s} is also provided.")
+ "LilyPond specific format, supporting @code{~a} and @code{~[0-9]f}."
+ " Basic support for @code{~s} is also provided.")
{
LY_ASSERT_TYPE (scm_is_string, str, 1);
@@ -644,7 +644,7 @@ LY_DEFINE (ly_format, "ly:format",
if (scm_is_pair (rest))
programming_error (string (__FUNCTION__)
- + ": too many arguments");
+ + ": too many arguments");
vsize len = 0;
for (vsize i = 0; i < results.size (); i++)
diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 25194a4b13..509ecd2df3 100644
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -155,8 +155,9 @@ Ligature_engraver::stop_translation_timestep ()
{
if (!finished_primitives_.size ())
{
- finished_ligature_->programming_error ("Ligature_engraver::stop_translation_timestep (): "
- "junking empty ligature");
+ finished_ligature_->programming_error (
+ "Ligature_engraver::stop_translation_timestep ():"
+ " junking empty ligature");
}
else
{
diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 09e89e3a5e..ca0fe9b039 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -105,8 +105,8 @@ internal_brew_primitive (Grob *me)
SCM primitive_scm = me->get_property ("primitive");
if (primitive_scm == SCM_EOL)
{
- programming_error ("Mensural_ligature: "
- "undefined primitive -> ignoring grob");
+ programming_error ("Mensural_ligature:"
+ " undefined primitive -> ignoring grob");
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
int primitive = scm_to_int (primitive_scm);
@@ -149,8 +149,8 @@ internal_brew_primitive (Grob *me)
out = brew_flexa (me, delta_pitch, false, width, thickness);
break;
default:
- programming_error (_ ("Mensural_ligature: "
- "unexpected case fall-through"));
+ programming_error (_ ("Mensural_ligature:"
+ " unexpected case fall-through"));
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
diff --git a/lily/music-function-scheme.cc b/lily/music-function-scheme.cc
index c22634f152..b6473b19d1 100644
--- a/lily/music-function-scheme.cc
+++ b/lily/music-function-scheme.cc
@@ -19,8 +19,8 @@ LY_DEFINE (ly_music_function_extract, "ly:music-function-extract", 1, 0, 0,
LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
(SCM signature, SCM func),
"Make a function to process music, to be used for the"
- " parser. @code{func} is the function, and @code{signature}"
- " describes its arguments. @code{signature} is a list"
+ " parser. @var{func} is the function, and @var{signature}"
+ " describes its arguments. @var{signature} is a list"
" containing either @code{ly:music?} predicates or other type"
" predicates.")
{
diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc
index 281a7056e0..54b3bbc566 100644
--- a/lily/page-turn-page-breaking.cc
+++ b/lily/page-turn-page-breaking.cc
@@ -213,8 +213,8 @@ Page_turn_page_breaking::calc_subproblem (vsize ending_breakpoint)
if (start == 0 && end == 1
&& this_start_best.first_page_number_ == 1
&& this_start_best.page_count_ > 1)
- warning (_ ("cannot fit the first page turn onto a single page. "
- "Consider setting first-page-number to an even number."));
+ warning (_ ("cannot fit the first page turn onto a single page."
+ " Consider setting first-page-number to an even number."));
if (this_start_best.demerits_ < best.demerits_)
best = this_start_best;
diff --git a/lily/scheme-engraver.cc b/lily/scheme-engraver.cc
index 476f6d4dea..eeddec74de 100644
--- a/lily/scheme-engraver.cc
+++ b/lily/scheme-engraver.cc
@@ -242,8 +242,8 @@ ADD_END_ACKNOWLEDGER (Scheme_engraver, grob);
ADD_TRANSLATOR (Scheme_engraver,
/* doc */
- "Implement engravers in Scheme. Interprets arguments to @code{\\consists} "
- "as callbacks. ",
+ "Implement engravers in Scheme. Interprets arguments to"
+ " @code{\\consists} as callbacks.",
/* create */
"",
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index dde8831a31..1c8e74f954 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -110,8 +110,8 @@ make_script_from_event (Grob *p, Context *tg,
if (art == SCM_BOOL_F)
{
/* FIXME: */
- warning (_ ("do not know how to interpret articulation: "));
- warning (_ ("scheme encoding: "));
+ warning (_ ("do not know how to interpret articulation:"));
+ warning (_ (" scheme encoding: "));
scm_write (art_type, scm_current_error_port ());
message ("");
return;
diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 60cd300aff..3c4ddae504 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -122,7 +122,8 @@ Tie_column::calc_positioning_done (SCM smob)
ADD_INTERFACE (Tie_column,
- "Object that sets directions of multiple ties in a tied chord.",
+ "Object that sets directions of multiple ties in a tied"
+ " chord.",
/* properties */
"positioning-done "
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 0de6a6b296..4e0181e9f4 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -205,8 +205,8 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
{
if (!primitives.size ())
{
- programming_error ("Vaticana_ligature: "
- "empty ligature [ignored]");
+ programming_error ("Vaticana_ligature:"
+ " empty ligature [ignored]");
return 0.0;
}
@@ -330,8 +330,8 @@ Vaticana_ligature_engraver::align_heads (vector<Grob_info> primitives,
{
if (!prev_primitive)
{
- primitive->programming_error ("vaticana ligature: add-join: "
- "missing previous primitive");
+ primitive->programming_error ("Vaticana ligature: add-join:"
+ " missing previous primitive");
}
else
{
@@ -397,8 +397,9 @@ Vaticana_ligature_engraver::check_for_prefix_loss (Item *primitive)
if (prefix_set & ~PES_OR_FLEXA)
{
string prefs = Gregorian_ligature::prefixes_to_str (primitive);
- primitive->warning (_f ("ignored prefix (es) `%s' of this head according "
- "to restrictions of the selected ligature style",
+ primitive->warning (_f ("ignored prefix(es) `%s' of this head"
+ " according to restrictions of the selected"
+ " ligature style",
prefs.c_str ()));
}
}
@@ -462,9 +463,9 @@ Vaticana_ligature_engraver::check_for_ambiguous_dot_pitch (Grob_info primitive)
if (pitch == new_pitch)
{
primitive.grob ()->
- warning ("Ambiguous use of dots in ligature: there are "
- "multiple dotted notes with the same pitch. "
- "The ligature should be split.");
+ warning ("Ambiguous use of dots in ligature: there are"
+ " multiple dotted notes with the same pitch."
+ " The ligature should be split.");
return; // supress multiple identical warnings
}
}
@@ -520,10 +521,10 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
}
else if (augmented_primitives_.size () > 0)
{
- primitive->warning ("This ligature has a dotted head followed by "
- "a non-dotted head. The ligature should be "
- "split after the last dotted head before "
- "this head.");
+ primitive->warning ("This ligature has a dotted head followed by"
+ " a non-dotted head. The ligature should be"
+ " split after the last dotted head before"
+ " this head.");
}
if (is_stacked_head (prefix_set, context_info))
@@ -732,8 +733,8 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature,
voices/staves also may want to set this property. */
Item *first_primitive = dynamic_cast<Item *> (primitives[0].grob ());
Paper_column *paper_column = first_primitive->get_column ();
- paper_column->warning (_f ("Vaticana_ligature_engraver: "
- "setting `spacing-increment = %f': ptr =%ul",
+ paper_column->warning (_f ("Vaticana_ligature_engraver:"
+ " setting `spacing-increment = %f': ptr =%ul",
ligature_width, paper_column));
paper_column->
set_property ("forced-spacing", scm_from_double (ligature_width));
@@ -744,7 +745,8 @@ ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, rest);
ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, note_head);
ADD_TRANSLATOR (Vaticana_ligature_engraver,
/* doc */
- "Handle ligatures by glueing special ligature heads together.",
+ "Handle ligatures by glueing special ligature heads"
+ " together.",
/* create */
"VaticanaLigature "
--
2.39.5