From b3c6bdda38f7e370e1f80f02a61f1d3f08c1b57d Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 29 Dec 2007 00:24:15 -0600
Subject: doc: rename manlink macro to linkman

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<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+
+# Explicit so they can be nested.
+(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+
 # Anchor: [[[id]]]. Bibliographic anchor.
 (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3
 # Anchor: [[id,xreflabel]]

This default regex now matches explicit values, and unfortunately in this
case manlink 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: Dan McGee <dan@archlinux.org>
---
 doc/asciidoc.conf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'doc/asciidoc.conf')

diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index 98308f53..f92a3eab 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -1,10 +1,7 @@
-#
+## linkman: macro
 # Inspired by/borrowed from the GIT source tree at Documentation/asciidoc.conf
 #
-
-## manlink: macro
-#
-# Usage: manlink:command[manpage-section]
+# Usage: linkman:command[manpage-section]
 #
 # Note, {0} is the manpage section, while {target} is the command.
 #
@@ -19,7 +16,7 @@ endsb=&#93;
 tilde=&#126;
 
 ifdef::backend-docbook[]
-[manlink-inlinemacro]
+[linkman-inlinemacro]
 {0%{target}}
 {0#<citerefentry>}
 {0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
@@ -27,7 +24,9 @@ ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-docbook[]
+ifndef::docbook-xsl-172[]
 # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
+# v1.72 breaks with this because it replaces dots not in roff requests.
 [listingblock]
 <example><title>{title}</title>
 <literallayout>
@@ -40,6 +39,7 @@ ifdef::doctype-manpage[]
 endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
+endif::docbook-xsl-172[]
 endif::backend-docbook[]
 
 ifdef::doctype-manpage[]
@@ -65,6 +65,6 @@ endif::backend-docbook[]
 endif::doctype-manpage[]
 
 ifdef::backend-xhtml11[]
-[manlink-inlinemacro]
+[linkman-inlinemacro]
 <a href="{target}.{0}.html">{target}{0?({0})}</a>
 endif::backend-xhtml11[]
-- 
cgit v1.2.3-24-g4f1b