* scripts/lilypond-book.py (do_file): search chunks for

\\begin{document}

* GNUmakefile.in: add copy step in between so we can lose the
out-www directories.

diff --git a/ChangeLog b/ChangeLog
index 8d0a6947046d42a0379e71ac9be23e6f6c41d8fb..0277a1315b7b998a8b37d3ebe154f9ac991967c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (do_file): search chunks for
+       \\begin{document}
+
+       * GNUmakefile.in: add copy step in between so we can lose the
+       out-www directories.
+
 2005-11-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/pango-font.cc (pango_item_string_stencil): put
@@ -14,6 +22,8 @@
 
 2005-11-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * VERSION: release 2.7.19
+       
        * lily/figured-bass-engraver.cc (process_music): check
        figuredBassCenterContinuations first.
 

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index c53ec96ab33cc01c6470e77414f1b8591c26edfb..d1befa15e25e27afd8402c6ed51df828690a313a 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -42,7 +42,7 @@
           <td class="left-column">
          <ul>
            <li>
-           <a class="title" href="../user/out-www/lilypond/Tutorial.html">Tutorial</a>
+           <a class="title" href="user/lilypond/Tutorial.html">Tutorial</a>
              <br>(start here)
          </ul>
          </td>
@@ -50,11 +50,11 @@
          <ul>
          
             <li>
-           <a class="title" href="../topdocs/out-www/NEWS.html">NEWS</a>
+           <a class="title" href="topdocs/NEWS.html">NEWS</a>
            <br>(changes since the last major release)
 
             <li>
-           <a class="title" href="../topdocs/out-www/INSTALL.html">INSTALL</a>
+           <a class="title" href="topdocs/INSTALL.html">INSTALL</a>
            <br>(how to compile)
          </ul>
          </td>
@@ -64,23 +64,23 @@
           &nbsp;
          <ul>
            <li>
-<a class="title" href="../user/out-www/lilypond/index.html">User manual</a>
-(in <a class="title" href="../user/out-www/lilypond.pdf">PDF</a>, in
-<a class="title" href="../user/out-www/lilypond.html">one big page, ~4Mb</a>)
+<a class="title" href="user/lilypond/index.html">User manual</a>
+(in <a class="title" href="user/lilypond.pdf">PDF</a>, in
+<a class="title" href="user/lilypond.html">one big page, ~4Mb</a>)
 
      <br>(everything about LilyPond)
      
-<li><a class="title"href="../../examples.html">Examples</a>
+<li><a class="title"href="../examples.html">Examples</a>
 
      <br>(see some examples)
 
-<li><a class="title" href="../../input/test/out-www/collated-files.html">Tips and tricks</a>
-(in  <a class="title" href="../../input/test/out-www/collated-files.pdf">PDF</a>)
+<li><a class="title" href="../input/test/collated-files.html">Tips and tricks</a>
+(in  <a class="title" href="../input/test/collated-files.pdf">PDF</a>)
 
      <br>(for advanced users)
- <li><a class="title" href="../user/out-www/music-glossary/index.html">Glossary</a>
-(in <a class="title" href="../user/out-www/music-glossary.pdf">PDF</a>, in
-<a class="title" href="../user/out-www/music-glossary.html">one big page</a>)
+ <li><a class="title" href="user/music-glossary/index.html">Glossary</a>
+(in <a class="title" href="user/music-glossary.pdf">PDF</a>, in
+<a class="title" href="user/music-glossary.html">one big page</a>)
 
      <br>(for non-English users)
          </ul>
@@ -89,18 +89,18 @@
           &nbsp;
          <ul>
            <li>
- <a  class="title" href="../user/out-www/lilypond-internals/index.html">Program reference</a>
- (in <a class="title" href="../user/out-www/lilypond-internals.html">one big page</a>)
+ <a  class="title" href="user/lilypond-internals/index.html">Program reference</a>
+ (in <a class="title" href="user/lilypond-internals.html">one big page</a>)
 
      <br>(definitions for tweaking)
 
            <li>
