From: Reinhold Kainhofer Date: Sun, 24 Aug 2008 11:49:42 +0000 (+0200) Subject: texi2html: Properly extract sectioning and node commands X-Git-Tag: release/2.11.58-1~32^2~20 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90e5af636f3eb3eb2b7e8b8a4eec2728e32606b1;p=lilypond.git texi2html: Properly extract sectioning and node commands -) Don't match quoted commands, i.e. @@node inside an @example section. -) Properly use multiline matching, so we can use ^ and $ to detect the start/end of each line This fixes the problem that the xlatex node was not detected --- diff --git a/buildscripts/extract_texi_filenames.py b/buildscripts/extract_texi_filenames.py index 6b89954b25..c85a18fb22 100755 --- a/buildscripts/extract_texi_filenames.py +++ b/buildscripts/extract_texi_filenames.py @@ -41,7 +41,7 @@ if not os.path.isdir (outdir): include_re = re.compile (r'@include ((?!../lily-).*?)\.texi$', re.M) whitespaces = re.compile (r'\s+') -section_translation_re = re.compile (r'@(node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading|translationof) (.*?)\s*\n') +section_translation_re = re.compile (r'^@(node|(?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading|translationof) (.*?)\s*$', re.MULTILINE) def expand_includes (m, filename): filepath = os.path.join (os.path.dirname (filename), m.group(1)) + '.texi'