Hi everybody,
It's rather a trivial detail, but I couldn't help noticing that
'stencil-align-dir-y is an exception to the general style for
properties which include axes. Attached is a patch to change it to
'stencil-align-dir-Y.
Also included is a correction to the description for 'direction in
define-grob-properties.scm.
Regards,
Neil
From f34a0e3138b7dbbf05e200a64094347e59c1ae0f Mon Sep 17 00:00:00 2001
From: Neil Puttock <[EMAIL PROTECTED]>
Date: Fri, 16 May 2008 17:35:48 +0100
Subject: [PATCH] Style nit: change stencil-align-dir-y to stencil-align-dir-Y.
Fix ref to 'side-axis for 'direction in define-grob-properties
(#X = 0, #Y = 1).
---
Documentation/es/user/text.itely | 8 ++++----
Documentation/fr/user/text.itely | 8 ++++----
Documentation/user/changing-defaults.itely | 8 ++++----
input/new/line-arrows.ly | 4 ++--
input/regression/line-arrows.ly | 4 ++--
lily/line-spanner.cc | 2 +-
python/convertrules.py | 4 +++-
scm/define-grob-properties.scm | 2 +-
8 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely
index 1eb8067..333f269 100644
--- a/Documentation/es/user/text.itely
+++ b/Documentation/es/user/text.itely
@@ -204,16 +204,16 @@ para poner @i{cresc.} y @i{tr} sobre los objetos de extensión horizontales.
c2\startTextSpan b c a\stopTextSpan
@end lilypond
[EMAIL PROTECTED] stencil-align-dir-y
[EMAIL PROTECTED] stencil-align-dir-Y
@item stencil-offset
Sin un valor establecido para esto, el stencil se coloca simplemente sobre el extremo del final,
tal y como se encuentra definido por las subpropiedades @code{X} e @code{Y}.
-La asignación de un valor para @code{stencil-align-dir-y} o para @code{stencil-offset}
+La asignación de un valor para @code{stencil-align-dir-Y} o para @code{stencil-offset}
desplaza el sÃmbolo del extremo de forma relativa al extremo de la lÃnea
@lilypond[relative=1,fragment,verbatim]
-\override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #DOWN
-\override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #UP
+\override TextSpanner #'bound-details #'left #'stencil-align-dir-Y = #DOWN
+\override TextSpanner #'bound-details #'right #'stencil-align-dir-Y = #UP
\override TextSpanner #'bound-details #'left #'text = #"gggg"
\override TextSpanner #'bound-details #'right #'text = #"hhhh"
diff --git a/Documentation/fr/user/text.itely b/Documentation/fr/user/text.itely
index 67b49fa..3fa79fc 100644
--- a/Documentation/fr/user/text.itely
+++ b/Documentation/fr/user/text.itely
@@ -217,17 +217,17 @@ habituellement les @i{cresc.} ou @i{tr} des extenseurs horizontaux.
c2\startTextSpan b c a\stopTextSpan
@end lilypond
[EMAIL PROTECTED] stencil-align-dir-y
[EMAIL PROTECTED] stencil-align-dir-Y
@item stencil-offset
Lorsqu'ils ne sont pas définis, le tracé est tout simplement
positionné conformément aux sous-propriétés @code{X} et @code{Y}. En
-fixant soit @code{stencil-align-dir-y}, soit @code{stencil-offset},
+fixant soit @code{stencil-align-dir-Y}, soit @code{stencil-offset},
vous pouvez décaler le coin du marqueur par rapport à l'extrémité de
la ligne.
@lilypond[relative=1,fragment,verbatim]
-\override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #DOWN
-\override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #UP
+\override TextSpanner #'bound-details #'left #'stencil-align-dir-Y = #DOWN
+\override TextSpanner #'bound-details #'right #'stencil-align-dir-Y = #UP
\override TextSpanner #'bound-details #'left #'text = #"gggg"
\override TextSpanner #'bound-details #'right #'text = #"hhhh"
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 32f14c6..0e39e25 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1607,19 +1607,19 @@ to put @i{cresc.} and @i{tr} on horizontal spanners.
c2\startTextSpan b c a\stopTextSpan
@end lilypond
[EMAIL PROTECTED] stencil-align-dir-y
[EMAIL PROTECTED] stencil-align-dir-Y
@item stencil-offset
Without setting this, the stencil is simply put there at the
end-point, as defined by the @code{X} and @code{Y} sub properties.
-Setting either @code{stencil-align-dir-y} or @code{stencil-offset}
+Setting either @code{stencil-align-dir-Y} or @code{stencil-offset}
will move the symbol at the edge relative to the end point of the
line
@lilypond[relative=1,fragment,verbatim]
\override TextSpanner #'bound-details
- #'left #'stencil-align-dir-y = #DOWN
+ #'left #'stencil-align-dir-Y = #DOWN
\override TextSpanner #'bound-details
- #'right #'stencil-align-dir-y = #UP
+ #'right #'stencil-align-dir-Y = #UP
\override TextSpanner #'bound-details
#'left #'text = #"gggg"
diff --git a/input/new/line-arrows.ly b/input/new/line-arrows.ly
index 9c50cec..09766cd 100644
--- a/input/new/line-arrows.ly
+++ b/input/new/line-arrows.ly
@@ -14,8 +14,8 @@
\override TextSpanner #'bound-details #'right #'text = #"gag"
\override TextSpanner #'bound-details #'right #'padding = #0.6
- \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER
- \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER
+ \override TextSpanner #'bound-details #'right #'stencil-align-dir-Y = #CENTER
+ \override TextSpanner #'bound-details #'left #'stencil-align-dir-Y = #CENTER
\override Glissando #'bound-details #'right #'arrow = ##t
\override Glissando #'arrow-length = #0.5
diff --git a/input/regression/line-arrows.ly b/input/regression/line-arrows.ly
index 0fe4156..390d6b6 100644
--- a/input/regression/line-arrows.ly
+++ b/input/regression/line-arrows.ly
@@ -16,8 +16,8 @@
\override TextSpanner #'bound-details #'right #'text = #"gag"
\override TextSpanner #'bound-details #'right #'padding = #0.6
- \override TextSpanner #'bound-details #'right #'stencil-align-dir-y = #CENTER
- \override TextSpanner #'bound-details #'left #'stencil-align-dir-y = #CENTER
+ \override TextSpanner #'bound-details #'right #'stencil-align-dir-Y = #CENTER
+ \override TextSpanner #'bound-details #'left #'stencil-align-dir-Y = #CENTER
\override Glissando #'bound-details #'right #'arrow = ##t
\override Glissando #'arrow-length = #0.5
diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 3215456..1cdd47d 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -298,7 +298,7 @@ Line_spanner::print (SCM smob)
span_points[d][X_AXIS] -= anchor;
Stencil s = stencils[d]->translated (span_points[d]);
- SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"),
+ SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-Y"),
bounds[d], SCM_BOOL_F);
SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"),
bounds[d], SCM_BOOL_F);
diff --git a/python/convertrules.py b/python/convertrules.py
index 31d756f..a29230b 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3045,6 +3045,8 @@ def conv (str):
r"\\revert Hairpin #'to-barline", str)
str = re.sub (r"hairpinToBarline\s*=\s*##([tf]+)",
r"\\override Hairpin #'to-barline = ##\1", str)
+ str = re.sub (r"stencil-align-dir-y", r"stencil-align-dir-Y", str)
return str
-conversions.append (((2, 11, 46), conv, """\\set hairpinToBarline -> \\override Hairpin #'to-barline"""))
+conversions.append (((2, 11, 46), conv, """\\set hairpinToBarline -> \\override Hairpin #'to-barline,
+stencil-align-dir-y -> stencil-align-dir-Y"""))
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index bb2f289..5f2d650 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -162,7 +162,7 @@ whitespace. If negative, no line is drawn at all.")
(default-direction ,ly:dir? "Direction determined by note head
positions.")
(digit-names ,vector "Names for string finger digits.")
- (direction ,ly:dir? "If @code{side-axis} is @code{1} (or
+ (direction ,ly:dir? "If @code{side-axis} is @code{0} (or
@code{#X}), then this property determines whether the object is placed
@code{#LEFT}, @code{#CENTER} or @code{#RIGHT} with respect to the
other object. Otherwise, it determines whether the object is placed
--
1.5.4.950.ga176
_______________________________________________
lilypond-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
