From 741b51db421f594b84d135be78d83cba0ef009ac Mon Sep 17 00:00:00 2001 From: Nicolas Sceaux Date: Fri, 24 Apr 2015 11:20:58 +0200 Subject: [PATCH] corrections dans la lib commune --- common/baroque.ily | 1 + common/marks.ily | 9 +++++++-- common/music-commands.ily | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/baroque.ily b/common/baroque.ily index 54739588..4dede20c 100644 --- a/common/baroque.ily +++ b/common/baroque.ily @@ -1,5 +1,6 @@ %% Custom bar lines \defineBarLine "!!:" #'("" "!!:" "!! ") +\defineBarLine ".!:" #'("|" ".!:" ".! ") \defineBarLine "|!:" #'("|" "|!:" "|! ") \defineBarLine "!:" #'("" "!:" "! ") \defineBarLine ":!." #'(":!." "" " !.") diff --git a/common/marks.ily b/common/marks.ily index e8a338d4..888a9281 100644 --- a/common/marks.ily +++ b/common/marks.ily @@ -52,6 +52,7 @@ markUpBegin = { \once\override Score.RehearsalMark.direction = #UP \once\override Score.RehearsalMark.self-alignment-X = #LEFT \once\override Score.RehearsalMark.padding = #2 + \once\override Score.RehearsalMark.font-size = #1 } markDownBegin = { @@ -60,6 +61,7 @@ markDownBegin = { \once\override Score.RehearsalMark.direction = #DOWN \once\override Score.RehearsalMark.self-alignment-X = #LEFT \once\override Score.RehearsalMark.padding = #2 + \once\override Score.RehearsalMark.font-size = #1 } markDownEnd = { @@ -68,6 +70,7 @@ markDownEnd = { \once\override Score.RehearsalMark.direction = #DOWN \once\override Score.RehearsalMark.self-alignment-X = #RIGHT \once\override Score.RehearsalMark.padding = #2 + \once\override Score.RehearsalMark.font-size = #1 } segnoMark = { \once\override Score.RehearsalMark.break-visibility = @@ -104,6 +107,7 @@ dacapoOverrides = { \once\override Score.RehearsalMark.direction = #DOWN \once\override Score.RehearsalMark.self-alignment-X = #RIGHT \once\override Score.RehearsalMark.padding = #2 + \once\override Score.RehearsalMark.font-size = #1 } endMark = @@ -112,7 +116,7 @@ endMark = endMarkSmall = #(define-music-function (parser location text) (markup?) - #{ \dacapoOverrides\mark\markup\right-align\italic\fontsize#-2 $text #}) + #{ \dacapoOverrides\mark\markup\right-align\italic\fontsize#-1 $text #}) beginMark = #(define-music-function (parser location text) (markup?) @@ -120,7 +124,7 @@ beginMark = beginMarkSmall = #(define-music-function (parser location text) (markup?) - #{ \markUpBegin\mark\markup\italic\fontsize#-2 $text #}) + #{ \markUpBegin\mark\markup\italic\fontsize#-1 $text #}) beginMarkDown = #(define-music-function (parser location text) (markup?) @@ -129,6 +133,7 @@ beginMarkDown = #end-of-line-invisible \once\override Score.RehearsalMark.direction = #DOWN \once\override Score.RehearsalMark.self-alignment-X = #LEFT +\once\override Score.RehearsalMark.font-size = #1 \mark\markup $text #}) fineMark = { diff --git a/common/music-commands.ily b/common/music-commands.ily index 7d1eb6f6..a1dc776d 100644 --- a/common/music-commands.ily +++ b/common/music-commands.ily @@ -275,6 +275,7 @@ smallNotes = sugNotes = #(define-music-function (parser location music) (ly:music?) #{ + \override Rest.font-size = #-3 \override NoteHead.font-size = #-3 \override Flag.font-size = #-3 \override Dots.font-size = #-3 @@ -285,6 +286,7 @@ sugNotes = \override Accidental.font-size = #-4 \override AccidentalCautionary.font-size = #-4 $music + \revert Rest.font-size \revert NoteHead.font-size \revert Flag.font-size \revert Dots.font-size -- 2.11.4.GIT