Doc. system: fix deflist asciidoc formatting

Collisions with automatic function references
Disallowed characters in captions which were needed

diff --git a/build/asciidoc.conf b/build/asciidoc.conf
index 7753fa259f9ee13152992a87c8ee66ddc4f35f01..5ed9ef0f881d383fc3d298a4e36b35f576c9d945 100644 (file)
--- a/build/asciidoc.conf
+++ b/build/asciidoc.conf
@@ -1,12 +1,13 @@
 [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<caption>[^&;]+))?&gt;&gt;=xref_file_only
-(?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(?P<target>\w+)(,(?P<caption>[^&;]+))?&gt;&gt;=xref_file
+(?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<caption>[^&]+))?&gt;&gt;=xref_file_only
+(?su)[\\]?&lt;&lt;(?P<filename>[^&;:()]+):(?P<target>[^,();&]+)(,(?P<caption>[^&]+))?&gt;&gt;=xref_file
 (?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]
@@ -14,3 +15,6 @@
 
 [no_func_param_return-inlinemacro]
 @{word}@
+
+[parent_open_hack-inlinemacro]
+(

diff --git a/build/def-doc.pl b/build/def-doc.pl
index d316a56d076f2537a25f49d6bb4006d210c9d532..a39cda40f626983c2150e26e5fc61bdb871d9791 100755 (executable)
--- a/build/def-doc.pl
+++ b/build/def-doc.pl
@@ -28,6 +28,7 @@ while( defined( my $line = <> ) ) {
        $file = $dircp."/".$file;
        $file =~ s/^\///;
        $file =~ s/\.[^.]+$//;
+       $text =~ s/\(/!!PARENT_OPEN!!/g;
        print OUT "- <<$file:auto_$num,`$text`>>\n";
 }