From patchwork Fri Mar 31 15:32:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 48854 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8517B172C5; Fri, 31 Mar 2023 16:33:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3994817280 for ; Fri, 31 Mar 2023 16:33:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piGkX-00034k-F1; Fri, 31 Mar 2023 11:33:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1piGkV-00031z-2K for guix-patches@gnu.org; Fri, 31 Mar 2023 11:33:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piGkQ-0000ts-KU for guix-patches@gnu.org; Fri, 31 Mar 2023 11:33:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piGkQ-0007Sc-CP for guix-patches@gnu.org; Fri, 31 Mar 2023 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62570] [PATCH 3/6] gnu: texlive-latex-bigfoot: Replace with texlive-bigfoot. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62570@debbugs.gnu.org Received: via spool by 62570-submit@debbugs.gnu.org id=B62570.168027677628626 (code B ref 62570); Fri, 31 Mar 2023 15:33:02 +0000 Received: (at 62570) by debbugs.gnu.org; 31 Mar 2023 15:32:56 +0000 Received: from localhost ([127.0.0.1]:34278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piGkK-0007Rc-0t for submit@debbugs.gnu.org; Fri, 31 Mar 2023 11:32:56 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:44583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piGk6-0007QK-MS for 62570@debbugs.gnu.org; Fri, 31 Mar 2023 11:32:46 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id ABF45E0014 for <62570@debbugs.gnu.org>; Fri, 31 Mar 2023 15:32:36 +0000 (UTC) From: Nicolas Goaziou Date: Fri, 31 Mar 2023 17:32:23 +0200 Message-Id: <20230331153226.607420-3-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331153226.607420-1-mail@nicolasgoaziou.fr> References: <20230331153226.607420-1-mail@nicolasgoaziou.fr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tex.scm (texlive-bigfoot): New variable. (texlive-latex-bigfoot): Deprecate package. (texlive-pstool): Use new variable. --- gnu/packages/tex.scm | 82 ++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0f87dc4a77..d78b1672f1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4865,40 +4865,54 @@ (define-public texlive-latex-amsrefs conjunction with BibTeX or as a replacement for BibTeX.") (license license:lppl1.3+))) -(define-public texlive-latex-bigfoot - (package - (name "texlive-latex-bigfoot") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "bigfoot")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "092g8alnsdwlgl1isdnqrr32l161994295kadr1n05d81xgj5wnv")))) - (build-system texlive-build-system) - (arguments - '(#:tex-directory "latex/bigfoot" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-generated-file - (lambda _ - (for-each delete-file (find-files "." "\\.drv$")) - #t))))) - (home-page "https://www.ctan.org/pkg/bigfoot") - (synopsis "Footnotes for critical editions") - (description - "This package aims to provide a one-stop solution to requirements for -footnotes. It offers: Multiple footnote apparatus superior to that of +(define-public texlive-bigfoot + (let ((template (simple-texlive-package + "texlive-bigfoot" + (list "doc/latex/bigfoot/" + "source/latex/bigfoot/" + "tex/latex/bigfoot/") + (base32 + "140b4bbjcgajd1flznmi3ga6lx5pna2nxybr2dqm9515lny8gwf0")))) + (package + (inherit template) + (outputs '("out" "doc")) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) "latex/bigfoot") + ((#:build-targets _ '()) '(list "bigfoot.ins")) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/latex/bigfoot/"))) + (add-after 'chdir 'delete-drv-files + (lambda _ + (for-each delete-file (find-files "." "\\.drv$")))) + (replace 'copy-files + (lambda* (#:key inputs #:allow-other-keys) + (let ((origin (assoc-ref inputs "source")) + (source (string-append #$output + "/share/texmf-dist/source")) + (doc (string-append #$output:doc + "/share/texmf-dist/doc"))) + (copy-recursively (string-append origin "/source") source) + (copy-recursively (string-append origin "/doc") doc)))))))) + (propagated-inputs + (list texlive-etex texlive-ncctools)) + (home-page "https://ctan.org/pkg/bigfoot") + (synopsis "Footnotes for critical editions") + (description + "The package aims to provide a one-stop solution to requirements for +footnotes. It offers multiple footnote apparatus superior to that of @code{manyfoot}. Footnotes can be formatted in separate paragraphs, or be run -into a single paragraph (this choice may be selected per footnote series); -Things you might have expected (such as @code{\\verb}-like material in -footnotes, and color selections over page breaks) now work. Note that the -majority of the bigfoot package's interface is identical to that of -@code{manyfoot}; users should seek information from that package's -documentation. The bigfoot bundle also provides the @code{perpage} and -@code{suffix} packages.") - (license license:gpl2+))) +into a single paragraph. Note that the majority of the @code{bigfoot} +package's interface is identical to that of @code{manyfoot}; users should seek +information from that package's documentation. + +The @code{bigfoot} bundle also provides the @code{perpage} and @code{suffix} +packages.") + (license license:gpl2+)))) + +(define-deprecated-package texlive-latex-bigfoot texlive-bigfoot) (define-public texlive-latex-blindtext (package @@ -5342,7 +5356,7 @@ (define-public texlive-pstool "12clzcw2cl7g2chr2phgmmiwxw4859cln1gbx1wgp8bl9iw590nc") #:trivial? #t)) (propagated-inputs - (list texlive-latex-bigfoot ; for suffix + (list texlive-bigfoot ; for suffix texlive-filemod texlive-latex-graphics texlive-latex-ifplatform