From: "Martin Ågren" <martin.agren@gmail.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH] asciidoctor-extensions: provide `<refmiscinfo/>`
Date: Sun, 17 Mar 2019 21:03:30 +0100 [thread overview]
Message-ID: <CAN0heSr3Q48Dfskc7A55Z6MUEk0A3MPQAn3b25+=J1Ezrwk9Hg@mail.gmail.com> (raw)
In-Reply-To: <20190317194431.GY31362@pobox.com>
Hi Todd,
On Sun, 17 Mar 2019 at 20:44, Todd Zullinger <tmz@pobox.com> wrote:
>
> Hi Martin,
>
> Martin Ågren wrote:
> > That is, we miss out on the `<refmiscinfo/>` tags. As a result, the
> > header of each man page doesn't say "Git Manual", but "git-foo(1)"
> > instead. Worse, the footers don't give the Git version number and
> > instead provide the fairly ugly "[FIXME: source]".
> >
> > That Asciidoctor ignores asciidoc.conf is nothing new. This is why we
> > implement the `linkgit:` macro in asciidoc.conf *and* in
> > asciidoctor-extensions.rb. Follow suit and provide these tags in
> > asciidoctor-extensions.rb, using a "postprocessor" extension.
>
> > We may consider a few alternatives:
> >
> > * Provide the `mansource` attribute to Asciidoctor. This attribute
> > looks promising until one realizes that it can only be given inside
> > the source file (the .txt file in our case), *not* on the command
> > line using `-a mansource=foobar`. I toyed with the idea of injecting
> > this attribute while feeding Asciidoctor the input on stdin, but it
> > didn't feel like it was worth the complexity in the Makefile.
>
> I played with this direction before. Using Asciidoctor we
> can convert directly from .txt to man without docbook
> and xmlto. That does have some other issues which need to
> be worked out though. Here's what I had as a start:
>
> -- 8< --
> Subject: [PATCH] WIP: doc: improve asciidoctor manpage generation
>
> Avoid 'FIXME: Source' by setting mansource. Skip xmlto step and render
> manpages directly with asciidoctor.
>
> TODO:
> - apply to all man pages
> - fix links to html docs, like user-manual.html in git.1 (currently
> it is listed in brackets inline rather than as a footnote)
>
> Reference:
> https://lore.kernel.org/lkml/20180424150456.17353-1-tiwai@suse.de/
> Signed-off-by: Todd Zullinger <tmz@pobox.com>
> ---
> Documentation/Makefile | 8 ++++++++
> Documentation/asciidoctor-extensions.rb | 2 ++
> 2 files changed, 10 insertions(+)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index a9697f5146..494f8c9464 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -197,6 +197,7 @@ ASCIIDOC_DOCBOOK = docbook45
> ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
> ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
> ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
> +ASCIIDOC_EXTRA += -a mansource="Git $(GIT_VERSION)" -a manmanual="Git Manual"
> DBLATEX_COMMON =
> endif
>
> @@ -354,9 +355,16 @@ $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
> manpage-base-url.xsl: manpage-base-url.xsl.in
> $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
>
> +ifndef USE_ASCIIDOCTOR
> %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
> $(QUIET_XMLTO)$(RM) $@ && \
> $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
> +else
> +%.1 %.5 %.7 : %.txt
> + $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
> + $(ASCIIDOC_COMMON) -b manpage -d manpage -o $@+ $< && \
> + mv $@+ $@
> +endif
>
> %.xml : %.txt asciidoc.conf asciidoctor-extensions.rb
> $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
> diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb
> index f7a5982f8b..ebb078807a 100644
> --- a/Documentation/asciidoctor-extensions.rb
> +++ b/Documentation/asciidoctor-extensions.rb
> @@ -12,6 +12,8 @@ module Git
> if parent.document.basebackend? 'html'
> prefix = parent.document.attr('git-relative-html-prefix')
> %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>\n)
> + elsif parent.document.basebackend? 'manpage'
> + "#{target}(#{attrs[1]})"
> elsif parent.document.basebackend? 'docbook'
> "<citerefentry>\n" \
> "<refentrytitle>#{target}</refentrytitle>" \
> -- 8< --
>
> That was based on ma/asciidoctor-extensions, but it may be
> missing other recent improvements you've made to the make
> targets. It's been a month or so since I worked on it.
>
> I munged up doc-diff to set MANDWIDTH=1000 and set one
> branch to default to asciidoctor to compare. (Your other
> recent series looks like it'll make doing asciidoc and
> asciidoctor comparisons easier.)
>
> There were a number of differences that I didn't work
> through though. Most importantly was the change in the
> links noted in the commit message.
Your approach looks like the correct one long term, at least.
I'll try to play with this to see if I can figure out the differences.
That will have to wait until tomorrow though.
Thanks for sharing your progress.
Martin
next prev parent reply other threads:[~2019-03-17 20:03 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-17 14:47 [PATCH] asciidoctor-extensions: provide `<refmiscinfo/>` Martin Ågren
2019-03-17 19:44 ` Todd Zullinger
2019-03-17 20:03 ` Martin Ågren [this message]
2019-03-19 7:02 ` Martin Ågren
2019-03-20 18:17 ` Todd Zullinger
2019-03-22 21:01 ` Martin Ågren
2019-03-23 19:27 ` Todd Zullinger
2019-03-24 12:16 ` Jeff King
2019-03-24 16:21 ` Todd Zullinger
2019-03-25 15:06 ` Jeff King
2019-03-25 19:00 ` Todd Zullinger
2019-03-27 1:06 ` Todd Zullinger
2019-03-27 10:05 ` SZEDER Gábor
2019-03-28 0:06 ` brian m. carlson
2019-03-30 18:00 ` Todd Zullinger
2019-03-30 21:04 ` brian m. carlson
2019-04-05 2:17 ` Todd Zullinger
2019-04-05 18:46 ` Jeff King
2019-03-28 2:54 ` Jeff King
2019-03-28 3:33 ` Jeff King
2019-03-19 2:46 ` Jeff King
2019-03-19 2:59 ` Jeff King
2019-03-19 3:55 ` Junio C Hamano
2019-03-19 7:33 ` Martin Ågren
2019-03-19 7:36 ` Martin Ågren
2019-09-03 18:51 ` [PATCH v2 0/2] " Martin Ågren
2019-09-03 18:51 ` [PATCH v2 1/2] " Martin Ågren
2019-09-03 18:51 ` [PATCH v2 2/2] doc-diff: replace --cut-header-footer with --cut-footer Martin Ågren
2019-09-03 23:16 ` [PATCH v2 0/2] asciidoctor-extensions: provide `<refmiscinfo/>` brian m. carlson
2019-09-05 19:28 ` Martin Ågren
2019-09-04 3:26 ` Jeff King
2019-09-05 19:35 ` Martin Ågren
2019-09-07 6:45 ` Jeff King
2019-09-07 14:06 ` Martin Ågren
2019-09-08 21:30 ` Jeff King
2019-09-06 23:29 ` brian m. carlson
2019-09-07 4:40 ` Jeff King
2019-09-07 16:53 ` brian m. carlson
2019-09-07 17:07 ` [PATCH] Documentation: fix build with Asciidoctor 2 brian m. carlson
2019-09-08 10:48 ` Jeff King
2019-09-08 17:18 ` brian m. carlson
2019-09-08 21:21 ` Jeff King
2019-09-08 22:24 ` brian m. carlson
2019-09-09 17:37 ` Junio C Hamano
2019-09-10 18:44 ` Jeff King
2019-09-11 23:19 ` brian m. carlson
2019-09-08 14:13 ` SZEDER Gábor
2019-09-08 21:32 ` Jeff King
2019-09-13 1:52 ` [PATCH v2] " brian m. carlson
2019-09-13 5:06 ` Jeff King
2019-09-13 17:06 ` Junio C Hamano
2019-09-16 10:47 ` Martin Ågren
2019-09-16 17:43 ` Junio C Hamano
2019-09-14 7:53 ` SZEDER Gábor
2019-09-14 19:44 ` brian m. carlson
2019-09-14 19:49 ` [PATCH v3] " brian m. carlson
2019-09-15 9:59 ` SZEDER Gábor
2019-09-15 21:26 ` brian m. carlson
2019-09-15 22:05 ` SZEDER Gábor
2019-09-15 22:14 ` brian m. carlson
2019-09-16 10:51 ` Martin Ågren
2019-09-15 22:43 ` [PATCH v4] " brian m. carlson
2019-09-16 19:00 ` [PATCH v3 0/3] asciidoctor-extensions: provide `<refmiscinfo/>` Martin Ågren
2019-09-16 19:00 ` [PATCH v3 1/3] Doc/Makefile: give mansource/-version/-manual attributes Martin Ågren
2019-09-16 19:00 ` [PATCH v3 2/3] asciidoctor-extensions: provide `<refmiscinfo/>` Martin Ågren
2019-09-16 19:00 ` [PATCH v3 3/3] doc-diff: replace --cut-header-footer with --cut-footer Martin Ågren
2019-03-19 3:30 ` [PATCH] asciidoctor-extensions: provide `<refmiscinfo/>` Jeff King
2019-03-19 7:12 ` Martin Ågren
2019-03-19 7:43 ` Jeff King
2019-03-20 18:32 ` Todd Zullinger
2019-03-19 7:10 ` Martin Ågren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN0heSr3Q48Dfskc7A55Z6MUEk0A3MPQAn3b25+=J1Ezrwk9Hg@mail.gmail.com' \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=tmz@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).