From: Valentin Villenave Date: Wed, 8 Oct 2008 17:59:45 +0000 (+0200) Subject: Removed \bigger markup command (use \larger instead) X-Git-Tag: release/2.11.62-1~8 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cef13af124f3aa4ced76f71e02e990f94b49a978;p=lilypond.git Removed \bigger markup command (use \larger instead) This commit removes the \bigger command, duplicate with the already existing \larger command. A convert rule has been added, and the documentation has been updated. --- diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely index dc8d47a755..6a62bfad07 100644 --- a/Documentation/es/user/text.itely +++ b/Documentation/es/user/text.itely @@ -494,7 +494,6 @@ el modo de marcado: @funindex \fontsize @funindex \smaller @funindex \larger -@funindex \bigger @funindex \magnify El tamaño de los caracteres también se puede alterar de distintas diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index b0b6ba9a09..efd842df25 100644 --- a/Documentation/user/programming-interface.itely +++ b/Documentation/user/programming-interface.itely @@ -865,14 +865,14 @@ The @code{markup} macro builds markup expressions in Scheme while providing a LilyPond-like syntax. For example, @example (markup #:column (#:line (#:bold #:italic "hello" #:raise 0.4 "world") - #:bigger #:line ("foo" "bar" "baz"))) + #:larger #:line ("foo" "bar" "baz"))) @end example @noindent is equivalent to: @example \markup \column @{ \line @{ \bold \italic "hello" \raise #0.4 "world" @} - \bigger \line @{ foo bar baz @} @} + \larger \line @{ foo bar baz @} @} @end example @noindent diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index af83eb940e..2e6e32a569 100644 --- a/Documentation/user/text.itely +++ b/Documentation/user/text.itely @@ -471,7 +471,6 @@ f1 d2 r @funindex \fontsize @funindex \smaller @funindex \larger -@funindex \bigger @funindex \magnify The size of the characters can also be altered in different ways: diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 401ca18319..f488e85bfd 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -36,7 +36,7 @@ hairpinWithCenteredText = #(define-music-function (parser location text) (markup #}) hairpinMolto = \hairpinWithCenteredText \markup { \italic molto } -hairpinMore = \hairpinWithCenteredText \markup { \bigger moltissimo } +hairpinMore = \hairpinWithCenteredText \markup { \larger moltissimo } \layout { ragged-right = ##f } diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 84ab30e083..5717727557 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -53,7 +53,7 @@ modernAccidentals = { melody = \relative c'' \repeat volta 2 \new Voice = "singer" { \time 6/8 \autoBeamOff - s1*0^\markup { \bold \large\bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } } + s1*0^\markup { \bold \large\larger\larger { \hspace #-3.0 Lieblich, etwas geschwind } } R2. r4 r8 c4 g8 | e4 c8 @@ -162,7 +162,7 @@ pianoLH = \relative c'' \repeat volta 2 { \new PianoStaff << \set PianoStaff.instrumentName = \markup { \bold - \bigger\bigger\bigger\bigger \huge "2. " } + \larger\larger\larger\larger \huge "2. " } \new Staff \pianoRH \new Staff \pianoLH >> diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index 790cc31b7d..f458fdbf95 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -28,9 +28,9 @@ cantus = \new VaticanaVoice = "cantus" { \column { " " " " " " " " "VII" " " { - \bigger \bigger \bigger \bigger - \bigger \bigger \bigger \bigger - \bigger \bigger \bigger \bigger + \larger \larger \larger \larger + \larger \larger \larger \larger + \larger \larger \larger \larger "P" } } diff --git a/input/typography-demo.ly b/input/typography-demo.ly index fbe31bb624..c9db11c198 100644 --- a/input/typography-demo.ly +++ b/input/typography-demo.ly @@ -34,7 +34,7 @@ modernAccidentals = { melody = \relative c'' \repeat volta 2 \context Voice = "singer" { \time 6/8 \autoBeamOff - s1*0^\markup { \bigger { \hspace #-3.0 Lieblich, etwas geschwind } } + s1*0^\markup { \larger { \hspace #-3.0 Lieblich, etwas geschwind } } R2. r4 r8 c4 g8 | \acciaccatura { f16 } e4 c8 @@ -131,7 +131,7 @@ pianoLH = \relative c'' \repeat volta 2\new Voice { \new PianoStaff << \set PianoStaff.instrumentName = \markup { \bold - \bigger\bigger\bigger\bigger + \larger\larger\larger\larger \huge "2." } diff --git a/ly/titling-init.ly b/ly/titling-init.ly index 17b7789e18..9ef8cd48dd 100644 --- a/ly/titling-init.ly +++ b/ly/titling-init.ly @@ -35,13 +35,13 @@ bookTitleMarkup = \markup { \fill-line { \fromproperty #'header:dedication } \override #'(baseline-skip . 3.5) \column { - \huge \bigger \bold + \huge \larger \bold \fill-line { - \bigger \fromproperty #'header:title + \larger \fromproperty #'header:title } \fill-line { \large \smaller \bold - \bigger \fromproperty #'header:subtitle + \larger \fromproperty #'header:subtitle } \fill-line { \smaller \bold diff --git a/python/convertrules.py b/python/convertrules.py index cb48266a28..e94bf30e76 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2817,9 +2817,10 @@ def conv (str): str = re.sub (r'\\include(\s+)"gregorian-init.ly"', r'\\include\1"gregorian.ly"', str) return str -@rule ((2, 11, 62), "makam-init.ly -> makam.ly") +@rule ((2, 11, 62), "makam-init.ly -> makam.ly, \\bigger -> \\larger") def conv (str): str = re.sub (r'\\include(\s+)"makam-init.ly"', r'\\include\1"makam.ly"', str) + str = re.sub (r"\\bigger", r"\\larger", str) return str # Guidelines to write rules (please keep this at the end of this file) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 778569f3d3..6330025720 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -1673,27 +1673,6 @@ any sort of property supported by @rinternals{font-interface} and ;; fonts. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define-builtin-markup-command (bigger layout props arg) - (markup?) - font - () - "Increase the font size relative to current setting. - -@lilypond[verbatim,quote] -\\markup { - \\huge { - huge - \\hspace #2 - \\bigger { - bigger - } - \\hspace #2 - huge - } -} -@end lilypond" - (interpret-markup layout props - `(,fontsize-markup 1 ,arg))) (define-builtin-markup-command (smaller layout props arg) (markup?) @@ -1721,7 +1700,7 @@ any sort of property supported by @rinternals{font-interface} and (markup?) font () - "Copy of the @code{\\bigger} command. + "Increase the font size relative to current setting. @lilypond[verbatim,quote] \\markup { @@ -1731,7 +1710,8 @@ any sort of property supported by @rinternals{font-interface} and larger } @end lilypond" - (interpret-markup layout props (make-bigger-markup arg))) + (interpret-markup layout props + `(,fontsize-markup 1 ,arg))) (define-builtin-markup-command (finger layout props arg) (markup?) diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index e835d68753..6cdd72e430 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -1053,7 +1053,7 @@ def musicxml_words_to_lily_event (words): "medium": '', "large": '\\large', "x-large": '\\huge', - "xx-large": '\\bigger\\huge' + "xx-large": '\\larger\\huge' }.get (size, '') if font_size: event.markup += font_size