From fc994c211cca22ee3149e61151a4f2fb3ac684f0 Mon Sep 17 00:00:00 2001 From: Valentin Villenave Date: Mon, 17 Nov 2014 20:12:48 +0100 Subject: [PATCH] Pieces may now have subtitles. --- etc/locale/fr.conf | 1 + etc/ly.conf.d/lang.conf | 1 + lib/90-makescore.scm | 2 ++ share/themes/default/paper.ily | 3 +++ 4 files changed, 7 insertions(+) diff --git a/etc/locale/fr.conf b/etc/locale/fr.conf index 7ecf91e..6698051 100644 --- a/etc/locale/fr.conf +++ b/etc/locale/fr.conf @@ -20,6 +20,7 @@ ## LilyPond variables title-suffix = "Titre" +subtitle-suffix = "Soustitre" instr-suffix = "Instr" short-instr-suffix = "ShortInstr" lyrics-suffix = "Texte" diff --git a/etc/ly.conf.d/lang.conf b/etc/ly.conf.d/lang.conf index 3354ac2..5a48d18 100644 --- a/etc/ly.conf.d/lang.conf +++ b/etc/ly.conf.d/lang.conf @@ -18,6 +18,7 @@ ## LilyPond variables title-suffix = "Title" +subtitle-suffix = "Subtitle" instr-suffix = "Instr" short-instr-suffix = "ShortInstr" lyrics-suffix = "Words" diff --git a/lib/90-makescore.scm b/lib/90-makescore.scm index fb3e201..f60fcb0 100644 --- a/lib/90-makescore.scm +++ b/lib/90-makescore.scm @@ -128,9 +128,11 @@ current-part music." (layout $defaultlayout) (header (make-module)) (title (make-this-text part lang:title-suffix)) + (subtitle (make-this-text part lang:subtitle-suffix)) (author (make-this-text part lang:author-suffix lang:untaint-disclaimer))) (module-define! header 'piece title) + (module-define! header 'piece-subtitle subtitle) (module-define! header 'author author) (ly:score-set-header! score header) (ly:score-add-output-def! score (if local-layout local-layout layout)) diff --git a/share/themes/default/paper.ily b/share/themes/default/paper.ily index 6d9bc6d..94b33db 100644 --- a/share/themes/default/paper.ily +++ b/share/themes/default/paper.ily @@ -81,6 +81,9 @@ \fromproperty #'header:piece % \fromproperty #'paper:papersizename } + \fill-line { + \fromproperty #'header:piece-subtitle + } \vspace #1 \fill-line { \fromproperty #'header:instrument -- 2.11.4.GIT