[129855] trunk/base/doc/asciidoc.conf

[raimue at macports.org]

Revision: 129855
          https://trac.macports.org/changeset/129855
Author:   raimue at macports.org
Date:     2014-12-21 08:29:58 -0800 (Sun, 21 Dec 2014)
Log Message:
-----------
base: avoid the trailing '#' character in links

Links to the guide previously had a trailing '#' even when no section was
given. By using different syntax in the regular expression, no named capture
group will be created for an empty string. In this case, no '#' character will
be emitted in the backend replacement.

Modified Paths:
--------------
    trunk/base/doc/asciidoc.conf

Modified: trunk/base/doc/asciidoc.conf
===================================================================
--- trunk/base/doc/asciidoc.conf	2014-12-21 16:19:52 UTC (rev 129854)
+++ trunk/base/doc/asciidoc.conf	2014-12-21 16:29:58 UTC (rev 129855)
@@ -15,11 +15,15 @@
 # Show link as: <command>(<section>); if section is defined, else just show
 # the command.
 
+# Macros for links to other documentation
+#
+# The syntax (|...) is used here instead of (...)? to avoid creating
+# a named capture group when no match occurs.
 [macros]
-(?su)[\\]?(?P<name>man):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-(?su)[\\]?(?P<name>guide):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-(?su)[\\]?(?P<name>wiki):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-(?su)[\\]?(?P<name>source):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+(?su)[\\]?(?P<name>man):(|(?P<target>\S+))\[(?P<attrlist>.*?)\]=
+(?su)[\\]?(?P<name>guide):(|(?P<target>\S+))\[(?P<attrlist>.*?)\]=
+(?su)[\\]?(?P<name>wiki):(|(?P<target>\S+))\[(?P<attrlist>.*?)\]=
+(?su)[\\]?(?P<name>source):(|(?P<target>\S+))\[(?P<attrlist>.*?)\]=
 
 # man: and guide: for docbook
 ifdef::backend-docbook[]
@@ -28,7 +32,7 @@
     <refentrytitle>{target}</refentrytitle>{0?<manvolnum>{0}</manvolnum>}
 </citerefentry>
 [guide-inlinemacro]
-<ulink url="{guideurl}#{target}">{0={guideurl}#{target}}</ulink>
+<ulink url="{guideurl}{target?#{target}}">{0={guideurl}{target?#{target}}}</ulink>
 [wiki-inlinemacro]
 <ulink url="{wikiurl}{target}">{0={target}}</ulink>
 [source-inlinemacro]
@@ -40,7 +44,7 @@
 [man-inlinemacro]
 <a href="{target}{0?.{0}}.html">{target}{0?({0})}</a>
 [guide-inlinemacro]
-<a href="{guideurl}#{target}">{0={guideurl}#{target}}</a>
+<a href="{guideurl}{target?#{target}}">{0={guideurl}{target?#{target}}}</a>
 [wiki-inlinemacro]
 <a href="{wikiurl}{target}">{0={target}}</a>
 [source-inlinemacro]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141221/e149ea0a/attachment.html>