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 dc8d47a755d08f0353f8b21c4fe19a1d986c02c4..6a62bfad076feef0b5a33ba14a4e7dda19bb5f3f 100644 (file)
--- 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 b0b6ba9a09c9005fc77c533cea702017aec837f0..efd842df2531bdea894218ae78ea19d89f7dff18 100644 (file)
--- 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 af83eb940e0a92037efbee7130abd9c56e49bce1..2e6e32a569832911f4893160b9a6259f5993ec47 100644 (file)
--- 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 401ca18319c93133f2d244ae045dd971dec3e56b..f488e85bfd7590ff7b37edf981a91a3fce3a875b 100644 (file)
--- 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 84ab30e083a0556d590550eb57dd036551ba7cf6..5717727557ccf15ce6342919b60f2bec8f3b1eff 100644 (file)
--- 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 790cc31b7dfae0c09eb42e73d49365c6ef0402a3..f458fdbf95075b4cda5af84ff84ef9fe2d215352 100644 (file)
--- 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 fbe31bb624510875a6fc7d80e05daefea3d1901a..c9db11c198490e46cbac40a4fc1487396ae57b33 100644 (file)
--- 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 17b7789e1800261e7db63fdb405f6cef9d350d75..9ef8cd48dd9b598f6d8f8a216474c6e117518781 100644 (file)
--- 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 cb48266a28361f8228227427734192ee47605f88..e94bf30e7625c5c5d6cd0863d46607805d9b13e0 100644 (file)
--- 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 778569f3d33c25081a0a158493c5e1837688fe2d..63300257208cd21847cec5cf1887d9b634b97d56 100644 (file)
--- 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 e835d68753e86a47d15da433b7a3bc0a0f359582..6cdd72e430996ba47c1f58fd9ac3db68d941e283 100644 (file)
--- 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