Issue 659: alternate segno symbol

scm/output-lib.scm

 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
 ;;;; Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
 ;;;; the Free Software Foundation, either version 3 of the License, or
 ;;;; (at your option) any later version.
 ;;;;
@@ skipping 204 matching lines @@
     ("" . ("" . ""))
     (":" . (":" . ""))
     ("." . ("." . ()))
     ("'" . ("'" . ()))
     ("empty" . (() . ()))
     ("brace" . (() . "brace"))
     ("bracket" . (() . "bracket"))
 
     ;; segno bar lines
     ("S" . ("||" . "S"))
-    ("|S" . (() . "S"))
+    ("|S" . ("|" . "S"))
     ("S|" . ("S" . ()))
     (":|S" . (":|" . "S"))
     (":|S." . (":|S" . ()))
     ("S|:" . ("S" . "|:"))
     (".S|:" . ("|" . "S|:"))
     (":|S|:" . (":|" . "S|:"))
     (":|S.|:" . (":|S" . "|:"))))
 
 (define-public (bar-line::calc-glyph-name grob)
   (let* ((glyph (ly:grob-property grob 'glyph))
@@ skipping 227 matching lines @@
 ;; * Parentheses
 
 (define-public (parentheses-item::calc-parenthesis-stencils grob)
   (let* ((font (ly:grob-default-font grob))
          (lp (ly:font-get-glyph font "accidentals.leftparen"))
          (rp (ly:font-get-glyph font "accidentals.rightparen")))
 
     (list lp rp)))
 
 (define-public (parentheses-item::calc-angled-bracket-stencils grob)
-  (let* ((font (ly:grob-default-font grob))
-         (lp (ly:stencil-aligned-to (ly:stencil-aligned-to
-                                     (grob-interpret-markup
-                                      grob
-                                      (ly:wide-char->utf-8 #x2329))
-                                     Y CENTER)
-                                    X RIGHT))
-         (rp (ly:stencil-aligned-to (ly:stencil-aligned-to
-                                     (grob-interpret-markup
-                                      grob
-                                      (ly:wide-char->utf-8 #x232A))
-                                     Y CENTER)
-                                    X LEFT)))
-
+  (let* ((parent (ly:grob-parent grob Y))
+         (y-extent (ly:grob-extent parent parent Y))
+         (half-thickness 0.05) ; should it be a property?
+         (width 0.5) ; should it be a property?
+         (angularity 1.5)  ; makes angle brackets
+         (white-padding 0.1) ; should it be a property?
+         (lp (ly:stencil-aligned-to
+                 (ly:stencil-aligned-to
+                   (make-parenthesis-stencil y-extent
+                                             half-thickness
+                                             (- width)
+                                             angularity)
+                   Y CENTER)
+                 X RIGHT))
+         (lp-x-extent
+           (interval-widen (ly:stencil-extent lp X) white-padding))
+         (rp (ly:stencil-aligned-to
+                 (ly:stencil-aligned-to
+                   (make-parenthesis-stencil y-extent
+                                             half-thickness
+                                             width
+                                             angularity)
+                   Y CENTER)
+                 X LEFT))
+          (rp-x-extent
+            (interval-widen (ly:stencil-extent rp X) white-padding)))
+    (set! lp (ly:make-stencil (ly:stencil-expr lp)
+                              lp-x-extent
+                              (ly:stencil-extent lp Y)))
+    (set! rp (ly:make-stencil (ly:stencil-expr rp)
+                              rp-x-extent
+                              (ly:stencil-extent rp Y)))
     (list (stencil-whiteout lp)
-          (stencil-whiteout rp))))
+          (stencil-whiteout rp))))
 
 (define (parenthesize-elements grob . rest)
   (let* ((refp (if (null? rest)
                    grob
                    (car rest)))
          (elts (ly:grob-object grob 'elements))
          (x-ext (ly:relative-group-extent elts refp X))
          (stencils (ly:grob-property grob 'stencils))
          (lp (car stencils))
          (rp (cadr stencils))
@@ skipping 353 matching lines @@
                      (x-ext (symmetric-interval (/ width 2)))
                      (y-ext (cons point-min point-max))
                      (line (ly:round-filled-box x-ext y-ext blot))
                      (y-coord (ly:grob-relative-coordinate grob common Y)))
 
                 (ly:stencil-translate-axis line (- y-coord) Y))
               empty-stencil))
         (begin
           (ly:grob-suicide! grob)
           (list)))))