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 09/12] doc: asciidoctor: refactor macro registration
Date: Tue, 25 May 2021 05:47:59 -0500	[thread overview]
Message-ID: <20210525104802.158336-10-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210525104802.158336-1-felipe.contreras@gmail.com>

There is no need to execute extra code every time the process block is
called.

In Ruby the lexical scope is shared, so we can define variables in the
register block scope, and all the rest will inherit those variables.

Based on the doctype and basebackend one of three blocks is selected for
the inline_macro. However, the conditionals will be run only once.

In the end Ruby will only run the code between `process do end`, nothing
else.

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

diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb
index c77b6de350..a678704e17 100644
--- a/Documentation/asciidoctor-extensions.rb
+++ b/Documentation/asciidoctor-extensions.rb
@@ -2,15 +2,21 @@ require 'asciidoctor/extensions'
 
 Asciidoctor::Extensions.register do
 
+  doc = document
+
   inline_macro :linkgit do
-    process do |parent, target, attrs|
-      if parent.document.doctype == 'book'
+    if doc.doctype == 'book'
+      process do |parent, target, attrs|
         "<ulink url=\"#{target}.html\">" \
         "#{target}(#{attrs[1]})</ulink>"
-      elsif parent.document.basebackend? 'html'
-        prefix = parent.document.attr('git-relative-html-prefix')
+      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>)
-      elsif parent.document.basebackend? 'docbook'
+      end
+    elsif doc.basebackend? 'docbook'
+      process do |parent, target, attrs|
         "<citerefentry>\n" \
           "<refentrytitle>#{target}</refentrytitle>" \
           "<manvolnum>#{attrs[1]}</manvolnum>\n" \
-- 
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 ` Felipe Contreras [this message]
2021-05-25 10:48 ` [PATCH v3 10/12] doc: asciidoctor: improve string handling Felipe Contreras
2021-05-25 10:48 ` [PATCH v3 11/12] doc: asciidoctor: split the format from the code Felipe Contreras
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-10-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 09/12] doc: asciidoctor: refactor macro registration' \
    /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).