[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
38/416: gnu: texlive-latex-l3packages -> texlive-l3packages.
From: |
guix-commits |
Subject: |
38/416: gnu: texlive-latex-l3packages -> texlive-l3packages. |
Date: |
Sun, 28 May 2023 02:32:10 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit 38db9af386e5eef031e8aa35e2f174201c8c978d
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Fri May 12 23:58:08 2023 +0200
gnu: texlive-latex-l3packages -> texlive-l3packages.
* gnu/packages/tex.scm (texlive-l3packages): New variable.
(texlive-latex-l3packages): Deprecate variable.
(texlive-latex-base):
(texlive-fontspec):
(texlive-ddphonism):
(texlive-polyglossia):
(texlive-siunitx):
(texlive-xetex): Use new name.
---
gnu/packages/tex.scm | 116 ++++++++++++++++++++++-----------------------------
1 file changed, 50 insertions(+), 66 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4c1df7be6a..eee9d945d1 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3209,7 +3209,7 @@ formats.")
;; TODO: This dependency isn't needed for LaTeX version 2021-06-01
;; and later. See:
;; https://tug.org/pipermail/tex-live/2021-June/047180.html
- texlive-latex-l3packages
+ texlive-l3packages
texlive-latexconfig))
(home-page "https://www.ctan.org/pkg/latex-base")
(synopsis "Base sources of LaTeX")
@@ -3946,77 +3946,61 @@ an independent schedule.")
(define-deprecated-package texlive-dvips-l3backend texlive-l3backend)
(define-deprecated-package texlive-latex-l3backend texlive-l3backend)
-(define-public texlive-latex-l3packages
+(define-public texlive-l3packages
(package
- (name "texlive-latex-l3packages")
+ (name "texlive-l3packages")
(version (number->string %texlive-revision))
- (source (texlive-origin name version
- '("/source/latex/l3packages/"
- ;; These files have been generated with a
- ;; bespoke source tree and then modified by
- ;; hand. It's unfeasible to recreate them. See:
- ;;
https://tug.org/pipermail/tex-live/2021-June/047188.html
-
"/tex/latex/l3packages/xparse/xparse-2018-04-12.sty"
-
"/tex/latex/l3packages/xparse/xparse-2020-10-01.sty"
-
- ;; TODO: This file can be removed when using
- ;; LaTeX version 2021-06-01 or newer. See:
- ;;
https://tug.org/pipermail/tex-live/2021-June/047180.html
-
"/tex/latex/l3packages/xparse/xparse-generic.tex")
- (base32
"05rjxdqhhg7z1z2rmhmwj2qf09xygymayy3jzj9fdphk0pab3amm")))
+ (source (texlive-origin
+ name version
+ (list "doc/latex/l3packages/"
+ "source/latex/l3packages/l3keys2e/"
+ "source/latex/l3packages/xfp/"
+ "source/latex/l3packages/xfrac/"
+ "source/latex/l3packages/xparse/"
+ "source/latex/l3packages/xtemplate/"
+ "tex/latex/l3packages/l3keys2e/"
+ "tex/latex/l3packages/xfp/"
+ "tex/latex/l3packages/xfrac/"
+ "tex/latex/l3packages/xparse/"
+ "tex/latex/l3packages/xtemplate/")
+ (base32
+ "1k9zms255qz6i24k74g7wnyrdvshl52jgb198pmg6mj9ajhw9sks")))
+ (outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
- '(#:tex-directory "latex/l3packages"
- #:tex-engine "tex"
- #:tex-format #f
- #:texlive-latex-base #f
- ;; build-targets must be specified manually since they are in
- ;; sub-directories.
- #:build-targets '("l3keys2e.ins" "xparse.ins" "xfrac.ins" "xfp.ins"
"xtemplate.ins")
- #:phases
- (modify-phases %standard-phases
- ;; All package sources are in sub-directories, so we need to add them
- ;; to TEXINPUTS.
- (add-after 'unpack 'set-TEXINPUTS
- (lambda _
- (let ((cwd (getcwd)))
- (setenv "TEXINPUTS"
- (string-append cwd "/source/latex/l3packages/l3keys2e:"
- cwd "/source/latex/l3packages/xparse:"
- cwd "/source/latex/l3packages/xfrac:"
- cwd "/source/latex/l3packages/xfp:"
- cwd "/source/latex/l3packages/xtemplate"
- ;; The terminating ":" is required to
include the
- ;; l3kernel input as well.
- ":")))
- #t))
- (add-after 'install 'copy-generated-files
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((dest (string-append (assoc-ref outputs "out")
-
"/share/texmf-dist/tex/latex/l3packages")))
- (copy-recursively "tex/latex/l3packages/xparse" dest)))))
- ))
+ (list
+ #:build-targets
+ '(list "l3keys2e.ins"
+ "xparse.ins"
+ "xfrac.ins"
+ "xfp.ins"
+ "xtemplate.ins")
+ #:tex-engine "tex"
+ #:tex-format #f
+ #:texlive-latex-base #f))
(native-inputs
(list texlive-docstrip))
(propagated-inputs
(list texlive-l3kernel))
- (home-page "https://www.ctan.org/pkg/l3packages")
+ (home-page "https://ctan.org/pkg/l3packages")
(synopsis "High-level LaTeX3 concepts")
(description
- "This bundle holds prototype implementations of concepts for a LaTeX
-designer interface, to be used with the experimental LaTeX kernel as
-programming tools and kernel support. Packages provided in this release are:
+ "This collection contains implementations for aspects of the LaTeX3
+kernel, dealing with higher-level ideas such as the Designer Interface. The
+packages here are considered broadly stable (The LaTeX3 Project does not
+expect the interfaces to alter radically). These packages are built on
+LaTeX2e conventions at the interface level, and so may not migrate in the
+current form to a stand-alone LaTeX3 format.
+
+Packages provided are @code{xparse}, which provides a high-level interface for
+declaring document commands @code{xfp}, an expandable IEEE 754 FPU for LaTeX,
+@code{l3keys2e}, which makes the facilities of the kernel module l3keys
+available for use by LaTeX 2e packages, @code{xtemplate}, which provides
+a means of defining generic functions using a key-value syntax, and
+@code{xfrac}, which provides flexible split-level fractions.")
+ (license license:lppl1.3c)))
-@enumerate
-@item l3keys2e, which makes the facilities of the kernel module l3keys
- available for use by LaTeX 2e packages;
-@item xfrac, which provides flexible splitlevel fractions;
-@item xparse, which provides a high-level interface for declaring document
- commands; and
-@item xtemplate, which provides a means of defining generic functions using a
- key-value syntax.
-@end enumerate\n")
- (license license:lppl1.3c+)))
+(define-deprecated-package texlive-latex-l3packages texlive-l3packages)
(define-public texlive-fontspec
(let ((template (simple-texlive-package
@@ -4033,7 +4017,7 @@ programming tools and kernel support. Packages provided
in this release are:
((#:tex-directory _ #t)
"latex/fontspec")))
(propagated-inputs
- (list texlive-cm texlive-latex-l3packages texlive-lm))
+ (list texlive-cm texlive-l3packages texlive-lm))
(home-page "https://www.ctan.org/pkg/fontspec")
(synopsis "Advanced font selection in XeLaTeX and LuaLaTeX")
(description
@@ -5770,7 +5754,7 @@ in LaTeX documents; a jiffy to create slashed characters
for physicists.")
(propagated-inputs
(list texlive-etoolbox
texlive-hyperref
- texlive-latex-l3packages
+ texlive-l3packages
texlive-listings
texlive-pgf
texlive-tools
@@ -6237,7 +6221,7 @@ also provides compacted versions of enumerate and
itemize.")
texlive-stringenc
texlive-zapfding
texlive-makecmds
- texlive-latex-l3packages ;expl3, l3keys2e, xparse
+ texlive-l3packages ;expl3, l3keys2e, xparse
texlive-tools
texlive-latex-xkeyval))
(home-page "https://www.ctan.org/pkg/polyglossia")
@@ -10394,7 +10378,7 @@ The behaviour in standalone mode may adjusted using a
configuration file
'(#:tex-directory "latex/siunitx"
#:build-targets '("siunitx.dtx")))
(propagated-inputs
- (list texlive-l3kernel texlive-latex-l3packages))
+ (list texlive-l3kernel texlive-l3packages))
(home-page "http://www.ctan.org/pkg/siunitx")
(synopsis "Comprehensive SI units package")
(description
@@ -12893,7 +12877,7 @@ itself may be shipped out to the DVI file.")
texlive-fonts-latex
texlive-l3backend
texlive-l3kernel
- texlive-latex-l3packages
+ texlive-l3packages
texlive-lm
texlive-tex-ini-files
texlive-tex-plain
- 302/416: gnu: texlive-doi: Refresh package definition., (continued)
- 302/416: gnu: texlive-doi: Refresh package definition., guix-commits, 2023/05/28
- 306/416: gnu: texlive-seminar: Refresh package definition., guix-commits, 2023/05/28
- 301/416: gnu: texlive-etoolbox: Refresh package definition., guix-commits, 2023/05/28
- 299/416: gnu: texlive-ae: Refresh package definition., guix-commits, 2023/05/28
- 327/416: gnu: texlive-ruhyphen: Refresh package definition., guix-commits, 2023/05/28
- 320/416: gnu: texlive-glyphlist: Refresh package definition., guix-commits, 2023/05/28
- 291/416: gnu: texlive-stix2-otf: Refresh package definition., guix-commits, 2023/05/28
- 11/416: gnu: texlive-latex-draftwatermark -> texlive-draftwatermark., guix-commits, 2023/05/28
- 19/416: gnu: Add texlive-xfor., guix-commits, 2023/05/28
- 37/416: gnu: texlive-dvips-l3backend -> texlive-l3backend., guix-commits, 2023/05/28
- 38/416: gnu: texlive-latex-l3packages -> texlive-l3packages.,
guix-commits <=
- 46/416: gnu: texlive-latex-psfrag -> texlive-psfrag., guix-commits, 2023/05/28
- 48/416: gnu: texlive-generic-listofitems -> texlive-listofitems., guix-commits, 2023/05/28
- 52/416: gnu: texlive-latex-framed -> texlive-framed., guix-commits, 2023/05/28
- 60/416: gnu: texlive-latex-mdwtools -> texlive-mdwtools., guix-commits, 2023/05/28
- 80/416: gnu: texlive-latex-eepic -> texlive-eepic., guix-commits, 2023/05/28
- 77/416: gnu: texlive-latex-float -> texlive-float., guix-commits, 2023/05/28
- 73/416: gnu: texlive-latex-changebar -> texlive-changebar., guix-commits, 2023/05/28
- 76/416: gnu: texlive-latex-fancybox -> texlive-fancybox., guix-commits, 2023/05/28
- 72/416: gnu: texlive-latex-bookmark -> texlive-bookmark., guix-commits, 2023/05/28
- 79/416: gnu: texlive-latex-jknapltx -> texlive-jknapltx., guix-commits, 2023/05/28