git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 10/12] doc: asciidoctor: improve string handling

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 21, 2021, 22:36 UTC
Message-ID
<20210521223701.526547-11-felipe.contreras@gmail.com>
In-Reply-To
<20210521223701.526547-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..3282d59a48 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.chomp % [target, attrs[1]]
+        <citerefentry>
+        <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
+        </citerefentry>
+        EOF
       end
     end
   end
-- 
2.32.0.rc0
Previous: Felipe ContrerasNext: Felipe Contreras
Message 11 of 18 in “doc: cleanup old cruft and asciidoctor revamp”
  1. 00/12 doc: cleanup old cruft and asciidoctor revampFelipe Contreras, May 21, 2021
  2. 01/12 doc: remove GNU troff workaroundFelipe Contreras, May 21, 2021
  3. 02/12 doc: use --stringparam in xmltoFelipe Contreras, May 21, 2021
  4. 03/12 doc: simplify version passingFelipe Contreras, May 21, 2021
  5. 04/12 doc: asciidoc: remove unnecessary attributeFelipe Contreras, May 21, 2021
  6. 05/12 doc: asciidoctor: remove unnecessary requireFelipe Contreras, May 21, 2021
  7. 06/12 doc: asciidoctor: remove cruftFelipe Contreras, May 21, 2021
  8. 07/12 doc: asciidoctor: reorganize extensionsFelipe Contreras, May 21, 2021
  9. 08/12 doc: asciidoctor: use html-prefix only for htmlFelipe Contreras, May 21, 2021
  10. 09/12 doc: asciidoctor: refactor macro registrationFelipe Contreras, May 21, 2021
  11. 10/12 doc: asciidoctor: improve string handlingFelipe Contreras, May 21, 2021
  12. 11/12 doc: asciidoctor: split the format from the codeFelipe Contreras, May 21, 2021
  13. 12/12 doc: asciidoctor: specify name of our groupFelipe Contreras, May 21, 2021
  14. Junio C HamanoMay 24, 2021
  15. Felipe ContrerasMay 24, 2021
  16. Junio C HamanoMay 25, 2021
  17. Junio C HamanoMay 25, 2021
  18. Felipe ContrerasMay 25, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.