[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Remove thin-kern property. (issue 105560044 by address@hidden)
From: |
markpolesky |
Subject: |
Remove thin-kern property. (issue 105560044 by address@hidden) |
Date: |
Sun, 06 Jul 2014 06:46:53 +0000 |
Reviewers: ,
Message:
Hi, I'm proposing to get rid of the BarLine.thin-kern property with this
patch, so if you're opposed, let me know.
You can see my comments/rationale here:
http://code.google.com/p/lilypond/issues/detail?id=3995
Thanks,
Mark
Description:
This removes the thin-kern property, and adds a convert-ly rule to
convert `thin-kern' to `kern', since kern does what thin-kern claimed to
do anyway, and thin-kern (AFAICT) does nothing.
See http://code.google.com/p/lilypond/issues/detail?id=3995
Please review this at https://codereview.appspot.com/105560044/
Affected files (+11, -9 lines):
M python/convertrules.py
M scm/bar-line.scm
M scm/define-grob-interfaces.scm
M scm/define-grob-properties.scm
M scm/define-grobs.scm
Index: python/convertrules.py
diff --git a/python/convertrules.py b/python/convertrules.py
index
5eb2a75bfc4f17bbcea91068518c2e928b502d99..aeb9384a5529423e8e7f279e8ce41183993d7769
100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3450,7 +3450,7 @@ def conv (str):
if m.group (1):
return m.group (0)
x = m.group (2) + m.group (4)
-
+
if m.group (3):
x = x + re.sub (r"(\s*)(" + symbol_list + ")", fn_path_replace,
m.group (3))
@@ -3718,6 +3718,11 @@ def conv(str):
str = re.sub (r'\blocalKeySignature\b', 'localAlterations', str)
return str
address@hidden ((2, 19, 10), "thin-kern -> kern")
+def conv(str):
+ str = re.sub (r'\bthin-kern\b', 'kern', str)
+ return str
+
# Guidelines to write rules (please keep this at the end of this file)
#
# - keep at most one rule per version; if several conversions should be
done,
Index: scm/bar-line.scm
diff --git a/scm/bar-line.scm b/scm/bar-line.scm
index
ff2d3f29b4a35d30cee581fa8f31ac096b06acb5..77c41f5cc04973c85c092e03ad6d96a98618b2ef
100644
--- a/scm/bar-line.scm
+++ b/scm/bar-line.scm
@@ -440,14 +440,14 @@ is not used within the routine."
the segno sign is drawn over the double bar line; otherwise, it
draws the span bar variant, i.e. without the segno sign."
(let* ((line-thickness (layout-line-thickness grob))
- (thinkern (* (ly:grob-property grob 'thin-kern 1) line-thickness))
+ (kern (* (ly:grob-property grob 'kern 1) line-thickness))
(thin-stil (make-simple-bar-line grob extent))
(double-line-stil (ly:stencil-combine-at-edge
thin-stil
X
LEFT
thin-stil
- thinkern))
+ kern))
(segno (ly:font-get-glyph (ly:grob-default-font grob)
"scripts.varsegno"))
(stencil (ly:stencil-add
@@ -459,7 +459,7 @@ draws the span bar variant, i.e. without the segno
sign."
(cons 0 0)))
(ly:stencil-translate-axis
double-line-stil
- (* 1/2 thinkern)
+ (* 1/2 kern)
X))))
stencil))
Index: scm/define-grob-interfaces.scm
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index
4ffd761607c788feef67edba4b1b1e5522bf78fb..7e5fa2283f29678d788ba9cc7d92eb2ea7d4536a
100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -59,7 +59,6 @@ found in @file{scm/bar-line.scm}.
has-span-bar
kern
rounded
- thin-kern
thick-thickness))
(ly:add-interface
Index: scm/define-grob-properties.scm
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index
24e8e3298abeb0d93607832d0d1422b757e83c8d..be82bd1c0c3061777bbb8e4f37457d09d9267231
100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -531,8 +531,8 @@ slur quants to this position, and print the respective
scores.")
;;;
(keep-inside-line ,boolean? "If set, this column cannot have
objects sticking into the margin.")
- (kern ,ly:dimension? "Amount of extra white space to add. For
-bar lines, this is the amount of space after a thick line.")
+ (kern ,ly:dimension? "The space between bar lines in any type
+of double bar")
(knee ,boolean? "Is this beam kneed?")
(knee-spacing-correction ,number? "Factor for the optical
correction amount for kneed beams. Set between @code{0} for no
@@ -969,7 +969,6 @@ should use @code{LEFT}.")
@code{line-thickness}.")
(thickness ,number? "Line thickness, generally measured in
@code{line-thickness}.")
- (thin-kern ,number? "The space after a hair-line in a bar line.")
(tie-configuration ,list? "List of @code{(@var{position} .
@var{dir})} pairs, indicating the desired tie configuration, where
@var{position} is the offset from the center of the staff in staff
Index: scm/define-grobs.scm
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index
ddacbcb7ec1131864197462b77ef59f7dca37b4b..c6dbd325d862ab42bc1efe35a610410dfdcb950f
100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -216,7 +216,6 @@
;; TODO:
;; kern should scale with line-thickness too.
(kern . 3.0)
- (thin-kern . 3.0)
(hair-thickness . 1.9)
(thick-thickness . 6.0)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Remove thin-kern property. (issue 105560044 by address@hidden),
markpolesky <=