WEB: Found more hardcoded names, yay! Fix linking to essay, images in essay.

diff --git a/Documentation/general.texi b/Documentation/general.texi
index a7a9dc3dc7dbc717f6125d7d331b5a082002a030..297faffabb6b01570ebb165fd8061f4815b0400d 100644 (file)
--- a/Documentation/general.texi
+++ b/Documentation/general.texi
@@ -82,6 +82,13 @@ LilyPond is Free Software and part of the
 
 @divClass{align-right}
 Read more in our @ref{Introduction}!
+
+@c For this to work, essay needs to be split like we are
+@c   --split=node --node-files
+@c This and more in our @ressaynamed{Engraving, essay}.
+@c Possibly, node Top always works?
+This and more in our @ressaynamed{Top, essay}.
+
 @divEnd
 @divEnd
 

diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index 38609b25efbe6fc8570abcd247e293dedc7ca80f..6f3029243e5383ff9a6aed804b7cb0b50e39259f 100644 (file)
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -99,13 +99,13 @@
 
 @c  Definitions for references:
 @c
+@c     @ressay
 @c     @rglos
+@c     @rinternals
 @c     @rlearning
-@c     @ruser
-@c     @ressay
-@c     @rprogram
 @c     @rlsr
-@c     @rinternals
+@c     @rprogram
+@c     @ruser
 @c
 @c  All these also have a @...named version which allows to specify the
 @c  displayed text for the reference as second argument.

diff --git a/Documentation/nl/general.texi b/Documentation/nl/general.texi
index 8ca41c39988a38bc27eb82816e1fd069dc262018..b1cc9142fcc89b40ee34168e07a75076537c6ff1 100644 (file)
--- a/Documentation/nl/general.texi
+++ b/Documentation/nl/general.texi
@@ -59,6 +59,13 @@ LilyPond is Vrije Software, is gratis en is onderdeel van het
 
 @divClass{align-right}
 Lees de @ref{Inleiding}!
+
+@c For this to work, essay needs to be split like we are
+@c   --split=node --node-files
+@c Dat en meer in ons @ressaynamed{Engraving, essay}.
+@c Possibly, node Top always works?
+Dat en meer in ons @ressaynamed{Top, essay}.
+
 @divEnd
 @divEnd
 @divId{news}

diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py
index 9e624e2de2c9398f1453a59f73ada7df69fe47fb..68b0536a77812c1cbd4cde54f05141e6d51f635e 100644 (file)
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -99,8 +99,8 @@ def build_pages_dict (filelist):
 def source_links_replace (m, source_val):
     return 'href="' + os.path.join (source_val, m.group (1)) + '"'
 
-splitted_docs_re = re.compile ('(Documentation/out-www/(notation|\
-music-glossary|application|general|learning|snippets))/')
+# More hardcoding, yay!
+splitted_docs_re = re.compile ('(Documentation/out-www/(essay|notation|music-glossary|application|general|learning|snippets))/')
 lily_snippets_re = re.compile ('(href|src)="(../lily-.*?|.*?[.]png)"')
 pictures_re = re.compile ('src="(pictures/.*?)"')
 

diff --git a/scripts/auxiliar/check_texi_refs.py b/scripts/auxiliar/check_texi_refs.py
index dff7e334f1ccc45d9e2ab039ef8b222ef8443a48..cf046dddf6a6a0bc7f2bae20a9cb823919d8a4af 100755 (executable)
--- a/scripts/auxiliar/check_texi_refs.py
+++ b/scripts/auxiliar/check_texi_refs.py
@@ -144,7 +144,7 @@ else:
 
 
 ref_re = re.compile \
-    ('@(ref|ruser|rlearning|rprogram|rglos)(?:\\{(?P<ref>[^,\\\\\\}]+?)|\
+    ('@((?:ressay|rgloss|rinternals|rlearning|rslr|rprogram|ruser|ref)|named)(?:\\{(?P<ref>[^,\\\\\\}]+?)|\
 named\\{(?P<refname>[^,\\\\]+?),(?P<display>[^,\\\\\\}]+?))\\}(?P<last>.)',
      re.DOTALL)
 node_include_re = re.compile (r'(?m)^@(node|include)\s+(.+?)$')

diff --git a/scripts/auxiliar/tely-gettext.py b/scripts/auxiliar/tely-gettext.py
index b2729489bb964888d8de941653670496c064b864..870a10e97f9fa504fb970f11e97dca49d671af47 100755 (executable)
--- a/scripts/auxiliar/tely-gettext.py
+++ b/scripts/auxiliar/tely-gettext.py
@@ -22,7 +22,7 @@ _doc = langdefs.translation[lang]
 
 include_re = re.compile (r'@include (.*?)$', re.M)
 whitespaces = re.compile (r'\s+')
-ref_re = re.compile (r'(?ms)@(ruser|rprogram|ref|rlearning)\{(.*?)\}')
+ref_re = re.compile (r'(?ms)@((?:ressay|rgloss|rinternals|rlearning|rslr|rprogram|ruser|ref)|named)\{(.*?)\}')
 node_section_re = re.compile (r'@node (.*?)\n@((?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) (.*?)\n')
 section_only_re = re.compile (r'@((?:unnumbered|appendix)(?:(?:sub){0,2}sec)?|top|chapter|(?:sub){0,2}section|(?:major|chap|(?:sub){0,2})heading) (.*?)\n')
 menu_entry_re = re.compile (r'\* (.*?)::')