* lily/paper-outputter.cc (output_scope): Check if number before

  checking exact (guile cvs).

* scm/*: Escape backslashes in scheme strings (guile cvs).

diff --git a/ChangeLog b/ChangeLog
index 873a36fe6a7fed3ca8b5af8d68b08f04ece15fce..5153e348ba6c6708c0d5acbcfe4428e9072bff38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-10  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/paper-outputter.cc (output_scope): Check if number before
+       checking exact (guile cvs).
+
+       * scm/*: Escape backslashes in scheme strings (guile cvs).
+
 2004-01-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * Documentation/user/refman.itely (Tablatures basic): annotate

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 44b9b671156db9794d8a4f4041b32ef2dbe67352..a040ceecfb8fd9f7640e5a9a7cb341b1c01b55d0 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -119,7 +119,7 @@ Paper_outputter::output_scope (SCM mod, String prefix)
        {
          output_String_def (prefix + s, ly_scm2string (v));
        }
-      else if (scm_exact_p (v) == SCM_BOOL_T)
+      else if (scm_number_p (v) == SCM_BOOL_T && scm_exact_p (v) == SCM_BOOL_T)
        {
          output_int_def (prefix + s, gh_scm2int (v));    
        }

diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm
index 1f4ad95ca4c92d6ae9c360a9135e5438141ed00d..564be84af428124ac12ba29838768f3387c55f77 100644 (file)
--- a/scm/auto-beam.scm
+++ b/scm/auto-beam.scm
@@ -85,7 +85,7 @@
 
 
 (define (override-property-setting context context-prop setting value)
-  "Like the C++ code that executes \override, but without type
+  "Like the C++ code that executes \\override, but without type
 checking. "
 
   (ly:set-context-property! context context-prop

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 1bc5ba99ef24b0acf1295f8c33cc496f9572ad45..0248c8c3f62d99283f62eaab5484a820612bacf5 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -84,7 +84,7 @@
 ;; fixme we should standardize on omit-root (or the other one.)
 ;; perhaps the  default should also be reversed --hwn
 (define-public (sequential-music-to-chord-exceptions seq . rest)
-  "Transform sequential music SEQ of type <<c d e>>-\markup{ foobar }
+  "Transform sequential music SEQ of type <<c d e>>-\\markup{ foobar }
 to (cons CDE-PITCHES FOOBAR-MARKUP), or to (cons DE-PITCHES
 FOOBAR-MARKUP) if OMIT-ROOT is given and non-false.
 "

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 69a7bfca343f0452b52ee681d9c3b65693befcd4..1e61027221f9959b1bf8361cbf471c295e300881 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -42,7 +42,7 @@ direction.
 Offset callbacks can be stacked, i.e.
 
 @example
-        \property .... \override #'Y-offset-callbacks = #(list
+        \\property .... \\override #'Y-offset-callbacks = #(list
                 callback1 callback2 callback3)
 
 @end example
@@ -297,8 +297,8 @@ length of a note with N flags.
 (grob-property-description 'linea boolean? "attach vertical lines to this neume?.")
 (grob-property-description 'line-count integer? "Number of staff
 lines.  If you want to override this for staffs individually, you must
-use @code{\outputproperty}. @code{\property .. \override} will not
-work: @code{\override} is processed after the StaffSymbol is created,
+use @code{\\outputproperty}. @code{\\property .. \\override} will not
+work: @code{\\override} is processed after the StaffSymbol is created,
 and will have no effect.
 ")
 (grob-property-description 'maximum-rest-count integer? "kill off rests so we don't more than this number left.")

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 5c75926ad05bba6bfd2590b34b1f610ce386dc37..d6c34c17dd94d3d9c19436b252f1131df477d28b 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -74,7 +74,7 @@ For chord inversions, this is negative.")
                            "The function to run with \\applycontext. It must take a single argument, being the context.")
 (music-property-description 'property-operations list?
                            "Do these operations for instantiating the context.")
-(music-property-description 'predicate procedure? "the predicate of a \outputproperty")
+(music-property-description 'predicate procedure? "the predicate of a \\outputproperty")
 (music-property-description 'type symbol? "The type of this music object. Determines iteration in some cases.")
 (music-property-description 'types list? "The types of this music object. Determines iteration in some cases.")
 (music-property-description 'repeat-count  integer? "do a @code{\repeat} how ofen?")

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 130bce3e0eacafcc5d9c21fd1fd244c5a2947268..67a80cfe26a27ca801e4110fe03ebc74d6553ce0 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -11,7 +11,7 @@
     (AbsoluteDynamicEvent
      . (
    (description . "Creates a dynamic mark.  Syntax: @var{note}@code{\\x},
-where x is one of \@\{\\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.\@\}")
+where x is one of \\@\\{\\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.\\@\\}")
        (internal-class-name . "Event")
        (types . (general-music event dynamic-event absolute-dynamic-event))
        ))
@@ -226,7 +226,7 @@ Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
        ))
     (MarkEvent
      . (
-       (description .  "Insert a rehearsal mark. Syntax: @code{\mark} @var{marker},
+       (description .  "Insert a rehearsal mark. Syntax: @code{\\mark} @var{marker},
 e.g. @code{\\mark \"A\"}.")
 
        (internal-class-name . "Event")
@@ -306,7 +306,7 @@ as separate voices.")
      . (
        (description .  "Set a context property.
 
-Syntax: @code{\property @var{context}.@var{prop} = @var{scheme-val}}.")
+Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
        (internal-class-name . "Music")
        (types . (layout-instruction general-music))
        (iterator-ctor . ,Property_iterator::constructor)
@@ -315,7 +315,7 @@ Syntax: @code{\property @var{context}.@var{prop} = @var{scheme-val}}.")
     
     (PropertyUnset
      . (
-       (description .  "Remove the definition of a context @code{\property}.")
+       (description .  "Remove the definition of a context @code{\\property}.")
 
        (internal-class-name . "Music")
        (types . (layout-instruction general-music))

diff --git a/scm/define-translator-properties.scm b/scm/define-translator-properties.scm
index 3f2f7b85995bc812b694aab6463e83619cefdfa0..6df9e9bf92f92e6fc19e1ab94e9f2dbe03a72b2e 100644 (file)
--- a/scm/define-translator-properties.scm
+++ b/scm/define-translator-properties.scm
@@ -237,7 +237,7 @@ Do nothing.
 
 (translator-property-description 'explicitKeySignatureVisibility
 procedure? "visibility-lambda function for explicit Key changes;
-\override of #'break-visibility will set the visibility for normal
+\\override of #'break-visibility will set the visibility for normal
 (ie. at the start of the line) key signatures.")
 
 (translator-property-description 'extraNatural boolean? "Whether to typeset an
@@ -498,7 +498,7 @@ Example:
 
 This will create a start-repeat bar in this staff only.
 
-If not set explicitly (by property or @code{\bar}), this is set
+If not set explicitly (by property or @code{\\bar}), this is set
 according to values of @code{defaultBarType}, @code{barAlways},
 @code{barNonAuto} and @code{measurePosition}.
 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 6ba56ac02134f33a3edf92989e2446298c2ab53f..41a725101a4f6a55d2fd455058d5dbcbee07de30 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -232,7 +232,7 @@ i.e.  this is not an override"
 
 
 (define-public (context-spec-music m context . rest)
-  "Add \context CONTEXT = foo to M. "
+  "Add \\context CONTEXT = foo to M. "
   
   (let* ((cm (make-music-by-name 'ContextSpeccedMusic)))
     (ly:set-mus-property! cm 'element m)
@@ -308,7 +308,7 @@ i.e.  this is not an override"
     ))
 
 (define-public (glue-mm-rest-texts music)
-  "Check if we have R1*4-\markup { .. }, and if applicable convert to
+  "Check if we have R1*4-\\markup { .. }, and if applicable convert to
 a property set for MultiMeasureRestNumber."
   
   (define (script-to-mmrest-text script-music)

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index cd23437bef9cc569ca129011fd1f84a2535257f4..bbb621cba65ead778b207ea45c24dd6bd624a8dc 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -30,7 +30,7 @@ arguments to expect:
 3. The command is now available in markup mode, e.g.
 
 
-  \markup { .... \COMMAND #1 argument ... }
+  \\markup { .... \\COMMAND #1 argument ... }
 
 
 BUGS:
@@ -393,7 +393,7 @@ for DIR, you can obtain longer or shorter stems."
 (define-public (override-markup paper props . rest)
   "Tack the 1st arg in REST onto PROPS, e.g.
 
-\override #'(font-family . married) \"bla\"
+\\override #'(font-family . married) \"bla\"
 
 "
   
@@ -434,7 +434,7 @@ for DIR, you can obtain longer or shorter stems."
 
 
 (define-public (strut-markup paper props . rest)
-  "Syntax: \strut
+  "Syntax: \\strut
 
  A box of the same height as the space.
 "