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 10/12] doc: asciidoctor: improve string handling
Date: Sat, 15 May 2021 06:56:51 -0500 [thread overview]
Message-ID: <20210515115653.922902-11-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210515115653.922902-1-felipe.contreras@gmail.com>
Using printf style formatting (more familiar to git developers), and
also here document.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/asciidoctor-extensions.rb | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb
index a678704e17..eb2326d05a 100644
--- a/Documentation/asciidoctor-extensions.rb
+++ b/Documentation/asciidoctor-extensions.rb
@@ -7,20 +7,20 @@ Asciidoctor::Extensions.register do
inline_macro :linkgit do
if doc.doctype == 'book'
process do |parent, target, attrs|
- "<ulink url=\"#{target}.html\">" \
- "#{target}(#{attrs[1]})</ulink>"
+ '<ulink url="%1$s.html">%1$s(%2$s)</ulink>' % [target, attrs[1]]
end
elsif doc.basebackend? 'html'
prefix = doc.attr('git-relative-html-prefix')
process do |parent, target, attrs|
- %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>)
+ %(<a href="#{prefix}%1$s.html">%1$s(%2$s)</a>) % [target, attrs[1]]
end
elsif doc.basebackend? 'docbook'
process do |parent, target, attrs|
- "<citerefentry>\n" \
- "<refentrytitle>#{target}</refentrytitle>" \
- "<manvolnum>#{attrs[1]}</manvolnum>\n" \
- "</citerefentry>"
+ <<~EOF % [target, attrs[1]]
+ <citerefentry>
+ <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
+ </citerefentry>
+ EOF
end
end
end
--
2.31.1
next prev parent reply other threads:[~2021-05-15 11:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 11:56 [PATCH 00/12] doc: cleanup old cruft and asciidoctor revamp Felipe Contreras
2021-05-15 11:56 ` [PATCH 01/12] doc: remove GNU troff workaround Felipe Contreras
2021-05-15 11:56 ` [PATCH 02/12] doc: use --stringparam in xmlto Felipe Contreras
2021-05-15 11:56 ` [PATCH 03/12] doc: simplify version passing Felipe Contreras
2021-05-15 11:56 ` [PATCH 04/12] doc: asciidoc: remove unnecessary attribute Felipe Contreras
2021-05-15 11:56 ` [PATCH 05/12] doc: asciidoctor: remove unnecessary require Felipe Contreras
2021-05-15 11:56 ` [PATCH 06/12] doc: asciidoctor: remove cruft Felipe Contreras
2021-05-15 11:56 ` [PATCH 07/12] doc: asciidoctor: reorganize extensions Felipe Contreras
2021-05-15 11:56 ` [PATCH 08/12] doc: asciidoctor: use html-prefix only for html Felipe Contreras
2021-05-15 11:56 ` [PATCH 09/12] doc: asciidoctor: refactor macro registration Felipe Contreras
2021-05-15 11:56 ` Felipe Contreras [this message]
2021-05-15 11:56 ` [PATCH 11/12] doc: asciidoctor: split the format from the code Felipe Contreras
2021-05-15 11:56 ` [PATCH 12/12] doc: asciidoctor: specify name of our group 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=20210515115653.922902-11-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).