Documentation system: file xrefs

<<file:link>> and <<file:link,text>> links to other files work now.

diff --git a/build/asciidoc-xhtml.conf b/build/asciidoc-xhtml.conf
index 81313ce0729ab503eadddcab37d645854e9003f8..97f9a12848369b6dd141f75d965c4f79ab9d7021 100644 (file)
--- a/build/asciidoc-xhtml.conf
+++ b/build/asciidoc-xhtml.conf
@@ -13,6 +13,9 @@ NULL=<tt>NULL</tt>
 [func_ref_file-inlinemacro]
 <a href='{filename}.html#fun_{name}'>{caption=<tt>{name}:!:{params}</tt>}</a>
 
 [func_ref_file-inlinemacro]
 <a href='{filename}.html#fun_{name}'>{caption=<tt>{name}:!:{params}</tt>}</a>
 

+[xref_file-inlinemacro]
+<a href='{filename}.html#{target}'>{caption=[{target}]}</a>
+

 [func_anchor-inlinemacro]
 <div class="literalblock" id="fun_{name}"><div class="content"><pre><tt>{prefix}:!:{params}</tt></pre></div></div>
 
 [func_anchor-inlinemacro]
 <div class="literalblock" id="fun_{name}"><div class="content"><pre><tt>{prefix}:!:{params}</tt></pre></div></div>
 

diff --git a/build/asciidoc.conf b/build/asciidoc.conf
index c32b048d1e85ddc3f3b11e7797274ca05c7b3d93..be5797696b7d9923bce436f19b023237cb82e944 100644 (file)
--- a/build/asciidoc.conf
+++ b/build/asciidoc.conf
@@ -1,6 +1,7 @@
 [macros]
 (?su)[\\]?&lt;&lt;(?P<filename>\w+):(?P<name>[^&;:()<> ]+)(?P<params>\([^&:;]*\);?)(,(?P<caption>[^&;]+))?&gt;&gt;=func_ref_file
 (?su)[\\]?&lt;&lt;(?P<name>[^&;:()<> ]+)(?P<params>\([^&:;]*\);?)(,(?P<caption>[^&;]+))?&gt;&gt;=func_ref
 [macros]
 (?su)[\\]?&lt;&lt;(?P<filename>\w+):(?P<name>[^&;:()<> ]+)(?P<params>\([^&:;]*\);?)(,(?P<caption>[^&;]+))?&gt;&gt;=func_ref_file
 (?su)[\\]?&lt;&lt;(?P<name>[^&;:()<> ]+)(?P<params>\([^&:;]*\);?)(,(?P<caption>[^&;]+))?&gt;&gt;=func_ref

+(?su)[\\]?&lt;&lt;(?P<filename>\w+):(?P<target>\w+)(,(?P<caption>[^&;]+))?&gt;&gt;=xref_file

 (?su)[\\]?@(?P<name>\w+)=func_param
 (?su)[\\]?!!f!(?P<prefix>[^!]*(?P<name>\w+))(?P<params>\([^&;:()]*\);?)[^!]*!!!=func_anchor
 (?su)[\\]?(?P<all>(?P<name>\w+)\([^();:]*\))=func_auto_ref
 (?su)[\\]?@(?P<name>\w+)=func_param
 (?su)[\\]?!!f!(?P<prefix>[^!]*(?P<name>\w+))(?P<params>\([^&;:()]*\);?)[^!]*!!!=func_anchor
 (?su)[\\]?(?P<all>(?P<name>\w+)\([^();:]*\))=func_auto_ref