Fix image paths in web and website (1663)

Amends image macros and URL fix-up to ensure that
pictures are accurately displayed in web:big and
contributor:split.

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index 11bae886e4613c31e968b31deb11a3cc2aa51268..ab45cbaf32cbd4fdd1af09c603977dd5b8ede136 100644 (file)
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -197,8 +197,8 @@ UNTRANSLATED NODE: IGNORE ME
 @macro imageClickable{IMAGE-FILE, EXT, MORE-TEXT, CLICK-FILE, CLICK-EXT, POSITION}
 @html
 <div class="float-\POSITION\">
-  <a class="clickable" href="../pictures/\CLICK-FILE\.\CLICK-EXT\">
-    <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+  <a class="clickable" href="pictures/\CLICK-FILE\.\CLICK-EXT\">
+    <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
   </a>
   <p style="text-align: center">
     \MORE-TEXT\
@@ -215,7 +215,7 @@ UNTRANSLATED NODE: IGNORE ME
 
 @macro imageFloat{IMAGE-FILE, EXT, POSITION}
 @html
-<img class="float-\POSITION\" src="../pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
+<img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
 @image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
@@ -228,7 +228,7 @@ UNTRANSLATED NODE: IGNORE ME
 @macro imageId{ID, IMAGE-FILE, EXT, ALT}
 @html
 <div id="\ID\">
-  <img src="../pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
+  <img src="pictures/\IMAGE-FILE\.\EXT\" alt="\ALT\">
 </div>
 @end html
 @iftex

diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py
index 568ff17e75e42331648135b4423f0f836b16ee8c..9c0d90dc2fd031046252c59c4bda207a9420783b 100644 (file)
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -102,7 +102,7 @@ def source_links_replace (m, source_val):
     return 'href="' + os.path.join (source_val, m.group (1)) + '"'
 
 # More hardcoding, yay!
-splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets))/')
+splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets|contributor))/')
 lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"')
 pictures_re = re.compile ('src="(pictures/.*?)"')