From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?B?VG9tw6HFoSDEjGVjaA==?= Subject: Re: [PATCH] gnu: asciidoc: Use local docbook-xsl package. Date: Sun, 14 Aug 2016 19:17:49 +0200 Message-ID: <20160814171749.5qumfswbr54c63vr@venom> References: <20160803210752.16650-1-sleep_walker@gnu.org> <20160810184846.GD12220@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wawflgbzpo4nfyd4" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYz2t-0001pV-R9 for guix-devel@gnu.org; Sun, 14 Aug 2016 13:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bYz2p-0004r7-Iu for guix-devel@gnu.org; Sun, 14 Aug 2016 13:17:58 -0400 Received: from mx2.suse.de ([195.135.220.15]:55502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bYz2p-0004qr-8C for guix-devel@gnu.org; Sun, 14 Aug 2016 13:17:55 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id EBA95AAF2 for ; Sun, 14 Aug 2016 17:17:52 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20160810184846.GD12220@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --wawflgbzpo4nfyd4 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Aug 10, 2016 at 02:48:46PM -0400, Leo Famulari wrote: >On Wed, Aug 03, 2016 at 11:07:52PM +0200, Tom=C3=A1=C5=A1 =C4=8Cech 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=3D\"http://docbook.sourceforge.net/re= lease/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=3D\"http://docbook.sourceforge.= net/release/xsl/current") (string-append "xsl:import href=3D\"" (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=3D\"" >> + (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 --wawflgbzpo4nfyd4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXsKe2AAoJEEoj40+gM0NtJM4P+weoZdF7vrrfF+A5htjWfEIB XINcJ0YYKHYKQ4s5CbRjNC/pBbZgM58R3EvoUXfMMgObtO+4Alzm7rjXkIx69aAr xUlrMD+YKqBrzr5i4mZuYRG69fEkzX1aoNgmX7yXf3SAYrI9+0QoTqK3N/sUKBHu 6PMg5YEwo2Crtcy4ucOXuLypqLH5C3ZF3eSZkZWTVwBrMNkldYzRUPNlQPCYW+HI s+qSIc9nPGUVaLlfxx0dQvFTkn/7PtpbJuJB1V6mRXIUScziDgADh78FrpIjgfJW gOuufAK1GZuTeCUJBNMElROoRfCXwocN1CQCGqLGIw/62dTot4VOyZf2cN+J6x9p N7JCizRDeKW6gK4/KMipAajHuuhPa1DvLLSBhhIA3KcHs66hLcolV+RzTtrpaHSV uusVyfWNE2vKamL7vDsvEVfKhPXvPtMgidNDk5ePRp1uSpU8Gp9LStRqx6QBo8Nb Y2tKuKdBeqxzzXhMHzkgiHVvm7Htr42H+M9h0KvpsqKJdJctNyYMSWBuFHIZ8/RE QpJCnv0R9+nj3vubqS/w2CkLmfd63wVKCx8/7P7LtMnX2vc1Os0adnOuvGKiLmqz IfOAISUxV+oAOLaHSl5AjNHTyUp21zO+Cf+WJxZWoFESv8foO5HcjmOXb1ysIBnr vmjDgJKf0LlLbzxkYgfZ =7suG -----END PGP SIGNATURE----- --wawflgbzpo4nfyd4--