patch::: 1.3.149.jcn3

1.3.149.jcn3
============

* Bugfix: markup text: lines with markup.

* Fixed line height in postscript output.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.149.jcn2, To = lilypond-1.3.149.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.149.jcn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index b7adacbb30beb6005c180334d5725e70e9e059f3..d3c1eb664438afcb0ec1b55131d0b1116523fd67 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,16 @@
-1.3.149.jcn2
+--- ../lilypond-1.3.149.jcn2/CHANGES   Fri Apr 20 15:44:19 2001
+++ b/CHANGES   Sun Apr 22 15:11:37 2001
+@@ -1,3 +1,10 @@
+1.3.149.jcn3
+============
+
+* Bugfix: markup text: lines with markup.
+
+* Fixed line height in postscript output.
+
+ 1.3.149.jcn2
+ ============
+ 1.3.149.jcn2
 ============
 
 * Fixed one more shift/reduce rule in parser: c1/e  NOT

diff --git a/VERSION b/VERSION
index 1139b03c0f9dda72ac094b2a354f660b1da982dc..6483ebaf4d2f0f1c6ac0c80da8484939033dba76 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=149
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/super-sub.ly b/input/test/super-sub.ly
index 5d55806d8dfcf7719227cff2f1b2839a804c2467..3e8f8ff3c24eedca81ac108b82448fd0085a1234 100644 (file)
--- a/input/test/super-sub.ly
+++ b/input/test/super-sub.ly
@@ -23,5 +23,7 @@ texidoc="Test super/sub, raise and overstrike."
     c^#'(columns "foe" ((bold roman overstrike) "o") "/")
     c^#'(columns "foe" ((extent . (0 . 0)) "o") "/")
     c^#'(columns "foo" (super "bar" (super "baz")))
+    c
+    c^#`(columns (lines "" ";" "") (lines "1" ((bold) "2") "3"))
   }
 }
\ No newline at end of file

diff --git a/input/test/super-sub.ly.orig b/input/test/super-sub.ly.orig
new file mode 100644 (file)
index 0000000..5d55806
--- /dev/null
+++ b/input/test/super-sub.ly.orig
@@ -0,0 +1,27 @@
+\header {
+texidoc="Test super/sub, raise and overstrike."
+}
+
+
+
+\score {
+  \notes \relative a'' {
+    c^#'("bar")
+    c^#'(("bar"))
+    c^#'((("bar")))
+    c^#'(bold "bar")
+    c^#'((bold) "bar")
+    c^#'(((bold)) "bar")
+    c^#'(bold ("bar"))
+    c^#'(bold "bar")
+    c^#'(columns "foe" ((raise . 3) "bar"))
+    c^#'(columns "foe" (((raise . 3) "bar")))
+    c^#'(columns "foe" (((raise . 3)) "bar"))
+    c^#'(columns "foe" (super "12") (sub "3 4"))
+    c^#'(columns "foe" (super (overstrike "o") "/") (sub "x"))
+    c^#'(columns "foe" (overstrike "o") "/")
+    c^#'(columns "foe" ((bold roman overstrike) "o") "/")
+    c^#'(columns "foe" ((extent . (0 . 0)) "o") "/")
+    c^#'(columns "foo" (super "bar" (super "baz")))
+  }
+}
\ No newline at end of file

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 3e17134db4e00bb0f8cfe56f9731e725758d9140..5441963c0ef54485ee735b13a5d67f8319db0bc6 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -217,9 +217,14 @@ Text_item::markup_text2molecule (Grob *me, SCM markup_text,
       if (!m.empty_b ())
        {
          m.translate (o);
-         if (axis == Y_AXIS && baseline_skip)
-           next_kern += baseline_skip - m.extent (Y_AXIS)[UP];
-         mol.add_at_edge (axis, axis == X_AXIS ? RIGHT : DOWN, m, next_kern);
+         if (mol.empty_b ())
+           mol = m;
+         else
+           {
+             if (axis == Y_AXIS && baseline_skip)
+               next_kern += baseline_skip - m.extent (Y_AXIS)[UP];
+             mol.add_at_edge (axis, axis == X_AXIS ? RIGHT : DOWN, m, next_kern);
+           }
        }
       text = gh_cdr (text);
     }

diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index d4994a0e0f5757fd8fdc0b80f78273f218b73fb9..899b0f0061a9504fb3e69b52a13296ae008fc88b 100644 (file)
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -69,8 +69,11 @@
        grestore
 } bind def
 
-/start-line
-{ 
+/start-line % height
+{
+       dup base-line-skip gt {
+               /line-height exch def
+       } if
        line-y top-margin sub base-line-skip lt {
                showpage
                /line-y vsize top-margin sub def
@@ -82,29 +85,10 @@
 /stop-line
 { 
        /the-line exch def
-       0 0 moveto the-line clippath pathbbox
+       the-line
        stroke
        grestore
-       exch 4 -1 roll
-       sub
-       3 1 roll
-       exch sub
-       %pstack
-       %
-       % ugh: now we should have `width height' on stack,
-       % but it's probably just the width and height of last element
-       % (the last staff)
-       % How do we get all heights of all staffs in a line?
-       %
-       % output-scale div neg line-y add /line-y exch def
-       %
-       % discarding height...
-       pop
-       %
-       % discard width
-       pop
-       % use fixed base-line-skip for now
-       line-y base-line-skip output-scale mul sub /line-y exch def
+       line-y line-height output-scale mul sub /line-y exch def
 } bind def
 
 % FIXME: font definitions should come from LilyPond
@@ -215,11 +199,12 @@
 
 /turnOnExperimentalFeatures { } bind def
 
-
 staff-line-thickness setlinewidth
 
+% set postscript paper size
 paper-size
 
+% initialise paper dimensions
 staff-height init-paper
 
 /line-x left-margin def

diff --git a/scm/ps.scm b/scm/ps.scm
index 70a115d8c63b856d98fa44093fd1ea51ceeda823..008a6e7d674b28ac49ac07248a3d65dbdd1e6e60 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -161,9 +161,12 @@
      " draw_bezier_sandwich"))
 
   (define (start-line height)
-         "\nstart-line {
+    (string-append
+     "\n"
+     (ly-number->string height)
+     " start-line {
 lilypondpaperoutputscale lilypondpaperoutputscale scale
-")
+"))
   
   (define (stem breapth width depth height) 
     (string-append (numbers->string (list breapth width depth height))