git@vger.kernel.org list mirror (unofficial, 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 v3 11/12] doc: asciidoctor: split the format from the code
Date: Tue, 25 May 2021 05:48:01 -0500	[thread overview]
Message-ID: <20210525104802.158336-12-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210525104802.158336-1-felipe.contreras@gmail.com>

This way we don't have to specify the block to execute on every
conditional.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 Documentation/asciidoctor-extensions.rb | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb
index 3282d59a48..51981af13c 100644
--- a/Documentation/asciidoctor-extensions.rb
+++ b/Documentation/asciidoctor-extensions.rb
@@ -6,22 +6,22 @@ Asciidoctor::Extensions.register do
 
   inline_macro :linkgit do
     if doc.doctype == 'book'
-      process do |parent, target, attrs|
-        '<ulink url="%1$s.html">%1$s(%2$s)</ulink>' % [target, attrs[1]]
-      end
+      format = '<ulink url="%1$s.html">%1$s(%2$s)</ulink>'
     elsif doc.basebackend? 'html'
       prefix = doc.attr('git-relative-html-prefix')
-      process do |parent, target, attrs|
-        %(<a href="#{prefix}%1$s.html">%1$s(%2$s)</a>) % [target, attrs[1]]
-      end
+      format = %(<a href="#{prefix}%1$s.html">%1$s(%2$s)</a>)
     elsif doc.basebackend? 'docbook'
-      process do |parent, target, attrs|
-        <<~EOF.chomp % [target, attrs[1]]
-        <citerefentry>
-        <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
-        </citerefentry>
-        EOF
-      end
+      format = <<~EOF.chomp
+      <citerefentry>
+      <refentrytitle>%s</refentrytitle><manvolnum>%s</manvolnum>
+      </citerefentry>
+      EOF
+    else
+      return
+    end
+
+    process do |_, target, attrs|
+      format % [target, attrs[1]]
     end
   end
 
-- 
2.32.0.rc0


  parent reply	other threads:[~2021-05-25 10:48 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-25 10:47 [PATCH v3 00/12] doc: cleanup old cruft and asciidoctor revamp Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 01/12] doc: remove GNU troff workaround Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 02/12] doc: use --stringparam in xmlto Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 03/12] doc: simplify version passing Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 04/12] doc: asciidoc: remove unnecessary attribute Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 05/12] doc: asciidoctor: remove unnecessary require Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 06/12] doc: asciidoctor: remove cruft Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 07/12] doc: asciidoctor: reorganize extensions Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 08/12] doc: asciidoctor: use html-prefix only for html Felipe Contreras
2021-05-25 10:47 ` [PATCH v3 09/12] doc: asciidoctor: refactor macro registration Felipe Contreras
2021-05-25 10:48 ` [PATCH v3 10/12] doc: asciidoctor: improve string handling Felipe Contreras
2021-05-25 10:48 ` Felipe Contreras [this message]
2021-05-25 10:48 ` [PATCH v3 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=20210525104802.158336-12-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 \
    --subject='Re: [PATCH v3 11/12] doc: asciidoctor: split the format from the code' \
    /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

Code repositories for project(s) associated with this 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).