X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=9b24de88ecef092e4925259dc34dae2ba14ad046;hb=0921b2ae67376efaadf35bf597be929d9c7f71f5;hp=6adb53fcfb1bf21c6846240011b41dafef75050a;hpb=3cd4ec70813835810b04383581ab57eb7085e4a2;p=lilypond.git

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 6adb53fcfb..9b24de88ec 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -97,7 +97,7 @@
   (lambda (grob) (box-stencil (callback grob) thickness padding)))
 
 (define-public (make-stencil-circler thickness padding callback)
-  "Return function that adds a box around the grob passed as argument."
+  "Return function that adds a circle around the grob passed as argument."
   (lambda (grob) (circle-stencil (callback grob) thickness padding)))
 
 (define-public (arg->string arg)
@@ -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)