From: Reinhold Kainhofer Date: Fri, 30 May 2008 15:28:13 +0000 (+0200) Subject: Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev... X-Git-Tag: release/2.11.58-1~32^2~135 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=beb52c9966a934559684caebce7acc2b326d316e;p=lilypond.git Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html Conflicts: buildscripts/add_html_footer.py input/lsr/ancient-notation-intro.itely input/lsr/chords-intro.itely input/lsr/contexts-and-engravers-intro.itely input/lsr/expressive-marks-intro.itely input/lsr/midi-intro.itely input/lsr/paper-and-layout-intro.itely input/lsr/percussion-intro.itely input/lsr/pitches-intro.itely input/lsr/repeats-intro.itely input/lsr/rhythms-intro.itely input/lsr/simultaneous-notes-intro.itely input/lsr/spacing-intro.itely input/lsr/staff-notation-intro.itely input/lsr/text-intro.itely input/lsr/titles-intro.itely input/lsr/tweaks-and-overrides-intro.itely input/lsr/vocal-music-intro.itely --- beb52c9966a934559684caebce7acc2b326d316e diff --cc buildscripts/add_html_footer.py index 5a45978482,34ada97aac..83a52dc726 --- a/buildscripts/add_html_footer.py +++ b/buildscripts/add_html_footer.py @@@ -113,22 -110,19 +114,22 @@@ def hack_urls (s, prefix) if not os.path.islink (source_path): return s source_val = os.readlink (source_path) - return source_link_re.sub (lambda m: source_links_replace (m, source_val), s) + return re.sub ('href="source/(.*?)"', lambda m: source_links_replace (m, source_val), s) +body_tag_re = re.compile ('(?i)]*)>') +html_tag_re = re.compile ('(?i)') +doctype_re = re.compile ('(?i)\n' + def add_header (s): - """Add header ( and doctype)""" - if re.search (header_tag, s) == None: - body = '' - s = re.sub ('(?i)', body, s) - if re.search ('(?i)]*>', body + header, s, 1) - elif re.search ('(?i)', '' + header, s, 1) - else: - s = header + s + """Add header ( and doctype)""" + if header_tag_re.search (s) == None: + body = '' + (s, n) = body_tag_re.subn (body + header, s, 1) + if not n: + (s, n) = html_tag_re.subn ('' + header, s, 1) + if not n: + s = header + s s = header_tag + '\n' + s diff --cc make/doclang-rules.make index 0b8f359f9c,10fa6ef382..52e4684391 --- a/make/doclang-rules.make +++ b/make/doclang-rules.make @@@ -1,12 -1,9 +1,11 @@@ - <<<<<<< HEAD:make/doclang-rules.make -$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi +$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi mkdir -p $(dir $@) - $(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< + $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< + cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi - $(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< +$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi + $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $< + cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.itexi $(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<