From cd71b948eba90e345393f1d39475cb46c0473775 Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Sun, 7 Sep 2008 17:08:04 +0200 Subject: [PATCH] Doc. system: fix deflist asciidoc formatting Collisions with automatic function references Disallowed characters in captions which were needed --- build/asciidoc.conf | 12 ++++++++---- build/def-doc.pl | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build/asciidoc.conf b/build/asciidoc.conf index 7753fa25..5ed9ef0f 100644 --- a/build/asciidoc.conf +++ b/build/asciidoc.conf @@ -1,12 +1,13 @@ [macros] -(?su)[\\]?<<(?P[^&;:()]+):(?P[^&;:()<> ]+)(?P\([^&:;]*\);?)(,(?P[^&;]+))?>>=func_ref_file -(?su)[\\]?<<(?P[^&;:()<> ]+)(?P\([^&:;]*\);?)(,(?P[^&;]+))?>>=func_ref -(?su)[\\]?<<(?P[^&;:()]+):(,(?P[^&;]+))?>>=xref_file_only -(?su)[\\]?<<(?P[^&;:()]+):(?P\w+)(,(?P[^&;]+))?>>=xref_file +(?su)[\\]?<<(?P[^&;:()]+):(?P[^&;:()<> ]+)(?P\([^&:;]*\);?)(,(?P[^&]+))?>>=func_ref_file +(?su)[\\]?<<(?P[^&;:()<> ]+)(?P\([^&:;]*\);?)(,(?P[^&]+))?>>=func_ref +(?su)[\\]?<<(?P[^&;:()]+):(,(?P[^&]+))?>>=xref_file_only +(?su)[\\]?<<(?P[^&;:()]+):(?P[^,();&]+)(,(?P[^&]+))?>>=xref_file (?su)[\\]?@(?P\w+)@=no_func_param (?su)[\\]?@(?P\w+)=func_param (?su)[\\]?!!f!(?P[^!]*(?P\w+))(?P\([^&;:()]*\);?)[^!]*!!!=func_anchor (?su)[\\]?(?P(?P\w+)\([^();:]*\))=func_auto_ref +(?su)[\\]?!!PARENT_OPEN!!=parent_open_hack (?su)[\\]?@!!KEEP!!(?P\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 d316a56d..a39cda40 100755 --- 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"; } -- 2.39.2