From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Chris Johnsen" <chris_johnsen@pobox.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
"Jeff King" <peff@peff.net>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [RFC PATCH 03/12] doc: remove unnecessary hack for asciidoctor
Date: Thu, 13 Apr 2023 05:57:36 -0600 [thread overview]
Message-ID: <20230413115745.116063-4-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20230413115745.116063-1-felipe.contreras@gmail.com>
It was added in f6461b82b9 (Documentation: fix build with Asciidoctor 2,
2019-09-15) to avoid newlines, but they don't matter.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/Makefile | 1 -
Documentation/manpage.xsl | 3 ---
t/t0600-doc-tools.sh | 4 ++--
3 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 Documentation/manpage.xsl
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 5cd35df61c..3fab7ce9cd 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -202,7 +202,6 @@ ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
DBLATEX_COMMON =
XMLTO_EXTRA += --skip-validation
-XMLTO_EXTRA += -x manpage.xsl
endif
SHELL_PATH ?= $(SHELL)
diff --git a/Documentation/manpage.xsl b/Documentation/manpage.xsl
deleted file mode 100644
index ef64bab17a..0000000000
--- a/Documentation/manpage.xsl
+++ /dev/null
@@ -1,3 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl" />
-</xsl:stylesheet>
diff --git a/t/t0600-doc-tools.sh b/t/t0600-doc-tools.sh
index db77db72e5..a80cd32cd6 100755
--- a/t/t0600-doc-tools.sh
+++ b/t/t0600-doc-tools.sh
@@ -70,7 +70,7 @@ build_asciidoctor() {
asciidoctor -acompat-mode -atabsize=8 -I "$doc_dir" -rasciidoctor-extensions -alitdd='--' \
-amanmanual='Git Manual' -amansource='Git 1.0.0' -arevdate='2005-01-01' -b docbook5 -d manpage \
-o "$1.xml" "$1.txt" &&
- xmltoman "$1" -x "$doc_dir"/manpage.xsl
+ xmltoman "$1"
}
check_manpage() {
@@ -83,7 +83,7 @@ test_expect_success ASCIIDOC 'legacy asciidoc.py' '
check_manpage "git-foo"
'
-test_expect_failure ASCIIDOCTOR 'modern asciidoctor (docbook5)' '
+test_expect_success ASCIIDOCTOR 'modern asciidoctor (docbook5)' '
build_asciidoctor "git-foo" &&
check_manpage "git-foo"
'
--
2.40.0+fc1
next prev parent reply other threads:[~2023-04-13 11:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 11:57 [RFC PATCH 00/12] doc: add tests and reimplement xmlto Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 01/12] doc: add test for doc tools output Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 02/12] doc: add missing manpage docinfo Felipe Contreras
2023-04-13 11:57 ` Felipe Contreras [this message]
2023-04-13 11:57 ` [RFC PATCH 04/12] test: doc: add test for docbook5 Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 05/12] doc: fix support for multiple docbook backends Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 06/12] doc: add gen-stylesheet helper Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 07/12] doc: get rid of xmlto dependency Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 08/12] test: doc: use temporary stylesheet Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 09/12] doc: remove references to xmlto Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 10/12] doc: stylesheet: move all the xslt templates Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 11/12] test: doc: add check for callouts Felipe Contreras
2023-04-13 11:57 ` [RFC PATCH 12/12] doc: manpage: remove callout hack Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230413115745.116063-4-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=chris_johnsen@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).