Re: [PATCH] gnu: asciidoc: Use local docbook-xsl package.

[Tomáš Čech]

On Wed, Aug 10, 2016 at 02:48:46PM -0400, Leo Famulari wrote:

On Wed, Aug 03, 2016 at 11:07:52PM +0200, Tomáš Čech wrote:

* gnu/packages/documentation.scm(asciidoc): New input docbook-xsl,
  replace use of online source and prefer docbook-xsl package.

Not having any practical experience with docbook-xsl, I think this
change looks fine, in general.

I think the commit message should be like this:

* gnu/packages/documentation.scm (asciidoc)[inputs]: Add docbook-xsl.
[arguments]: Add 'make-local-docbook-xsl' phase.

That is closer to the GNU Changelog format that we prefer to use.

I see your point and thanks for the pointer, I'll try to read more
about that.

+         (add-before
+             'install 'make-local-docbook-xsl

I think these two lines can collapsed into a single line.

+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (find-files "docbook-xsl" ".*\\.xsl$")
+               (("xsl:import 
href=\"http://docbook.sourceforge.net/release/xsl/current";)

I'd agree but my emacs autoindentation then does crazy things:

        (add-before 'install 'make-local-docbook-xsl
                    (lambda* (#:key inputs #:allow-other-keys)
                      (substitute* (find-files "docbook-xsl" ".*\\.xsl$")
                        (("xsl:import 
href=\"http://docbook.sourceforge.net/release/xsl/current";)
                         (string-append
                          "xsl:import href=\""
                          (string-append (assoc-ref inputs "docbook-xsl")
                                         "/xml/xsl/docbook-xsl-"
                                         ,(package-version docbook-xsl))))))))))

So, can I adjust indentation settings or is it expected?

+                (string-append
+                 "xsl:import href=\""
+                 (string-append (assoc-ref inputs "docbook-xsl")
+                                "/xml/xsl/docbook-xsl-"
+                                ,(package-version docbook-xsl))))))))))

My limited sense of Scheme style tells me to shift the previous 4 lines
to the right by 1 character.

Are you sure about that? It's 2nd and 3rd parameter to `string-append'...

The function should return #t, since (substitute*) has no defined return
value.

I see. Fixed.

Thanks for review!

S_W

signature.asc
Description: Digital signature