From 2bf4edeb7a6e6bde31c699f0f00cec494d5cf4cd Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sun, 6 Mar 2005 00:09:14 +0000
Subject: [PATCH] (fontsize): new markup command. Also set baseline-skip
---
ly/titling-init.ly | 27 +++++++++------------------
scm/define-markup-commands.scm | 5 ++++-
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 2af0acc450..9246a90128 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -21,31 +21,23 @@ tagline = \markup {
}
bookTitleMarkup = \markup {
-
+ \override #'(baseline-skip . 3)
\column {
- \override #'(baseline-skip . 3)
\fill-line { \fromproperty #'header:dedication }
- \fill-line {
- \huge \bigger \bigger \bold \fromproperty #'header:title
- }
- \fill-line {
- \override #'(baseline-skip . 6)
+ \override #'(baseline-skip . 3.5)
+ \huge \bigger \bold
\column {
\fill-line {
- \huge \bigger \bigger
- \bold \fromproperty #'header:subtitle
+ \bigger \fromproperty #'header:title
}
\fill-line {
- \huge \bigger
- \bold \fromproperty #'header:subsubtitle
+ \bigger \fromproperty #'header:subtitle
+ }
+ \fill-line {
+ \fromproperty #'header:subsubtitle
}
-%% From 2.4:
-%% \column {
-%% \override #'(baseline-skip . 5)
-%% ""
-%% }
}
- }
+
\fill-line {
\fromproperty #'header:poet
\fromproperty #'header:instrument
@@ -55,7 +47,6 @@ bookTitleMarkup = \markup {
}
}
}
-
}
scoreTitleMarkup = \markup {
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 6fec7362e3..e975b35acf 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -360,10 +360,13 @@ recommend font for this is bold and italic"
"Draw a double flat symbol."
(interpret-markup layout props (markup #:musicglyph "accidentals.M4")))
+
+;;
+;; TODO: should extract baseline-skip from each argument somehow..
+;;
(def-markup-command (column layout props args) (markup-list?)
"Stack the markups in @var{args} vertically. The property
@code{baseline-skip} determines the space between each markup in @var{args}."
- (display (chain-assoc-get 'baseline-skip props))(newline)
(stack-lines
-1 0.0 (chain-assoc-get 'baseline-skip props)
(remove ly:stencil-empty?
--
2.39.5