diff mbox series

[v2,04/11] doc-diff: support asciidoctor man pages

Message ID 20210521224452.530852-5-felipe.contreras@gmail.com (mailing list archive)
State New, archived
Headers show
Series doc: asciidoctor: direct man page creation and fixes | expand

Commit Message

Felipe Contreras May 21, 2021, 10:44 p.m. UTC 
From: Jeff King <peff@peff.net>

The new option enables both asciidoctor as well as its direct-to-manpage
mode that skips xmlto. This lets you view the rendered difference
between the two pipelines with something like:

  ./doc-diff --from-asciidoctor --to-asciidoctor-direct HEAD HEAD

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Documentation/doc-diff | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Felipe Contreras May 21, 2021, 10:52 p.m. UTC | #1 
Felipe Contreras wrote:
> From: Jeff King <peff@peff.net>
> diff --git a/Documentation/doc-diff b/Documentation/doc-diff
> index 6b6bb444ac..52cf639f4d 100755
> --- a/Documentation/doc-diff
> +++ b/Documentation/doc-diff
> @@ -17,10 +17,14 @@ f			force rebuild; do not rely on cached results
>  c,clean			cleanup temporary working files
>  from-asciidoc		use asciidoc with the 'from'-commit
>  from-asciidoctor	use asciidoctor with the 'from'-commit
> +from-asciidoctor-direct use asciidoctor without xmlto for 'from'-commit
>  asciidoc		use asciidoc with both commits
>  to-asciidoc		use asciidoc with the 'to'-commit
>  to-asciidoctor		use asciidoctor with the 'to'-commit
> +to-asciidoctor-direct   use asciidoctor without xmlto for 'to'-commit
>  asciidoctor		use asciidoctor with both commits
> +asciidoctor-direct      use asciidoctor without xml for both commits

> +cut-footer		cut away footer

Oops. This obviously sneaked by; doesn't belong here.
diff mbox series

Patch

diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 6b6bb444ac..52cf639f4d 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -17,10 +17,14 @@  f			force rebuild; do not rely on cached results
 c,clean			cleanup temporary working files
 from-asciidoc		use asciidoc with the 'from'-commit
 from-asciidoctor	use asciidoctor with the 'from'-commit
+from-asciidoctor-direct use asciidoctor without xmlto for 'from'-commit
 asciidoc		use asciidoc with both commits
 to-asciidoc		use asciidoc with the 'to'-commit
 to-asciidoctor		use asciidoctor with the 'to'-commit
+to-asciidoctor-direct   use asciidoctor without xmlto for 'to'-commit
 asciidoctor		use asciidoctor with both commits
+asciidoctor-direct      use asciidoctor without xml for both commits
+cut-footer		cut away footer
 "
 SUBDIRECTORY_OK=1
 . "$(git --exec-path)/git-sh-setup"
@@ -53,6 +57,15 @@  do
 	--asciidoc)
 		from_program=-asciidoc
 		to_program=-asciidoc ;;
+	--cut-footer)
+		cut_footer=-cut-footer ;;
+	--from-asciidoctor-direct)
+		from_program=-asciidoctor-direct ;;
+	--to-asciidoctor-direct)
+		to_program=-asciidoctor-direct ;;
+	--asciidoctor-direct)
+		from_program=-asciidoctor-direct
+		to_program=-asciidoctor-direct ;;
 	--)
 		shift; break ;;
 	*)
@@ -108,6 +121,10 @@  construct_makemanflags () {
 	elif test "$1" = "-asciidoctor"
 	then
 		echo USE_ASCIIDOCTOR=YesPlease ASCIIDOC_FLAGS='-adocdate="01/01/1970"'
+	elif test "$1" = "-asciidoctor-direct"
+	then
+		echo USE_ASCIIDOCTOR=YesPlease ASCIIDOC_FLAGS='-adocdate="01/01/1970"'
+		echo USE_ASCIIDOCTOR_MANPAGE=YesPlease
 	fi
 }