git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Martin Ågren" <martin.agren@gmail.com>,
	"brian m . carlson" <sandals@crustytoothpaste.net>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp
Date: Fri, 21 May 2021 17:36:49 -0500	[thread overview]
Message-ID: <20210521223701.526547-1-felipe.contreras@gmail.com> (raw)

This patch series gets rid of old unnecessary workarounds and convoluted solutions.

Additionally it cleanups the asciidoctor-specific code so it ends up much more simpler.

This goes on top of my other cleanup patches [1].

Since v2 there's only one small fix that introduced an extra space after linkgit.

[2] https://lore.kernel.org/git/20210521222941.525901-1-felipe.contreras@gmail.com/

Felipe Contreras (12):
  doc: remove GNU troff workaround
  doc: use --stringparam in xmlto
  doc: simplify version passing
  doc: asciidoc: remove unnecessary attribute
  doc: asciidoctor: remove unnecessary require
  doc: asciidoctor: remove cruft
  doc: asciidoctor: reorganize extensions
  doc: asciidoctor: use html-prefix only for html
  doc: asciidoctor: refactor macro registration
  doc: asciidoctor: improve string handling
  doc: asciidoctor: split the format from the code
  doc: asciidoctor: specify name of our group

 Documentation/.gitignore                |  1 -
 Documentation/Makefile                  | 19 ++-------
 Documentation/asciidoc.conf             | 20 ---------
 Documentation/asciidoctor-extensions.rb | 56 ++++++++-----------------
 Documentation/manpage-base-url.xsl.in   | 10 -----
 Documentation/manpage-quote-apos.xsl    | 16 -------
 Makefile                                |  4 --
 7 files changed, 21 insertions(+), 105 deletions(-)
 delete mode 100644 Documentation/manpage-base-url.xsl.in
 delete mode 100644 Documentation/manpage-quote-apos.xsl

Range-diff against v1:
 1:  371b0ababd =  1:  f9fe40224d doc: remove GNU troff workaround
 2:  0d55f9dd09 =  2:  eed7d77e1e doc: use --stringparam in xmlto
 3:  2c2af6bade =  3:  d8bebb37e4 doc: simplify version passing
 4:  eef11180d2 =  4:  2df412bce6 doc: asciidoc: remove unnecessary attribute
 5:  573b0995b2 =  5:  3abdeada0c doc: asciidoctor: remove unnecessary require
 6:  35fceb27ea =  6:  685cd824ea doc: asciidoctor: remove cruft
 7:  2b4f696ad6 =  7:  7f1fb74a04 doc: asciidoctor: reorganize extensions
 8:  1860058908 =  8:  bede3d2294 doc: asciidoctor: use html-prefix only for html
 9:  5fc0a42cec =  9:  2ecd19e4e3 doc: asciidoctor: refactor macro registration
10:  c09718f046 ! 10:  6c5e9142c8 doc: asciidoctor: improve string handling
    @@ Documentation/asciidoctor-extensions.rb: Asciidoctor::Extensions.register do
     -          "<refentrytitle>#{target}</refentrytitle>" \
     -          "<manvolnum>#{attrs[1]}</manvolnum>\n" \
     -        "</citerefentry>"
    -+        <<~EOF % [target, attrs[1]]
    ++        <<~EOF.chomp % [target, attrs[1]]
     +        <citerefentry>
     +        <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
     +        </citerefentry>
11:  f4c5c7d593 ! 11:  820bc01e49 doc: asciidoctor: split the format from the code
    @@ Documentation/asciidoctor-extensions.rb: Asciidoctor::Extensions.register do
     +      format = %(<a href="#{prefix}%1$s.html">%1$s(%2$s)</a>)
          elsif doc.basebackend? 'docbook'
     -      process do |parent, target, attrs|
    --        <<~EOF % [target, attrs[1]]
    +-        <<~EOF.chomp % [target, attrs[1]]
     -        <citerefentry>
     -        <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
     -        </citerefentry>
     -        EOF
     -      end
    -+      format = <<~EOF
    ++      format = <<~EOF.chomp
     +      <citerefentry>
     +      <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
     +      </citerefentry>
12:  96e981b97f = 12:  69de00c9ee doc: asciidoctor: specify name of our group
-- 
2.32.0.rc0


             reply	other threads:[~2021-05-21 22:37 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-21 22:36 Felipe Contreras [this message]
2021-05-21 22:36 ` [PATCH v2 01/12] doc: remove GNU troff workaround Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 02/12] doc: use --stringparam in xmlto Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 03/12] doc: simplify version passing Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 04/12] doc: asciidoc: remove unnecessary attribute Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 05/12] doc: asciidoctor: remove unnecessary require Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 06/12] doc: asciidoctor: remove cruft Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 07/12] doc: asciidoctor: reorganize extensions Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 08/12] doc: asciidoctor: use html-prefix only for html Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 09/12] doc: asciidoctor: refactor macro registration Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 10/12] doc: asciidoctor: improve string handling Felipe Contreras
2021-05-21 22:37 ` [PATCH v2 11/12] doc: asciidoctor: split the format from the code Felipe Contreras
2021-05-21 22:37 ` [PATCH v2 12/12] doc: asciidoctor: specify name of our group Felipe Contreras
2021-05-24 18:01 ` [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp Junio C Hamano
2021-05-24 19:23   ` Felipe Contreras
2021-05-25  6:59     ` Junio C Hamano
2021-05-25  7:14       ` Junio C Hamano
2021-05-25 10:44       ` 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

  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=20210521223701.526547-1-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=martin.agren@gmail.com \
    --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.
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).