diff options
| author | Phil Holmes <mail@philholmes.net> | 2011-07-29 15:17:58 +0100 |
|---|---|---|
| committer | Graham Percival <graham@percival-music.ca> | 2011-07-30 14:16:13 -0700 |
| commit | 63b9d01b1ff3fda7e0a7979710665af11a190eab (patch) | |
| tree | 17bc58cd9cfe0e949c001ad8ea6215416b61dc58 | |
| parent | dd4dd6a3148bf3bf06ae6240565cf692f1e7f270 (diff) | |
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.
| -rw-r--r-- | Documentation/common-macros.itexi | 8 | ||||
| -rw-r--r-- | python/auxiliar/postprocess_html.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi index 11bae886e4..ab45cbaf32 100644 --- 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 568ff17e75..9c0d90dc2f 100644 --- 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/.*?)"') |