diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2004-11-21 18:19:11 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2004-11-21 18:19:11 +0000 |
| commit | c0ba46b982f0bb0544c5267b5176c17d8d9d1447 (patch) | |
| tree | ea1081315b0b8966db9d6556ce207a97780d9147 /ly/titling-init.ly | |
| parent | f40c15110e524f6ee076e2de3dc987468f889abc (diff) | |
* scm/stencil.scm (stack-lines): return empty-stencil if argument
is '()
(stack-stencils): idem.
* Documentation/user/changing-defaults.itely (Creating titles):
document new title layout options.
* lily/parser.yy (lilypond_header_body): copy previous
$globalheader if present.
* lily/ly-module.cc (LY_DEFINE): rename ly:import-module to
ly:module-copy
* scm/page-layout.scm (marked-up-headfoot): remove old functions.
* scm/titling.scm: remove old titling functions
* ly/titling-init.ly (oddFooterMarkup): new file. Generate titles
via markup.
* scm/page-layout.scm (marked-up-headfoot): create header/footer
field from user-supplied markup
* scm/define-markup-commands.scm (on-the-fly): new markup
command. Enter SCM markup procedure directly in Scheme.
(fromproperty): new markup command. Read markup from props argument.
* scm/titling.scm (marked-up-title): create title via
user-specified markup.
* scm/define-markup-commands.scm (column): remove empty stencils
from column.
* lily/ly-module.cc (LY_DEFINE): use ly_module_lookup(). This does
not have side-effect of creating variable stub.
Diffstat (limited to 'ly/titling-init.ly')
| -rw-r--r-- | ly/titling-init.ly | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/ly/titling-init.ly b/ly/titling-init.ly index d94c42a78b..bea90f7ebc 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -1,4 +1,3 @@ - bookTitleMarkup = \markup { \column < \fill-line < \fromproperty #'header:dedication > @@ -7,25 +6,25 @@ bookTitleMarkup = \markup { > \fill-line < \override #'(baseline-skip . 3) - \column < - \fill-line < - \huge \bigger \bigger - \bold \fromproperty #'header:subtitle - > - \fill-line < - \huge \bigger - \bold \fromproperty #'header:subsubtitle - > - > + \column < + \fill-line < + \huge \bigger \bigger + \bold \fromproperty #'header:subtitle + > + \fill-line < + \huge \bigger + \bold \fromproperty #'header:subsubtitle + > + > > \fill-line < \fromproperty #'header:poet \fromproperty #'header:instrument \column < - \fromproperty #'header:composer - \fromproperty #'header:arranger - > + \fromproperty #'header:composer + \fromproperty #'header:arranger > + > > } @@ -54,6 +53,8 @@ evenHeaderMarkup = \markup oddFooterMarkup = \markup { \column < \fill-line < + + % put copyright only on pagenr. 1 \on-the-fly #(lambda (layout props arg) (if (= 1 (chain-assoc-get 'page:page-number props -1)) (interpret-markup layout props arg) @@ -62,6 +63,7 @@ oddFooterMarkup = \markup { \fromproperty #'header:copyright > \fill-line < + % put tagline only on last page \on-the-fly #(lambda (layout props arg) (if (chain-assoc-get 'page:last? props #f) (interpret-markup layout props arg) @@ -72,6 +74,3 @@ oddFooterMarkup = \markup { > } - - - |