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

diff --git a/build/asciidoc.conf b/build/asciidoc.conf
index be579769..18c92d44 100644
--- a/build/asciidoc.conf
+++ b/build/asciidoc.conf
@@ -1,7 +1,16 @@
 [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)[\\]?&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)[\\]?@!!KEEP!!(?P<word>\w+)!!KEEP!!@=no_func_param_return
+
+[no_func_param-inlinemacro]
+@!!KEEP!!{word}!!KEEP!!@
+
+[no_func_param_return-inlinemacro]
+@{word}@