* Documentation/user/lilypond-book.itely (Music fragment options),

	  scripts/lilypond-book.py: Don't include quotation blocks by
	  default. Introduce option quote instead of noquote

diff --git a/ChangeLog b/ChangeLog
index a2230a4e05ccaab9df3b11ad0237817c5d36414d..82a613fc7be8ea7cfbe28b8fcf3a048bb999bfde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-19  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
+
+
+       * Documentation/user/lilypond-book.itely (Music fragment options),
+         scripts/lilypond-book.py: Don't include quotation blocks by
+         default. Introduce option quote instead of noquote
+
 2003-03-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION: 1.7.15 released

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 08640cb8a2fcc0392c0100b4d91aa06390c8d7ce..6c29d85c7655998f7a4801394b2aa2b27c65a739 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -331,10 +331,9 @@ affects LilyPond, not the text layout.
 @item notexidoc
 Do not include the .texidoc header. This is only for Texinfo output.
 
-@item noquote
-By default, @command{lilypond-book} puts both La@TeX{} and texinfo output
-into a quotation block.  Using this option prevents this; no indentation
-will be used.
+@item quote
+Instruct @command{lilypond-book} to put La@TeX{} and texinfo output
+into a quotation block.
 
 @item printfilename
 Prints the file name before the music example.  Useful in conjunction

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 1a6498bfe488b88f7330c92ce0d3ccf36c5754a5..3cc1fe3495dd0a9eed171d843436736ad8778caf 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1110,15 +1110,15 @@ def schedule_lilypond_block (chunk):
                if 'eps' in opts:
                        s = 'output-eps'
                else:
-                       if 'noquote' in opts:
-                               s = 'output-latex-noquote'
-                       else:
+                       if 'quote' in opts:
                                s = 'output-latex-quoted'
+                       else:
+                               s = 'output-latex-noquote'
        elif format == 'texi':
-               if 'noquote' in opts:
-                       s = 'output-texi-noquote'
-               else:
+               if 'quote' in opts:
                        s = 'output-texi-quoted'
+               else:
+                       s = 'output-texi-noquote'
        else: # format == 'html'
                s = 'output-html'
        newbody = newbody + get_output (s) % {'fn': basename }