Run `make grand-replace'.

[lilypond.git] / lily / paper-column.cc

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index e347def4079abe1dddc34c9e64caaea395c67acf..b30c7de32fec89688d4e0d5e2b0893bca07bc73c 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,28 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
 
-#include "break-align-interface.hh"
-#include "moment.hh"
-#include "paper-score.hh"
-#include "warn.hh"
 #include "axis-group-interface.hh"
-#include "spaceable-grob.hh"
-#include "text-interface.hh"
-#include "lookup.hh"
+#include "break-align-interface.hh"
 #include "font-interface.hh"
-#include "output-def.hh"
-#include "pointer-group-interface.hh"
 #include "grob-array.hh"
-#include "system.hh"
-#include "spring.hh"
 #include "lookup.hh"
+#include "lookup.hh"
+#include "moment.hh"
+#include "output-def.hh"
+#include "paper-score.hh"
+#include "pointer-group-interface.hh"
 #include "separation-item.hh"
+#include "skyline-pair.hh"
+#include "spaceable-grob.hh"
+#include "spring.hh"
 #include "string-convert.hh"
+#include "system.hh"
+#include "text-interface.hh"
+#include "warn.hh"
 
 Grob *
 Paper_column::clone () const
@@ -314,18 +315,18 @@ Paper_column::before_line_breaking (SCM grob)
 
 
 ADD_INTERFACE (Paper_column,
-              "@code{Paper_column} objects form the top-most X@tie{}parents "
-              "for items.  There are two types of columns: musical columns, "
-              "where are attached to, and non-musical columns, where "
-              "bar-lines, clefs, etc., are attached to.  The spacing engine "
-              "determines the X@tie{}positions of these objects.\n"
+              "@code{Paper_column} objects form the top-most X@tie{}parents"
+              " for items.  There are two types of columns: musical columns,"
+              " where are attached to, and non-musical columns, where"
+              " bar-lines, clefs, etc., are attached to.  The spacing engine"
+              " determines the X@tie{}positions of these objects.\n"
               "\n"
-              "They are numbered, the first (leftmost) is column@tie{}0.  "
-              "Numbering happens before line breaking, and columns are not "
-              "renumbered after line breaking.  Since many columns go "
-              "unused, you should only use the rank field to get ordering "
-              "information.  Two adjacent columns may have non-adjacent "
-              "numbers.",
+              "They are numbered, the first (leftmost) is column@tie{}0."
+              "  Numbering happens before line breaking, and columns are not"
+              " renumbered after line breaking.  Since many columns go"
+              " unused, you should only use the rank field to get ordering"
+              " information.  Two adjacent columns may have non-adjacent"
+              " numbers.",
 
               /* properties */
               "between-cols "