X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fasciidoc.conf;h=18c92d44f63f7dcab6f53c2e5a880c6bd85ca95f;hb=2623d85c7a2cfbbfafc9b9b8a4f5e75ab21179f3;hp=8e9af77de8c53282a3b8ff98b6c6f7411a21d3c5;hpb=a3cde4f0e6ceb61800cac6a039dcd5ca0eaf8f02;p=libucw.git

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]
-(