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