[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
251/421: gnu: texlive-polyglossia: Refresh package definition.
From: |
guix-commits |
Subject: |
251/421: gnu: texlive-polyglossia: Refresh package definition. |
Date: |
Sun, 28 May 2023 01:30:07 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit 7759e51761fe2c5a1486829a5fb07347da67e463
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Mon May 15 23:21:39 2023 +0200
gnu: texlive-polyglossia: Refresh package definition.
* gnu/packages/tex.scm (texlive-polyglossia): Remove SIMPLE-TEXLIVE-PACKAGE
call.
[arguments]<#:phases>: Do not use Amiri font.
---
gnu/packages/tex.scm | 126 ++++++++++++++++++++++++---------------------------
1 file changed, 58 insertions(+), 68 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 3fa4dd5992..694d8ff56e 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6400,20 +6400,30 @@ or symbol. It also provides compacted versions of
@code{enumerate} and
(define-public texlive-polyglossia
(package
- (inherit (simple-texlive-package
- "texlive-polyglossia"
- (list "source/latex/polyglossia/"
- ;; These files are not part of polyglossia.dtx
- "tex/latex/polyglossia/arabicnumbers.sty"
- "tex/latex/polyglossia/xpg-cyrillicnumbers.sty")
- (base32 "1p0hhclypv2zbs8h64c6sd689m9ym3vvpn966qpwpjxbymsrc49g")))
+ (name "texlive-polyglossia")
+ (version (number->string %texlive-revision))
+ (source (texlive-origin
+ name version
+ (list "doc/latex/polyglossia/"
+ "fonts/misc/xetex/fontmapping/polyglossia/"
+ "source/latex/polyglossia/"
+ "tex/latex/polyglossia/")
+ (base32
+ "1lkf06mr7p7p1fdkrnhmvj8iamzppjy952d79mc81cilkw5zskah")))
(outputs '("out" "doc"))
+ (build-system texlive-build-system)
(arguments
(list
- #:tex-directory "latex/polyglossia"
#:tex-format "xelatex"
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'substitute-fonts
+ (lambda _
+ (substitute* "source/latex/polyglossia/polyglossia.dtx"
+ (("\\{Serto Jerusalem}") "{FreeSans}") ;non-free
+ ;; XXX: Amiri font would introduce a (native) dependency on
+ ;; webkitgtk! No, thanks.
+ (("\\{Amiri}") "{FreeSans}"))))
(add-after 'unpack 'build-and-install-xelatex.fmt
(lambda* (#:key tex-format #:allow-other-keys)
(invoke "fmtutil-sys" "--byfmt" tex-format "--fmtdir=web2c")
@@ -6424,68 +6434,49 @@ or symbol. It also provides compacted versions of
@code{enumerate} and
;; XXX: Extend the base (more limited) xelatex.fmt provided by
;; texlive-latex-base, otherwise packages using Polyglossia
;; would encounter the same lack of hyphenation support problem.
- (install-file "web2c/xetex/xelatex.fmt"
- (string-append #$output
- "/share/texmf-dist/web2c/xetex"))))
- (add-before 'build 'chdir
- (lambda _
- ;; This is so the build can find the files not part of the .dtx.
- (setenv "TEXINPUTS" (string-append (getcwd)
- "/tex/latex/polyglossia:"))))
- (add-after 'chdir 'substitute-nonfree-fonts
- (lambda _
- (substitute* "polyglossia.dtx"
- (("\\{Serto Jerusalem}")
- "{FreeSans}"))))
- (add-after 'substitute-nonfree-fonts 'extract-dtx
- (lambda* (#:key tex-format #:allow-other-keys)
- (invoke tex-format "polyglossia.dtx"))))))
- (native-inputs (list fontconfig ;for XDG_DATA_DIRS (to locate fonts)
- font-amiri
- font-dejavu
- font-gfs-ambrosia
- font-gnu-freefont
- font-linuxlibertine
- font-sil-ezra
- texlive-latex-base
- texlive-babel
- texlive-bin ;for fmtutil.cnf
- texlive-bidi
- texlive-booktabs
- texlive-caption
- texlive-context
- texlive-fancyvrb
- texlive-etoolbox
- texlive-latex-fonts
- texlive-fontspec
- texlive-hyperref
- ;; TODO: Remove texlive-stringenc and
- ;; texlive-zapfding after texlive-hyperref propagates
- ;; them.
- texlive-stringenc
- texlive-zapfding
- texlive-graphics
- texlive-kpathsea ;for cp227.tcx & friends
- texlive-makecmds
- texlive-metalogo
- texlive-microtype
- texlive-paralist
- texlive-tools
- texlive-tex-ini-files)) ;for pdftexconfig
+ (install-file
+ "web2c/xetex/xelatex.fmt"
+ (string-append #$output
+ "/share/texmf-dist/web2c/xetex")))))))
+ (native-inputs
+ (list font-dejavu
+ font-gfs-ambrosia
+ font-gnu-freefont
+ font-linuxlibertine
+ font-sil-ezra
+ fontconfig ;for XDG_DATA_DIRS (to locate fonts)
+ texlive-babel
+ texlive-bidi
+ texlive-bin ;for fmtutil.cnf
+ texlive-booktabs
+ texlive-caption
+ texlive-context
+ texlive-etoolbox
+ texlive-fancyvrb
+ texlive-fontspec
+ texlive-graphics
+ texlive-hyperref
+ texlive-kpathsea ;for cp227.tcx & friends
+ texlive-latex-base
+ texlive-latex-fonts
+ texlive-makecmds
+ texlive-metalogo
+ texlive-microtype
+ texlive-paralist
+ texlive-tex-ini-files ;for pdftexconfig
+ texlive-tools))
;; polyglossia.sty \RequirePackage or \\usepackage these other TexLive
;; packages.
(propagated-inputs
(list texlive-bidi
texlive-etoolbox
+ texlive-filehook
texlive-fontspec
texlive-hyperref
- ;; TODO: Remove texlive-stringenc and
- ;; texlive-zapfding after texlive-hyperref propagates
- ;; them.
- texlive-stringenc
- texlive-zapfding
- texlive-makecmds
+ texlive-iftex
texlive-l3packages ;expl3, l3keys2e, xparse
+ texlive-luabidi
+ texlive-makecmds
texlive-tools
texlive-xkeyval))
(home-page "https://www.ctan.org/pkg/polyglossia")
@@ -6499,25 +6490,24 @@ different writing system. It enables:
Loading the appropriate hyphenation patterns.
@item
Setting the script and language tags of the current font (if possible and
-available), using the package fontspec.
+available), using the package @code{fontspec}.
@item
Switching to a font assigned by the user to a particular script or language.
@item
Adjusting some typographical conventions in function of the current language
-(such as afterindent, frenchindent, spaces before or after punctuation marks,
-etc.)
+(such as @code{afterindent}, @code{frenchindent}, spaces before or after
+punctuation marks, etc.)
@item
Redefining the document strings (like @samp{chapter}, @samp{figure},
@samp{bibliography}). Adapting the formatting of dates (for non-gregorian
-calendars via external packages bundled with polyglossia: currently the
+calendars via external packages bundled with @code{polyglossia}: currently the
Hebrew, Islamic and Farsi calendars are supported).
@item
For languages that have their own numeration system, modifying the formatting
of numbers appropriately.
@item
Ensuring the proper directionality if the document contains languages
-written from right to left (via the packages bidi and luabidi, available
-separately).
+written from right to left.
@end itemize")
(license license:expat)))
- 220/421: gnu: texlive-ulem: Refresh package definition., (continued)
- 220/421: gnu: texlive-ulem: Refresh package definition., guix-commits, 2023/05/28
- 224/421: gnu: texlive-marvosym: Refresh package definition., guix-commits, 2023/05/28
- 226/421: gnu: texlive-dejavu: Refresh package definition., guix-commits, 2023/05/28
- 228/421: gnu: texlive-jknappen: Deprecate package., guix-commits, 2023/05/28
- 232/421: gnu: texlive-xmltex: Fix build., guix-commits, 2023/05/28
- 233/421: gnu: texlive-pict2e: Refresh package definition., guix-commits, 2023/05/28
- 237/421: gnu: texlive-babel-french: Refresh package definition., guix-commits, 2023/05/28
- 238/421: gnu: texlive-babel: Refresh package definition., guix-commits, 2023/05/28
- 240/421: gnu: texlive-bigfoot: Refresh package definition., guix-commits, 2023/05/28
- 242/421: gnu: texlive-firstaid: Refresh package definition., guix-commits, 2023/05/28
- 251/421: gnu: texlive-polyglossia: Refresh package definition.,
guix-commits <=
- 260/421: gnu: texlive-ms: Refresh package definition., guix-commits, 2023/05/28
- 257/421: gnu: texlive-subfigure: Refresh package definition., guix-commits, 2023/05/28
- 256/421: gnu: texlive-pdfpages: Refresh package definition., guix-commits, 2023/05/28
- 263/421: gnu: texlive-atbegshi: Refresh package definition., guix-commits, 2023/05/28
- 264/421: gnu: texlive-bigintcalc: Refresh package definition., guix-commits, 2023/05/28
- 265/421: gnu: texlive-bitset: Refresh package definition., guix-commits, 2023/05/28
- 271/421: gnu: texlive-kvsetkeys: Refresh package definition., guix-commits, 2023/05/28
- 273/421: gnu: texlive-pdfescape: Refresh package definition., guix-commits, 2023/05/28
- 277/421: gnu: texlive-marginnote: Refresh package definition., guix-commits, 2023/05/28
- 279/421: gnu: texlive-unicode-data: Refresh package definition., guix-commits, 2023/05/28