Docs-fr: fix PDF docs build

diff --git a/Documentation/fr/macros.itexi b/Documentation/fr/macros.itexi
index 20fb2920b4c9db8aa021f8cd562c44a194032b3f..116a0ffe44ccdb7aa1e8af74cbd15b9f5b581062 100644 (file)
--- a/Documentation/fr/macros.itexi
+++ b/Documentation/fr/macros.itexi
@@ -87,7 +87,7 @@ translations should be in macros.itexi.
 @macro docMain
 @cartouche
 Pour connaître la place qu'occupe ce manuel dans la
-documentation, consultez @rweb{Manuels}.
+documentation, consultez Manuels.
 
 Si vous ne disposez pas de certains manuels, la documentation complète
 se trouve sur @w{@uref{http://@/www@/.lilypond@/.org/}}.

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4e02289031723665bed5c92cc91d64cf93b8b22f..d52e09ad2f2725c201523bd0f783b3a0d8190724 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1202,20 +1202,12 @@ left-margin-default right-margin-default)"
         override[LINE_WIDTH] = texinfo_line_widths['@smallbook']
         override.update (default_ly_options)
 
-        def not_processing_independent (opt):
-            for name in PROCESSING_INDEPENDENT_OPTIONS:
-                if opt.startswith (name):
-                    return False
-
-            return True
-
         option_list = []
         for option in self.get_option_list ():
-            option_list.append (option)
-        warning ("option_string before: %s" % option_list)
-        option_list = filter (not_processing_independent, option_list)
+            if not any (option.startswith (name)
+                        for name in PROCESSING_INDEPENDENT_OPTIONS):
+                option_list.append (option)
         option_string = ','.join (option_list)
-        warning ("option_string: %s" % option_string)
         compose_dict = {}
         compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
         for a in compose_types:
@@ -1292,8 +1284,10 @@ left-margin-default right-margin-default)"
             hash = md5 (self.relevant_contents (self.ly ()))
             for option in self.get_option_list ():
                 for name in PROCESSING_INDEPENDENT_OPTIONS:
-                    if not option.startswith (name):
-                        hash.update (option)
+                    if option.startswith (name):
+                        break
+                else:
+                    hash.update (option)
 
             ## let's not create too long names.
             self.checksum = hash.hexdigest ()[:10]