Issue 659: alternate segno symbol

lily/bar-line.cc

 /*
   This file is part of LilyPond, the GNU music typesetter.
 
   Copyright (C) 1997--2009 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 98 matching lines @@
   Real center = 0;
   if (staff)
     {
       Interval staff_extent = staff->extent (staff, Y_AXIS);
       center = staff_extent.center ();
     }
 
   if (str == "||:")
     str = "|:";
 
+  if (str == ".S")
+    str = "S";
+
   if (str == "")
     {
       Stencil empty =  Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2)));
       empty.translate_axis (center, Y_AXIS);
       return empty;
     }
   else if (str == "|")
     {
       thin.translate_axis (center, Y_AXIS);
       return thin;
@@ skipping 61 matching lines @@
     }
   else if (str == "||")
     {
       /*
         should align to other side? this never appears
         on the system-start?
       */
       m.add_at_edge (X_AXIS, RIGHT, thin, 0);
       m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
     }
+  else if (str == "S")
+    {
+      Stencil segno = Font_interface::get_default_font (me)->find_by_name ("scripts.varsegno");
+      m.add_at_edge (X_AXIS, RIGHT, thin, 0);
+      m.add_at_edge (X_AXIS, RIGHT, segno, thinkern / 2);
+      m.add_at_edge (X_AXIS, RIGHT, thin, thinkern / 2);
+    }
   else if (str == ":")
     {
       int c = (Staff_symbol_referencer::line_count (me));
 
       for (int i = 0; i < c - 1; i++)
         {
           Real y = (- (c - 1.0) / 2 + 0.5 + i) * staff_space;
           Stencil d (dot);
 
           d.translate_axis (y, Y_AXIS);
@@ skipping 152 matching lines @@
 }
 
 ADD_INTERFACE (Bar_line,
                "Bar line.\n"
                "\n"
                "Print a special bar symbol.  It replaces the regular bar"
                " symbol with a special symbol.  The argument @var{bartype}"
                " is a string which specifies the kind of bar line to print."
                "  Options are @code{|}, @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:},"
                " @code{:|.:}, @code{.}, @code{||}, @code{|.}, @code{.|}, @code{.|.},"
-               " @code{|.|}, @code{:}, @code{dashed} and @code{'}.\n"
+               " @code{|.|}, @code{:}, @code{dashed}, code{S} and @code{'}.\n"

[Neil Puttock, 2010/01/07 22:55:40]

@code{S}

                "\n"
                "These produce, respectively, a normal bar line, a right repeat, a left repeat,"
                " a thick double repeat, a thin-thick-thin double repeat,"
                " a thin-thick double repeat, a thick bar, a double bar, a start bar,"
                " an end bar, a thick double bar, a thin-thick-thin bar,"
-               " a dotted bar, a dashed bar and a tick as bar bar line."
+               " a dotted bar, a dashed bar, a segno bar and a tick as bar bar line."
                "  In addition, there is an option"
                " @code{||:} which is equivalent to @code{|:} except at line"
                " breaks, where it produces a double bar (@code{||}) at the"
                " end of the line and a repeat sign (@code{|:}) at the"
                " beginning of the new line.\n"
+               " For segno, there is @code{.S} which is equivalent to @code{S};"
+               " at line breaks, it produces a normal bar line at the end and a segno bar line"
+               " at the beginning of the following line,"
+               " whereas @code{S.} behaves just contrary.\n"
                "\n"
                "If @var{bartype} is set to @code{empty} then nothing is"
                " printed, but a line break is allowed at that spot.\n"
                "\n"
                "@code{gap} is used for the gaps in dashed bar lines.",
 
                /* properties */
                "allow-span-bar "
                "gap "
                "kern "
                "thin-kern "
                "hair-thickness "
                "thick-thickness "
                "glyph "
                "glyph-name "
                "bar-size "
                "bar-extent "
                );