-     <a  class="title" href="../../input/regression/out-www/collated-files.html">Regression tests</a> (in <a  class="title" href="../../input/regression/out-www/collated-files.pdf">PDF</a>) ~ 2.4Mb
+     <a  class="title" href="../input/regression/collated-files.html">Regression tests</a> (in <a  class="title" href="../input/regression/collated-files.pdf">PDF</a>) ~ 2.4Mb
 
      <br>(for developers)
 
 
-           <li><a  class="title" href="../bibliography/out-www/index.html">Bibliography</a>
+           <li><a  class="title" href="bibliography/index.html">Bibliography</a>
 
      <br>(background information)
 <li><a class="title"  href="THANKS.html">Thank yous</a>

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8cd8fb7d5dfd9d8924853bd3bcf7f74f9fea2bf4..83e65c799111a2098e3806562b2447cb6142fe8e 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -70,16 +70,27 @@ footifymail = MAILADDRESS=bug-lilypond@gnu.org
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
        echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(top-build-dir)/examples.html ./
+       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html ./
+       echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/index.html">' > $(outdir)/index.html
+       echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(outdir)/index.html
+
        cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
        cd $(top-build-dir) && find . -name \*.html~ -print | xargs rm -f
        cd $(top-build-dir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
                > $(outdir)/weblist
-       echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $(top-build-dir)/index.html
-       echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(top-build-dir)/index.html
-       cd $(top-build-dir) && ls *.html >> $(outdir)/weblist
-       cat $(outdir)/weblist | (cd $(top-build-dir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
+       ls $(outdir)/*.html >> $(outdir)/weblist
+
+## rewrite paths so we lose out-www
+       rm -rf $(outdir)/web-root/
+       mkdir $(outdir)/web-root/
+       cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
+               tar -C $(outdir)/web-root/ -xf -  
+       cd $(outdir)/web-root/ &&  \
+               for a in `find -name out-www`; do \
+                       mv $$a/* $$a/.. ; \
+                       rmdir $$a ; \
+               done
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin

diff --git a/VERSION b/VERSION
index e54171247a5e5a1612340afdf36a741e9c991667..811df0c26a1d5c5e7ee161da017b90a84517fc52 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=19
+PATCH_LEVEL=20
 MY_PATCH_LEVEL=
 

diff --git a/lily/main.cc b/lily/main.cc
index 7dd752baf45f477a1113f0ebe78311595907b7f7..c36c90760fad3364fe66ef612ff7258b900f9474 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -140,7 +140,7 @@ static Getopt_long *option_parser = 0;
 
 static Long_option_init options_static[]
 = {
-  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],eps,\nscm, svg, tex, texstr)")},
+  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps,eps,\nscm, svg, tex, texstr)\ndefault: PS")},
 
   {_i ("SYM=VAL"), "define-default", 'd',
    _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
@@ -246,7 +246,7 @@ LY_DEFINE (ly_usage, "ly:usage",
   printf (Long_option_init::table_string (options_static).to_str0 ());
   printf ("\n");
   printf (_f ("Report bugs to %s or via %s",
-             "bug-lilypond@gnu.org"
+             "bug-lilypond@gnu.org",
              "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
              ).to_str0 ());
   printf ("\n");

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index d349c29bc3e46fd1497ba820f2ee27ac2810c60c..673afa8d3363e1bcbe374ad5eeb732d530578307 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -710,6 +710,9 @@ class Chunk:
        def png_is_outdated (self):
                return 0
 
+       def is_plain (self):
+               return false
+       
 class Substring (Chunk):
        def __init__ (self, source, start, end, line_number):
                self.source = source
@@ -717,6 +720,9 @@ class Substring (Chunk):
                self.end = end
                self.line_number = line_number
                self.override_text = None
+               
+       def is_plain (self):
+               return true
 
        def replacement_text (self):
                if self.override_text:
@@ -1521,10 +1527,12 @@ def do_file (input_filename):
                ly.progress (_ ("Dissecting..."))
                chunks = find_toplevel_snippets (source, snippet_types)
 
-               if format == LATEX: 
-                       modify_preamble (chunks[0])
-                       
-               
+               if format == LATEX:
+                       for c in chunks:
+                               if (c.is_plain () and
+                                   re.search (r"\\begin{document}", c.replacement_text())):
+                                       modify_preamble (chunks[0])
+                                       break
                ly.progress ('\n')
 
                if filter_cmd: