From: Junio C Hamano <gitster@pobox•com>
To: "brian m. carlson" <sandals@crustytoothpaste•net>
Cc: "Eric Wong" <e@80x24•org>, "Jeff King" <peff@peff•net>,
git@vger•kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx•de>,
"Øyvind A. Holm" <sunny@sunbase•org>
Subject: Re: [PATCH] Documentation: implement linkgit macro for Asciidoctor
Date: Tue, 31 Jan 2017 12:20:20 -0800 [thread overview]
Message-ID: <xmqqtw8fq8vv.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170127004050.23jrq5iqwfxcwmik@genre.crustytoothpaste.net> (brian m. carlson's message of "Fri, 27 Jan 2017 00:40:50 +0000")
"brian m. carlson" <sandals@crustytoothpaste•net> writes:
> On Thu, Jan 26, 2017 at 07:18:41PM +0000, Eric Wong wrote:
>> > Eric Wong <e@80x24•org> writes:
>> Junio C Hamano <gitster@pobox•com> wrote:
>> > + "<citerefentry>\n"
>> > + "<refentrytitle>#{target}</refentrytitle>"
>> > + "<manvolnum>#{attrs[1]}</manvolnum>\n"
>> > + "</citerefentry>\n"
>> > end
>>
>> You need the '\' at the end of those strings, it's not like C
>> since Ruby doesn't require semi-colons to terminate lines.
>> In other words, that should be:
>>
>> "<citerefentry>\n" \
>> "<refentrytitle>#{target}</refentrytitle>" \
>> "<manvolnum>#{attrs[1]}</manvolnum>\n" \
>> "</citerefentry>\n"
>>
>
> This change is fine with me.
OK, I just squashed the final one in. Will merge to 'next' shortly.
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 11f76506b6..b21e5808b1 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -179,7 +179,8 @@ ASCIIDOC = asciidoctor
ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
ASCIIDOC_DOCBOOK = docbook45
-ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions -alitdd='&\#x2d;&\#x2d;'
+ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
+ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
DBLATEX_COMMON =
endif
diff --git a/Documentation/asciidoctor-extensions.rb b/Documentation/asciidoctor-extensions.rb
index 09f7088eea..ec83b4959e 100644
--- a/Documentation/asciidoctor-extensions.rb
+++ b/Documentation/asciidoctor-extensions.rb
@@ -13,10 +13,10 @@ module Git
prefix = parent.document.attr('git-relative-html-prefix')
%(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>\n)
elsif parent.document.basebackend? 'docbook'
- %(<citerefentry>
-<refentrytitle>#{target}</refentrytitle><manvolnum>#{attrs[1]}</manvolnum>
-</citerefentry>
-)
+ "<citerefentry>\n" \
+ "<refentrytitle>#{target}</refentrytitle>" \
+ "<manvolnum>#{attrs[1]}</manvolnum>\n" \
+ "</citerefentry>\n"
end
end
end
next prev parent reply other threads:[~2017-01-31 20:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-22 2:41 [PATCH v2 0/7] Macros for Asciidoctor support brian m. carlson
2017-01-22 2:41 ` [PATCH v2 1/7] Documentation: fix warning in cat-texi.perl brian m. carlson
2017-01-22 2:41 ` [PATCH v2 2/7] Documentation: modernize cat-texi.perl brian m. carlson
2017-01-22 2:41 ` [PATCH v2 3/7] Documentation: remove unneeded argument in cat-texi.perl brian m. carlson
2017-01-22 2:41 ` [PATCH v2 4/7] Documentation: sort sources for gitman.texi brian m. carlson
2017-01-22 2:41 ` [PATCH v2 5/7] Documentation: add XSLT to fix DocBook for Texinfo brian m. carlson
2017-01-22 2:41 ` [PATCH v2 6/7] Documentation: move dblatex arguments into variable brian m. carlson
2017-01-22 2:41 ` [PATCH v2 7/7] Makefile: add a knob to enable the use of Asciidoctor brian m. carlson
2017-01-23 2:57 ` Øyvind A. Holm
2017-01-23 4:09 ` brian m. carlson
2017-01-25 2:26 ` Øyvind A. Holm
2017-01-23 18:59 ` [PATCH v2 0/7] Macros for Asciidoctor support Junio C Hamano
2017-01-25 13:28 ` Johannes Schindelin
2017-01-25 21:35 ` Jeff King
2017-01-25 23:19 ` brian m. carlson
2017-01-25 23:30 ` Jeff King
2017-01-25 23:41 ` brian m. carlson
2017-01-26 0:13 ` [PATCH] Documentation: implement linkgit macro for Asciidoctor brian m. carlson
2017-01-26 3:46 ` Jeff King
2017-01-26 7:43 ` Eric Wong
[not found] ` <xmqq1svp7lcs.fsf@gitster.mtv.corp.google.com>
2017-01-26 19:18 ` Eric Wong
2017-01-27 0:40 ` brian m. carlson
2017-01-31 20:20 ` Junio C Hamano [this message]
2017-01-26 11:43 ` Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtw8fq8vv.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=e@80x24$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=sandals@crustytoothpaste$(echo .)net \
--cc=sunny@sunbase$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox