* Documentation/user/basic-notation.itely (Measure repeats): add

countPercentRepeats example.

* Documentation/user/advanced-notation.itely (Other text markup
issues): remove remark about normal-font.  We have \normal-text

diff --git a/ChangeLog b/ChangeLog
index 4758a9b69312c18442bf574dd4b22a15af16ea99..e7d449081ed1181fb823988e80eb23900615e3c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-24  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/basic-notation.itely (Measure repeats): add
+       countPercentRepeats example.
+
+       * Documentation/user/advanced-notation.itely (Other text markup
+       issues): remove remark about normal-font.  We have \normal-text
+
        * input/regression/tie-chord.ly: add note about remaining bugs.
 
        * lily/tie.cc (print): try Tie_column::set_directions () if

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index cc588bbc3fcabc87f5b122015e2713c765d4ad8e..3027d2c56339c6506fe62fe5bec22e53b51f1323 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -38,7 +38,6 @@ your scores.
 * Overview of text markup commands::  
 * Font selection::              
 * New dynamic marks::           
-* Other text markup issues::    
 @end menu
 
 
@@ -521,22 +520,6 @@ boxf = \markup{ \bracket { \dynamic f } }
 @end lilypond
 
 
-@node Other text markup issues
-@subsection Other text markup issues
-
-To use a normal font within a title, you must define it manually
-
-@example
-#(def-markup-command (normal-font layout props arg) (markup?)
-  "Switch to normal text font"
-  (interpret-markup layout (cons '((font-series . 'medium) (font-shape . 'upright)) props) arg))
-
-\header@{
-  title = \markup@{ ABCD \normal-font ABCD @}
-@}
-@end example
-
-
 
 @node Preparing parts
 @section Preparing parts
@@ -1875,7 +1858,7 @@ teaching tools in addition to great musical scores.
 * Balloon help::                
 * Blank music sheet::           
 * Hidden notes::                
-* Shape note heads ::          
+* Shape note heads ::           
 * Easy Notation note heads::    
 * Analysis brackets::           
 * Coloring objects::            

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index 338ca83129d951447e1c3185484259945871a126..4f32d047d066ceac8fa18bba1517cee9c70276b7 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2931,10 +2931,20 @@ Percent repeats must be declared within a @code{Voice} context.
 }
 @end lilypond
 
-Isolated percents can also be printed. This is done by putting a multi
-measure rest, with a different print function,
+Measure repeats of more than 2 measures get a counter, if you switch
+on the @code{countPercentRepeats} property,
+
+@lilypond[relative=2, quote,verbatim,raggedright]
+\set countPercentRepeats = ##t
+\new Voice
+  \repeat "percent" 4 { c1 }
+@end lilypond
+
 
 
+Isolated percents can also be printed. This is done by putting a multi
+measure rest with a different print function,
+
 @lilypond[fragment,verbatim]
 \override MultiMeasureRest #'print-function
   = #Multi_measure_rest::percent
@@ -2942,6 +2952,8 @@ R1
 @end lilypond
 
 
+
+
 @seealso
 
 Program reference: @internalsref{RepeatSlash},

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 88a2a6db8b396633aedf2fc1255f8e76f5898226..6eb6fde1671f414f8d91eec449d8cac569a66252 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -384,10 +384,10 @@ determines the space between each markup in @var{args}."
 
 
 (define (wordwrap-stencils stencils
-                          justify base-space line-width 
-                          )
+                          justify base-space line-width)
   
   "Perform simple wordwrap, return stencil of each line."
+  
   (define space (if justify
                    
                    ;; justify only stretches lines.
@@ -771,8 +771,10 @@ recommend font for this is bold and italic"
   "Set all font related properties (except the size) to get the default normal text font, no matter what font was used earlier."
   ;; ugh - latin1
   (interpret-markup layout
-                    (cons '((font-family . roman) (font-shape . upright) (font-series . medium) (font-encoding . latin1)) props)
-                    arg)) 
+                    (cons '((font-family . roman) (font-shape . upright)
+                           (font-series . medium) (font-encoding . latin1))
+                         props)
+                    arg))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; symbols.