From: Michal Vaner <vorner@ucw.cz>
Date: Sun, 14 Sep 2008 13:37:33 +0000 (+0200)
Subject: Doc. system: use @function() for function links
X-Git-Tag: holmes-import~292
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=f3735242f39f63c019d35091cd380147de658ad2;p=libucw.git

Doc. system: use @function() for function links

<<function()>> works too, this is just replacement of the old implicit
function(), which caused problems (the system wanted to put the links
everywhere).

Removed some hacks around the old problems, which are no longer needed.
---

diff --git a/build/asciidoc-xhtml.conf b/build/asciidoc-xhtml.conf
index 8eba6d28..ce7352f3 100644
--- a/build/asciidoc-xhtml.conf
+++ b/build/asciidoc-xhtml.conf
@@ -1,17 +1,11 @@
 [replacements]
 NULL=<tt>NULL</tt>
 
-[macros]
-(?su)[\\]?(?P<name>\w+):!:(?P<rest>\([^();:]*\))=func_no_reuse
-
-[func_param-inlinemacro]
-<i><tt>{name}</tt></i>
-
 [func_ref-inlinemacro]
-<a href='#fun_{name}'>{caption=<tt>{name}:!:{params}</tt>}</a>
+<a href='#fun_{name}'>{caption={all}}</a>
 
 [func_ref_file-inlinemacro]
-<a href='{filename}.html#fun_{name}'>{caption=<tt>{name}:!:{params}</tt>}</a>
+<a href='{filename}.html#fun_{name}'>{caption={all}}</a>
 
 [xref_file-inlinemacro]
 <a href='{filename}.html#{target}'>{caption=[{target}]}</a>
@@ -19,11 +13,11 @@ NULL=<tt>NULL</tt>
 [xref_file_only-inlinemacro]
 <a href='{filename}.html'>{caption=<tt>[{filename}]</tt>}</a>
 
-[func_anchor-inlinemacro]
-<div class="literalblock"><div class="content"><pre><tt>{prefix}:!:{params}</tt></pre></div></div>
-
 [func_auto_ref-inlinemacro]
-<a href='#fun_{name}'><tt>{all}</tt></a>
+<a href='#fun_{name}'>{all}</a>
+
+[func_param-inlinemacro]
+<i><tt>{name}</tt></i>
 
-[func_no_reuse-inlinemacro]
-{name}{rest}
+[func_format-inlinemacro]
+<tt>{all}</tt>
diff --git a/build/asciidoc.conf b/build/asciidoc.conf
index 8e9af77d..18c92d44 100644
--- a/build/asciidoc.conf
+++ b/build/asciidoc.conf
@@ -1,13 +1,12 @@
 [macros]
-(?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(?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>[^&;:()]+):(?P<all>(?P<name>[^&;:()<> ]+)(\([^&:;]*\);?))(,(?P<caption>[^&]+))?&gt;&gt;=func_ref_file
+(?su)[\\]?&lt;&lt;(?P<all>(?P<name>[^&;:()<> ]+)(\([^&:;]*\);?))(,(?P<caption>[^&]+))?&gt;&gt;=func_ref
 (?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(,(?P<caption>[^&]+))?&gt;&gt;=xref_file_only
 (?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(?P<target>[^,();&]+)(,(?P<caption>[^&]+))?&gt;&gt;=xref_file
+(?su)[\\]?@(?P<all>(?P<name>\w+)\([^();:]*\))=func_ref
+(?su)[\\]?(?P<all>\w+\([^();:]*\))=func_format
 (?su)[\\]?@(?P<word>\w+)@=no_func_param
 (?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)[\\]?!!PARENT_OPEN!!=parent_open_hack
 (?su)[\\]?@!!KEEP!!(?P<word>\w+)!!KEEP!!@=no_func_param_return
 
 [no_func_param-inlinemacro]
@@ -15,6 +14,3 @@
 
 [no_func_param_return-inlinemacro]
 @{word}@
-
-[parent_open_hack-inlinemacro]
-(
diff --git a/build/doc-defs b/build/doc-defs
index 1a5b3d13..b0c5a5e8 100755
--- a/build/doc-defs
+++ b/build/doc-defs
@@ -56,7 +56,6 @@ foreach( sort { ( $groups{$a->[2]} <=> $groups{$b->[2]} ) or ( $a->[3] cmp $b->[
 	$file = $dircp."/".$file;
 	$file =~ s/^\///;
 	$file =~ s/\.[^.]+$//;
-	$text =~ s/\(/!!PARENT_OPEN!!/g;
 	$text =~ s/(\.\.\.)/\\$1/g;
 	print OUT "<<$file:$anchor,`$name`>>:: `$text`\n";
 }