Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Improve regression test.
  regression test for line thickness consistency.
  Don't test ly:font-config-display-fonts
  don't dump cpu timing by default.
  set markup thicknesses relative to line-thickness.

diff --git a/input/regression/general-scheme-bindings.ly b/input/regression/general-scheme-bindings.ly
index ad625ff25a7953f81024debc4d09be882ac71646..acbf4e0bd08d90f2960f9c15106035e2bd856a75 100644 (file)
--- a/input/regression/general-scheme-bindings.ly
+++ b/input/regression/general-scheme-bindings.ly
@@ -9,7 +9,10 @@
 
 %% todo : use macro, to show the statement tested. 
 #(ly:progress "~a\n" (ly:expand-environment "${HOME} $HOME $$ "))
-#(ly:font-config-display-fonts)
+
+
+%% very platform dependent.
+%% #(ly:font-config-display-fonts)
 
 #(ly:progress "~A\n" (ly:duration->string (ly:make-duration 2 2 3 7)))
 #(ly:parser-parse-string (ly:parser-clone parser) "foo  = #1 #(ly:progress \"hello there\n\")")

diff --git a/input/regression/markup-line-thickness.ly b/input/regression/markup-line-thickness.ly
new file mode 100644 (file)
index 0000000..13ee3f1
--- /dev/null
+++ b/input/regression/markup-line-thickness.ly
@@ -0,0 +1,16 @@
+\version "2.11.28"
+
+\header {
+
+  texidoc = "The thickness setting between markup lines and other
+  lines is consistent."
+
+}
+
+\new Staff {
+  \override TextSpanner #'bound-details #'right #'text =
+        #(markup #:draw-line '(0 . -1))
+  \override TextSpanner #'thickness = #2
+  c'4 \startTextSpan
+  c'4 \stopTextSpan
+}

diff --git a/input/regression/override-nest.ly b/input/regression/override-nest.ly
index e8767ce28427d88c3001ad5b75d844448bef5630..04460495d62547b8d8f26077abc218c3d4837526 100644 (file)
--- a/input/regression/override-nest.ly
+++ b/input/regression/override-nest.ly
@@ -1,13 +1,14 @@
 \version "2.10.0"
-\header {
 
-  texidoc = "Sublist of grob property lists may be also tuned. In the
+\header {
+  texidoc = "Sublist of grob property lists may be also tuned.  In the
 next example, the @code{beamed-lengths} property of the @code{Stem}
 grob is tweaked."
-
 }
 
 \relative {
-  \override Stem #'details #'beamed-lengths = #'(8 8 8)
-  c8[ c]
+  \override Stem #'details #'beamed-lengths = #'(6 10 8)
+  c8[ c] c16[ c] c32[ c]
+  \revert Stem #'details
+  c8[ c] c16[ c] c32[ c]
 }

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 5405aff31253b4879470adeb0b4011f361fb46f4..58b446e1cd74be51bf0f18014c13893a1cd123f5 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -28,7 +28,9 @@
   (number-pair?)
   "A simple line.  Uses the @code{thickness} property."
   (let*
-      ((th (chain-assoc-get 'thickness props  0.1))
+      ((th (*
+           (ly:output-def-lookup layout 'line-thickness)
+           (chain-assoc-get 'thickness props 1)))
        (x (car dest))
        (y (cdr dest))
        (s (ly:make-stencil
@@ -74,7 +76,9 @@ optionally filled."
 @code{circle-padding} and @code{font-size} properties to determine line
 thickness and padding around the markup."
   
-  (let* ((th (chain-assoc-get 'thickness props  0.1))
+  (let* ((th
+         (* (ly:output-def-lookup layout 'line-thickness)
+            (chain-assoc-get 'thickness props  1)))
         (size (chain-assoc-get 'font-size props 0))
         (pad
          (* (magstep size)
@@ -118,7 +122,9 @@ the PDF backend."
 @code{box-padding} and @code{font-size} properties to determine line
 thickness and padding around the markup."
   
-  (let* ((th (chain-assoc-get 'thickness props  0.1))
+  (let* ((th (*
+             (ly:output-def-lookup layout 'line-thickness)
+             (chain-assoc-get 'thickness props  0.1)))
         (size (chain-assoc-get 'font-size props 0))
         (pad (* (magstep size)
                 (chain-assoc-get 'box-padding props 0.2)))
@@ -1164,7 +1170,8 @@ figured bass notation."
       ((mag (magstep (chain-assoc-get 'font-size props 0)))
        (thickness
        (* mag
-          (chain-assoc-get 'thickness props 0.16)))
+          (ly:output-def-lookup layout 'line-thickness)
+          (chain-assoc-get 'thickness props 1.6)))
        (dy (* mag 0.15))
        (number-stencil (interpret-markup layout
                                         (prepend-alist-chain 'font-encoding 'fetaNumber props)

diff --git a/scm/lily.scm b/scm/lily.scm
index ce1936fd9089a1cb914a06952623f5dae474438c..6f2f09d2e6f5ed67475f926c4a8b71c0b9fe0ddf 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -40,7 +40,8 @@ ensure that all refs to parsed objects are dead.  This is an internal option, an
     (debug-skylines #f "debug skylines")
     (delete-intermediate-files #f
                               "delete unusable PostScript files")
-    (dump-profile #f "dump timing information for each file")
+    (dump-profile #f "dump memory and time information for each file")
+    (dump-cpu-profile #f "dump timing information (system-dependent)")
     (dump-signatures #f "dump output signatures of each system.  Used for regression testing.")
     
     (eps-box-padding #f "Pad EPS bounding box left edge.  Guarantee alignment between systems in LaTeX.")
@@ -415,7 +416,9 @@ The syntax is the same as `define*-public'."
     (ly:progress "\nWriting timing to ~a..." outname)
     (format (open-file outname "w")
            "time: ~a\ncells: ~a\n"
-           (car diff)
+           (if (ly:option 'dump-cpu-profile)
+               (car diff)
+               0)
            (cadr diff)
            )))