From: Karl Hasselström Date: Fri, 13 Mar 2009 03:14:42 +0000 (+0100) Subject: Documentation: Rename link macros X-Git-Tag: v0.15-rc1~41 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/760a7cfc29f0645056b04e4d6f7c63cb46b4d384?ds=inline;hp=760a7cfc29f0645056b04e4d6f7c63cb46b4d384 Documentation: Rename link macros They can no longer end with "link", as explained in commit 5162e697 by Dan McGee in the git repository: Documentation: rename gitlink macro to linkgit Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P\w(\w|-)*?):(?P\S*?)(\[(?P.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P(http|https|ftp|file|mailto|callto|image|link)):(?P\S*?)(\[(?P.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Karl Hasselström ---