(fontsize): new markup

command. Also set baseline-skip

diff --git a/ChangeLog b/ChangeLog
index 0d52821b11241ce7327bb5ed70aea76c4cff197f..9f8bdd9c5e6ab9fd5c73fd03d7ccdd50db45fc20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/define-markup-commands.scm (fontsize): new markup
+       command. Also set baseline-skip
+
        * lily/main.cc (do_chroot_jail): paranoia security for webserver
        use. Patch by Sebastiano Vigna <vigna@dsi.unimi.it>.
 

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 5901f3adbb71f88c3b9fdbc60a7823eecfc74103..2af0acc450b7c644091c66db2629525e91f6558b 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -7,15 +7,13 @@ slashSeparator = \markup {
   \raise #0.7 \beam #2.0 #0.5 #0.48
 }
 
-%% FIXME: Would using http://lilypond.org/pdflink#music%20notation
-%%        help Google to find us even better?  Is it bad not to point
-%%        to our main page, for this reason?  How bad is using /web
-%%        iso /?
 tagline = \markup {
   \with-url
-  #"http://lilypond.org/pdflink/"
+
+  % todo: lilypond.org/music-engraving
+  #"http://lilypond.org/web/"
   \line {
-    "Engraving by LilyPond"
+    "Music engraving by LilyPond"
     #(ly:export (lilypond-version))
     "-"
     "www.lilypond.org"

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 5f4fa4b7b75100dd60f563213f45c797acae8225..6fec7362e35f833af11aebe37d14e305388fd520 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -363,6 +363,7 @@ recommend font for this is bold and italic"
 (def-markup-command (column layout props args) (markup-list?)
   "Stack the markups in @var{args} vertically.  The property
 @code{baseline-skip} determines the space between each markup in @var{args}."
+  (display (chain-assoc-get 'baseline-skip props))(newline)
   (stack-lines
    -1 0.0 (chain-assoc-get 'baseline-skip props)
    (remove ly:stencil-empty?
@@ -685,17 +686,27 @@ any sort of property supported by @internalsref{font-interface} and
 "
   (interpret-markup layout (cons (list new-prop) props) arg))
 
-(def-markup-command (smaller layout props arg) (markup?)
-  "Decrease the font size relative to current setting"
+
+(def-markup-command (fontsize layout props increment arg) (number? markup?)
+  "Add @var{increment} to the font-size. Adjust baseline skip accordingly."
+
   (let* ((fs (chain-assoc-get 'font-size props 0))
-        (entry (cons 'font-size (- fs 1))))
-    (interpret-markup layout (cons (list entry) props) arg)))
+        (bs (chain-assoc-get 'baseline-skip props 2)) 
+         (entries (list
+                  (cons 'baseline-skip (* bs (magstep increment)))
+                  (cons 'font-size (+ fs increment )))))
 
+    (interpret-markup layout (cons entries props) arg)))
+  
 (def-markup-command (bigger layout props arg) (markup?)
   "Increase the font size relative to current setting"
-  (let* ((fs (chain-assoc-get 'font-size props 0))
-         (entry (cons 'font-size (+ fs 1))))
-    (interpret-markup layout (cons (list entry) props) arg)))
+  (interpret-markup layout props
+   `(,fontsize-markup 1 ,arg)))
+
+(def-markup-command (smaller layout props arg) (markup?)
+  "Decrease the font size relative to current setting"
+  (interpret-markup layout props
+   `(,fontsize-markup -1 ,arg)))
 
 (def-markup-command larger (markup?) bigger-markup)
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 6707d5ce51c9392910d7a1c01df1c7e2cee3fd9b..558d42e043ec749bfb2d138fccd5440a22b74462 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -127,7 +127,9 @@
 
                             "%%BeginPageSetup\n"
                             (if landscape?
-                                "page-width output-scale mul 0 translate 90 rotate\n"
+                                "page-width output-scale
+ lily-output-units mul
+ mul 0 translate 90 rotate\n"
                                 "")
                             "%%EndPageSetup\n"