unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: 62570@debbugs.gnu.org
Subject: [bug#62570] [PATCH 3/6] gnu: texlive-latex-bigfoot: Replace with texlive-bigfoot.
Date: Fri, 31 Mar 2023 17:32:23 +0200	[thread overview]
Message-ID: <20230331153226.607420-3-mail@nicolasgoaziou.fr> (raw)
In-Reply-To: <20230331153226.607420-1-mail@nicolasgoaziou.fr>

* 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
-- 
2.39.2





  parent reply	other threads:[~2023-03-31 15:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-31 15:30 [bug#62570] [PATCH 0/6] Fix name and dependencies of a few Texlive packages Nicolas Goaziou
2023-03-31 15:32 ` [bug#62570] [PATCH 1/6] gnu: Add texlive-ncctools Nicolas Goaziou
2023-03-31 15:32   ` [bug#62570] [PATCH 2/6] gnu: Add texlive-relsize Nicolas Goaziou
2023-03-31 15:32   ` Nicolas Goaziou [this message]
2023-04-07 16:48     ` [bug#62570] [PATCH 3/6] gnu: texlive-latex-bigfoot: Replace with texlive-bigfoot Simon Tournier
2023-04-07 18:01       ` Nicolas Goaziou
2023-04-08  9:35         ` Simon Tournier
2023-04-08 13:07           ` Nicolas Goaziou
2023-04-18 13:30             ` bug#62570: " Nicolas Goaziou
2023-03-31 15:32   ` [bug#62570] [PATCH 4/6] gnu: texlive-latex-acronym: Replace with texlive-acronym Nicolas Goaziou
2023-03-31 15:32   ` [bug#62570] [PATCH 5/6] gnu: texlive-latex-totcount: Replace with texlive-totcount Nicolas Goaziou
2023-03-31 15:32   ` [bug#62570] [PATCH 6/6] gnu: texlive-latex-lastpage: Replace with texlive-lastpage Nicolas Goaziou

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: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230331153226.607420-3-mail@nicolasgoaziou.fr \
    --to=mail@nicolasgoaziou.fr \
    --cc=62570@debbugs.gnu.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.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).