2005-05-09 Jürgen Reuter <reuter@ipd.uka.de>

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 7e746b789535fe0ad4a0b75fbabe5bb48a049252..9b24de88ecef092e4925259dc34dae2ba14ad046 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -111,8 +111,9 @@
         (defs (ly:output-def-lookup layout 'text-font-defaults))
         (props (ly:grob-alist-chain grob defs))
         (circle (Text_interface::interpret_markup
-                 layout props (make-draw-circle-markup 0.8 0.1)))
+                 layout props (make-draw-circle-markup 0.8 0.1 #f)))
         (text-stencil (Text_interface::interpret_markup layout props text)))
+    
     (ly:stencil-add (centered-stencil text-stencil) circle)))
 
 
@@ -157,6 +158,10 @@
         (number->string duration)))
     ((mensural)
      (string-append (number->string duration) (symbol->string style)))
+    ((petrucci)
+     (if (< duration 0)
+        (string-append (number->string duration) "mensural")
+        (string-append (number->string duration) (symbol->string style))))
     ((neomensural)
      (string-append (number->string duration) (symbol->string style)))
     ((default)
@@ -242,7 +247,7 @@ centered, X==1 is at the right, X == -1 is at the left."
                         ("bracket" . (() . "bracket"))  ))))
 
     (if (equal? result #f)
-       (ly:warn "Unknown bar glyph: `~S'" glyph)
+       (ly:warning (_ "unknown bar glyph: `~S'" glyph))
        (index-cell (cdr result) dir))))
 
 (define-public (shift-right-at-line-begin g)