From 6fab9d28204f1fad82aa884d3ba3d172ec5e4256 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Sun, 2 Dec 2007 15:05:09 +0100 Subject: [PATCH] Cleanly fix pictures URLs in HTML docs Get rid of all symlinks to pictures because: - symlinks don't work on Windows systems, so a docball with symlinks would not be very usable; - symlinks to lily pictures are not made in translated docs dirs, so the splitted docs missed them. --- GNUmakefile.in | 5 ++--- buildscripts/add_html_footer.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index fb07d87eaa..219af763fd 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -89,10 +89,9 @@ 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 $(outdir)/examples.html input/ - rm -rf $(outdir)/online-root - rm -rf $(outdir)/offline-root + find $(outdir) -name '*-root' | xargs rm -rf $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)" - find $(outdir)/offline-root -type l -delete + find $(foreach t, $(WEB_TARGETS), $(outdir)/$(t)-root) -type l -delete tree-prefix = $(outdir) diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py index 0ef42e1833..d46685da43 100644 --- a/buildscripts/add_html_footer.py +++ b/buildscripts/add_html_footer.py @@ -92,9 +92,10 @@ splitted_docs_re = re.compile ('Documentation/user/out-www/(lilypond|music-gloss # On systems without symlinks (e.g. Windows), docs are not very usable # Get rid of symlinks references here # Get rid of symlinks in GNUmakefile.in (local-WWW-post) +# this also fixes missing PNGs only present in translated docs def replace_symlinks_urls (s, prefix): if splitted_docs_re.match (prefix): - s = re.sub ('(href|src)="(lily-.*?|.*?-flat-.*?|context-example.*?)"', '\\1="../\\2"', s) + s = re.sub ('(href|src)="(lily-.*?|.*?[.]png)"', '\\1="../\\2"', s) source_path = os.path.join (os.path.dirname (prefix), 'source') if not os.path.islink (source_path): return s @@ -261,8 +262,7 @@ def add_html_footer (translation, in_f.close() s = re.sub ('%', '%%', s) - if target == 'offline': - s = replace_symlinks_urls (s, prefix) + s = replace_symlinks_urls (s, prefix) s = add_header (s) ### add footer -- 2.39.5