mirror of
https://github.com/moparisthebest/pacman
synced 2024-11-10 03:25:01 -05:00
b3c6bdda38
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>
74 lines
1.7 KiB
Makefile
74 lines
1.7 KiB
Makefile
# We have to do some funny stuff here with the manpages. In order to ensure
|
|
# a dist tarball doesn't get put out there without manpages, we keep those
|
|
# files listed in EXTRA_DIST no matter what. However, we only add them to
|
|
# man_MANS if --enable-asciidoc and/or --enable-doxygen are used.
|
|
|
|
ASCIIDOC_MANS = \
|
|
pacman.8 \
|
|
makepkg.8 \
|
|
repo-add.8 \
|
|
PKGBUILD.5 \
|
|
makepkg.conf.5 \
|
|
pacman.conf.5 \
|
|
libalpm.3
|
|
|
|
DOXYGEN_MANS = $(wildcard man3/*.3)
|
|
|
|
EXTRA_DIST = \
|
|
pacman.8.txt \
|
|
makepkg.8.txt \
|
|
repo-add.8.txt \
|
|
PKGBUILD.5.txt \
|
|
PKGBUILD-example.txt \
|
|
makepkg.conf.5.txt \
|
|
pacman.conf.5.txt \
|
|
libalpm.3.txt \
|
|
footer.txt \
|
|
Doxyfile \
|
|
$(ASCIIDOC_MANS) \
|
|
$(DOXYGEN_MANS)
|
|
|
|
# Files that should be removed, but which Automake does not know.
|
|
MOSTLYCLEANFILES = *.xml
|
|
MAINTAINERCLEANFILES = $(ASCIIDOC_MANS)
|
|
|
|
man_MANS =
|
|
dist_man_MANS = $(ASCIIDOC_MANS)
|
|
|
|
if USE_DOXYGEN
|
|
man_MANS += $(DOXYGEN_MANS)
|
|
|
|
all: doxygen.in
|
|
|
|
doxygen.in:
|
|
$(DOXYGEN) $(srcdir)/Doxyfile
|
|
endif
|
|
|
|
if USE_ASCIIDOC
|
|
ASCIIDOC_OPTS = \
|
|
-f asciidoc.conf \
|
|
-a pacman_version="$(PACKAGE_VERSION)" \
|
|
-a pacman_date="`date +%Y-%m-%d`" \
|
|
-a sysconfdir=$(sysconfdir)
|
|
A2X_OPTS = \
|
|
-d manpage \
|
|
-f manpage \
|
|
--xsltproc-opts='-param man.endnotes.list.enabled 0' \
|
|
--xsltproc-opts='-param man.endnotes.are.numbered 0'
|
|
|
|
$(ASCIIDOC_MANS):
|
|
a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
|
|
|
|
# These rules are due to the includes and files of the asciidoc text
|
|
$(ASCIIDOC_MANS): asciidoc.conf footer.txt
|
|
pacman.8: pacman.8.txt
|
|
makepkg.8: makepkg.8.txt
|
|
repo-add.8: repo-add.8.txt
|
|
PKGBUILD.5: PKGBUILD.5.txt PKGBUILD-example.txt
|
|
makepkg.conf.5: makepkg.conf.5.txt
|
|
pacman.conf.5: pacman.conf.5.txt
|
|
libalpm.3: libalpm.3.txt
|
|
endif
|
|
|
|
# vim:set ts=2 sw=2 noet:
|