X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=8068846dab7661e56198ba8b9265114065b5681c;hb=eee9576c5d8ee45e432365d15159044f9a06229c;hp=a6e7fa6a35fe38a1d945cc075ad5235aba0ac550;hpb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;p=lilypond.git

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index a6e7fa6a35..8068846dab 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -1,9 +1,20 @@
 /*
-  paper-column.cc -- implement Paper_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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 "paper-column.hh"
@@ -344,10 +355,10 @@ Paper_column::is_extraneous_column_from_ligature (Grob *me)
 
 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"
+	       " for items.  There are two types of columns: musical and"
+	       " non-musical, to which musical and non-musical objects are"
+	       " attached respectively.  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"
@@ -359,11 +370,13 @@ ADD_INTERFACE (Paper_column,
 	       /* properties */
 	       "between-cols "
 	       "bounded-by-me "
+	       "full-measure-extra-space "
 	       "grace-spacing "
 	       "labels "
 	       "line-break-system-details "
 	       "line-break-penalty "
 	       "line-break-permission "
+	       "maybe-loose "
 	       "page-break-penalty "
 	       "page-break-permission "
 	       "page-turn-penalty "