Hi,

Here's a patch to make short-indent work properly.

I haven't done a new regression test for this since
instrument-name-x-align.ly already tests this property; attached is a
make-check comparision for this file.

Regards,
Neil

<<attachment: lily-99eee7b1.compare.jpeg>>

From 0d2a6a663c3ee5b64edd03ed45147465a7f3de86 Mon Sep 17 00:00:00 2001
From: Neil Puttock <[EMAIL PROTECTED]>
Date: Wed, 23 Jul 2008 22:27:11 +0100
Subject: [PATCH] Fix short-indent.

Get indent from short-indent in line_dimensions_int () if not first system.
---
 lily/output-def.cc |    4 +++-
 scm/paper.scm      |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 0e0259f..a849afe 100644
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -137,7 +137,9 @@ Interval
 line_dimensions_int (Output_def *def, int n)
 {
   Real lw = def->get_dimension (ly_symbol2scm ("line-width"));
-  Real ind = n ? 0.0 : def->get_dimension (ly_symbol2scm ("indent"));
+  Real ind = n
+    ? def->get_dimension (ly_symbol2scm ("short-indent"))
+    : def->get_dimension (ly_symbol2scm ("indent"));
   return Interval (ind, lw);
 }
 
diff --git a/scm/paper.scm b/scm/paper.scm
index 951addf..d587f5e 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -207,7 +207,7 @@ size. SZ is in points"
 				     (ly:modules-lookup (list m) 'right-margin (* 10 mm))))
 
     (module-define! m 'indent (/ w 14))
-    (module-define! m 'short-indent (* 5 mm))
+    (module-define! m 'short-indent 0)
 
     ;; page layout - what to do with (printer specific!) margin settings?
 
-- 
1.5.4.3

_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to