From 1a64a7b31434fcef48be36f1ddc3e3f0ecbfed1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Jul 2019 17:48:45 +0200 Subject: gnu: texlive-union: Build font maps. * gnu/packages/tex.scm (texlive-union)[arguments]: Execute updmap to generate missing font maps. [native-inputs]: Add coreutils, sed, and updmap.cfg. --- gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ec35315f22..85c72e006a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2387,16 +2387,18 @@ standard LaTeX packages." #:builder (begin (use-modules (ice-9 match) + (ice-9 popen) (srfi srfi-26) (guix build union) (guix build utils) (guix build texlive-build-system)) (let* ((out (assoc-ref %outputs "out")) (texmf.cnf (string-append out "/share/texmf-dist/web2c/texmf.cnf"))) - ;; Build a modifiable union of all inputs (but exclude bash) + ;; Build a modifiable union of all inputs (but exclude bash and + ;; the updmap.cfg file) (match (filter (match-lambda ((name . _) - (not (string=? "bash" name)))) + (not (member name '("bash" "updmap.cfg"))))) %build-inputs) (((names . directories) ...) (union-build (assoc-ref %outputs "out") @@ -2413,19 +2415,47 @@ standard LaTeX packages." (string-append "TEXMFROOT = " out "/share\n")) (("^TEXMF = .*") "TEXMF = $TEXMFROOT/share/texmf-dist\n")) - (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") - "/bin")) + (setenv "PATH" (string-append + (assoc-ref %build-inputs "bash") "/bin:" + (assoc-ref %build-inputs "coreutils") "/bin:" + (string-append out "/bin"))) (for-each (cut wrap-program <> `("TEXMFCNF" ":" suffix (,(dirname texmf.cnf))) `("TEXMF" ":" suffix (,(string-append out "/share/texmf-dist")))) (find-files (string-append out "/bin") ".*")) + + ;; Remove invalid maps from config file. + (let ((port (open-pipe* OPEN_WRITE "updmap-sys" + "--syncwithtrees" + "--nohash" + (assoc-ref %build-inputs "updmap.cfg")))) + (display "Y\n" port) + (when (not (zero? (status:exit-val (close-pipe port)))) + (error "failed to filter updmap.cfg"))) + ;; Generate maps. + (invoke "updmap-sys" "--force" + (string-append out "/share/texmf-config/web2c/updmap.cfg")) #t)))) (inputs `(("bash" ,bash) ,@(map (lambda (package) (list (package-name package) package)) (append default-packages packages)))) + (native-inputs + `(("coreutils" ,coreutils) + ("sed" ,sed) + ("updmap.cfg" + ,(origin + (method url-fetch) + (uri (string-append "https://tug.org/svn/texlive/tags/" + %texlive-tag "/Master/texmf-dist/web2c/updmap.cfg" + "?revision=" (number->string %texlive-revision))) + (file-name (string-append "updmap.cfg-" + (number->string %texlive-revision))) + (sha256 + (base32 + "06mwpy5i218g5k3sf4gba0fmxgas82hkzx9fhwn67z5ik37d8apq")))))) (home-page (package-home-page texlive-bin)) (synopsis "Union of TeX Live packages") (description "This package provides a subset of the TeX Live -- cgit v1.2.3 From 8ab600f8c3ce3d04b791c596744510fd089dbea0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 6 Jul 2019 21:27:19 +0200 Subject: gnu: Add simple-texlive-package. * gnu/packages/tex.scm (simple-texlive-package): New procedure. --- gnu/packages/tex.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 85c72e006a..678e46ccd2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -75,6 +75,64 @@ #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:hide (zip))) +(define* (simple-texlive-package name locations hash + #:key trivial?) + "Return a template for a simple TeX Live package with the given NAME, +downloading from a list of LOCATIONS in the TeX Live repository, and expecting +the provided output HASH. If TRIVIAL? is provided, all files will simply be +copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." + (define with-documentation? + (and trivial? + (any (lambda (location) + (string-prefix? "/doc" location)) + locations))) + (package + (name name) + (version (number->string %texlive-revision)) + (source (texlive-origin name version + locations hash)) + (outputs (if with-documentation? + '("out" "doc") + '("out"))) + (build-system (if trivial? + gnu-build-system + texlive-build-system)) + (arguments + (let ((copy-files + `(lambda* (#:key outputs inputs #:allow-other-keys) + (let (,@(if with-documentation? + `((doc (string-append (assoc-ref outputs "doc") + "/share/texmf-dist/"))) + '()) + (out (string-append (assoc-ref outputs "out") + "/share/texmf-dist/"))) + ,@(if with-documentation? + '((mkdir-p doc) + (copy-recursively + (string-append (assoc-ref inputs "source") "/doc") + (string-append doc "/doc"))) + '()) + (mkdir-p out) + (copy-recursively (assoc-ref inputs "source") out) + ,@(if with-documentation? + '((delete-file-recursively (string-append out "/doc"))) + '()) + #t)))) + (if trivial? + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build (const #t)) + (replace 'install ,copy-files))) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'copy-files ,copy-files)))))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + (define texlive-extra-src (origin (method url-fetch) -- cgit v1.2.3 From 28e521e960676c3004702815b213e056b90b85ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 23:56:19 +0200 Subject: gnu: Add hyph-utf8-scripts. * gnu/packages/tex.scm (hyph-utf8-scripts): New variable. --- gnu/packages/tex.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 678e46ccd2..f56f42782d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -133,6 +133,17 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (description #f) (license #f))) +(define hyph-utf8-scripts + (origin + (method svn-fetch) + (uri (texlive-ref "generic" "hyph-utf8")) + (file-name (string-append "hyph-utf8-scripts-" + (number->string %texlive-revision) + "-checkout")) + (sha256 + (base32 + "1ix8h637hwhz4vrdhilf84kzzdza0wi8fp26nh7iws0bq08sl517")))) + (define texlive-extra-src (origin (method url-fetch) -- cgit v1.2.3 From cf4c07b9f1e9497e906839c8d5661d41c6a0beda Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 23:56:35 +0200 Subject: gnu: Add texlive-hyphen-package. * gnu/packages/tex.scm (texlive-hyphen-package): New procedure. --- gnu/packages/tex.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f56f42782d..bc897095de 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -144,6 +144,85 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (base32 "1ix8h637hwhz4vrdhilf84kzzdza0wi8fp26nh7iws0bq08sl517")))) +(define (texlive-hyphen-package name code locations hash) + (let ((parent (simple-texlive-package + name locations hash #:trivial? #t))) + (package + (inherit parent) + (arguments + (substitute-keyword-arguments (package-arguments parent) + ((#:modules _ '()) + '((guix build gnu-build-system) + (guix build utils) + (ice-9 match))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (root (string-append out "/share/texmf-dist")) + (patterns + (string-append root "/tex/generic/hyph-utf8/patterns/txt/")) + (loaders + (string-append root "/tex/generic/hyph-utf8/loadhyph")) + (ptex + (string-append root "/tex/generic/hyph-utf8/patterns/ptex")) + (filter-expression + (match ',code + ((? string?) + (format #f "\nlanguages.select!{|l| l.code == \"~a\"}\n" ',code)) + ((a b ...) + (format #f "\nlanguages.select!{|l| [~{\"~a\",~}].include? l.code }\n" ',code))))) + (mkdir "scripts") + (copy-recursively + (assoc-ref inputs "hyph-utf8-scripts") "scripts") + + ;; Prepare target directories + (mkdir-p patterns) + (mkdir-p loaders) + (mkdir-p ptex) + + ;; Generate plain patterns + (with-directory-excursion "scripts" + (substitute* "languages.rb" + (("../../../tex/generic/") "../tex/generic/")) + (substitute* "generate-plain-patterns.rb" + ;; Ruby 2 does not need this. + (("require 'unicode'") "") + (("Unicode.upcase\\(ch\\)") "ch.upcase") + ;; Write directly to the output directory + (("\\$path_root=File.*") + (string-append "$path_root=\"" out "/share/texmf-dist/\"\n")) + ;; Create quote directory when needed + (("f = File.open\\(\"#\\{\\$path_quote\\}" m) + (string-append "require 'fileutils'; FileUtils.mkdir_p $path_quote;" m)) + ;; Only generate patterns for this language. + (("languages =.*" m) + (string-append m filter-expression))) + (invoke "ruby" "generate-plain-patterns.rb") + + ;; Build pattern loaders + (substitute* "generate-pattern-loaders.rb" + (("\\$path_tex_generic=File.*") + (string-append "$path_tex_generic=\"" root "/tex/generic\"\n")) + ;; Only generate loader for this language. + (("languages =.*" m) + (string-append m filter-expression))) + (invoke "ruby" "generate-pattern-loaders.rb") + + ;; Build ptex patterns + (substitute* "generate-ptex-patterns.rb" + (("\\$path_root=File.*") + (string-append "$path_root=\"" root "\"\n")) + ;; Only generate ptex patterns for this language. + (("languages =.*" m) + (string-append m filter-expression))) + (invoke "ruby" "generate-ptex-patterns.rb"))))))))) + (native-inputs + `(("ruby" ,ruby) + ("hyph-utf8-scripts" ,hyph-utf8-scripts))) + (home-page "https://ctan.org/pkg/hyph-utf8")))) + (define texlive-extra-src (origin (method url-fetch) -- cgit v1.2.3 From 2cece695ba0ac3ad689550a5891c20397354fdd5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 6 Jul 2019 23:08:21 +0200 Subject: gnu: Add texlive-unicode-data. * gnu/packages/tex.scm (texlive-unicode-data): New variable. (texlive-generic-unicode-data): Deprecate package. --- gnu/packages/tex.scm | 65 +++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 39 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bc897095de..490d219677 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -411,6 +411,32 @@ This package contains the binaries.") (license (license:fsf-free "https://www.tug.org/texlive/copying.html")) (home-page "https://www.tug.org/texlive/"))) + +(define-public texlive-unicode-data + (package + (inherit (simple-texlive-package + "texlive-unicode-data" + (list "/tex/generic/unicode-data/" + "/doc/generic/unicode-data/") + (base32 + "1j63kz29arfiydb8r1a53q1r4zyk1yjbcq0w9i93zddczgqzgbfb") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/unicode-data") + (synopsis "Unicode data and loaders for TeX") + (description "This bundle provides generic access to Unicode Consortium +data for TeX use. It contains a set of text files provided by the Unicode +Consortium which are currently all from Unicode 8.0.0, with the exception of +@code{MathClass.txt} which is not currently part of the Unicode Character +Database. Accompanying these source data are generic TeX loader files +allowing this data to be used as part of TeX runs, in particular in building +format files. Currently there are two loader files: one for general character +set up and one for initializing XeTeX character classes as has been carried +out to date by @code{unicode-letters.tex}. ") + (license license:lppl1.3c+))) + +(define-public texlive-generic-unicode-data + (deprecated-package "texlive-generic-unicode-data" texlive-unicode-data)) + (define-public texlive-dvips (package (name "texlive-dvips") @@ -478,45 +504,6 @@ to PostScript.") license:expat license:lgpl3+)))) -(define-public texlive-generic-unicode-data - (package - (name "texlive-generic-unicode-data") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/unicode-data")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0r1v16jyfpz6dwqsgm6b9jcj4kf2pkzc9hg07s6fx9g8ba8qglih")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/unicode-data"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://www.ctan.org/pkg/unicode-data") - (synopsis "Unicode data and loaders for TeX") - (description "This bundle provides generic access to Unicode Consortium -data for TeX use. It contains a set of text files provided by the Unicode -Consortium which are currently all from Unicode 8.0.0, with the exception of -@code{MathClass.txt} which is not currently part of the Unicode Character -Database. Accompanying these source data are generic TeX loader files -allowing this data to be used as part of TeX runs, in particular in building -format files. Currently there are two loader files: one for general character -set up and one for initializing XeTeX character classes as has been carried -out to date by @code{unicode-letters.tex}. ") - (license license:lppl1.3c+))) - (define-public texlive-generic-dehyph-exptl (package (name "texlive-generic-dehyph-exptl") -- cgit v1.2.3 From 92b4a48c9125cbb3de8d11b31f14c67d7315b45d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 6 Jul 2019 23:31:57 +0200 Subject: gnu: Add texlive-hyphen-base. * gnu/packages/tex.scm (texlive-hyphen-base): New variable. --- gnu/packages/tex.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 490d219677..f4e874ccfe 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -437,6 +437,31 @@ out to date by @code{unicode-letters.tex}. ") (define-public texlive-generic-unicode-data (deprecated-package "texlive-generic-unicode-data" texlive-unicode-data)) +(define-public texlive-hyphen-base + (package + (inherit (simple-texlive-package + "texlive-hyphen-base" + (list "/tex/generic/config/language.dat" + "/tex/generic/config/language.dat.lua" + "/tex/generic/config/language.def" + "/tex/generic/config/language.us" + "/tex/generic/config/language.us.def" + "/tex/generic/config/language.us.lua" + "/tex/generic/hyphen/dumyhyph.tex" + "/tex/generic/hyphen/hyphen.tex" + "/tex/generic/hyphen/hypht1.tex" + "/tex/generic/hyphen/zerohyph.tex") + (base32 + "002g5zhzbj3ikgg8zidagdp605ac9f4qmfl148mp0mbpz1svk0ni") + #:trivial? #t)) + (home-page "https://tug.org/texlive/") + (synopsis "Core hyphenation support files") + (description "This package includes Knuth's original @file{hyphen.tex}, +@file{zerohyph.tex} to disable hyphenation, @file{language.us} which starts +the autogenerated files @file{language.dat} and @file{language.def} (and +default versions of those), etc.") + (license license:knuth))) + (define-public texlive-dvips (package (name "texlive-dvips") -- cgit v1.2.3 From 5153431ca5ec9a27a5b1fe2374f8b1c58acb509e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 8 Jul 2019 19:15:36 +0200 Subject: gnu: Add texlive-hyph-utf8. * gnu/packages/tex.scm (texlive-hyph-utf8): New variable. (texlive-generic-hyph-utf8): Deprecate in favour of texlive-hyph-utf8. --- gnu/packages/tex.scm | 205 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 148 insertions(+), 57 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f4e874ccfe..9d26c9b156 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -600,63 +600,6 @@ allow existing format source files to be used with newer engines, for example to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") (license license:public-domain))) -(define-public texlive-generic-hyph-utf8 - (package - (name "texlive-generic-hyph-utf8") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/hyph-utf8")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1alnn9cd60m2c12vym9f9q22ap1ngywxpkjl9dk472why44g1dmy")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/hyph-utf8"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://ctan.org/pkg/hyph-utf8") - (synopsis "Hyphenation patterns expressed in UTF-8") - (description "Modern native UTF-8 engines such as XeTeX and LuaTeX need -hyphenation patterns in UTF-8 format, whereas older systems require -hyphenation patterns in the 8-bit encoding of the font in use (such encodings -are codified in the LaTeX scheme with names like OT1, T2A, TS1, OML, LY1, -etc). The present package offers a collection of conversions of existing -patterns to UTF-8 format, together with converters for use with 8-bit fonts in -older systems. Since hyphenation patterns for Knuthian-style TeX systems are -only read at iniTeX time, it is hoped that the UTF-8 patterns, with their -converters, will completely supplant the older patterns.") - ;; Individual files each have their own license. Most of these files are - ;; independent hyphenation patterns. - (license (list license:lppl1.0+ - license:lppl1.2+ - license:lppl1.3 - license:lppl1.3+ - license:lppl1.3a+ - license:lgpl2.1 - license:lgpl2.1+ - license:lgpl3+ - license:gpl2+ - license:gpl3+ - license:mpl1.1 - license:asl2.0 - license:expat - license:bsd-3 - license:cc0 - license:public-domain - license:wtfpl2)))) - (define-public texlive-metafont-base (package (name "texlive-metafont-base") @@ -1518,6 +1461,154 @@ TeXbook, together with various supporting files (some also discussed in the book).") (license license:knuth))) +(define-public texlive-hyph-utf8 + (package + (inherit (simple-texlive-package + "texlive-hyph-utf8" + (list "/source/generic/hyph-utf8/" + "/source/luatex/hyph-utf8/" + "/doc/luatex/hyph-utf8/" + "/tex/luatex/hyph-utf8/etex.src" + ;; Used to extract luatex-hyphen.lua + "/tex/latex/base/docstrip.tex" + + ;; Documentation; we can't use the whole directory because + ;; it includes files from other packages. + "/doc/generic/hyph-utf8/CHANGES" + "/doc/generic/hyph-utf8/HISTORY" + "/doc/generic/hyph-utf8/hyph-utf8.pdf" + "/doc/generic/hyph-utf8/hyph-utf8.tex" + "/doc/generic/hyph-utf8/hyphenation-distribution.pdf" + "/doc/generic/hyph-utf8/hyphenation-distribution.tex" + "/doc/generic/hyph-utf8/img/miktex-languages.png" + "/doc/generic/hyph-utf8/img/texlive-collection.png") + (base32 + "10y8svgk68sivmgzrv8gv137r7kv49cs256cq2wja9ms437pxvbj"))) + (outputs '("out" "doc")) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:make-flags + (list "-C" "source/luatex/hyph-utf8/" + (string-append "DO_TEX = tex --interaction=nonstopmode '&tex' $<") + (string-append "RUNDIR =" (assoc-ref %outputs "out") "/share/texmf-dist/tex/luatex/hyph-utf8/") + (string-append "DOCDIR =" (assoc-ref %outputs "doc") "/share/texmf-dist/doc/luatex/hyph-utf8/") + ;; hyphen.cfg is neither included nor generated, so let's only build the lua file. + (string-append "UNPACKED = $(NAME).lua")) + #:phases + (modify-phases %standard-phases + ;; TeX isn't usable at this point, so we first need to generate the + ;; tex.fmt. + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Target directories must exist. + (mkdir-p (string-append (assoc-ref %outputs "out") + "/share/texmf-dist/tex/luatex/hyph-utf8/")) + (mkdir-p (string-append (assoc-ref %outputs "doc") + "/share/texmf-dist/doc/luatex/hyph-utf8/")) + + ;; We cannot build the documentation because that requires a + ;; fully functional pdflatex, which depends on this package. + (substitute* "source/luatex/hyph-utf8/Makefile" + (("all: .*") "all: $(RUNFILES)\n")) + + ;; Find required fonts for building tex.fmt + (setenv "TFMFONTS" + (string-append (assoc-ref inputs "texlive-fonts-cm") + "/share/texmf-dist/fonts/tfm/public/cm:" + (assoc-ref inputs "texlive-fonts-knuth-lib") + "/share/texmf-dist/fonts/tfm/public/knuth-lib")) + ;; ...and find all tex files in this environment. + (setenv "TEXINPUTS" + (string-append + (getcwd) ":" + (string-join + (map (match-lambda ((_ . dir) dir)) inputs) + "//:"))) + + ;; Generate tex.fmt. + (let ((where "source/luatex/hyph-utf8")) + (mkdir-p where) + (with-directory-excursion where + (invoke "tex" "-ini" + (string-append (assoc-ref inputs "texlive-tex-plain") + "/share/texmf-dist/tex/plain/config/tex.ini")))))) + (add-before 'build 'build-loaders-and-converters + (lambda* (#:key outputs #:allow-other-keys) + (let* ((root (string-append (assoc-ref outputs "out") + "/share/texmf-dist")) + (conv + (string-append root + "/tex/generic/hyph-utf8/conversions"))) + + ;; Build converters + (mkdir-p conv) + (with-directory-excursion "source/generic/hyph-utf8" + (substitute* "generate-converters.rb" + (("\\$path_root=File.*") + (string-append "$path_root=\"" root "\"\n")) + ;; Avoid error with newer Ruby. + (("#1\\{%") "#1{%%")) + (invoke "ruby" "generate-converters.rb")) + #t))) + (replace 'install + (lambda* (#:key source outputs #:allow-other-keys) + (let ((doc (assoc-ref outputs "doc")) + (out (assoc-ref outputs "out"))) + (mkdir-p doc) + (copy-recursively + (string-append source "/doc") + (string-append doc "/doc")) + (install-file + (string-append source "/tex/luatex/hyph-utf8/etex.src") + (string-append out "/share/texmf-dist/tex/luatex/hyph-utf8/"))) + #t))))) + (native-inputs + `(("ruby" ,ruby) + ("texlive-bin" ,texlive-bin) + ;; The following packages are needed for build "tex.fmt", which we need + ;; for a working "tex". + ("texlive-tex-plain" ,texlive-tex-plain) + ("texlive-fonts-cm" ,texlive-fonts-cm) + ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) + ("texlive-hyphen-base" ,texlive-hyphen-base))) + (home-page "https://ctan.org/pkg/hyph-utf8") + (synopsis "Hyphenation patterns expressed in UTF-8") + (description "Modern native UTF-8 engines such as XeTeX and LuaTeX need +hyphenation patterns in UTF-8 format, whereas older systems require +hyphenation patterns in the 8-bit encoding of the font in use (such encodings +are codified in the LaTeX scheme with names like OT1, T2A, TS1, OML, LY1, +etc). The present package offers a collection of conversions of existing +patterns to UTF-8 format, together with converters for use with 8-bit fonts in +older systems. Since hyphenation patterns for Knuthian-style TeX systems are +only read at iniTeX time, it is hoped that the UTF-8 patterns, with their +converters, will completely supplant the older patterns.") + ;; Individual files each have their own license. Most of these files are + ;; independent hyphenation patterns. + (license (list license:lppl1.0+ + license:lppl1.2+ + license:lppl1.3 + license:lppl1.3+ + license:lppl1.3a+ + license:lgpl2.1 + license:lgpl2.1+ + license:lgpl3+ + license:gpl2+ + license:gpl3+ + license:mpl1.1 + license:asl2.0 + license:expat + license:bsd-3 + license:cc0 + license:public-domain + license:wtfpl2)))) + +(define-public texlive-generic-hyph-utf8 + (deprecated-package "texlive-generic-hyph-utf8" texlive-hyph-utf8)) + (define-public texlive-latex-base (let ((texlive-dir (lambda (dir hash) -- cgit v1.2.3 From e68c70917958aa38c35a3cf349cdc80df31d2194 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 8 Jul 2019 19:17:34 +0200 Subject: gnu: Add texlive-dehyph-exptl. * gnu/packages/tex.scm (texlive-dehyph-exptl): New variable. (texlive-generic-dehyph-exptl): Deprecate. --- gnu/packages/tex.scm | 61 +++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9d26c9b156..74d8e04a75 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -529,42 +529,6 @@ to PostScript.") license:expat license:lgpl3+)))) -(define-public texlive-generic-dehyph-exptl - (package - (name "texlive-generic-dehyph-exptl") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/dehyph-exptl")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "03yj1di9py92drp6gpfva6q69vk2iixr79r7cp7ja570s3pr0m33")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/dehyph-exptl"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "http://projekte.dante.de/Trennmuster/WebHome") - (synopsis "Hyphenation patterns for German") - (description "The package provides experimental hyphenation patterns for -the German language, covering both traditional and reformed orthography. The -patterns can be used with packages Babel and hyphsubst from the Oberdiek -bundle.") - ;; Hyphenation patterns are under the Expat license; documentation is - ;; under LPPL. - (license (list license:expat license:lppl)))) - (define-public texlive-generic-tex-ini-files (package (name "texlive-generic-tex-ini-files") @@ -1609,6 +1573,31 @@ converters, will completely supplant the older patterns.") (define-public texlive-generic-hyph-utf8 (deprecated-package "texlive-generic-hyph-utf8" texlive-hyph-utf8)) +(define-public texlive-dehyph-exptl + (package + (inherit (simple-texlive-package + "texlive-dehyph-exptl" + (list "/tex/generic/dehyph-exptl/" + "/doc/generic/dehyph-exptl/") + (base32 + "1w2danvvy2f52hcb4acvjks53kcanwxr9s990fap6mj279hpgmh2") + #:trivial? #t)) + (propagated-inputs + `(("texlive-hyphen-base" ,texlive-hyphen-base) + ("texlive-hyph-utf8" ,texlive-hyph-utf8))) + (home-page "http://projekte.dante.de/Trennmuster/WebHome") + (synopsis "Hyphenation patterns for German") + (description "The package provides experimental hyphenation patterns for +the German language, covering both traditional and reformed orthography. The +patterns can be used with packages Babel and hyphsubst from the Oberdiek +bundle.") + ;; Hyphenation patterns are under the Expat license; documentation is + ;; under LPPL. + (license (list license:expat license:lppl)))) + +(define-public texlive-generic-dehyph-exptl + (deprecated-package "texlive-generic-dehyph-exptl" texlive-dehyph-exptl)) + (define-public texlive-latex-base (let ((texlive-dir (lambda (dir hash) -- cgit v1.2.3 From 659fda6cc716b8fcdee93012f25514ab8ad514f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 8 Jul 2019 22:43:43 +0200 Subject: gnu: texlive-dvips: Implement with simple-texlive-package. * gnu/packages/tex.scm (texlive-dvips): Use simple-texlive-package. --- gnu/packages/tex.scm | 66 ++++++++-------------------------------------------- 1 file changed, 10 insertions(+), 56 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 74d8e04a75..bea661b91e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -462,64 +462,18 @@ the autogenerated files @file{language.dat} and @file{language.def} (and default versions of those), etc.") (license license:knuth))) +;; TODO: This package should not exist. There should not be a single package +;; containing all of /dvips. These really belong to different packages. (define-public texlive-dvips (package - (name "texlive-dvips") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/dvips")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1ky6wc173jhf0b33lhyb4r3bx1d4bmiqkn6y1hxn92kwjdzl42p7")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist")) - (dvips (string-append root "/dvips")) - (maps (string-append root "/fonts/map/dvips")) - (encs (string-append root "/fonts/enc/dvips/base"))) - (mkdir-p dvips) - (copy-recursively (assoc-ref %build-inputs "source") dvips) - (mkdir-p maps) - (copy-recursively (assoc-ref %build-inputs "dvips-font-maps") maps) - (mkdir-p encs) - (copy-recursively (assoc-ref %build-inputs "dvips-base-enc") encs) - #t)))) - (native-inputs - `(("dvips-font-maps" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips")) - (revision %texlive-revision))) - (file-name (string-append "dvips-font-maps-" version "-checkout")) - (sha256 - (base32 - "0nxvfbb5vsvakiw0iviicghdc2sxk05cj056ilqnpa62fffc36a6")))) - ("dvips-base-enc" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/enc/dvips/base")) - (revision %texlive-revision))) - (file-name (string-append "dvips-base-enc-" version "-checkout")) - (sha256 - (base32 - "1xnf6ms0h87r55kxik4vicwr1907scj789lhqflqns8svvsli5iy")))))) + (inherit (simple-texlive-package + "texlive-dvips" + (list "/fonts/map/dvips/" + "/fonts/enc/dvips/base/" + "/dvips/") + (base32 + "1di07wx8wjczddmagq5z082l2has3inzk5jwkqh4i6wv1qdfqpp6") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/dvips") (synopsis "DVI to PostScript drivers") (description "This package provides files needed for converting DVI files -- cgit v1.2.3 From 0512ae30b3907261f1070312107bd0ff62686ece Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 8 Jul 2019 23:28:47 +0200 Subject: gnu: texlive-fonts-cm: Remove cm-type1. These fonts should actually be part of the amsfonts package. * gnu/packages/tex.scm (texlive-fonts-cm)[arguments]: Do not install cm-type1 fonts. [native-inputs]: Remove cm-type1 fonts. --- gnu/packages/tex.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bea661b91e..6a4271f35c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -706,24 +706,10 @@ documents.") (for-each (cut install-file <> mf) (find-files "." "\\.mf")) (copy-recursively "pk" pk) - (mkdir-p type1) - (copy-recursively (assoc-ref inputs "cm-type1") type1) #t)))))) (native-inputs `(("texlive-bin" ,texlive-bin) - ("texlive-metafont-base" ,texlive-metafont-base) - ("cm-type1" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/public/amsfonts/cm")) - (revision %texlive-revision))) - (file-name (string-append name "-type1-" version "-checkout")) - (sha256 - (base32 - "12jyl9jp3hidifa4l5pmi47p71d5mb5kj5rknxkygilix8yz2iy6")))))) + ("texlive-metafont-base" ,texlive-metafont-base))) (home-page "https://www.ctan.org/pkg/cm") (synopsis "Computer Modern fonts for TeX") (description "This package provides the Computer Modern fonts by Donald -- cgit v1.2.3 From 2b63e54bf10be935797b3163662135564a180574 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 8 Jul 2019 23:46:48 +0200 Subject: gnu: texlive-fonts-cm: Use simple-texlive-package. * gnu/packages/tex.scm (texlive-fonts-cm): Implement with simple-texlive-package. [arguments]: Adjust. --- gnu/packages/tex.scm | 85 +++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 38 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6a4271f35c..152e5b6483 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -642,19 +642,15 @@ documents.") (define-public texlive-fonts-cm (package - (name "texlive-fonts-cm") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/source/public/cm")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0vfjhidr9pha613h8mfhnpcpvld6ahdfb449918fpsfs93cppkyj")))) + (inherit (simple-texlive-package + "texlive-fonts-cm" + (list "/fonts/source/public/cm/" + "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map" + "/doc/fonts/cm/README" + "/doc/fonts/cm/README-cmps.txt") + (base32 + "1h0q71paqmg1xjg6k35ni2i6m93kmlq9rdwm913xg9n4qngywl18"))) + (outputs '("out" "doc")) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -672,40 +668,53 @@ documents.") (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) ;; Tell mf where to look for source files (setenv "MFINPUTS" - (string-append (getcwd) ":" + (string-append (getcwd) "/fonts/source/public/cm/:" mf "/share/texmf-dist/metafont/base"))) - (mkdir "build") - (mkdir-p "pk/ljfour/public/cm/dpi600") - (for-each (lambda (font) - (format #t "building font ~a\n" font) - (invoke "mf" "-progname=mf" - "-output-directory=build" - (string-append "\\" - "mode:=ljfour; " - "mag:=1+0/600; " - "batchmode; " - "input " - (basename font ".mf"))) - (invoke "gftopk" - (string-append "build/" - (basename font ".mf") ".600gf") - (string-append "pk/ljfour/public/cm/dpi600/" - (basename font ".mf") ".pk"))) - (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")) + (for-each make-file-writable + (cons "fonts/source/public/cm/" + (find-files "fonts/source/public/cm/" ".*"))) + (let ((build (string-append (getcwd) "/build")) + (pkdir (string-append (getcwd) "/pk/ljfour/public/cm/dpi600"))) + (mkdir-p pkdir) + (mkdir-p build) + (with-directory-excursion "fonts/source/public/cm/" + (for-each (lambda (font) + (format #t "building font ~a\n" font) + (invoke "mf" "-progname=mf" + (string-append "-output-directory=" build) + (string-append "\\" + "mode:=ljfour; " + "mag:=1+0/600; " + "scrollmode; " + "input " + (basename font ".mf"))) + (invoke "gftopk" + (string-append build "/" + (basename font ".mf") ".600gf") + (string-append pkdir "/" + (basename font ".mf") ".pk"))) + (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")))) #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (fonts (string-append out "/share/texmf-dist/fonts/")) - (pk (string-append fonts "pk")) - (tfm (string-append fonts "tfm/public/cm")) - (mf (string-append fonts "source/public/cm")) - (type1 (string-append fonts "type1/public/amsfonts/cm"))) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (source (assoc-ref inputs "source")) + (fonts (string-append out "/share/texmf-dist/fonts/")) + (pk (string-append fonts "pk")) + (tfm (string-append fonts "tfm/public/cm")) + (mf (string-append fonts "source/public/cm"))) (for-each (cut install-file <> tfm) (find-files "build" "\\.*")) (for-each (cut install-file <> mf) (find-files "." "\\.mf")) (copy-recursively "pk" pk) + (copy-recursively + (string-append source "/doc") + (string-append doc "/doc")) + (install-file + (string-append source "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map") + (string-append fonts "/map/dvips/cm/cmtext-bsr-interpolated.map")) #t)))))) (native-inputs `(("texlive-bin" ,texlive-bin) -- cgit v1.2.3 From b8df0d1b169a5f1f24136ffa71cb12de7fc7fb85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Jul 2019 00:07:55 +0200 Subject: gnu: Add texlive-tex-ini-files. * gnu/packages/tex.scm (texlive-tex-ini-files): New variable. (texlive-generic-tex-ini-files): Deprecate it. --- gnu/packages/tex.scm | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 152e5b6483..57b5612ed7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -483,32 +483,14 @@ to PostScript.") license:expat license:lgpl3+)))) -(define-public texlive-generic-tex-ini-files +(define-public texlive-tex-ini-files (package - (name "texlive-generic-tex-ini-files") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/tex-ini-files")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1wh42n1lmzcvi3g6mm31nm3yd5ha5bl260xqc444jg1m9fdp3wz5")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/tex-ini-files"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-tex-ini-files" + (list "/tex/generic/tex-ini-files/") + (base32 + "0q1g62jg0qiqslm93ycvm30bw8ydmssjdshzsnzl7n2vpd62qfi2") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/tex-ini-files") (synopsis "Files for creating TeX formats") (description "This bundle provides a collection of model \".ini\" files @@ -518,6 +500,9 @@ allow existing format source files to be used with newer engines, for example to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") (license license:public-domain))) +(define-public texlive-generic-tex-ini-files + (deprecated-package "texlive-generic-tex-ini-files" texlive-tex-ini-files)) + (define-public texlive-metafont-base (package (name "texlive-metafont-base") -- cgit v1.2.3 From df73a3d3b64a648a32dc65283fb35366bd704c78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Jul 2019 11:30:58 +0200 Subject: gnu: Add texlive-hyphen-afrikaans. * gnu/packages/tex.scm (texlive-hyphen-afrikaans): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 57b5612ed7..2e9e95b3a4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1359,6 +1359,18 @@ TeXbook, together with various supporting files (some also discussed in the book).") (license license:knuth))) +(define-public texlive-hyphen-afrikaans + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-afrikaans" "af" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-af.tex") + (base32 + "1vb3jccqnn1pm0680yqx52kvz595fmxnwa0cbf8qman6zglsssiw"))) + (synopsis "Hyphenation patterns for Afrikaans") + (description "The package provides hyphenation patterns for the Afrikaans +language.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 619ca0230c5ec06eb73051dac2459a2d0ffdd2fa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Jul 2019 12:39:56 +0200 Subject: gnu: Add texlive-hyphen-ancientgreek. * gnu/packages/tex.scm (texlive-hyphen-ancientgreek): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2e9e95b3a4..14d82c7cc7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1371,6 +1371,20 @@ book).") language.") (license license:lppl1.3+))) +(define-public texlive-hyphen-ancientgreek + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-ancientgreek" "grc" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-grc.tex" + "/tex/generic/hyphen/grahyph5.tex" + "/tex/generic/hyphen/ibyhyph.tex") + (base32 + "0kwrqsz7wdr1d9kylzwp60ka3wfbj8iad029k5h6y94nb86mf7zv"))) + (synopsis "Hyphenation patterns for ancient Greek") + (description "The package provides hyphenation patterns for ancient +Greek.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From a361f4128cc4c52269090be6261e56dc85c257c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Jul 2019 11:53:55 +0200 Subject: gnu: Add texlive-hyphen-armenian. * gnu/packages/tex.scm (texlive-hyphen-armenian): New variable. --- gnu/packages/tex.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 14d82c7cc7..bfb48322b3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1385,6 +1385,42 @@ language.") Greek.") (license license:lppl1.3+))) +(define-public texlive-hyphen-armenian + (let ((template (texlive-hyphen-package + "texlive-hyphen-armenian" "hy" + (list "/source/generic/hyph-utf8/languages/hy/generate_patterns_hy.rb") + (base32 + "0z666y580w1kpxssdanz67ykq257lf11a1mnp1jrn08zijvfrw9c")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-patterns + (lambda _ + (let ((target (string-append (getcwd) + "/tex/generic/hyph-utf8/patterns/tex"))) + (mkdir-p target) + (with-directory-excursion "source/generic/hyph-utf8/languages/hy/" + (substitute* "generate_patterns_hy.rb" + (("\\$file = File.new.*") + (string-append "$file = File.new(\"" target + "/hyph-hy.tex\",\"w\")\n"))) + (invoke "ruby" "generate_patterns_hy.rb")) + #t))) + (add-after 'install 'install-hyph-hy.tex + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target (string-append out "/share/texmf-dist/tex"))) + (copy-recursively "tex" target) + #t))))))) + (synopsis "Hyphenation patterns for Armenian") + (description "The package provides hyphenation patterns for the Armenian +language.") + ;; Any version of the LGPL. + (license license:lgpl3+)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 0ddbc25cbb7e51483136a8a4f707e63db2dbfc44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Jul 2019 12:57:27 +0200 Subject: gnu: Add texlive-hyphen-basque. * gnu/packages/tex.scm (texlive-hyphen-basque): New variable. --- gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bfb48322b3..7197663ef0 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1421,6 +1421,44 @@ language.") ;; Any version of the LGPL. (license license:lgpl3+)))) +(define-public texlive-hyphen-basque + (let ((template (texlive-hyphen-package + "texlive-hyphen-basque" "eu" + (list "/source/generic/hyph-utf8/languages/eu/generate_patterns_eu.rb") + (base32 + "1yhsbzf1g9dm70jfixsz51hsfvn26cwfkfxvhg7xv2piynr4v51l")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-patterns + (lambda _ + (let ((target (string-append (getcwd) + "/tex/generic/hyph-utf8/patterns/tex"))) + (mkdir-p target) + (with-directory-excursion "source/generic/hyph-utf8/languages/eu/" + (substitute* "generate_patterns_eu.rb" + (("\\$file = File.new.*") + (string-append "$file = File.new(\"" target + "/hyph-eu.tex\",\"w\")\n"))) + (invoke "ruby" "generate_patterns_eu.rb")) + #t))) + (add-after 'install 'install-hyph-eu.tex + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target (string-append out "/share/texmf-dist/tex"))) + (copy-recursively "tex" target) + #t))))))) + (synopsis "Hyphenation patterns for Basque") + (description "The package provides hyphenation patterns for the Basque +language.") + ;; "Free for any purpose". + (license (license:fsf-free + "/source/generic/hyph-utf8/languages/eu/generate_patterns_eu.rb"))))) + + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From e4c5481df21d2a1de50bca53dfd448a47e5a4b42 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:45:21 +0200 Subject: gnu: Add texlive-mkpattern. * gnu/packages/tex.scm (texlive-mkpattern): New variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7197663ef0..c84ae38b98 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1323,6 +1323,26 @@ by the amsfonts package. It provides @code{amsfonts.sty}, with names of individual symbols defined in @code{amssymb.sty}.") (license license:silofl1.1))) +(define-public texlive-mkpattern + (package + (inherit (simple-texlive-package + "texlive-mkpattern" + (list "/doc/plain/mkpattern/README" + "/doc/plain/mkpattern/mkpatdoc.tex" + "/doc/plain/mkpattern/mkpatter.pdf" + "/doc/plain/mkpattern/mkpattern-exmpl.tex" + "/tex/plain/mkpattern/mkpatter.tex") + (base32 + "0sxnkbcc802jl3fj56x9hvg978bpv15lhrwj0aykb4syq29l47ga") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/mkpattern") + (synopsis "Utility for making hyphenation patterns") + (description "Mkpattern is a general purpose program for the generation of +hyphenation patterns, with definition of letter sets and template-like +constructions. It also provides an easy way to handle different input and +output encodings, and features generation of clean UTF-8 patterns.") + (license license:lppl))) + ;; This provides etex.src which is needed to build various formats, including ;; luatex.fmt and pdflatex.fmt (define-public texlive-tex-plain -- cgit v1.2.3 From 922667967c9012ffa53b0cb6eb8860e694f683ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:53:01 +0200 Subject: gnu: Add texlive-hyphen-belarusian. * gnu/packages/tex.scm (texlive-hyphen-belarusian): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c84ae38b98..31dd67e9e4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1478,6 +1478,18 @@ language.") (license (license:fsf-free "/source/generic/hyph-utf8/languages/eu/generate_patterns_eu.rb"))))) +(define-public texlive-hyphen-belarusian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-belarusian" "be" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-be.tex") + (base32 + "1xvffph824rg43gi2xs3ny9gzlp708fyxj9zfhckmg8pzh9vv3n6"))) + (synopsis "Hyphenation patterns for Belarusian") + (description "The package provides hyphenation patterns for the Belarusian +language.") + (license license:expat))) + (define-public texlive-hyph-utf8 (package -- cgit v1.2.3 From 7ffc31058cde07b28cd5676f7e2016b480ef0ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:53:12 +0200 Subject: gnu: Add texlive-hyphen-bulgarian. * gnu/packages/tex.scm (texlive-hyphen-bulgarian): New variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 31dd67e9e4..eaf201241a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1490,6 +1490,22 @@ language.") language.") (license license:expat))) +(define-public texlive-hyphen-bulgarian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-bulgarian" "bg" + (list "/doc/generic/hyph-utf8/bg/azbukaExtended.pdf" + "/doc/generic/hyph-utf8/bg/azbukaExtended.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex") + (base32 + "06dxkk9azsggbri04i6g62lswygzadsx3rpqvbyzvbxc5wxz1dj1"))) + (synopsis "Hyphenation patterns for Bulgarian") + (description "The package provides hyphenation patterns for the Bulgarian +language in T2A and UTF-8 encodings.") + (license (license:non-copyleft + "file:///tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex" + "Ancestral BSD variant")))) + (define-public texlive-hyph-utf8 (package -- cgit v1.2.3 From cbc7e10999ec152e9c21425c3da79034c246445d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:53:22 +0200 Subject: gnu: Add texlive-hyphen-catalan. * gnu/packages/tex.scm (texlive-hyphen-catalan): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index eaf201241a..c323ce657b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1506,6 +1506,18 @@ language in T2A and UTF-8 encodings.") "file:///tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex" "Ancestral BSD variant")))) +(define-public texlive-hyphen-catalan + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-catalan" "ca" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ca.tex") + (base32 + "0cisx76jpw8kpd3an37m9h8ppiysnizgfzl48y9d9n3fvx8jyykb"))) + (synopsis "Hyphenation patterns for Catalan") + (description "The package provides hyphenation patterns for Catalan in +T1/EC and UTF-8 encodings.") + (license license:lppl1.0+))) + (define-public texlive-hyph-utf8 (package -- cgit v1.2.3 From 9ebce8fc1dc1612bb1e83fa9986deae7e304f07c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:53:33 +0200 Subject: gnu: Add texlive-hyphen-chinese. * gnu/packages/tex.scm (texlive-hyphen-chinese): New variable. --- gnu/packages/tex.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c323ce657b..ce10b9298a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1518,6 +1518,17 @@ language in T2A and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:lppl1.0+))) +(define-public texlive-hyphen-chinese + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-chinese" "zh-latn-pinyin" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex") + (base32 + "07gbrn5fcl5d3hyg1zpai3zp1ggl73cmvpalwvh7ah313f57gjkk"))) + (synopsis "Hyphenation patterns for unaccented Chinese pinyin") + (description "The package provides hyphenation patterns for unaccented +Chinese pinyin T1/EC and UTF-8 encodings.") + (license license:gpl2+))) (define-public texlive-hyph-utf8 (package -- cgit v1.2.3 From beed8377595cda72d69786539f9670597d4b183c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:53:42 +0200 Subject: gnu: Add texlive-hyphen-churchslavonic. * gnu/packages/tex.scm (texlive-hyphen-churchslavonic): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ce10b9298a..b7ed687101 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1530,6 +1530,18 @@ T1/EC and UTF-8 encodings.") Chinese pinyin T1/EC and UTF-8 encodings.") (license license:gpl2+))) +(define-public texlive-hyphen-churchslavonic + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-churchslavonic" "cu" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cu.tex") + (base32 + "0xkqlz3ixyl4fxsnzrbxqrb82p0n67rhgpddbiyv3qwfnbr2b5a4"))) + (synopsis "Hyphenation patterns for Church Slavonic") + (description "The package provides hyphenation patterns for Church +Slavonic in UTF-8 encoding.") + (license license:expat))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 1b1d8577892a92fc5098b6246e452ee07ee380f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:53:51 +0200 Subject: gnu: Add texlive-hyphen-coptic. * gnu/packages/tex.scm (texlive-hyphen-coptic): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b7ed687101..ed5ccfde23 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1542,6 +1542,20 @@ Chinese pinyin T1/EC and UTF-8 encodings.") Slavonic in UTF-8 encoding.") (license license:expat))) +(define-public texlive-hyphen-coptic + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-coptic" "cop" + (list "/tex/generic/hyph-utf8/patterns/tex-8bit/copthyph.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-cop.tex") + (base32 + "07i03jpdfy4ip7zbg4gnk4hk8zwj8rlni9dgrb1p8mfw2w19d80c"))) + (synopsis "Hyphenation patterns for Coptic") + (description "The package provides hyphenation patterns for Coptic in +UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines.") + ;; No explicit license declaration, so we use the project license. + (license license:lppl))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 9b65c6117963f02ad5f34aaba60941a3f6a3ab3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:04 +0200 Subject: gnu: Add texlive-hyphen-croatian. * gnu/packages/tex.scm (texlive-hyphen-croatian): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ed5ccfde23..d289f53ae3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1556,6 +1556,18 @@ UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines.") ;; No explicit license declaration, so we use the project license. (license license:lppl))) +(define-public texlive-hyphen-croatian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-croatian" "hr" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hr.tex") + (base32 + "129nz2nqilyq2477n2clx20xfbxh1qxm69zg4n2f6c4d4a8711nc"))) + (synopsis "Hyphenation patterns for Croatian") + (description "The package provides hyphenation patterns for Croatian in +T1/EC and UTF-8 encodings.") + (license license:lppl1.0+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From b5b2ef6e3d796fa19929e5d88f7c084d1683db4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:12 +0200 Subject: gnu: Add texlive-hyphen-czech. * gnu/packages/tex.scm (texlive-hyphen-czech): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d289f53ae3..637e9b2974 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1568,6 +1568,18 @@ UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines.") T1/EC and UTF-8 encodings.") (license license:lppl1.0+))) +(define-public texlive-hyphen-czech + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-czech" "cs" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cs.tex") + (base32 + "1k5516gbfp1d5p97j247byag9sdgds5zwc11bwxfk58i6zq1v0m6"))) + (synopsis "Hyphenation patterns for Czech") + (description "The package provides hyphenation patterns for Czech in T1/EC +and UTF-8 encodings.") + (license license:gpl2+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 3889b022ca142c3ba870dd863a32c5acad6333d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:19 +0200 Subject: gnu: Add texlive-hyphen-danish. * gnu/packages/tex.scm (texlive-hyphen-danish): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 637e9b2974..c2b3f4df50 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1580,6 +1580,19 @@ T1/EC and UTF-8 encodings.") and UTF-8 encodings.") (license license:gpl2+))) +(define-public texlive-hyphen-danish + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-danish" "da" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-da.tex") + (base32 + "0zxzs1b1723mav76i0wiyq4w82x8715cykvwa2bc60ldc2amv0vs"))) + (synopsis "Hyphenation patterns for Danish") + (description "The package provides hyphenation patterns for Danish in +T1/EC and UTF-8 encodings.") + ;; Either LPPL 1.3 or later, or Expat + (license (list license:lppl1.3+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 402b835f2bff2997a91323da84e6c25b601cbe54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:27 +0200 Subject: gnu: Add texlive-hyphen-dutch. * gnu/packages/tex.scm (texlive-hyphen-dutch): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c2b3f4df50..22a8a68a05 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1593,6 +1593,18 @@ T1/EC and UTF-8 encodings.") ;; Either LPPL 1.3 or later, or Expat (license (list license:lppl1.3+ license:expat)))) +(define-public texlive-hyphen-dutch + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-dutch" "nl" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-nl.tex") + (base32 + "0cq46cmgjc4y2x0xs9b0a5zca3jmszv4rkzmrhgjb5z2nm3xkrpi"))) + (synopsis "Hyphenation patterns for Dutch") + (description "The package provides hyphenation patterns for Dutch in T1/EC +and UTF-8 encodings.") + (license license:lppl1.0+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From ab8f6de6fef1147c38167b25bd744390278fec0a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:35 +0200 Subject: gnu: Add texlive-hyphen-english. * gnu/packages/tex.scm (texlive-hyphen-english): New variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 22a8a68a05..2f324ba064 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1605,6 +1605,21 @@ T1/EC and UTF-8 encodings.") and UTF-8 encodings.") (license license:lppl1.0+))) +(define-public texlive-hyphen-english + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-english" '("en-gb" "en-us") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-en-gb.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex") + (base32 + "08hyih8hn2w2q12gc4zygz0ckbz00mkzzn9898z2bicky02zg3kc"))) + (synopsis "Hyphenation patterns for American and British English") + (description "The package provides additional hyphenation patterns for +American and British English in ASCII encoding.") + (license (license:non-copyleft + "file:///tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex" + "FSF all permissive license")))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From d7c80395bc54b85f4ba9dd9dded0a81f4aeb612c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:42 +0200 Subject: gnu: Add texlive-hyphen-esperanto. * gnu/packages/tex.scm (texlive-hyphen-esperanto): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2f324ba064..3888b08090 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1620,6 +1620,18 @@ American and British English in ASCII encoding.") "file:///tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex" "FSF all permissive license")))) +(define-public texlive-hyphen-esperanto + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-esperanto" "eo" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-eo.tex") + (base32 + "03xbjbzasznsyf4wd45bya6f4snfmzpdzg5zpvqj5q6gjykdg54k"))) + (synopsis "Hyphenation patterns for Esperanto") + (description "The package provides hyphenation patterns for Esperanto ISO +Latin 3 and UTF-8 encodings.") + (license license:lppl1.0+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 5f2294843cbf92cf5144423a7206c04af1ae4353 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:54:50 +0200 Subject: gnu: Add texlive-hyphen-estonian. * gnu/packages/tex.scm (texlive-hyphen-estonian): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3888b08090..3a22eb3f90 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1632,6 +1632,19 @@ American and British English in ASCII encoding.") Latin 3 and UTF-8 encodings.") (license license:lppl1.0+))) +(define-public texlive-hyphen-estonian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-estonian" "et" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-et.tex") + (base32 + "0idl6xajkkgxqngjn19jcfd29is5rhfn59v0z8h4sv8yjv6k934m"))) + (synopsis "Hyphenation patterns for Estonian") + (description "The package provides hyphenation patterns for Estonian in +T1/EC and UTF-8 encodings.") + ;; Dual licensed under either license. + (license (list license:lppl1.3+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 54ef221c59085723990d4df3234f10862acc7e67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:55:04 +0200 Subject: gnu: Add texlive-hyphen-ethiopic. * gnu/packages/tex.scm (texlive-hyphen-ethiopic): New variable. --- gnu/packages/tex.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3a22eb3f90..b6048b2d1d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1645,6 +1645,57 @@ T1/EC and UTF-8 encodings.") ;; Dual licensed under either license. (license (list license:lppl1.3+ license:expat)))) +(define-public texlive-hyphen-ethiopic + (let ((template (texlive-hyphen-package + "texlive-hyphen-ethiopic" "mul-ethi" + (list "/source/generic/hyph-utf8/languages/mul-ethi/generate_patterns_mul-ethi.lua") + (base32 + "1dp5qn1mhv62kj27lqc7s0ca65z9bziyavkvif9ds5ivk7aq9drw")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-patterns + (lambda* (#:key inputs #:allow-other-keys) + (let ((tex (string-append (getcwd) + "/tex/generic/hyph-utf8/patterns/tex/"))) + (mkdir-p tex) + (with-directory-excursion "source/generic/hyph-utf8/languages/mul-ethi/" + (substitute* "generate_patterns_mul-ethi.lua" + (("\"UnicodeData.txt\"") + (string-append "\"" + (assoc-ref inputs "UnicodeData.txt") + "\""))) + (invoke "texlua" "generate_patterns_mul-ethi.lua") + (rename-file "hyph-mul-ethi.tex" + (string-append tex "/hyph-mul-ethi.tex")) + #t)))) + (add-after 'install 'install-hyph-mul-ethi.tex + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target (string-append out "/share/texmf-dist/tex"))) + (copy-recursively "tex" target) + #t))))))) + (native-inputs + `(,@(package-native-inputs template) + ("texlive-bin" ,texlive-bin) + ("UnicodeData.txt" + ,(origin + (method url-fetch) + (uri (string-append "http://www.unicode.org/Public/10.0.0/ucd/" + "UnicodeData.txt")) + (sha256 + (base32 + "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj")))))) + (synopsis "Hyphenation patterns for Ethiopic scripts") + (description "The package provides hyphenation patterns for languages +written using the Ethiopic script for Unicode engines. They are not supposed +to be linguistically relevant in all cases and should, for proper typography, +be replaced by files tailored to individual languages.") + (license license:lppl)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From bac10d8224ac759fa38f214c9741c58c84d4da24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:55:11 +0200 Subject: gnu: Add texlive-hyphen-finnish. * gnu/packages/tex.scm (texlive-hyphen-finnish): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b6048b2d1d..afca3461c4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1696,6 +1696,18 @@ to be linguistically relevant in all cases and should, for proper typography, be replaced by files tailored to individual languages.") (license license:lppl)))) +(define-public texlive-hyphen-finnish + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-finnish" "fi" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fi.tex") + (base32 + "03n6s8dwwa5vfk9bbyhcdf7p0bc0d1rrr312hpgbz8jfc9fbgd7n"))) + (synopsis "Hyphenation patterns for Finnish") + (description "The package provides hyphenation patterns for Finnish in +T1/EC and UTF-8 encodings.") + (license license:public-domain))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From a14ffed231139618572d5063799806c423849f51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:55:28 +0200 Subject: gnu: Add texlive-hyphen-french. * gnu/packages/tex.scm (texlive-hyphen-french): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index afca3461c4..f68fffd3a1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1708,6 +1708,18 @@ be replaced by files tailored to individual languages.") T1/EC and UTF-8 encodings.") (license license:public-domain))) +(define-public texlive-hyphen-french + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-french" "fr" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fr.tex") + (base32 + "1q82mmwvy7fdkm42958ajb53w89qkcdwybswxlwcvqngvhpy3zf0"))) + (synopsis "Hyphenation patterns for French") + (description "The package provides hyphenation patterns for French in +T1/EC and UTF-8 encodings.") + (license license:expat))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 28fbf42ae5c70ec2527af14d6c1446b9937b9923 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:55:38 +0200 Subject: gnu: Add texlive-hyphen-friulan. * gnu/packages/tex.scm (texlive-hyphen-friulan): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f68fffd3a1..03ca8a4ca6 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1720,6 +1720,18 @@ T1/EC and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:expat))) +(define-public texlive-hyphen-friulan + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-friulan" "fur" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-fur.tex") + (base32 + "07m975p0ghzs9sjqqgxy7qdkqmgvg4rx4xp08zwm1parqsdlwd5d"))) + (synopsis "Hyphenation patterns for Friulan") + (description "The package provides hyphenation patterns for Friulan in +ASCII encodings.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 8d87184b1210d2a46026898b72c803ea5d6d9175 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:55:48 +0200 Subject: gnu: Add texlive-hyphen-galician. * gnu/packages/tex.scm (texlive-hyphen-galician): New variable. --- gnu/packages/tex.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 03ca8a4ca6..838a28e88f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1732,6 +1732,54 @@ T1/EC and UTF-8 encodings.") ASCII encodings.") (license license:lppl1.3+))) +(define-public texlive-hyphen-galician + (let ((template (texlive-hyphen-package + "texlive-hyphen-galician" "gl" + (list "/source/generic/hyph-utf8/languages/gl/README" + "/source/generic/hyph-utf8/languages/gl/glhybiox.tex" + "/source/generic/hyph-utf8/languages/gl/glhyextr.tex" + "/source/generic/hyph-utf8/languages/gl/glhymed.tex" + "/source/generic/hyph-utf8/languages/gl/glhyquim.tex" + "/source/generic/hyph-utf8/languages/gl/glhytec.tex" + "/source/generic/hyph-utf8/languages/gl/glhyxeog.tex" + "/source/generic/hyph-utf8/languages/gl/glpatter-utf8.tex") + (base32 + "1yj1gxhkqqlyaand5gd6ij6xwffskryzlbcigdam3871a9p8x18w")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-patterns + (lambda* (#:key inputs #:allow-other-keys) + (let ((tex (string-append (getcwd) + "/tex/generic/hyph-utf8/patterns/tex/"))) + (mkdir-p tex) + (with-directory-excursion "source/generic/hyph-utf8/languages/gl/" + (setenv "TEXINPUTS" + (string-append (getcwd) "//:" + (assoc-ref inputs "texlive-mkpattern") "//")) + (invoke "tex" "-ini" "-8bit" "glpatter-utf8.tex") + (rename-file "hyph-gl.tex" + (string-append tex "/hyph-gl.tex")) + #t)))) + (add-after 'install 'install-hyph-gl.tex + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target (string-append out "/share/texmf-dist/tex"))) + (copy-recursively "tex" target) + #t))))))) + (native-inputs + `(,@(package-native-inputs template) + ("texlive-bin" ,texlive-bin) + ("texlive-mkpattern" ,texlive-mkpattern))) + (synopsis "Hyphenation patterns for Galician") + (description "The package provides hyphenation patterns for Galician in +T1/EC and UTF-8 encodings.") + ;; glhyextr.tex is the only file in the public domain. + (license (list license:lppl1.3 license:public-domain))))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From b2334b6e2042de6c2fb44ac03c5ea2d70c2c28da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:55:54 +0200 Subject: gnu: Add texlive-hyphen-georgian. * gnu/packages/tex.scm (texlive-hyphen-georgian): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 838a28e88f..74fbf16814 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1780,6 +1780,18 @@ T1/EC and UTF-8 encodings.") ;; glhyextr.tex is the only file in the public domain. (license (list license:lppl1.3 license:public-domain))))) +(define-public texlive-hyphen-georgian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-georgian" "ka" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ka.tex") + (base32 + "01zhn6mflpiqw4lyi8dx8syiz5mky9jrxm87cgw31hanis5cml4l"))) + (synopsis "Hyphenation patterns for Georgian") + (description "The package provides hyphenation patterns for Georgian in +T8M, T8K, and UTF-8 encodings.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 6028620db11fb4ca57a7897a036c9eeade093203 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:07 +0200 Subject: gnu: Add texlive-hyphen-german. * gnu/packages/tex.scm (texlive-hyphen-german): New variable. --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 74fbf16814..e1a9061065 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1792,6 +1792,27 @@ T1/EC and UTF-8 encodings.") T8M, T8K, and UTF-8 encodings.") (license license:lppl1.3+))) +(define-public texlive-hyphen-german + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-german" '("de-1901" "de-1996" "de-ch-1901") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-de-1901.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-de-1996.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-de-ch-1901.tex" + "/tex/generic/hyphen/dehyphn.tex" + "/tex/generic/hyphen/dehypht.tex" + "/tex/generic/hyphen/dehyphtex.tex" + "/tex/generic/hyphen/ghyphen.README") + (base32 + "1g0vhpvl2l69rn2lx7lkw0inrjbcxkj2sjgwd2fq7hdi4yb2ms76"))) + (synopsis "Hyphenation patterns for German") + (description "This package provides hyphenation patterns for German in +T1/EC and UTF-8 encodings, for traditional and reformed spelling, including +Swiss German.") + ;; The patterns are released under the Expat license; the dehyph* files + ;; are released under the LPPL version 1 or later. + (license (list license:expat license:lppl1.0+)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 65e4cfd1711e2ac5273b0a7cf745e51fcfcac4dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:14 +0200 Subject: gnu: Add texlive-hyphen-greek. * gnu/packages/tex.scm (texlive-hyphen-greek): New variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e1a9061065..4ee1498ac3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1813,6 +1813,22 @@ Swiss German.") ;; are released under the LPPL version 1 or later. (license (list license:expat license:lppl1.0+)))) +(define-public texlive-hyphen-greek + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-greek" '("el-monoton" "el-polyton") + (list "/doc/generic/elhyphen/" + "/tex/generic/hyph-utf8/patterns/tex/hyph-el-monoton.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-el-polyton.tex" + "/tex/generic/hyphen/grmhyph5.tex" + "/tex/generic/hyphen/grphyph5.tex") + (base32 + "04626jhlrv2flgdygm7sfv6xpqhfwiavi16gy2ac04iliyk4rypg"))) + (synopsis "Hyphenation patterns for Greek") + (description "This package provides hyphenation patterns for Modern Greek +in monotonic and polytonic spelling in LGR and UTF-8 encodings.") + (license license:lppl))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 36f03c33bacb1e6a5c0d33ebdd5ad1398aa9f949 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:21 +0200 Subject: gnu: Add texlive-hyphen-hungarian. * gnu/packages/tex.scm (texlive-hyphen-hungarian): New variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4ee1498ac3..8ffa2093a8 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1829,6 +1829,21 @@ Swiss German.") in monotonic and polytonic spelling in LGR and UTF-8 encodings.") (license license:lppl))) +(define-public texlive-hyphen-hungarian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-hungarian" "hu" + (list "/doc/generic/huhyphen/" + "/doc/generic/hyph-utf8/hu/" + "/tex/generic/hyph-utf8/patterns/tex/hyph-hu.tex") + (base32 + "0c81w2569cqsi4j56azwz0lfx16541zhiqgmn3m4iwh7mpx3rji8"))) + (synopsis "Hyphenation patterns for Hungarian") + (description "This package provides hyphenation patterns for Hungarian in +T1/EC and UTF-8 encodings.") + ;; Any of these licenses + (license (list license:gpl2 license:lgpl2.1+ license:mpl1.1)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 33a446e67e9a2ab9e9e5d99bd34b062f58e000b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:28 +0200 Subject: gnu: Add texlive-hyphen-icelandic. * gnu/packages/tex.scm (texlive-hyphen-icelandic): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8ffa2093a8..d261de2393 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1844,6 +1844,18 @@ T1/EC and UTF-8 encodings.") ;; Any of these licenses (license (list license:gpl2 license:lgpl2.1+ license:mpl1.1)))) +(define-public texlive-hyphen-icelandic + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-icelandic" "is" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-is.tex") + (base32 + "1ah1f82lgfhqgid4ngsfiypybx10v8gwxnb12396vfsj3bq6j0ba"))) + (synopsis "Hyphenation patterns for Icelandic") + (description "This package provides hyphenation patterns for Icelandic in +T1/EC and UTF-8 encodings.") + (license license:lppl1.2+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 825285d81075e6637cfdbd26621a50a63f0d0389 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:41 +0200 Subject: gnu: Add texlive-hyphen-indic. * gnu/packages/tex.scm (texlive-hyphen-indic): New variable. --- gnu/packages/tex.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d261de2393..3de2ce7ba4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1856,6 +1856,30 @@ T1/EC and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:lppl1.2+))) +(define-public texlive-hyphen-indic + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-indic" + '("as" "bn" "gu" "hi" "kn" "ml" "mr" "or" "pa" "ta" "te") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-as.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-bn.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-gu.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-hi.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-kn.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-ml.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-mr.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-or.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-pa.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-ta.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-te.tex") + (base32 + "1v8zc3wdbkhzjrflndmz4gdj11syz8vrcg0vwvm5bwhkx23g91lv"))) + (synopsis "Indic hyphenation patterns") + (description "This package provides hyphenation patterns for Assamese, +Bengali, Gujarati, Hindi, Kannada, Malayalam, Marathi, Oriya, Panjabi, Tamil +and Telugu for Unicode engines.") + (license license:expat))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From b6832d79414277c5d840e4bc64e005381e64105d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:48 +0200 Subject: gnu: Add texlive-hyphen-indonesian. * gnu/packages/tex.scm (texlive-hyphen-indonesian): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3de2ce7ba4..9ee7170715 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1880,6 +1880,19 @@ Bengali, Gujarati, Hindi, Kannada, Malayalam, Marathi, Oriya, Panjabi, Tamil and Telugu for Unicode engines.") (license license:expat))) +(define-public texlive-hyphen-indonesian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-indonesian" "id" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-id.tex") + (base32 + "0mf0hr9c952kb2hmzid7fqg5whshwpribbyndb3ba092wh02abh5"))) + (synopsis "Indonesian hyphenation patterns") + (description "This package provides hyphenation patterns for +Indonesian (Bahasa Indonesia) in ASCII encoding. They are probably also +usable for Malay (Bahasa Melayu).") + (license license:gpl2))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 9535f149ec43f58a06ace95a8f01708714282e9e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:56:55 +0200 Subject: gnu: Add texlive-hyphen-interlingua. * gnu/packages/tex.scm (texlive-hyphen-interlingua): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9ee7170715..9482260286 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1893,6 +1893,18 @@ Indonesian (Bahasa Indonesia) in ASCII encoding. They are probably also usable for Malay (Bahasa Melayu).") (license license:gpl2))) +(define-public texlive-hyphen-interlingua + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-interlingua" "ia" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ia.tex") + (base32 + "1aihgma3rix4jkc1z5k1lh6hlfrncn66yj0givd3j6xjqflafr2g"))) + (synopsis "Interlingua hyphenation patterns") + (description "This package provides hyphenation patterns for Interlingua +in ASCII encoding.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 88963a8e70f6bd94b4fce7be2aa9e7fbb12602c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:01 +0200 Subject: gnu: Add texlive-hyphen-irish. * gnu/packages/tex.scm (texlive-hyphen-irish): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9482260286..1311605714 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1905,6 +1905,19 @@ usable for Malay (Bahasa Melayu).") in ASCII encoding.") (license license:lppl1.3+))) +(define-public texlive-hyphen-irish + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-irish" "ga" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ga.tex") + (base32 + "02k1fykgj3xamczjq16i9fsjjsh78pp5ypmh93p64izk2vymfwk0"))) + (synopsis "Irish hyphenation patterns") + (description "This package provides hyphenation patterns for +Irish (Gaeilge) in T1/EC and UTF-8 encodings.") + ;; Either of these licenses + (license (list license:gpl2+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From e33250e48a428923d02b9aba2e5981dde9cc97f3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:08 +0200 Subject: gnu: Add texlive-hyphen-italian. * gnu/packages/tex.scm (texlive-hyphen-italian): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1311605714..9666bc397d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1918,6 +1918,20 @@ Irish (Gaeilge) in T1/EC and UTF-8 encodings.") ;; Either of these licenses (license (list license:gpl2+ license:expat)))) +(define-public texlive-hyphen-italian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-italian" "it" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-it.tex") + (base32 + "1a65q3hjn2p212cgv6p7wa0wcn34qnxcz2pl3v3ip0xmb16qqsk5"))) + (synopsis "Italian hyphenation patterns") + (description "This package provides hyphenation patterns for Italian in +ASCII encoding. Compliant with the Recommendation UNI 6461 on hyphenation +issued by the Italian Standards Institution (Ente Nazionale di Unificazione +UNI).") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 0b3442575cb4bc5121ba95b07eb116f5929ebb85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:15 +0200 Subject: gnu: Add texlive-hyphen-kurmanji. * gnu/packages/tex.scm (texlive-hyphen-kurmanji): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9666bc397d..bd3a642cb9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1932,6 +1932,19 @@ issued by the Italian Standards Institution (Ente Nazionale di Unificazione UNI).") (license license:lppl1.3+))) +(define-public texlive-hyphen-kurmanji + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-kurmanji" "kmr" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-kmr.tex") + (base32 + "1145ykfd0b0hgklindlxdgkqmsnj3cai3cwgllz411yqmrhjc6y9"))) + (synopsis "Kurmanji hyphenation patterns") + (description "This package provides hyphenation patterns for +Kurmanji (Northern Kurdish) as spoken in Turkey and by the Kurdish diaspora in +Europe, in T1/EC and UTF-8 encodings.") + (license license:lppl1.3))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 2f3a07c694c02438d8bc49f3eb0ea795057fe51f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:23 +0200 Subject: gnu: Add texlive-hyphen-latin. * gnu/packages/tex.scm (texlive-hyphen-latin): New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bd3a642cb9..2729a81d3e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1945,6 +1945,29 @@ Kurmanji (Northern Kurdish) as spoken in Turkey and by the Kurdish diaspora in Europe, in T1/EC and UTF-8 encodings.") (license license:lppl1.3))) +(define-public texlive-hyphen-latin + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-latin" '("la-x-classic" "la-x-liturgic" "la") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-classic.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-la-x-liturgic.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-la.tex") + (base32 + "1d8d6b47r4r000gqgzyl0sy9is0y0dg41jp8fw4gqq8qmcgdxgsg"))) + (synopsis "Liturgical Latin hyphenation patterns") + (description "This package provides hyphenation patterns for Latin in +T1/EC and UTF-8 encodings, mainly in modern spelling (u when u is needed and v +when v is needed), medieval spelling with the ligatures @code{\\ae} and +@code{\\oe} and the (uncial) lowercase 'v' written as a 'u' is also supported. +Apparently there is no conflict between the patterns of modern Latin and those +of medieval Latin. It also includes hyphenation patterns for the Classical +Latin in T1/EC and UTF-8 encodings. Classical Latin hyphenation patterns are +different from those of 'plain' Latin, the latter being more adapted to modern +Latin. It also provides hyphenation patterns for the Liturgical Latin in +T1/EC and UTF-8 encodings.") + ;; Either of these licenses + (license (list license:lppl1.0+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From e8effd273f42e79b89bae67501dc2ff81309ea3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:30 +0200 Subject: gnu: Add texlive-hyphen-latvian. * gnu/packages/tex.scm (texlive-hyphen-latvian): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2729a81d3e..4950751988 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1968,6 +1968,19 @@ T1/EC and UTF-8 encodings.") ;; Either of these licenses (license (list license:lppl1.0+ license:expat)))) +(define-public texlive-hyphen-latvian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-latvian" "lv" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-lv.tex") + (base32 + "1xbh5s6nwfjbv7g4kmcpjkm02a6s767p7jn9qjcnz5ip0ndl5g66"))) + (synopsis "Latvian hyphenation patterns") + (description "This package provides hyphenation patterns for Latvian in +L7X and UTF-8 encodings.") + ;; Either of these licenses. + (license (list license:gpl2 license:lgpl2.1)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From af0e6cc82a76b41703c3c2772d24f0cfccdcb3a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:36 +0200 Subject: gnu: Add texlive-hyphen-lithuanian. * gnu/packages/tex.scm (texlive-hyphen-lithuanian): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4950751988..35790390f9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1981,6 +1981,20 @@ L7X and UTF-8 encodings.") ;; Either of these licenses. (license (list license:gpl2 license:lgpl2.1)))) +(define-public texlive-hyphen-lithuanian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-lithuanian" "lt" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-lt.tex") + (base32 + "0v9spw0qkygkihj5app2immzqqr98w81pz460bcgvj1ah35jdfsl"))) + (synopsis "Lithuanian hyphenation patterns") + (description "This package provides hyphenation patterns for Lithuanian in +L7X and UTF-8 encodings.") + ;; "Do ... whatever ... as long as you respect the copyright"; as part of + ;; the hyph-utf8 package we choose the LPPL license. + (license license:lppl))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 1890799b6262fa212d4f22f0e4a6364863fb321a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:43 +0200 Subject: gnu: Add texlive-hyphen-mongolian. * gnu/packages/tex.scm (texlive-hyphen-mongolian): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 35790390f9..2e1e139348 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1995,6 +1995,20 @@ L7X and UTF-8 encodings.") ;; the hyph-utf8 package we choose the LPPL license. (license license:lppl))) +(define-public texlive-hyphen-mongolian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-mongolian" '("mn-cyrl-x-lmc" "mn-cyrl") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl-x-lmc.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl.tex") + (base32 + "0lqq3jgwgnclb1cn3x99xmk90xra9q51b00ypwy5crssmy023hqc"))) + (synopsis "Mongolian hyphenation patterns in Cyrillic script") + (description "This package provides hyphenation patterns for Mongolian in +T2A, LMC and UTF-8 encodings.") + ;; Either of these licenses + (license (list license:lppl1.3+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From da2b2d490bf2873065b5e65d471a50c662bd3234 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:57:50 +0200 Subject: gnu: Add texlive-hyphen-norwegian. * gnu/packages/tex.scm (texlive-hyphen-norwegian): New variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2e1e139348..e811f10bc7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2009,6 +2009,22 @@ T2A, LMC and UTF-8 encodings.") ;; Either of these licenses (license (list license:lppl1.3+ license:expat)))) +(define-public texlive-hyphen-norwegian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-norwegian" '("nb" "nn" "no") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-nb.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-nn.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex") + (base32 + "1fxnf671yz0p3lmdkspna7fjh96br1jy6yf7v17yh4fxwry3s4yz"))) + (synopsis "Norwegian Bokmal and Nynorsk hyphenation patterns") + (description "This package provides hyphenation patterns for Norwegian +Bokmal and Nynorsk in T1/EC and UTF-8 encodings.") + (license (license:non-copyleft + "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex" + "FSF All permissive license")))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 033406ad1426a4ca91a98944f895e606f2de90cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:01 +0200 Subject: gnu: Add texlive-hyphen-occitan. * gnu/packages/tex.scm (texlive-hyphen-occitan): New variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e811f10bc7..32c74b83ba 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2025,6 +2025,21 @@ Bokmal and Nynorsk in T1/EC and UTF-8 encodings.") "/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex" "FSF All permissive license")))) +(define-public texlive-hyphen-occitan + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-occitan" "oc" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-oc.tex") + (base32 + "1y6j6ac9ncn79p7hnp6mdwdsw9ij14zyjby5iwdhpvzzn7yyc7p8"))) + (synopsis "Occitan hyphenation patterns") + (description "This package provides hyphenation patterns for Occitan in +T1/EC and UTF-8 encodings. They are supposed to be valid for all the Occitan +variants spoken and written in the wide area called 'Occitanie' by the French. +It ranges from the Val d'Aran within Catalunya, to the South Western Italian +Alps encompassing the southern half of the French pentagon.") + (license license:lppl1.0+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From db3f7fdad09942b6d6065fab31b96fdee0eb9224 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:08 +0200 Subject: gnu: Add texlive-hyphen-piedmontese. * gnu/packages/tex.scm (texlive-hyphen-piedmontese): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 32c74b83ba..6a75c10909 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2040,6 +2040,19 @@ It ranges from the Val d'Aran within Catalunya, to the South Western Italian Alps encompassing the southern half of the French pentagon.") (license license:lppl1.0+))) +(define-public texlive-hyphen-piedmontese + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-piedmontese" "pms" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pms.tex") + (base32 + "00fqzymkg374r3dzf1y82k6b18bqrf688vnjv0vkvw5a45srlb5r"))) + (synopsis "Piedmontese hyphenation patterns") + (description "This package provides hyphenation patterns for Piedmontese +in ASCII encoding. Compliant with 'Gramatica dla lengua piemonteisa' by +Camillo Brero.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 9c451e774579c3376443d99399ef761f24d07eb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:14 +0200 Subject: gnu: Add texlive-hyphen-polish. * gnu/packages/tex.scm (texlive-hyphen-polish): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6a75c10909..debd7e4dfe 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2053,6 +2053,19 @@ in ASCII encoding. Compliant with 'Gramatica dla lengua piemonteisa' by Camillo Brero.") (license license:lppl1.3+))) +(define-public texlive-hyphen-polish + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-polish" "pl" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pl.tex") + (base32 + "0dzq8ca96q7m5bslh51x8d30pdb86glh2gn3mmvq5ip813ckwh3s"))) + (synopsis "Polish hyphenation patterns") + (description "This package provides hyphenation patterns for Polish in QX +and UTF-8 encodings.") + ;; No differing license declared, so we choose the project license. + (license license:lppl))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 5fd12ffbc879470f4da69a1ca83d9d94a498d404 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:21 +0200 Subject: gnu: Add texlive-hyphen-portuguese. * gnu/packages/tex.scm (texlive-hyphen-portuguese): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index debd7e4dfe..aea120d9ed 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2066,6 +2066,18 @@ and UTF-8 encodings.") ;; No differing license declared, so we choose the project license. (license license:lppl))) +(define-public texlive-hyphen-portuguese + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-portuguese" "pt" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-pt.tex") + (base32 + "1waxrmm33fd2qfc4kiaiblg8kwzasrvgq4j3l14z733d0hlg4rfz"))) + (synopsis "Portuguese hyphenation patterns") + (description "This package provides hyphenation patterns for Portuguese in +T1/EC and UTF-8 encodings.") + (license license:bsd-3))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 6fa3b112b9b5629c0b53459add9e1355388040f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:28 +0200 Subject: gnu: Add texlive-hyphen-romanian. * gnu/packages/tex.scm (texlive-hyphen-romanian): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index aea120d9ed..8895f531ac 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2078,6 +2078,19 @@ and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:bsd-3))) +(define-public texlive-hyphen-romanian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-romanian" "ro" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ro.tex") + (base32 + "12i1vryl51yhdpj163ahfyiy21rjmf4gkqgslpriirdjmyrwrs65"))) + (synopsis "Romanian hyphenation patterns") + (description "This package provides hyphenation patterns for Romanian in +T1/EC and UTF-8 encodings.") + ;; No differing license declared, so we choose the project license. + (license license:lppl))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From c4abd4a2fc6d34ec0e11fc081ddfac5fb54df143 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:34 +0200 Subject: gnu: Add texlive-hyphen-romansh. * gnu/packages/tex.scm (texlive-hyphen-romansh): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8895f531ac..927c789910 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2091,6 +2091,19 @@ T1/EC and UTF-8 encodings.") ;; No differing license declared, so we choose the project license. (license license:lppl))) +(define-public texlive-hyphen-romansh + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-romansh" "rm" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-rm.tex") + (base32 + "06wan8i4appc1zfvc0q4cgnfv1nj0qgk02w3sg56zc11hf8sywl9"))) + (synopsis "Romansh hyphenation patterns") + (description "This package provides hyphenation patterns for Romansh in +ASCII encodings. They are supposed to comply with the rules indicated by the +Lia Rumantscha (Romansh language society).") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 483d8af60c423b9b241db33146c764377dcbfdef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:40 +0200 Subject: gnu: Add texlive-hyphen-russian. * gnu/packages/tex.scm (texlive-hyphen-russian): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 927c789910..93599ad089 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2104,6 +2104,18 @@ ASCII encodings. They are supposed to comply with the rules indicated by the Lia Rumantscha (Romansh language society).") (license license:lppl1.3+))) +(define-public texlive-hyphen-russian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-russian" "ru" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-ru.tex") + (base32 + "09s4vq23x4vff08ykmf08dvcdradjzzwvyys8p2wk6jxaqp980s3"))) + (synopsis "Russian hyphenation patterns") + (description "This package provides hyphenation patterns for Russian in +T2A and UTF-8 encodings.") + (license license:lppl1.2+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 19e31f91d076164cb6896ebd3d4a918f4d7afec0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:47 +0200 Subject: gnu: Add texlive-hyphen-sanskrit. * gnu/packages/tex.scm (texlive-hyphen-sanskrit): New variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 93599ad089..76458ebe53 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2116,6 +2116,22 @@ Lia Rumantscha (Romansh language society).") T2A and UTF-8 encodings.") (license license:lppl1.2+))) +(define-public texlive-hyphen-sanskrit + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-sanskrit" "sa" + (list "/doc/generic/hyph-utf8/sa/hyphenmin.txt" + "/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex") + (base32 + "0grnn09l4i5yridx10yhm6dg9sbhgc2pmsp1p6hrcy7lzkqwdvs3"))) + (synopsis "Sanskrit hyphenation patterns") + (description "This package provides hyphenation patterns for Sanskrit and +Prakrit in longdesc transliteration, and in Devanagari, Bengali, Kannada, +Malayalam longdesc and Telugu scripts for Unicode engines.") + ;; "You may freely use, copy, modify and/or distribute this file." + (license (license:non-copyleft + "file:///tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex")))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 67c7900e99aae4854efbf7515243fa7d75453384 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:58:54 +0200 Subject: gnu: Add texlive-hyphen-serbian. * gnu/packages/tex.scm (texlive-hyphen-serbian): New variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 76458ebe53..0b46707913 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2132,6 +2132,21 @@ Malayalam longdesc and Telugu scripts for Unicode engines.") (license (license:non-copyleft "file:///tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex")))) +(define-public texlive-hyphen-serbian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-serbian" '("sh-cyrl" "sh-latn" "sr-cyrl") + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sh-cyrl.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-sh-latn.tex" + "/tex/generic/hyph-utf8/patterns/tex/hyph-sr-cyrl.tex") + (base32 + "0fhdfydyaspb8dwirlf24vn7y9dzwmhsld0mmw0fz1lmcfaj252n"))) + (synopsis "Serbian hyphenation patterns") + (description "This package provides hyphenation patterns for Serbian in +T1/EC, T2A and UTF-8 encodings.") + ;; Any version of the GPL. + (license license:gpl3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From af13345a6ca50923e572c33bad42917be08b5f38 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:59:02 +0200 Subject: gnu: Add texlive-hyphen-slovak. * gnu/packages/tex.scm (texlive-hyphen-slovak): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0b46707913..2aaedfe975 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2147,6 +2147,18 @@ T1/EC, T2A and UTF-8 encodings.") ;; Any version of the GPL. (license license:gpl3+))) +(define-public texlive-hyphen-slovak + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-slovak" "sk" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sk.tex") + (base32 + "1cgw6fmyci3za3vsa49b6m74wqv582w0rpca7s9xva3hqm1m5qdg"))) + (synopsis "Slovak hyphenation patterns") + (description "This package provides hyphenation patterns for Slovak in +T1/EC and UTF-8 encodings.") + (license license:gpl2+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 3cd8868f321bb09da9974913d6d9550735406f32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:59:10 +0200 Subject: gnu: Add texlive-hyphen-slovenian. * gnu/packages/tex.scm (texlive-hyphen-slovenian): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2aaedfe975..bebe1c5be9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2159,6 +2159,19 @@ T1/EC, T2A and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:gpl2+))) +(define-public texlive-hyphen-slovenian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-slovenian" "sl" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sl.tex") + (base32 + "1ixf2pxir9xf1gggq9k28xxglsq9bwqlghd9cl4amk5vrn5bjbds"))) + (synopsis "Slovenian hyphenation patterns") + (description "This package provides hyphenation patterns for Slovenian in +T1/EC and UTF-8 encodings.") + ;; Either license + (license (list license:lppl1.0+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 40b009b8c934144d005097f3a88b45bb5d5c0f3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:59:16 +0200 Subject: gnu: Add texlive-hyphen-spanish. * gnu/packages/tex.scm (texlive-hyphen-spanish): New variable. --- gnu/packages/tex.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bebe1c5be9..b2a4b90f84 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2172,6 +2172,21 @@ T1/EC and UTF-8 encodings.") ;; Either license (license (list license:lppl1.0+ license:expat)))) +(define-public texlive-hyphen-spanish + (package + ;; The source files "eshyph-make.lua" and "eshyph.src" are provided to + ;; generate obsolete hyphenation patterns, which aren't included in a + ;; default TeX Live distribution, so we don't include them either. + (inherit (texlive-hyphen-package + "texlive-hyphen-spanish" "es" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-es.tex") + (base32 + "0jgs0zzyk2wwrjbx2hqdh5qggrnik9xmsxygbfhlb7gdrcrs0mbj"))) + (synopsis "Hyphenation patterns for Spanish") + (description "The package provides hyphenation patterns for Spanish in +T1/EC and UTF-8 encodings.") + (license license:expat))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 1e7db18177cc3e1f447ab1c33e1d51f92ec4370b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:59:24 +0200 Subject: gnu: Add texlive-hyphen-swedish. * gnu/packages/tex.scm (texlive-hyphen-swedish): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b2a4b90f84..8b3e05e15b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2187,6 +2187,18 @@ T1/EC and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:expat))) +(define-public texlive-hyphen-swedish + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-swedish" "sv" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-sv.tex") + (base32 + "12sf9f43zwyzb4cn57yry8r4zmwdc7cfdljn3qwxwrny4m3sw4w8"))) + (synopsis "Swedish hyphenation patterns") + (description "This package provides hyphenation patterns for Swedish in +T1/EC and UTF-8 encodings.") + (license license:lppl1.2+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 3eaee8fbbdccad0b9a519e54dc3bf29524e5a540 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 12:59:32 +0200 Subject: gnu: Add texlive-hyphen-thai. * gnu/packages/tex.scm (texlive-hyphen-thai): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8b3e05e15b..9345cf4783 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2199,6 +2199,18 @@ T1/EC and UTF-8 encodings.") T1/EC and UTF-8 encodings.") (license license:lppl1.2+))) +(define-public texlive-hyphen-thai + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-thai" "th" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-th.tex") + (base32 + "15k1n4xdw8zzd5nrh76s53z4j95gxa4i2h1av5gx5vrjgblzzl97"))) + (synopsis "Thai hyphenation patterns") + (description "This package provides hyphenation patterns for Thai in LTH +and UTF-8 encodings.") + (license license:lppl1.3+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From e80ecb7bf203a5178a4cebf1ef9a7b4da6906e2a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 13:06:02 +0200 Subject: gnu: Add texlive-hyphen-turkish. * gnu/packages/tex.scm (texlive-hyphen-turkish): New variable. --- gnu/packages/tex.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9345cf4783..74d67c7a88 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2211,6 +2211,45 @@ T1/EC and UTF-8 encodings.") and UTF-8 encodings.") (license license:lppl1.3+))) +(define-public texlive-hyphen-turkish + (let ((template (texlive-hyphen-package + "texlive-hyphen-turkish" "tr" + (list "/source/generic/hyph-utf8/languages/tr/generate_patterns_tr.rb") + (base32 + "0rvlhs2z2sn312lqsf44bzknid5dry7d2sl2q1whfvr0y4qj1g8f")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-patterns + (lambda _ + (let ((target (string-append (getcwd) + "/tex/generic/hyph-utf8/patterns/tex"))) + (mkdir-p target) + (with-directory-excursion "source/generic/hyph-utf8/languages/tr/" + (substitute* "generate_patterns_tr.rb" + (("\\$file = File.new.*") + (string-append "$file = File.new(\"" target + "/hyph-tr.tex\",\"w\")\n"))) + (invoke "ruby" "generate_patterns_tr.rb")) + #t))) + (add-after 'install 'install-hyph-tr.tex + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target (string-append out "/share/texmf-dist/tex"))) + (copy-recursively "tex" target) + #t))))))) + (synopsis "Hyphenation patterns for Turkish") + (description "The package provides hyphenation patterns for Turkish in +T1/EC and UTF-8 encodings. The patterns for Turkish were first produced for +the Ottoman Texts Project in 1987 and were suitable for both Modern Turkish +and Ottoman Turkish in Latin script, however the required character set didn't +fit into EC encoding, so support for Ottoman Turkish had to be dropped to keep +compatibility with 8-bit engines.") + (license license:lppl1.0+)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 5f50dd95806f12f4f17c5112214114893ac22b99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 13:06:14 +0200 Subject: gnu: Add texlive-hyphen-turkmen. * gnu/packages/tex.scm (texlive-hyphen-turkmen): New variable. --- gnu/packages/tex.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 74d67c7a88..8e99835d90 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2250,6 +2250,41 @@ fit into EC encoding, so support for Ottoman Turkish had to be dropped to keep compatibility with 8-bit engines.") (license license:lppl1.0+)))) +(define-public texlive-hyphen-turkmen + (let ((template (texlive-hyphen-package + "texlive-hyphen-turkmen" "tk" + (list "/source/generic/hyph-utf8/languages/tk/generate_patterns_tk.rb") + (base32 + "1wlqx8wb0wsqhdv823brc3i8w1vf4m4bkb2vg917j5dq8p8p71aw")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-patterns + (lambda _ + (let ((target (string-append (getcwd) + "/tex/generic/hyph-utf8/patterns/tex"))) + (mkdir-p target) + (with-directory-excursion "source/generic/hyph-utf8/languages/tk/" + (substitute* "generate_patterns_tk.rb" + (("\\$file = File.new.*") + (string-append "$file = File.new(\"" target + "/hyph-tr.tex\",\"w\")\n"))) + (invoke "ruby" "generate_patterns_tk.rb")) + #t))) + (add-after 'install 'install-hyph-tk.tex + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target (string-append out "/share/texmf-dist/tex"))) + (copy-recursively "tex" target) + #t))))))) + (synopsis "Hyphenation patterns for Turkmen") + (description "The package provides hyphenation patterns for Turkmen in +T1/EC and UTF-8 encodings.") + (license license:public-domain)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From cf8f4e1ba3932f920a54c0285b23c394fb6b4c38 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 13:06:21 +0200 Subject: gnu: Add texlive-hyphen-ukrainian. * gnu/packages/tex.scm (texlive-hyphen-ukrainian): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8e99835d90..3ab8ed979f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2285,6 +2285,19 @@ compatibility with 8-bit engines.") T1/EC and UTF-8 encodings.") (license license:public-domain)))) +(define-public texlive-hyphen-ukrainian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-ukrainian" "uk" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-uk.tex") + (base32 + "17z0gmw5svsf5zlhjkckwk4y21g7prfwj473jlqnwcsr8a941gsf"))) + (synopsis "Ukrainian hyphenation patterns") + (description "This package provides hyphenation patterns for Ukrainian in +T2A and UTF-8 encodings.") + ;; No version specified + (license license:lppl))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 71e58125186b08c364989c66509cbb5cf3b693d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 13:06:28 +0200 Subject: gnu: Add texlive-hyphen-uppersorbian. * gnu/packages/tex.scm (texlive-hyphen-uppersorbian): New variable. --- gnu/packages/tex.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3ab8ed979f..c37133d171 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2298,6 +2298,18 @@ T2A and UTF-8 encodings.") ;; No version specified (license license:lppl))) +(define-public texlive-hyphen-uppersorbian + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-uppersorbian" "hsb" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-hsb.tex") + (base32 + "1q42s32cfbynlnzn9hpcldi77fszi5xkn1c85l8xqjmfydqbqdyi"))) + (synopsis "Upper Sorbian hyphenation patterns") + (description "This package provides hyphenation patterns for Upper Sorbian +in T1/EC and UTF-8 encodings.") + (license license:lppl1.3a+))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 0d4088e45eaa8cd351c55b962984cf5aa139e19c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 13:06:34 +0200 Subject: gnu: Add texlive-hyphen-welsh. * gnu/packages/tex.scm (texlive-hyphen-welsh): New variable. --- gnu/packages/tex.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c37133d171..fa3b6f8537 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2310,6 +2310,19 @@ T2A and UTF-8 encodings.") in T1/EC and UTF-8 encodings.") (license license:lppl1.3a+))) +(define-public texlive-hyphen-welsh + (package + (inherit (texlive-hyphen-package + "texlive-hyphen-welsh" "cy" + (list "/tex/generic/hyph-utf8/patterns/tex/hyph-cy.tex") + (base32 + "0h8yjj5zdg0hvpb2vx9gi376536nl59hp8w286z1a13diaayg1m2"))) + (synopsis "Welsh hyphenation patterns") + (description "This package provides hyphenation patterns for Welsh in +T1/EC and UTF-8 encodings.") + ;; Either license + (license (list license:lppl1.0+ license:expat)))) + (define-public texlive-hyph-utf8 (package (inherit (simple-texlive-package -- cgit v1.2.3 From 10e8b3385c54991b5ec21eb817ef44774d8e8fee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 23:14:23 +0200 Subject: gnu: Add texlive-ukrhyph. * gnu/packages/tex.scm (texlive-ukrhyph): New variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index fa3b6f8537..47508108b3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2496,6 +2496,22 @@ bundle.") (define-public texlive-generic-dehyph-exptl (deprecated-package "texlive-generic-dehyph-exptl" texlive-dehyph-exptl)) +(define-public texlive-ukrhyph + (package + (inherit (simple-texlive-package + "texlive-ukrhyph" + (list "/doc/generic/ukrhyph/" + "/tex/generic/ukrhyph/") + (base32 + "01ma274sixcrbpb7fpqkxwfvrnzfj2srv9b4a42rfnph1pdql74z") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/ukrhyph") + (synopsis "Hyphenation patterns for Ukrainian") + (description "The package provides a range of hyphenation patterns for +Ukrainian, depending on the encoding of the output font including the standard +T2A.") + (license license:lppl))) + (define-public texlive-latex-base (let ((texlive-dir (lambda (dir hash) -- cgit v1.2.3 From c87d8a140539abe9a86cbf0461ddb32dfeb92b39 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 13 Jul 2019 23:14:48 +0200 Subject: gnu: Add texlive-ruhyphen. * gnu/packages/tex.scm (texlive-ruhyphen): New variable. --- gnu/packages/tex.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 47508108b3..94abbf8ded 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages shells) #:use-module (gnu packages base) + #:use-module (gnu packages gawk) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -2512,6 +2513,45 @@ Ukrainian, depending on the encoding of the output font including the standard T2A.") (license license:lppl))) +(define-public texlive-ruhyphen + (let ((template (simple-texlive-package + "texlive-ruhyphen" + (list "/source/generic/ruhyphen/" + "/tex/generic/ruhyphen/") + (base32 + "18n1bqhh8jv765vz3a3fjwffy7m71vhwx9yq8zl0p5j7p72q9qcn") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda _ + (let ((cwd (getcwd))) + ;; Remove generated files. + (for-each delete-file + (find-files "tex/generic/ruhyphen/" + "^cyry.*.tex$")) + (substitute* "source/generic/ruhyphen/Makefile" + (("./mkcyryo") (string-append cwd "/source/generic/ruhyphen/mkcyryo"))) + (with-directory-excursion "tex/generic/ruhyphen" + (invoke "make" "-f" + (string-append cwd "/source/generic/ruhyphen/Makefile")))))))))) + (native-inputs + `(("coreutils" ,coreutils) + ("gawk" ,gawk) + ("sed" ,sed) + ("grep" ,grep) + ("perl" ,perl))) + (home-page "https://www.ctan.org/pkg/ruhyphen") + (synopsis "Hyphenation patterns for Russian") + (description "The package provides a collection of Russian hyphenation +patterns supporting a number of Cyrillic font encodings, including T2, +UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.") + (license license:lppl)))) + (define-public texlive-latex-base (let ((texlive-dir (lambda (dir hash) -- cgit v1.2.3 From 1e39065d29462ad7bef6651e64eb0732b18002be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 12:51:02 +0200 Subject: gnu: Add texlive-etex. * gnu/packages/tex.scm (texlive-etex): New variable. --- gnu/packages/tex.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 94abbf8ded..03e790cbd2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1346,6 +1346,64 @@ output encodings, and features generation of clean UTF-8 patterns.") ;; This provides etex.src which is needed to build various formats, including ;; luatex.fmt and pdflatex.fmt +(define-public texlive-etex + (let ((template (simple-texlive-package + "texlive-etex" + (list "/doc/etex/base/" + "/doc/man/man1/etex.1" + "/doc/man/man1/etex.man1.pdf" + "/tex/plain/etex/" + "/fonts/source/public/etex/") + (base32 + "1qv6vxm5a8pw38gas3i69ivmsn79zj2yq5n5vdmh0rzic5hw2hmc") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + ;; Build tfm font. + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((mf (assoc-ref inputs "texlive-metafont-base"))) + ;; Tell mf where to find mf.base + (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) + ;; Tell mf where to look for source files + (setenv "MFINPUTS" + (string-append (getcwd) + "/fonts/source/public/etex/:" + mf "/share/texmf-dist/metafont/base:" + (assoc-ref inputs "texlive-fonts-cm") + "/share/texmf-dist/fonts/source/public/cm"))) + (invoke "mf" "-progname=mf" + (string-append "\\" + "mode:=ljfour; " + "mag:=1; " + "scrollmode; " + "input xbmc10")) + #t)) + (add-after 'install 'install-font + (lambda* (#:key outputs #:allow-other-keys) + (install-file + "xbmc10.tfm" + (string-append (assoc-ref outputs "out") + "/share/texmf-dist/fonts/tfm/public/etex/")) + #t)))))) + (native-inputs + `(("texlive-bin" ,texlive-bin) + ("texlive-metafont-base" ,texlive-metafont-base) + ("texlive-fonts-cm" ,texlive-fonts-cm))) + (home-page "https://www.ctan.org/pkg/etex") + (synopsis "Extended version of TeX") + (description + "This package provides an extended version of TeX (which is capable of +running as if it were TeX unmodified). E-TeX has been specified by the LaTeX +team as the engine for the development of LaTeX2e; as a result, LaTeX +programmers may assume e-TeX functionality. The pdftex engine directly +incorporates the e-TeX extensions.") + (license license:knuth)))) + (define-public texlive-tex-plain (package (name "texlive-tex-plain") -- cgit v1.2.3 From 57680dc2c58085a26d30b0c98299d5a586612cf5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 12:52:35 +0200 Subject: gnu: Add texlive-latexconfig. * gnu/packages/tex.scm (texlive-latexconfig): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 03e790cbd2..d8cccfc227 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2610,6 +2610,20 @@ patterns supporting a number of Cyrillic font encodings, including T2, UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.") (license license:lppl)))) +(define-public texlive-latexconfig + (package + (inherit (simple-texlive-package + "texlive-latexconfig" + (list "/tex/latex/latexconfig/") + (base32 + "1wa7yhdpnz1nyidwgli68fyr33jn951bnniqrih5lj98k09rqc3h") + #:trivial? #t)) + (home-page "https://www.tug.org/") + (synopsis "Configuration files for LaTeX-related formats") + (description "The package provides configuration files for LaTeX-related +formats.") + (license license:lppl))) + (define-public texlive-latex-base (let ((texlive-dir (lambda (dir hash) -- cgit v1.2.3 From 7a9b737a8b07a9bef580296f280c9d8fe666a42d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 14:07:12 +0200 Subject: gnu: Add texlive-docstrip. * gnu/packages/tex.scm (texlive-docstrip): New variable. --- gnu/packages/tex.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d8cccfc227..85e458b919 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -413,6 +413,20 @@ This package contains the binaries.") (home-page "https://www.tug.org/texlive/"))) +(define texlive-docstrip + (package + (inherit (simple-texlive-package + "texlive-docstrip" + (list "/tex/latex/base/docstrip.tex") + (base32 + "17vdy43d9vknldz7wb69hp33r8awmdvn4xszamvgs5ikcl4cp289") + #:trivial? #t)) + (home-page "https://www.ctan.org/texlive") + (synopsis "Utility to strip documentation from TeX files.") + (description "This package provides the docstrip utility to strip +documentation from TeX files. It is part of the LaTeX base.") + (license license:lppl1.3+))) + (define-public texlive-unicode-data (package (inherit (simple-texlive-package -- cgit v1.2.3 From e9816fcbb4edf621b3ec22000f8d048c5c92153b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 21:58:03 +0200 Subject: gnu: Add texlive-fontinst. * gnu/packages/tex.scm (texlive-fontinst): New variable. (texlive-tex-fontinst-base): Deprecate package. --- gnu/packages/tex.scm | 117 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 30 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 85e458b919..fcf5bee536 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -570,41 +570,98 @@ to adapt the plain e-TeX source file to work with XeTeX and LuaTeX.") build fonts using the Metafont system.") (license license:knuth))) -(define-public texlive-tex-fontinst-base - (package - (name "texlive-tex-fontinst-base") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/fontinst/base")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "12gnb8hc45p47pqn31msvi4mpr3wxbbbf2k4xhmshjqykwzlx508")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/fontinst/base"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://www.ctan.org/pkg/fontinst") - (synopsis "Tools for converting and installing fonts for TeX and LaTeX") - (description "This package provides TeX macros for converting Adobe Font +(define-public texlive-fontinst + (let ((template (simple-texlive-package + "texlive-fontinst" + (list "/doc/fonts/fontinst/" + "/doc/man/man1/fontinst.1" + "/doc/man/man1/fontinst.man1.pdf" + + ;; This is used to build parts of + ;; /tex/fontinst/{base,misc}/ and + ;; /tex/latex/fontinst/fontdoc.sty. + "/source/fontinst/base/" + + ;; These are not generated. + "/tex/fontinst/base/bbox.sty" + "/tex/fontinst/base/multislot.sty" + "/tex/fontinst/misc/glyphbox.mtx" + "/tex/fontinst/misc/glyphoff.mtx" + "/tex/fontinst/misc/glyphon.mtx" + "/tex/fontinst/misc/kernoff.mtx" + "/tex/fontinst/misc/kernon.mtx" + + "/tex/fontinst/latinetx/" + "/tex/fontinst/latinmtx/" + "/tex/fontinst/mathmtx/" + "/tex/fontinst/smblmtx/" + + "/scripts/texlive/fontinst.sh") + (base32 + "09drlb0krhnizw92xlm5wxzzpgn3shcxd684xlg0zc5p16l47w6h") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:modules _ '()) + '((guix build gnu-build-system) + (guix build utils) + (ice-9 match))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TEXINPUTS" + (string-append (getcwd) "//:" + (getcwd) "/source/fontinst/base//:" + (assoc-ref inputs "texlive-docstrip") "//")) + (mkdir "build") + (invoke "tex" "-ini" "-interaction=scrollmode" + "-output-directory=build" + "fontinst.ins"))) + ;; Since we're using docstrip without LaTeX we can't set \UseTDS + ;; or \BaseDirectory, so the generated files are just dumped in + ;; the "build" directory. + (add-after 'install 'install-generated-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (root (string-append out "/share/texmf-dist"))) + (for-each (match-lambda + ((dir files ...) + (for-each (lambda (file) + (install-file + (string-append "build/" file) + (string-append root dir))) + files))) + '(("/tex/fontinst/base" + "fontinst.sty" + "cfntinst.sty" + "xfntinst.sty" + "finstmsc.sty" + "fontinst.ini") + ("/tex/fontinst/misc" + "csc2x.tex" + "csckrn2x.tex" + "osf2x.tex") + ("/tex/latex/fontinst" + "fontdoc.sty"))) + #t))))))) + (native-inputs + `(("texlive-bin" ,texlive-bin) + ("texlive-docstrip" ,texlive-docstrip))) + (home-page "https://www.ctan.org/pkg/fontinst") + (synopsis "Tools for converting and installing fonts for TeX and LaTeX") + (description "This package provides TeX macros for converting Adobe Font Metric files to TeX metric and virtual font format. Fontinst helps mainly with the number crunching and shovelling parts of font installation. This means in practice that it creates a number of files which give the TeX metrics (and related information) for a font family that TeX needs to do any typesetting in these fonts.") - (license license:lppl1.1+))) + (license license:lppl1.1+)))) + +(define-public texlive-tex-fontinst-base + (deprecated-package "texlive-tex-fontinst-base" texlive-fontinst)) (define-public texlive-fontname (package -- cgit v1.2.3 From cd957f4fc69f64f66e7cb17ef0e53382c5c6d46b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:11:18 +0200 Subject: gnu: Add texlive-mflogo-font. * gnu/packages/tex.scm (texlive-mflogo-font): New variable. (texlive-fonts-mflogo-font): Deprecate package. --- gnu/packages/tex.scm | 73 ++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 60 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index fcf5bee536..120d30a5fb 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1097,67 +1097,17 @@ Knuthian mflogo fonts described in The Metafontbook and to typeset Metafont logos in LaTeX documents.") (license license:lppl))) -(define-public texlive-fonts-mflogo-font +(define-public texlive-mflogo-font (package - (name "texlive-fonts-mflogo-font") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/hoekwater/mflogo-font")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "09fsxfpiyxjljkrb52b197728bjnkcnv3bdwm4hl6hf23mbmqadf")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "fonts/type1/hoekwater/mflogo-font") - ("afm" . "fonts/afm/hoekwater/mflogo-font") - ("fonts-map" . "fonts/map/dvips/mflogo-font")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/hoekwater/mflogo-font")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "0bx1mfhhzsk9gj1pha36q2rk0jd0y285qm62zgvdvzzzlfnk8sdb")))) - ("fonts-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/mflogo-font/")) - (revision %texlive-revision))) - (file-name (string-append name "-fonts-map-" version "-checkout")) - (sha256 - (base32 - "044xrrpl8hnvj55cx2ql1ib1bcyr33nzanx5nkwxpai7fb7pg4y6")))))) + (inherit (simple-texlive-package + "texlive-mflogo-font" + (list "/doc/fonts/mflogo-font/README" + "/fonts/afm/hoekwater/mflogo-font/" + "/fonts/map/dvips/mflogo-font/" + "/fonts/type1/hoekwater/mflogo-font/") + (base32 + "094mknjv8ki2pvj1zin0f1z4f1w12g0cfqjiqcsawjsry4yfrmbg") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/mflogo-font") (synopsis "Metafont logo font") (description @@ -1168,6 +1118,9 @@ source; they have since been autotraced and reissued in Adobe Type 1 format by Taco Hoekwater.") (license license:knuth))) +(define-public texlive-fonts-mflogo-font + (deprecated-package "texlive-fonts-mflogo-font" texlive-mflogo-font)) + (define-public texlive-fonts-amsfonts (package (name "texlive-fonts-amsfonts") -- cgit v1.2.3 From cdc960922d96a8f24f217b6721165ab0d12cab5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:26:03 +0200 Subject: gnu: Add texlive-cm-super. * gnu/packages/tex.scm (texlive-cm-super): New variable. (texlive-fonts-cm-super): Deprecate package. --- gnu/packages/tex.scm | 134 +++++++++++---------------------------------------- 1 file changed, 29 insertions(+), 105 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 120d30a5fb..1722414506 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -784,116 +784,40 @@ display, and mathematical fonts in a range of styles, based on Monotype Modern 8A.") (license license:knuth))) -(define-public texlive-fonts-cm-super - (package - (name "texlive-fonts-cm-super") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/cm-super")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0ybb4gi2rblzpb6wfzm2wk7dj3y2jnmkzsla7mz7g3zc12y4r2b9")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "tex/latex/cm-super") - ("cm-super-afm" . "fonts/afm/public/cm-super") - ("cm-super-type1" . "fonts/type1/public/cm-super") - ("cm-super-enc" . "fonts/enc/dvips/cm-super") - ("cm-super-map" . "fonts/map/dvips/cm-super") - ("cm-super-vtex" . "fonts/map/vtex/cm-super")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("cm-super-vtex" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/vtex/cm-super")) - (revision %texlive-revision))) - (file-name (string-append name "-map-vtex-" version "-checkout")) - (sha256 - (base32 - "14c9allsgfv6za9wznz4cxqxwz5nsmj8rnwvxams8fhs5rvglxqi")))) - ("cm-super-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/public/cm-super")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "048ih65f2nghdabdar2p957c4s2spgllmy2gxdscddwqpnmd26yn")))) - ("cm-super-type1" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/public/cm-super")) - (revision %texlive-revision))) - (file-name (string-append name "-type1-" version "-checkout")) - (sha256 - (base32 - "1140swk3w2ka0y4zdsq6pdifrdanb281q71p5gngbbjxdxjxf4qx")))) - ("cm-super-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/cm-super")) - (revision %texlive-revision))) - (file-name (string-append name "-map-" version "-checkout")) - (sha256 - (base32 - "10r6xqbwf9wk3ylg7givwyrw1952zydc6p7fw29zjf8ijl0lndim")))) - ("cm-super-enc" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/enc/dvips/cm-super")) - (revision %texlive-revision))) - (file-name (string-append name "-enc-" version "-checkout")) - (sha256 - (base32 - "1pgksy96gfgyjxfhs2k04bgg7nr7i128y01kjcahr7n38080h4ij")))))) - (home-page "https://www.ctan.org/pkg/cm-super") - (synopsis "Computer Modern Super family of fonts") - (description "The CM-Super family provides Adobe Type 1 fonts that replace +(define-public texlive-cm-super + (let ((template (simple-texlive-package + "texlive-cm-super" + (list "/doc/fonts/cm-super/" + "/dvips/cm-super/" + "/fonts/afm/public/cm-super/" + "/fonts/enc/dvips/cm-super/" + "/fonts/map/dvips/cm-super/" + "/fonts/map/vtex/cm-super/" + "/fonts/type1/public/cm-super/" + "/tex/latex/cm-super/") + (base32 + "1k3afl0x0bqbr5mnawbnp7rr2126dwn0vwnxzibm9ggvzqilnkm6") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (delete 'reset-gzip-timestamps))))) + (home-page "https://www.ctan.org/pkg/cm-super") + (synopsis "Computer Modern Super family of fonts") + (description "The CM-Super family provides Adobe Type 1 fonts that replace the T1/TS1-encoded Computer Modern (EC/TC), T1/TS1-encoded Concrete, T1/TS1-encoded CM bright and LH Cyrillic fonts (thus supporting all European languages except Greek), and bringing many ameliorations in typesetting quality. The fonts exhibit the same metrics as the METAFONT-encoded originals.") - ;; With font exception - (license license:gpl2+))) + ;; With font exception + (license license:gpl2+)))) + +(define-public texlive-fonts-cm-super + (deprecated-package "texlive-fonts-cm-super" texlive-cm-super)) (define-public texlive-fonts-lm (package -- cgit v1.2.3 From 14a87760facdcdfab205f25273ee9e8df33b9c07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:28:33 +0200 Subject: gnu: texlive-fontname: Simplify. * gnu/packages/tex.scm (texlive-fontname): Implement with SIMPLE-TEXLIVE-PACKAGE. --- gnu/packages/tex.scm | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1722414506..119a1ffbf9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -665,30 +665,13 @@ typesetting in these fonts.") (define-public texlive-fontname (package - (name "texlive-fontname") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/fontname")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "05rbn7z30xawd3n6w7c3ijp2yc67ga220jgqmkla9pd9wx185rzq")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/fonts/map/fontname"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-fontname" + (list "/doc/fonts/fontname/fontname.texi" + "/fonts/map/fontname/") + (base32 + "0h5im5rnhycrrkd6z10f17m2caa8lv594wf482b68qjmnxfrqnxj") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/fontname") (synopsis "Scheme for naming fonts in TeX") (description "This is Fontname, a naming scheme for (the base part of) -- cgit v1.2.3 From 114a5d85aaa88709ba9c07f1350fdf300876258e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:36:35 +0200 Subject: gnu: Add texlive-lm. * gnu/packages/tex.scm (texlive-lm): New variable. (texlive-fonts-lm): Deprecate package. --- gnu/packages/tex.scm | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 119a1ffbf9..b05406b811 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -802,33 +802,22 @@ originals.") (define-public texlive-fonts-cm-super (deprecated-package "texlive-fonts-cm-super" texlive-cm-super)) -(define-public texlive-fonts-lm +(define-public texlive-lm (package - (name "texlive-fonts-lm") - (version "2.004") - (source (origin - (method url-fetch) - (uri (string-append "http://www.gust.org.pl/projects/e-foundry/" - "latin-modern/download/lm" version "bas.zip")) - (sha256 - (base32 - "0z2s253y751m2ci5aw8nq0sf2kyg9hpimv2gyixkch9d07m2b9wp")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/"))) - (mkdir-p root) - (with-directory-excursion root - (invoke (string-append (assoc-ref %build-inputs "unzip") - "/bin/unzip") - (assoc-ref %build-inputs "source"))) - #t)))) - (native-inputs - `(("unzip" ,unzip))) + (inherit (simple-texlive-package + "texlive-lm" + (list "/doc/fonts/lm/" + "/fonts/afm/public/lm/" + "/fonts/enc/dvips/lm/" + "/fonts/map/dvipdfm/lm/" + "/fonts/map/dvips/lm/" + "/fonts/opentype/public/lm/" + "/fonts/tfm/public/lm/" + "/fonts/type1/public/lm/" + "/tex/latex/lm/") + (base32 + "0i1hwr8rp0jqyvs4qyplrirscd4w7lsgwsncyv3yzy80bsa56jq5") + #:trivial? #t)) (home-page "http://www.gust.org.pl/projects/e-foundry/latin-modern/") (synopsis "Latin Modern family of fonts") (description "The Latin Modern fonts are derived from the famous Computer @@ -839,6 +828,9 @@ Computers & Typesetting series.") ;; additional but not legally binding clause. (license license:lppl1.3c+))) +(define-public texlive-fonts-lm + (deprecated-package "texlive-fonts-lm" texlive-lm)) + (define-public texlive-fonts-knuth-lib (package (name "texlive-fonts-knuth-lib") -- cgit v1.2.3 From f104ff618a1703439c17753b884f91a569925864 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:42:43 +0200 Subject: gnu: Add texlive-epsf. * gnu/packages/tex.scm (texlive-epsf): New variable. (texlive-generic-epsf): Deprecate package. --- gnu/packages/tex.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b05406b811..d6773042fa 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2779,32 +2779,15 @@ so that other code can determine that it is running under XeTeX. The package requires the e-TeX extensions to the TeX primitive set.") (license license:lppl1.3c+))) -(define-public texlive-generic-epsf +(define-public texlive-epsf (package - (name "texlive-generic-epsf") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/epsf")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "14w3j81ympyvg8hkk9i1xgr8a0gfnfsb2ki8qqsk5pa051za1xcy")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/epfs"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-epsf" + (list "/doc/generic/epsf/" + "/tex/generic/epsf/") + (base32 + "03jcf0kqh47is965d2590miwj7d5kif3c4mgsnvkyl664jzjkh92") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/epsf") (synopsis "Simple macros for EPS inclusion") (description @@ -2816,6 +2799,9 @@ bundle of packages. (The latex-graphics bundle is also available to Plain TeX users, via its Plain TeX version.)") (license license:public-domain))) +(define-public texlive-generic-epsf + (deprecated-package "texlive-generic-epsf" texlive-epsf)) + (define-public texlive-latex-fancyvrb (package (name "texlive-latex-fancyvrb") -- cgit v1.2.3 From f1b0939dbcaff1671f8aa0933a027db11da63623 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:46:41 +0200 Subject: gnu: Add texlive-graphics-def. * gnu/packages/tex.scm (texlive-graphics-def): New variable. --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d6773042fa..89ef7e8009 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2828,6 +2828,24 @@ verbatim mode; build \"example\" environments (showing both result and verbatim source).") (license license:lppl1.0+))) +(define-public texlive-graphics-def + (package + (inherit (simple-texlive-package + "texlive-graphics-def" + (list "/doc/latex/graphics-def/README.md" + "/tex/latex/graphics-def/") + (base32 + "0zrbn9cwfnnrrl3b2zsd74ldksp9jwpvjh7z93ild1m75crpb39a") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/latex-graphics") + (synopsis "Color and graphics option files") + (description + "This bundle is a combined distribution consisting of @file{dvips.def}, +@file{pdftex.def}, @file{luatex.def}, @file{xetex.def}, @file{dvipdfmx.def}, +and @file{dvisvgm.def} driver option files for the LaTeX graphics and color +packages.") + (license license:lppl1.3c+))) + (define-public texlive-latex-graphics (package (name "texlive-latex-graphics") -- cgit v1.2.3 From 83a5c6171b6aab003ed9eaf612577b2c5161845e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:50:26 +0200 Subject: gnu: Add texlive-graphics-cfg. * gnu/packages/tex.scm (texlive-graphics-cfg): New variable. --- gnu/packages/tex.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 89ef7e8009..d0097313d9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2846,6 +2846,22 @@ and @file{dvisvgm.def} driver option files for the LaTeX graphics and color packages.") (license license:lppl1.3c+))) +(define-public texlive-graphics-cfg + (package + (inherit (simple-texlive-package + "texlive-graphics-cfg" + (list "/doc/latex/graphics-cfg/README.md" + "/tex/latex/graphics-cfg/") + (base32 + "00n63adb2laf43lzix39xl68aq0k5k80mmrw602w99w5n7f96gsf") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/latex-graphics") + (synopsis "Sample configuration files for LaTeX color and graphics") + (description + "This bundle includes @file{color.cfg} and @file{graphics.cfg} files that +set default \"driver\" options for the color and graphics packages.") + (license license:public-domain))) + (define-public texlive-latex-graphics (package (name "texlive-latex-graphics") -- cgit v1.2.3 From 152950d49499b5e15a4cff8307e0ebcc6d16e9e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:51:57 +0200 Subject: gnu: texlive-latex-graphics: Simplify. * gnu/packages/tex.scm (texlive-latex-graphics)[arguments]: Remove custom phases. [native-inputs]: Remove. [propagated-inputs]: Add texlive-graphics-cfg and texlive-graphics-def. [license]: Update. --- gnu/packages/tex.scm | 56 +++++----------------------------------------------- 1 file changed, 5 insertions(+), 51 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d0097313d9..b2c072f694 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2874,54 +2874,10 @@ set default \"driver\" options for the color and graphics packages.") (base32 "0nlfhn55ax89rcvpkrl9570671b62kcr4c9l5ch3w5zw9vmi00dz")))) (build-system texlive-build-system) - (arguments - '(#:tex-directory "latex/graphics" - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-config - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((cfg (assoc-ref inputs "graphics-cfg")) - (target (string-append (assoc-ref outputs "out") - "/share/texmf-dist/tex/latex/graphics-cfg"))) - (mkdir-p target) - (install-file (string-append cfg "/graphics.cfg") target) - (install-file (string-append cfg "/color.cfg") target) - #t))) - (add-after 'install 'install-defs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((def (assoc-ref inputs "graphics-def")) - (target (string-append (assoc-ref outputs "out") - "/share/texmf-dist/tex/latex/graphics-def"))) - (mkdir-p target) - (copy-recursively def target) - #t)))))) - (native-inputs - `(("graphics-cfg" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/latex3/graphics-cfg.git") - (commit "19d1238af17df376cd46333b229579b0f7f3a41f"))) - (file-name (string-append "graphics-cfg-" - (number->string %texlive-revision) - "-checkout")) - (sha256 - (base32 - "12kbgbm52gmmgn8zajb74s8n5rvnxcfdvs3iyj8vcw5vrsw5i6mh")))) - ("graphics-def" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/graphics-def")) - (revision %texlive-revision))) - (file-name (string-append "graphics-def-" - (number->string %texlive-revision) - "-checkout")) - (sha256 - (base32 - "17zpcgrfsr29g1dkz9np1qi63kjv7gb12rg979c6dai6qksbr3vq")))))) + (arguments '(#:tex-directory "latex/graphics")) + (propagated-inputs + `(("texlive-graphics-cfg" ,texlive-graphics-cfg) + ("texlive-graphics-def" ,texlive-graphics-def))) (home-page "https://www.ctan.org/pkg/latex-graphics") (synopsis "LaTeX standard graphics bundle") (description @@ -2929,9 +2885,7 @@ set default \"driver\" options for the color and graphics packages.") graphics (e.g. PostScript) files, and rotation and scaling of text in LaTeX documents. It comprises the packages color, graphics, graphicx, trig, epsfig, keyval, and lscape.") - ;; The configuration files are released under CC0. - (license (list license:lppl1.3c+ - license:cc0)))) + (license license:lppl1.3c+))) (define-public texlive-latex-xcolor (package -- cgit v1.2.3 From c97d1a9123129e4b5bb6cc221c0ced1fb6271f8c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 22:56:54 +0200 Subject: gnu: Add texlive-url. * gnu/packages/tex.scm (texlive-url): New variable. (texlive-latex-url): Deprecate package. --- gnu/packages/tex.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b2c072f694..45ccdeb070 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3003,32 +3003,15 @@ rawfonts, showkeys, somedefs, tabularx, theorem, trace, varioref, verbatim, xr, and xspace.") (license license:lppl1.3+))) -(define-public texlive-latex-url +(define-public texlive-url (package - (name "texlive-latex-url") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/url")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "184s2543cwia5l7iibhlkl1ffbncfhjpv5p56zq0c15by5sghlac")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/url"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-url" + (list "/doc/latex/url/" + "/tex/latex/url/") + (base32 + "184m40wgnx939ky2hbxnj0v9aak023ldrhgffp0lgyk9wdqpxlqg") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/url") (synopsis "Verbatim with URL-sensitive line breaks") (description "The command @code{\\url} is a form of verbatim command that @@ -3043,6 +3026,9 @@ of file names.") ;; the latest version is 1.3c. (license license:lppl1.3c+))) +(define-public texlive-latex-url + (deprecated-package "texlive-latex-url" texlive-url)) + (define-public texlive-latex-l3kernel (package (name "texlive-latex-l3kernel") -- cgit v1.2.3 From 1333198da836b5423a903fc618b0c512c859486c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 23:00:36 +0200 Subject: gnu: Add texlive-filemod. * gnu/packages/tex.scm (texlive-filemod): New variable. (texlive-latex-filemod): Deprecate package. --- gnu/packages/tex.scm | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 45ccdeb070..62db2619f5 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3853,32 +3853,16 @@ without affecting the structure of the list (this works for @code{itemize} and @code{enumerate} lists, and numbered lists remain in sequence).") (license license:lppl))) -(define-public texlive-latex-filemod +(define-public texlive-filemod (package - (name "texlive-latex-filemod") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/filemod")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0vpxilfw69xv78f03g0j0zw0bw4qcn36whqp8phcq48qk1ax2kr2")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/filemod"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-filemod" + (list "/doc/latex/filemod/" + "/tex/latex/filemod/" + "/tex/generic/filemod/") + (base32 + "1snsj7kblkj1ig3x3845lsypz7ab04lf0dcpdh946xakgjnz4fb5") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/filemod") (synopsis "Provide file modification times, and compare them") (description @@ -3892,6 +3876,9 @@ mode. The functionality is provided by purely expandable macros or by faster but non-expandable ones.") (license license:lppl1.3+))) +(define-public texlive-latex-filemod + (deprecated-package "texlive-latex-filemod" texlive-filemod)) + (define-public texlive-latex-ifplatform (package (name "texlive-latex-ifplatform") -- cgit v1.2.3 From 6090b6c47423e54b7929d267f431969c515255e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 23:05:48 +0200 Subject: gnu: Add texlive-pstool. * gnu/packages/tex.scm (texlive-pstool): New variable. (texlive-latex-pstool): Deprecate package. --- gnu/packages/tex.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 62db2619f5..1f2f223a81 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3978,32 +3978,15 @@ package options. A specialized system for setting @code{PSTricks} keys is provided by the @code{pst-xkey} package.") (license license:lppl1.3+))) -(define-public texlive-latex-pstool +(define-public texlive-pstool (package - (name "texlive-latex-pstool") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/pstool")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1h816jain8c9nky75kk8pmmwj5b4yf9dpqvdvi2l6jhfj5iqkzr8")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/pstool"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-pstool" + (list "/doc/latex/pstool/" + "/tex/latex/pstool/") + (base32 + "12clzcw2cl7g2chr2phgmmiwxw4859cln1gbx1wgp8bl9iw590nc") + #:trivial? #t)) (propagated-inputs `(("texlive-latex-bigfoot" ,texlive-latex-bigfoot) ; for suffix ("texlive-latex-filemod" ,texlive-latex-filemod) @@ -4024,6 +4007,9 @@ drastically speeding up compilation time when only a single figure needs re-processing.") (license license:lppl))) +(define-public texlive-latex-pstool + (deprecated-package "texlive-latex-pstool" texlive-pstool)) + (define-public texlive-latex-seminar (package (name "texlive-latex-seminar") -- cgit v1.2.3 From a72058b950c5a204806177fea8c74e20c71329b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 23:08:04 +0200 Subject: gnu: Add texlive-seminar. * gnu/packages/tex.scm (texlive-seminar): New variable. (texlive-latex-seminar): Deprecate package. --- gnu/packages/tex.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1f2f223a81..65cb38e93a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4010,32 +4010,15 @@ re-processing.") (define-public texlive-latex-pstool (deprecated-package "texlive-latex-pstool" texlive-pstool)) -(define-public texlive-latex-seminar +(define-public texlive-seminar (package - (name "texlive-latex-seminar") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/seminar")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0y4i651b75y6006n03x8n86bsqvjsailvvz9bhzy51dzsznqidq0")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/seminar"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-seminar" + (list "/doc/latex/seminar/" + "/tex/latex/seminar/") + (base32 + "1clgw5xy867khzfn8d210rc5hsw5s7r0pznhk84niybvw4zc7r3f") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/seminar") (synopsis "Make overhead slides") ;; TODO: This package may need fancybox and xcomment at runtime. @@ -4047,6 +4030,9 @@ recent classes such as powerdot or beamer, both of which are tuned to 21st-century presentation styles.") (license license:lppl1.2+))) +(define-public texlive-latex-seminar + (deprecated-package "texlive-latex-seminar" texlive-seminar)) + (define-public texlive-latex-trimspaces (package (name "texlive-latex-trimspaces") -- cgit v1.2.3 From fb01a2965a707bcf17f5949c3ba734f296fe8520 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 23:13:05 +0200 Subject: gnu: Add texlive-doi. * gnu/packages/tex.scm (texlive-doi): New variable. (texlive-latex-doi): Deprecate package. --- gnu/packages/tex.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 65cb38e93a..3361e9845e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4100,32 +4100,15 @@ space-stripped macros.") to something that's not a float.") (license license:lppl))) -(define-public texlive-latex-doi +(define-public texlive-doi (package - (name "texlive-latex-doi") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/doi")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0378rdmrgr2lzbfi4qqy4dfpj5im20diyd8z8b9m4mlg05r7wgnb")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/doi"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-doi" + (list "/doc/latex/doi/README" + "/tex/latex/doi/") + (base32 + "17lnnhfmb8g4nh4fnyc9616h8xg3vjrzmlvfmlfqwwlfpma9xnnw") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/doi") (synopsis "Create correct hyperlinks for DOI numbers") (description @@ -4138,6 +4121,9 @@ hyperlink to the target of the DOI.") ;; Any version of the LPPL. (license license:lppl1.3+))) +(define-public texlive-latex-doi + (deprecated-package "texlive-latex-doi" texlive-doi)) + (define-public texlive-latex-etoolbox (package (name "texlive-latex-etoolbox") -- cgit v1.2.3 From 346354a18ebefee612ca8d2450a1009cc4c6196e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 14 Jul 2019 23:15:20 +0200 Subject: gnu: Add texlive-etoolbox. * gnu/packages/tex.scm (texlive-etoolbox): New variable. (texlive-latex-etoolbox): Deprecate package. --- gnu/packages/tex.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3361e9845e..9cfd7b887e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4124,32 +4124,15 @@ hyperlink to the target of the DOI.") (define-public texlive-latex-doi (deprecated-package "texlive-latex-doi" texlive-doi)) -(define-public texlive-latex-etoolbox +(define-public texlive-etoolbox (package - (name "texlive-latex-etoolbox") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/etoolbox")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1agmq6bf8wzcd77n20ng8bl4kh69cg5f6sjniii7bcw4llhd3nc8")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/etoolbox"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-etoolbox" + (list "/doc/latex/etoolbox/" + "/tex/latex/etoolbox/") + (base32 + "1qg4x5r4ibinl6zy5lq70lv4zcrjsn54n6hwv31k5kl7mwv0mvr3") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/etoolbox") (synopsis "e-TeX tools for LaTeX") (description @@ -4162,6 +4145,9 @@ some LaTeX kernel commands; nevertheless, the package will not modify any part of the LaTeX kernel.") (license license:lppl1.3+))) +(define-public texlive-latex-etoolbox + (deprecated-package "texlive-latex-etoolbox" texlive-etoolbox)) + (define-public texlive-latex-fncychap (package (name "texlive-latex-fncychap") -- cgit v1.2.3 From 2b25469476fd90d624f80189bb11ca32df8ee811 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 11:43:44 +0200 Subject: gnu: Add texlive-kpathsea. * gnu/packages/tex.scm (texlive-kpathsea): New variable. --- gnu/packages/tex.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9cfd7b887e..f66fddfe02 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2533,6 +2533,50 @@ patterns supporting a number of Cyrillic font encodings, including T2, UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r.") (license license:lppl)))) +(define-public texlive-kpathsea + (package + (inherit (simple-texlive-package + "texlive-kpathsea" + (list "/web2c/amiga-pl.tcx" + "/web2c/cp1250cs.tcx" + "/web2c/cp1250pl.tcx" + "/web2c/cp1250t1.tcx" + "/web2c/cp227.tcx" + "/web2c/cp852-cs.tcx" + "/web2c/cp852-pl.tcx" + "/web2c/cp8bit.tcx" + "/web2c/empty.tcx" + "/web2c/fmtutil.cnf" + "/web2c/il1-t1.tcx" + "/web2c/il2-cs.tcx" + "/web2c/il2-pl.tcx" + "/web2c/il2-t1.tcx" + "/web2c/kam-cs.tcx" + "/web2c/kam-t1.tcx" + "/web2c/macce-pl.tcx" + "/web2c/macce-t1.tcx" + "/web2c/maz-pl.tcx" + "/web2c/mktex.cnf" + "/web2c/mktex.opt" + "/web2c/mktexdir" + "/web2c/mktexdir.opt" + "/web2c/mktexnam" + "/web2c/mktexnam.opt" + "/web2c/mktexupd" + "/web2c/natural.tcx" + "/web2c/tcvn-t5.tcx" + "/web2c/viscii-t5.tcx") + (base32 + "0ajfp9kr330lcm2ymr3kl9zn6y2xjkrzpa0c0azc4qdm5jllawb9") + #:trivial? #t)) + (home-page "https://www.tug.org/texlive/") + (synopsis "Files related to the path searching library for TeX") + (description "Kpathsea is a library and utility programs which provide +path searching facilities for TeX file types, including the self-locating +feature required for movable installations, layered on top of a general search +mechanism. This package provides supporting files.") + (license license:lgpl3+))) + (define-public texlive-latexconfig (package (inherit (simple-texlive-package -- cgit v1.2.3 From dfdc002c9bf86270941823a96abded0aa5d44088 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 19:07:40 +0200 Subject: gnu: texlive-bin: Include scripts. * gnu/packages/tex.scm (texlive-bin)[inputs]: Add texlive-scripts. [arguments]: Let fmtutil.pl reference scripts directory. --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f66fddfe02..a1e12df6a6 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -271,6 +271,20 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) + ("texlive-scripts" + ,(origin + (method svn-fetch) + (uri (svn-reference + (url (string-append "svn://www.tug.org/texlive/tags/" + %texlive-tag "/Master/texmf-dist/" + "/scripts/texlive")) + (revision %texlive-revision))) + (file-name (string-append "texlive-scripts-" + (number->string %texlive-revision) + "-checkout")) + (sha256 + (base32 + "0wrjls1y9b4k1z10l9l8w2l3yjcw7v7by2y16kchdpkiyldlkry6")))) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("fontforge" ,fontforge) @@ -386,6 +400,13 @@ copied to their outputs; otherwise the TEXLIVE-BUILD-SYSTEM is used." (apply unpack (list #:source texlive-extra)) (apply patch-source-shebangs (list #:source texlive-extra)) (invoke "mv" "tlpkg" share)) + (let ((scripts (string-append share "/texmf-dist/scripts/texlive/"))) + (mkdir-p scripts) + (copy-recursively (assoc-ref inputs "texlive-scripts") scripts) + ;; Make sure that fmtutil can find its Perl modules. + (substitute* (string-append scripts "fmtutil.pl") + (("\\$TEXMFROOT/") (string-append share "/")))) + ;; texlua shebangs are not patched by the patch-source-shebangs ;; phase because the texlua executable does not exist at that ;; time. -- cgit v1.2.3 From b93d9dac24a035ffaba93b7ed0efb799e33bace2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 19:08:35 +0200 Subject: gnu: texlive-dvips: Update source files. * gnu/packages/tex.scm (texlive-dvips): Include source files from the TeX Live SVN repository according to texlive.tlpdb. --- gnu/packages/tex.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a1e12df6a6..3892b41d40 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -498,26 +498,24 @@ the autogenerated files @file{language.dat} and @file{language.def} (and default versions of those), etc.") (license license:knuth))) -;; TODO: This package should not exist. There should not be a single package -;; containing all of /dvips. These really belong to different packages. (define-public texlive-dvips (package (inherit (simple-texlive-package "texlive-dvips" - (list "/fonts/map/dvips/" + (list "/doc/man/man1/afm2tfm.1" + "/doc/man/man1/dvips.1" + "/dvips/base/" + "/dvips/config/" "/fonts/enc/dvips/base/" - "/dvips/") + "/tex/generic/dvips/") (base32 - "1di07wx8wjczddmagq5z082l2has3inzk5jwkqh4i6wv1qdfqpp6") + "1qr7h0ahycmz5wmpv54glfss9jqdmmyymj6kim626d1c8v9bmg86") #:trivial? #t)) (home-page "https://www.ctan.org/pkg/dvips") (synopsis "DVI to PostScript drivers") (description "This package provides files needed for converting DVI files to PostScript.") - ;; Various free software licenses apply to individual files. - (license (list license:lppl1.3c+ - license:expat - license:lgpl3+)))) + (license license:lppl))) (define-public texlive-tex-ini-files (package -- cgit v1.2.3 From e976d3618d2b732d1ddfa7ed7b89f8a8cfc3489a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 19:09:55 +0200 Subject: gnu: texlive-latex-base: Simplify. * gnu/packages/tex.scm (texlive-latex-base)[source]: Use TEXLIVE-ORIGIN. [arguments]: Simplify build phase by running fmtutil-sys; adjust install phase. [native-inputs]: Remove texlive-generic-unicode-data, texlive-generic-dehyph-exptl, texlive-generic-tex-ini-files, texlive-latex-latexconfig, texlive-generic-hyphen, texlive-generic-ruhyphen, texlive-generic-ukrhyph, texlive-generic-config, and texlive-latex-base-support-files; add texlive-tex-ini-files, texlive-kpathsea, and texlive-luatexconfig. [propagated-inputs]: Add texlive-etex, texlive-hyph-utf8, texlive-hyphen-base, texlive-hyphen-afrikaans, texlive-hyphen-ancientgreek, texlive-hyphen-armenian, texlive-hyphen-basque, texlive-hyphen-belarusian, texlive-hyphen-bulgarian, texlive-hyphen-catalan, texlive-hyphen-chinese, texlive-hyphen-churchslavonic, texlive-hyphen-coptic, texlive-hyphen-croatian, texlive-hyphen-czech, texlive-hyphen-danish, texlive-hyphen-dutch, texlive-hyphen-english, texlive-hyphen-esperanto, texlive-hyphen-estonian, texlive-hyphen-ethiopic, texlive-hyphen-finnish, texlive-hyphen-french, texlive-hyphen-friulan, texlive-hyphen-galician, texlive-hyphen-georgian, texlive-hyphen-german, texlive-hyphen-greek, texlive-hyphen-hungarian, texlive-hyphen-icelandic, texlive-hyphen-indic, texlive-hyphen-indonesian, texlive-hyphen-interlingua, texlive-hyphen-irish, texlive-hyphen-italian, texlive-hyphen-kurmanji, texlive-hyphen-latin, texlive-hyphen-latvian, texlive-hyphen-lithuanian, texlive-hyphen-mongolian, texlive-hyphen-norwegian, texlive-hyphen-occitan, texlive-hyphen-piedmontese, texlive-hyphen-polish, texlive-hyphen-portuguese, texlive-hyphen-romanian, texlive-hyphen-romansh, texlive-hyphen-russian, texlive-hyphen-sanskrit, texlive-hyphen-serbian, texlive-hyphen-slovak, texlive-hyphen-slovenian, texlive-hyphen-spanish, texlive-hyphen-swedish, texlive-hyphen-thai, texlive-hyphen-turkish, texlive-hyphen-turkmen, texlive-hyphen-ukrainian, texlive-hyphen-uppersorbian, texlive-hyphen-welsh, texlive-unicode-data, texlive-ukrhyph, texlive-ruhyphen, and texlive-latexconfig. --- gnu/packages/tex.scm | 370 +++++++++++++++++++++++++++------------------------ 1 file changed, 199 insertions(+), 171 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3892b41d40..de38cc92a8 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2611,186 +2611,214 @@ formats.") (license license:lppl))) (define-public texlive-latex-base - (let ((texlive-dir - (lambda (dir hash) - (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - dir)) - (revision %texlive-revision))) - (file-name (string-append "texlive-generic-" - (last (string-split - (string-drop-right dir 1) #\/)) - "-" (number->string %texlive-revision) - "-checkout")) - (sha256 (base32 hash)))))) - (package - (name "texlive-latex-base") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "base")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "17bqrzzjz16k52sc7ydl4vw7ddy2z3g0p1xsk2c35h1ynq9h3wwm")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 match) - (srfi srfi-1) - (srfi srfi-26)) - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - ;; Find required fonts - (setenv "TFMFONTS" - (string-append (assoc-ref inputs "texlive-fonts-cm") - "/share/texmf-dist/fonts/tfm/public/cm:" - (assoc-ref inputs "texlive-fonts-latex") - "/share/texmf-dist/fonts/tfm/public/latex-fonts:" - (assoc-ref inputs "texlive-fonts-knuth-lib") - "/share/texmf-dist/fonts/tfm/public/knuth-lib")) + (package + (name "texlive-latex-base") + (version (number->string %texlive-revision)) + (source (texlive-origin + name version + (list "/doc/latex/base/" + "/source/latex/base/" + ;; Almost all files in /tex/latex/base are generated, but + ;; these are not: + "/tex/latex/base/idx.tex" + "/tex/latex/base/lablst.tex" + "/tex/latex/base/lppl.tex" + "/tex/latex/base/ltnews.cls" + "/tex/latex/base/ltxcheck.tex" + "/tex/latex/base/ltxguide.cls" + "/tex/latex/base/minimal.cls" + "/tex/latex/base/sample2e.tex" + "/tex/latex/base/small2e.tex" + "/tex/latex/base/source2e.tex" + "/tex/latex/base/testpage.tex" + "/tex/latex/base/texsys.cfg") + (base32 + "0f8d41wk1gb7i6xq1a10drwhhayc50pg9nwzjkrqnxrv0pcc08w5"))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-26)) + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + ;; Find required fonts + (setenv "TFMFONTS" + (string-join + (map (match-lambda + ((pkg-name . dir) + (string-append + (assoc-ref inputs pkg-name) + "/share/texmf-dist/fonts/tfm/public" + dir))) + '(("texlive-etex" . "/etex") + ("texlive-fonts-cm" . "/cm") + ("texlive-fonts-latex" . "/latex-fonts") + ("texlive-fonts-knuth-lib" . "/knuth-lib"))) + ":")) + (let ((cwd (getcwd))) (setenv "TEXINPUTS" (string-append - (getcwd) ":" - (getcwd) "/build:" + cwd "//:" + cwd "/source/latex/base//:" + cwd "/build:" (string-join (map (match-lambda ((_ . dir) dir)) inputs) - "//:"))) + "//:")))) - ;; Create an empty texsys.cfg, because latex.ltx wants to include - ;; it. This file must exist and it's fine if it's empty. - (with-output-to-file "texsys.cfg" - (lambda _ (format #t "%"))) - - (mkdir "build") + ;; This is the actual build step. + (mkdir "build") + (invoke "tex" "-ini" "-interaction=scrollmode" + "-output-directory=build" "unpack.ins") + + ;; XXX: We can't build all formats at this point, nor are they + ;; part of the LaTeX base, so we disable them. Actually, we + ;; should be running this all in a profile hook, so that only + ;; selected formats and hyphenation patterns are included, but it + ;; takes long and TeX Live isn't designed to be modular like + ;; that. Everything operates on a shared directory, which we + ;; would only have at profile generation time. + (let ((disabled-formats + '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex" + "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" + "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" + "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex" + "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex" + "mptopdf pdftex" "uplatex euptex" "jadetex pdftex" + "amstex pdftex" "pdfcslatex pdftex" "lollipop tex" + "xmltex pdftex" "pdfjadetex pdftex" "eplain pdftex" + "texsis pdftex" "mltex pdftex" "utf8mex pdftex"))) (mkdir "web2c") - (invoke "luatex" "-ini" "-interaction=batchmode" - "-output-directory=build" "unpack.ins") - (invoke "tex" "-ini" "-interaction=batchmode" - "-output-directory=web2c" "tex.ini") - ;; LaTeX, pdfetex/pdftex, and XeTeX require e-TeX, which - ;; is enabled only in extended mode (activated with a - ;; leading asterisk). We should not use luatex here, - ;; because that would make the generated format files - ;; incompatible with any other TeX engine. - (for-each (lambda (format) - (invoke "latex" "-ini" "-interaction=batchmode" - "-output-directory=web2c" - "-translate-file=cp227.tcx" - (string-append "*" format ".ini"))) - '("latex" - "pdflatex" - "pdfetex")) - (for-each (lambda (format) - (invoke format "-ini" "-interaction=batchmode" - "-output-directory=web2c" - (string-append "*" format ".ini"))) - '("xetex" - "xelatex")) - (for-each (lambda (format) - (invoke "luatex" "-ini" "-interaction=batchmode" - "-output-directory=web2c" - (string-append format ".ini"))) - '("dviluatex" "dvilualatex" "luatex" "lualatex")) - #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (target (string-append - out "/share/texmf-dist/tex/latex/base")) - (web2c (string-append - out "/share/texmf-dist/web2c")) - (support-files (assoc-ref inputs "texlive-latex-base-support-files"))) - (mkdir-p target) - (mkdir-p web2c) - (for-each delete-file (find-files "." "\\.(log|aux)$")) - (for-each (cut install-file <> target) - (find-files "build" ".*")) - (for-each (cut install-file <> web2c) - (find-files "web2c" ".*")) - ;; pdftex is really just the same as pdfetex, but since it - ;; doesn't have its own format file, we need to copy it. - (copy-file "web2c/pdfetex.fmt" - (string-append web2c "/pdftex.fmt")) - ;; "source" is missing the support files as per doc/latex/base/manifest.txt. - ;; FIXME: We are probably not packaging this right. - (for-each (lambda (file) - (install-file - (string-append support-files "/" file) - target)) - '("ltxguide.cls" "ltnews.cls" "minimal.cls" "idx.tex" - "lablst.tex" "testpage.tex" "ltxcheck.tex")) - ;; Install configurations - (copy-recursively - (assoc-ref inputs "texlive-latex-latexconfig") - (string-append out "/share/texmf-dist/tex/latex/latexconfig")) - (copy-recursively - (assoc-ref inputs "texlive-generic-config") - (string-append out "/share/texmf-dist/tex/generic/config")) - (copy-recursively - (assoc-ref inputs "texlive-generic-hyphen") - (string-append out "/share/texmf-dist/tex/generic/hyphen")) - (copy-recursively - (assoc-ref inputs "texlive-generic-ruhyphen") - (string-append out "/share/texmf-dist/tex/generic/ruhyphen")) - (copy-recursively - (assoc-ref inputs "texlive-generic-ukrhyph") - (string-append out "/share/texmf-dist/tex/generic/ukrhyph")) - #t)))))) - (native-inputs - `(("texlive-bin" ,texlive-bin) - ("texlive-generic-unicode-data" ,texlive-generic-unicode-data) - ("texlive-generic-dehyph-exptl" ,texlive-generic-dehyph-exptl) - ("texlive-generic-tex-ini-files" ,texlive-generic-tex-ini-files) - ("texlive-latex-latexconfig" - ,(texlive-dir "tex/latex/latexconfig/" - "1zb3j49cj8p75yph6c8iysjp7qbdvghwf0mn9j0l7qq3qkbz2xaf")) - ("texlive-generic-hyphen" - ,(texlive-dir "tex/generic/hyphen/" - "0xim36wybw2625yd0zwlp9m2c2xrcybw58gl4rih9nkph0wqwwhd")) - ("texlive-generic-ruhyphen" - ,(texlive-dir "tex/generic/ruhyphen/" - "14rjkpl4zkjqs13rcf9kcd24mn2kx7i1jbdwxq8ds94bi66ylzsd")) - ("texlive-generic-ukrhyph" - ,(texlive-dir "tex/generic/ukrhyph/" - "1cfwdg2rhbayl3w0x1xqd36d45zbc96f029myp13s7cb6kbmbppv")) - ("texlive-generic-config" - ,(texlive-dir "tex/generic/config/" - "1v90iihy112q93zdpblpdk8zv8rf99fgslsg06s1sxm27zjm9nap")) - ("texlive-latex-base-support-files" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/base")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "18wy8dlcw8adl6jzqwbg54pdwlhs8hilnfvqbw6ikj6y3zhqkj7q")))) - ("texlive-tex-plain" ,texlive-tex-plain) - ("texlive-fonts-cm" ,texlive-fonts-cm) - ("texlive-fonts-latex" ,texlive-fonts-latex) - ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib))) - (propagated-inputs - `(("texlive-generic-hyph-utf8" ,texlive-generic-hyph-utf8))) - (home-page "https://www.ctan.org/pkg/latex-base") - (synopsis "Base sources of LaTeX") - (description - "This bundle comprises the source of LaTeX itself, together with several + (install-file (string-append + (assoc-ref inputs "texlive-kpathsea") + "/share/texmf-dist/web2c/fmtutil.cnf") + "web2c") + (make-file-writable "web2c/fmtutil.cnf") + (substitute* "web2c/fmtutil.cnf" + (((string-append "^(" (string-join disabled-formats "|") ")") m) + (string-append "#! " m)))) + (invoke "fmtutil-sys" "--all" + "--fmtdir=web2c" + (string-append "--cnffile=web2c/fmtutil.cnf")) + ;; We don't actually want to install it. + (delete-file "web2c/fmtutil.cnf") + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (root (string-append out "/share/texmf-dist")) + (target (string-append root "/tex/latex/base")) + (web2c (string-append root "/web2c")) + (makeindex (string-append root "/makeindex/latex"))) + (for-each delete-file (find-files "." "\\.(log|aux)$")) + + ;; The usedir directive in docstrip.ins is ignored, so these + ;; two files end up in the wrong place. Move them. + (mkdir-p makeindex) + (for-each (lambda (file) + (install-file file makeindex) + (delete-file file)) + '("build/gglo.ist" + "build/gind.ist")) + (for-each (cut install-file <> target) + (find-files "build" ".*")) + (for-each (cut install-file <> web2c) + (find-files "web2c" ".*")) + #t)))))) + (native-inputs + `(("texlive-bin" ,texlive-bin) + ("texlive-tex-ini-files" ,texlive-tex-ini-files) + ("texlive-tex-plain" ,texlive-tex-plain) + ("texlive-kpathsea" ,texlive-kpathsea) + ("texlive-fonts-cm" ,texlive-fonts-cm) + ("texlive-fonts-latex" ,texlive-fonts-latex) + ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) + ("texlive-luatexconfig" + ,(texlive-origin + "texlive-luatexconfig" (number->string %texlive-revision) + (list "/tex/generic/config/luatex-unicode-letters.tex" + "/tex/generic/config/luatexiniconfig.tex" + "/web2c/texmfcnf.lua") + (base32 + "0cs67a8wwh4s5p5gn8l49jyccgy7glw8mfq5klgn3dfsl2fdlhk7"))))) + (propagated-inputs + `(("texlive-dehyph-exptl" ,texlive-dehyph-exptl) + ("texlive-etex" ,texlive-etex) + ("texlive-hyph-utf8" ,texlive-hyph-utf8) + ("texlive-hyphen-base" ,texlive-hyphen-base) + ("texlive-hyphen-afrikaans" ,texlive-hyphen-afrikaans) + ("texlive-hyphen-ancientgreek" ,texlive-hyphen-ancientgreek) + ("texlive-hyphen-armenian" ,texlive-hyphen-armenian) + ("texlive-hyphen-basque" ,texlive-hyphen-basque) + ("texlive-hyphen-belarusian" ,texlive-hyphen-belarusian) + ("texlive-hyphen-bulgarian" ,texlive-hyphen-bulgarian) + ("texlive-hyphen-catalan" ,texlive-hyphen-catalan) + ("texlive-hyphen-chinese" ,texlive-hyphen-chinese) + ("texlive-hyphen-churchslavonic" ,texlive-hyphen-churchslavonic) + ("texlive-hyphen-coptic" ,texlive-hyphen-coptic) + ("texlive-hyphen-croatian" ,texlive-hyphen-croatian) + ("texlive-hyphen-czech" ,texlive-hyphen-czech) + ("texlive-hyphen-danish" ,texlive-hyphen-danish) + ("texlive-hyphen-dutch" ,texlive-hyphen-dutch) + ("texlive-hyphen-english" ,texlive-hyphen-english) + ("texlive-hyphen-esperanto" ,texlive-hyphen-esperanto) + ("texlive-hyphen-estonian" ,texlive-hyphen-estonian) + ("texlive-hyphen-ethiopic" ,texlive-hyphen-ethiopic) + ("texlive-hyphen-finnish" ,texlive-hyphen-finnish) + ("texlive-hyphen-french" ,texlive-hyphen-french) + ("texlive-hyphen-friulan" ,texlive-hyphen-friulan) + ("texlive-hyphen-galician" ,texlive-hyphen-galician) + ("texlive-hyphen-georgian" ,texlive-hyphen-georgian) + ("texlive-hyphen-german" ,texlive-hyphen-german) + ("texlive-hyphen-greek" ,texlive-hyphen-greek) + ("texlive-hyphen-hungarian" ,texlive-hyphen-hungarian) + ("texlive-hyphen-icelandic" ,texlive-hyphen-icelandic) + ("texlive-hyphen-indic" ,texlive-hyphen-indic) + ("texlive-hyphen-indonesian" ,texlive-hyphen-indonesian) + ("texlive-hyphen-interlingua" ,texlive-hyphen-interlingua) + ("texlive-hyphen-irish" ,texlive-hyphen-irish) + ("texlive-hyphen-italian" ,texlive-hyphen-italian) + ("texlive-hyphen-kurmanji" ,texlive-hyphen-kurmanji) + ("texlive-hyphen-latin" ,texlive-hyphen-latin) + ("texlive-hyphen-latvian" ,texlive-hyphen-latvian) + ("texlive-hyphen-lithuanian" ,texlive-hyphen-lithuanian) + ("texlive-hyphen-mongolian" ,texlive-hyphen-mongolian) + ("texlive-hyphen-norwegian" ,texlive-hyphen-norwegian) + ("texlive-hyphen-occitan" ,texlive-hyphen-occitan) + ("texlive-hyphen-piedmontese" ,texlive-hyphen-piedmontese) + ("texlive-hyphen-polish" ,texlive-hyphen-polish) + ("texlive-hyphen-portuguese" ,texlive-hyphen-portuguese) + ("texlive-hyphen-romanian" ,texlive-hyphen-romanian) + ("texlive-hyphen-romansh" ,texlive-hyphen-romansh) + ("texlive-hyphen-russian" ,texlive-hyphen-russian) + ("texlive-hyphen-sanskrit" ,texlive-hyphen-sanskrit) + ("texlive-hyphen-serbian" ,texlive-hyphen-serbian) + ("texlive-hyphen-slovak" ,texlive-hyphen-slovak) + ("texlive-hyphen-slovenian" ,texlive-hyphen-slovenian) + ("texlive-hyphen-spanish" ,texlive-hyphen-spanish) + ("texlive-hyphen-swedish" ,texlive-hyphen-swedish) + ("texlive-hyphen-thai" ,texlive-hyphen-thai) + ("texlive-hyphen-turkish" ,texlive-hyphen-turkish) + ("texlive-hyphen-turkmen" ,texlive-hyphen-turkmen) + ("texlive-hyphen-ukrainian" ,texlive-hyphen-ukrainian) + ("texlive-hyphen-uppersorbian" ,texlive-hyphen-uppersorbian) + ("texlive-hyphen-welsh" ,texlive-hyphen-welsh) + ("texlive-unicode-data" ,texlive-unicode-data) + ("texlive-ukrhyph" ,texlive-ukrhyph) + ("texlive-ruhyphen" ,texlive-ruhyphen) + ("texlive-latexconfig" ,texlive-latexconfig))) + (home-page "https://www.ctan.org/pkg/latex-base") + (synopsis "Base sources of LaTeX") + (description + "This bundle comprises the source of LaTeX itself, together with several packages which are considered \"part of the kernel\". This bundle, together with the required packages, constitutes what every LaTeX distribution should contain.") - (license license:lppl1.3c+)))) + (license license:lppl1.3c+))) (define-public texlive-latex-filecontents (package -- cgit v1.2.3 From 82ff725df9f93fb5a864eec7803fdbb09f7f816b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 19:16:00 +0200 Subject: gnu: Add texlive-amsfonts. * gnu/packages/tex.scm (texlive-fonts-amsfonts, texlive-latex-amsfonts): Deprecate and merge... (texlive-amsfonts): ...to this new package. --- gnu/packages/tex.scm | 352 ++++++++++++++++++++------------------------------- 1 file changed, 137 insertions(+), 215 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index de38cc92a8..ee404871fb 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1039,198 +1039,138 @@ Taco Hoekwater.") (define-public texlive-fonts-mflogo-font (deprecated-package "texlive-fonts-mflogo-font" texlive-mflogo-font)) -(define-public texlive-fonts-amsfonts - (package - (name "texlive-fonts-amsfonts") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/source/public/amsfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "07h20rvpbdb4k72hzmjkyb29426zr9wxsfp6yd4ajbbpd3vx8grb")))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 match) - (srfi srfi-1) - (srfi srfi-26)) - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (let ((mf (assoc-ref inputs "texlive-union")) - (cwd (getcwd))) - ;; Make METAFONT reproducible - (setenv "SOURCE_DATE_EPOCH" "1") - ;; Tell mf where to find mf.base - (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) - ;; Tell mf where to look for source files - (setenv "MFINPUTS" - (string-append cwd ":" - cwd "/cmextra:" - cwd "/cyrillic:" - cwd "/dummy:" - cwd "/symbols:" - mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-fonts-cm") - "/share/texmf-dist/fonts/source/public/cm"))) - (mkdir "build") - (for-each (lambda (font) - (format #t "building font ~a\n" (basename font ".mf")) - (with-directory-excursion (dirname font) - (invoke "mf" "-progname=mf" - "-output-directory=../build" - (string-append "\\" - "mode:=ljfour; " - "mag:=1; " - "nonstopmode; " - "input " - (getcwd) "/" - (basename font ".mf"))))) - (find-files "." "[0-9]+\\.mf$")) - - ;; There are no metafont sources for the Euler fonts, so we - ;; convert the afm files instead. - (mkdir "build/euler") - (for-each (lambda (font) - (format #t "converting afm font ~a\n" (basename font ".afm")) - (invoke "afm2tfm" font - (string-append "build/euler/" - (basename font ".tfm")))) - (find-files (assoc-ref inputs "amsfonts-afm") - "\\.afm$")) - - ;; Frustratingly, not all fonts can be created this way. To - ;; generate eufm8.tfm, for example, we first scale down - ;; eufm10.afm to eufm8.pl, and then generate the tfm file from - ;; the pl file. - (with-directory-excursion "build/euler" - (setenv "TEXINPUTS" - (string-append (getcwd) "//:" - (assoc-ref inputs "amsfonts-afm") "//:" - (assoc-ref inputs "texlive-union") "//")) - (for-each (match-lambda - (((target-base target-size) - (source-base source-size)) - (let ((factor (number->string - (truncate/ (* 1000 target-size) - source-size)))) - (invoke "tex" - "-interaction=scrollmode" - (string-append "\\input fontinst.sty " - "\\transformfont{" target-base "}" - "{\\scalefont{" factor "}" - "{\\fromafm{" source-base "}}} " - "\\bye"))) - (invoke "pltotf" - (string-append target-base ".pl") - (string-append target-base ".tfm")) - (delete-file (string-append target-base ".pl")))) - - '((("eufm8" 8) ("eufm10" 10)) - - (("eufb6" 6) ("eufb7" 7)) - (("eufb8" 8) ("eufb10" 10)) - (("eufb9" 9) ("eufb10" 10)) - - (("eufm6" 6) ("eufb7" 7)) - (("eufm9" 9) ("eufb10" 10)) - - (("eurb6" 6) ("eurb7" 7)) - (("eurb8" 8) ("eurb10" 10)) - (("eurb9" 9) ("eurb10" 10)) - - (("eurm6" 6) ("eurm7" 7)) - (("eurm8" 8) ("eurm10" 10)) - (("eurm9" 9) ("eurm10" 10))))) - #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (root (string-append out "/share/texmf-dist/fonts/")) - (pkgs '(("amsfonts-afm" . "afm/public/amsfonts") - ("amsfonts-type1" . "type1/public/amsfonts") - ("amsfonts-map" . "map/dvips/amsfonts")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref inputs pkg) - target)))) - pkgs) - (copy-recursively (assoc-ref inputs "amsfonts-plain") - (string-append out "/share/texmf-dist/tex/plain/amsfonts")) - (let* ((tfm (string-append root "tfm/public/amsfonts")) - (mf (string-append root "source/public/amsfonts"))) - (copy-recursively "build" tfm) - (for-each (cut install-file <> mf) - (find-files "." "\\.mf")) - #t))))))) - (native-inputs - `(("texlive-union" ,(texlive-union (list texlive-tex-fontinst-base - texlive-fonts-cm - texlive-metafont-base))) - ("amsfonts-plain" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/plain/amsfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-plain-" version "-checkout")) - (sha256 - (base32 - "1hi8c9rkfb6395sxf7fhkr91xygfg8am1hqij9g3h2c7qx3714qp")))) - ("amsfonts-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/amsfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-map-" version "-checkout")) - (sha256 - (base32 - "1lrj3bd9ybj4aawzlygc6qvakbrwc5s0mc5n9rpic331frv3axfs")))) - ("amsfonts-type1" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/public/amsfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-type1-" version "-checkout")) - (sha256 - (base32 - "1zfz33vn6gm19njy74n8wmn7sljrimfhwns5z8qqhxqfh1g4qip2")))) - ("amsfonts-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/public/amsfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "1fifzkaihmjgchnk7dmw0c23k0cz999dxnc78ivmqvgi1dhx0iv8")))))) - (home-page "https://www.ctan.org/pkg/amsfonts") - (synopsis "TeX fonts from the American Mathematical Society") - (description - "This package provides an extended set of fonts for use in mathematics, +(define-public texlive-amsfonts + (let ((template (simple-texlive-package + "texlive-amsfonts" + (list "/source/latex/amsfonts/" + "/fonts/source/public/amsfonts/" + "/fonts/type1/public/amsfonts/" + "/fonts/afm/public/amsfonts/" + "/fonts/map/dvips/amsfonts/" + "/tex/plain/amsfonts/" + "/doc/fonts/amsfonts/") + (base32 + "15q70nkjf8wqzbd5ivcdx3i2sdgqxjb38q0qn9a2qw9i0qcnx6zw")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "latex/amsfonts") + ((#:modules modules '()) + `((guix build texlive-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-1) + (srfi srfi-26))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'build 'build-fonts + (lambda* (#:key inputs #:allow-other-keys) + (let ((mf (assoc-ref inputs "texlive-union")) + (src (string-append (getcwd) "/fonts/source/public/amsfonts/"))) + ;; Make METAFONT reproducible + (setenv "SOURCE_DATE_EPOCH" "1") + ;; Tell mf where to find mf.base + (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) + ;; Tell mf where to look for source files + (setenv "MFINPUTS" + (string-append src ":" + src "/cmextra:" + src "/cyrillic:" + src "/dummy:" + src "/symbols:" + mf "/share/texmf-dist/metafont/base:" + (assoc-ref inputs "texlive-fonts-cm") + "/share/texmf-dist/fonts/source/public/cm"))) + (let ((build (string-append (getcwd) "/build"))) + (mkdir-p build) + (with-directory-excursion "fonts/source/public/amsfonts" + (for-each (lambda (font) + (format #t "building font ~a\n" (basename font ".mf")) + (with-directory-excursion (dirname font) + (invoke "mf" "-progname=mf" + (string-append "-output-directory=" build) + (string-append "\\" + "mode:=ljfour; " + "mag:=1; " + "nonstopmode; " + "input " + (getcwd) "/" + (basename font ".mf"))))) + (find-files "." "[0-9]+\\.mf$")))) + + ;; There are no metafont sources for the Euler fonts, so we + ;; convert the afm files instead. + (let ((build (string-append (getcwd) "/build/euler"))) + (mkdir build) + (with-directory-excursion "fonts/afm/public/amsfonts/" + (for-each (lambda (font) + (format #t "converting afm font ~a\n" (basename font ".afm")) + (invoke "afm2tfm" font + (string-append build "/" + (basename font ".tfm")))) + (find-files "." "\\.afm$"))) + + ;; Frustratingly, not all fonts can be created this way. To + ;; generate eufm8.tfm, for example, we first scale down + ;; eufm10.afm to eufm8.pl, and then generate the tfm file from + ;; the pl file. + (setenv "TEXINPUTS" + (string-append build "//:" + (getcwd) "/fonts/afm/public/amsfonts//:" + (assoc-ref inputs "texlive-union") "//")) + (with-directory-excursion build + (for-each (match-lambda + (((target-base target-size) + (source-base source-size)) + (let ((factor (number->string + (truncate/ (* 1000 target-size) + source-size)))) + (invoke "tex" + "-interaction=scrollmode" + (string-append "\\input fontinst.sty " + "\\transformfont{" target-base "}" + "{\\scalefont{" factor "}" + "{\\fromafm{" source-base "}}} " + "\\bye"))) + (invoke "pltotf" + (string-append target-base ".pl") + (string-append target-base ".tfm")) + (delete-file (string-append target-base ".pl")))) + + '((("eufm8" 8) ("eufm10" 10)) + + (("eufb6" 6) ("eufb7" 7)) + (("eufb8" 8) ("eufb10" 10)) + (("eufb9" 9) ("eufb10" 10)) + + (("eufm6" 6) ("eufb7" 7)) + (("eufm9" 9) ("eufb10" 10)) + + (("eurb6" 6) ("eurb7" 7)) + (("eurb8" 8) ("eurb10" 10)) + (("eurb9" 9) ("eurb10" 10)) + + (("eurm6" 6) ("eurm7" 7)) + (("eurm8" 8) ("eurm10" 10)) + (("eurm9" 9) ("eurm10" 10)))))) + #t)) + (add-after 'install 'install-generated-fonts + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-recursively "build" + (string-append + (assoc-ref outputs "out") + "/share/texmf-dist/fonts/tfm/public/amsfonts")) + #t)))))) + (native-inputs + `(("texlive-union" ,(texlive-union (list texlive-tex-fontinst-base + texlive-fonts-cm + texlive-metafont-base))))) + (home-page "https://www.ctan.org/pkg/amsfonts") + (synopsis "TeX fonts from the American Mathematical Society") + (description + "This package provides an extended set of fonts for use in mathematics, including: extra mathematical symbols; blackboard bold letters (uppercase only); fraktur letters; subscript sizes of bold math italic and bold Greek letters; subscript sizes of large symbols such as sum and product; added sizes @@ -1240,31 +1180,13 @@ files, and all except the Euler fonts are provided as Metafont source. The distribution also includes the canonical Type 1 versions of the Computer Modern family of fonts. The Euler fonts are supported by separate packages; details can be found in the documentation.") - (license license:silofl1.1))) + (license license:silofl1.1)))) + +(define-public texlive-fonts-amsfonts + (deprecated-package "texlive-fonts-amsfonts" texlive-amsfonts)) (define-public texlive-latex-amsfonts - (package - (name "texlive-latex-amsfonts") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "amsfonts")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0slzfv5h2m03b2xvm2sasznz4azh6rgi069z161dja3l8rln79hm")))) - (build-system texlive-build-system) - (arguments '(#:tex-directory "latex/amsfonts")) - (native-inputs - `(("texlive-fonts-cm" ,texlive-fonts-cm) - ("texlive-metafont-base" ,texlive-metafont-base))) - (home-page "https://www.ctan.org/pkg/amsfonts") - (synopsis "TeX fonts from the American Mathematical Society") - (description - "This package provides basic LaTeX support for the symbol fonts provides -by the amsfonts package. It provides @code{amsfonts.sty}, with names of -individual symbols defined in @code{amssymb.sty}.") - (license license:silofl1.1))) + (deprecated-package "texlive-latex-amsfonts" texlive-amsfonts)) (define-public texlive-mkpattern (package -- cgit v1.2.3 From f75aa97f9535170f581f780acec05a2c4298d4ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 19:30:57 +0200 Subject: gnu: Replace uses of texlive-*-amsfonts. * gnu/packages/algebra.scm (pari-gp)[native-inputs]: Replace texlive-fonts-amsfonts and texlive-latex-amsfonts with texlive-amsfonts in texlive-union. * gnu/packages/docbook.scm (dblatex)[inputs]: Same. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Same. * gnu/packages/python-xyz.scm (python-numpy-documentation, python-matplotlib-documentation, python-ipython-documentation) [native-inputs]: Same. * gnu/packages/statistics.scm (r-with-tests)[native-inputs]: Same. * gnu/packages/tex.scm (teximpatient)[native-inputs]: Same. --- gnu/packages/algebra.scm | 3 +-- gnu/packages/docbook.scm | 3 +-- gnu/packages/plotutils.scm | 3 +-- gnu/packages/python-xyz.scm | 11 ++++------- gnu/packages/statistics.scm | 5 ++--- gnu/packages/tex.scm | 3 +-- 6 files changed, 10 insertions(+), 18 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 1e21562e91..88fca62e4e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -236,8 +236,7 @@ the real span of the lattice.") (build-system gnu-build-system) (native-inputs `(("texlive" ,(texlive-union - (list texlive-fonts-amsfonts - texlive-latex-amsfonts))))) + (list texlive-amsfonts))))) (inputs `(("gmp" ,gmp) ("libx11" ,libx11) ("perl" ,perl) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 1e5379b020..d114e24ee7 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -195,7 +195,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (build-system python-build-system) ;; TODO: Add xfig/transfig for fig2dev utility (inputs - `(("texlive" ,(texlive-union (list texlive-latex-amsfonts + `(("texlive" ,(texlive-union (list texlive-amsfonts texlive-latex-anysize texlive-latex-appendix texlive-latex-changebar @@ -219,7 +219,6 @@ by no means limited to these applications.) This package provides XML DTDs.") texlive-latex-url texlive-latex-wasysym - texlive-fonts-amsfonts texlive-fonts-ec texlive-fonts-rsfs texlive-fonts-stmaryrd diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index b4ea20e387..88bc6b3dc6 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -198,8 +198,7 @@ colors, styles, options and details.") ("perl" ,perl) ("texinfo" ,texinfo) ;For generating documentation ;; For the manual and the tests. - ("texlive" ,(texlive-union (list texlive-fonts-amsfonts - texlive-latex-amsfonts + ("texlive" ,(texlive-union (list texlive-amsfonts texlive-latex-geometry texlive-latex-graphics texlive-latex-oberdiek ; for ifluatex diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 362ab7f031..ca3e3b642b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3495,12 +3495,11 @@ color scales, and color space conversion easy. It has support for: ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) - ("texlive" ,(texlive-union (list texlive-fonts-amsfonts - texlive-fonts-cm-super + ("texlive" ,(texlive-union (list texlive-fonts-cm-super texlive-fonts-ec texlive-generic-ifxetex texlive-generic-pdftex - texlive-latex-amsfonts + texlive-amsfonts texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ @@ -3899,7 +3898,7 @@ toolkits.") ("python-ipykernel" ,python-ipykernel) ("python-mock" ,python-mock) ("graphviz" ,graphviz) - ("texlive" ,(texlive-union (list texlive-latex-amsfonts + ("texlive" ,(texlive-union (list texlive-amsfonts texlive-latex-amsmath texlive-latex-enumitem texlive-latex-expdlist @@ -3910,7 +3909,6 @@ toolkits.") texlive-generic-pdftex - texlive-fonts-amsfonts texlive-fonts-ec texlive-fonts-adobe-times texlive-fonts-txfonts))) @@ -5467,11 +5465,10 @@ computing.") `(("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ;; FIXME: It's possible that a smaller union would work just as well. - ("texlive" ,(texlive-union (list texlive-fonts-amsfonts + ("texlive" ,(texlive-union (list texlive-amsfonts texlive-fonts-ec texlive-generic-ifxetex texlive-generic-pdftex - texlive-latex-amsfonts texlive-latex-capt-of texlive-latex-cmap texlive-latex-environ diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index eb5e5b4b76..6ed1e40108 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -319,9 +319,8 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ ("perl" ,perl) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) ; for building HTML manuals - ("texlive" ,(texlive-union (list texlive-fonts-amsfonts - texlive-fonts-ec - texlive-latex-amsfonts + ("texlive" ,(texlive-union (list texlive-fonts-ec + texlive-amsfonts texlive-latex-base texlive-latex-fancyvrb texlive-latex-graphics diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ee404871fb..30eda2f846 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6646,8 +6646,7 @@ develop documents with LaTeX, in a single application.") (delete-file "book.pdf") #t))))) (native-inputs - `(("texlive" ,(texlive-union (list texlive-latex-amsfonts - texlive-fonts-amsfonts + `(("texlive" ,(texlive-union (list texlive-amsfonts texlive-fonts-adobe-palatino texlive-fonts-adobe-zapfding texlive-fonts-knuth-lib -- cgit v1.2.3 From 4253358ab0e5a44423eb3c044a1e7fd1971b15f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 20:17:56 +0200 Subject: gnu: texlive-fonts-ec: Update license URL. * gnu/packages/tex.scm (texlive-fonts-ec)[license]: Update URL. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 30eda2f846..b649e5a116 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4861,7 +4861,7 @@ fonts are available in (traced) Adobe Type 1 format, as part of the set, Latin Modern, is not actually a direct development of the EC set, and differs from the EC in a number of particulars.") (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\ -texlive-2017.1/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) +texlive-2018.2/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) (define-public texlive-fonts-adobe-times (package -- cgit v1.2.3 From 6a4fe83b5edb26df45c1fb6bf66ebcf1e680f48c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jul 2019 20:19:03 +0200 Subject: gnu: Add texlive-ae. * gnu/packages/tex.scm (texlive-ae): New variable. --- gnu/packages/tex.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b649e5a116..c638750b92 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4863,6 +4863,31 @@ differs from the EC in a number of particulars.") (license (license:fsf-free "https://www.tug.org/svn/texlive/tags/\ texlive-2018.2/Master/texmf-dist/doc/fonts/ec/copyrite.txt")))) +;; FIXME: the fonts should be built from source, but running "tex aefonts.tex" +;; fails with obscure TeX-typical error messages. +(define-public texlive-ae + (package + (inherit (simple-texlive-package + "texlive-ae" + (list "/doc/fonts/ae/" + "/source/fonts/ae/" + "/fonts/tfm/public/ae/" + "/fonts/vf/public/ae/" + "/tex/latex/ae/") + (base32 + "1xkzg381y0avdq381r2m990wp27czkdff0qkvsp2n5q62yc0bdsw") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/ae") + (synopsis "Virtual fonts for T1 encoded CMR-fonts") + (description + "This package provides a set of virtual fonts which emulates T1 coded +fonts using the standard CM fonts. The package name, AE fonts, supposedly +stands for \"Almost European\". The main use of the package was to produce +PDF files using Adobe Type 1 versions of the CM fonts instead of bitmapped EC +fonts. Note that direct substitutes for the bitmapped EC fonts are available, +via the CM-super, Latin Modern and (in a restricted way) CM-LGC font sets.") + (license license:lppl1.3+))) + (define-public texlive-fonts-adobe-times (package (name "texlive-fonts-adobe-times") -- cgit v1.2.3 From 0901f1b04263db840d51010e032516237cf6ec2d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 12:59:24 +0200 Subject: gnu: Add texlive-txfonts. * gnu/packages/tex.scm (texlive-txfonts): New variable. (texlive-fonts-txfonts): Deprecate package. --- gnu/packages/tex.scm | 133 ++++++++------------------------------------------- 1 file changed, 20 insertions(+), 113 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c638750b92..a4d7b4006b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5754,120 +5754,24 @@ float, but you can put it in a @code{table} or a @code{table*} or some other environment.") (license (license:fsf-free "file://threeparttable.sty")))) -(define-public texlive-fonts-txfonts +(define-public texlive-txfonts (package - (name "texlive-fonts-txfonts") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0jl921qdphg8i7bkfprackn3xd4gmvxckc526nmzqsmahqkavgg2")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "tex/latex/txfonts") - ("txfonts-vf" . "fonts/tfm/public/txfonts") - ("txfonts-afm" . "fonts/afm/public/txfonts") - ("txfonts-tfm" . "fonts/tfm/public/txfonts") - ("txfonts-type1" . "fonts/type1/public/txfonts") - ("txfonts-enc" . "fonts/enc/dvips/txfonts") - ("txfonts-map" . "fonts/map/dvips/txfonts")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("txfonts-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/public/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-tfm-" version "-checkout")) - (sha256 - (base32 - "12ffmbrp48ap35qa3b4mi6ckif9q2vf7972jxh5dc1yzykhla2xv")))) - ("txfonts-vf" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/vf/public/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-vf-" version "-checkout")) - (sha256 - (base32 - "04acyfdwvxpfx4l2xh2bpzdmpvwdf2pzbs7a236b0xckz2jvc1ci")))) - ("txfonts-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/public/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "1705klz51pnqzcs89s3521b84b6c89wlczflsh0vci66nl155yis")))) - ("txfonts-type1" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/public/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-type1-" version "-checkout")) - (sha256 - (base32 - "0ajwr7zb6ch3gxd0g8p2i4llhy2wr9a9saz6jq6hm6fxf4pgl5h3")))) - ("txfonts-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-map-" version "-checkout")) - (sha256 - (base32 - "0kamr8a9x24jakas3v09dgv7kkpybj3i7qv4vz1iyypqr6kk1raj")))) - ("txfonts-enc" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/enc/dvips/txfonts")) - (revision %texlive-revision))) - (file-name (string-append name "-enc-" version "-checkout")) - (sha256 - (base32 - "1bal5fhw0xlhl37ayv8vlnqnsn1y82kadzfjhbgr223blspp4zsj")))))) - (home-page "https://www.ctan.org/pkg/threeparttable") + (inherit (simple-texlive-package + "texlive-txfonts" + (list "/doc/fonts/txfonts/" + + "/fonts/afm/public/txfonts/" + "/fonts/tfm/public/txfonts/" + "/fonts/type1/public/txfonts/" + "/fonts/vf/public/txfonts/" + + "/fonts/map/dvips/txfonts/" + "/fonts/enc/dvips/txfonts/" + "/tex/latex/txfonts/") + (base32 + "017zjas5y1zlyq0iy4x6mv1qbz23xcy3y5xs0crj6zdnfvnccqgp") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/txfonts") (synopsis "Times-like fonts in support of mathematics") (description "Txfonts supplies virtual text roman fonts using Adobe Times (or URW @@ -5885,6 +5789,9 @@ TeX metrics (VF and TFM files) and macros for use with LaTeX.") ;; Any version of the GPL with font exception. (license license:gpl3+))) +(define-public texlive-fonts-txfonts + (deprecated-package "texlive-fonts-txfonts" texlive-txfonts)) + (define-public texlive-fonts-iwona (package (name "texlive-fonts-iwona") -- cgit v1.2.3 From 8bc9afeb9e63a473b29a440f04659171a032ee23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 13:15:21 +0200 Subject: gnu: Add texlive-xypic. * gnu/packages/tex.scm (texlive-xypic): New variable. (texlive-fonts-xypic, texlive-generic-xypic): Deprecate them. --- gnu/packages/tex.scm | 148 +++++++++++++-------------------------------------- 1 file changed, 37 insertions(+), 111 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a4d7b4006b..e1c1d173cf 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7200,119 +7200,45 @@ titles.") ;; No version of the GPL is specified. (license license:gpl3+))) -(define-public texlive-generic-xypic - (package - (name "texlive-generic-xypic") - (version (number->string %texlive-revision)) - (source - (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/generic/xypic")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1g5cyxwdfznq4lk9zl6fkjkapmhmwd2cm4m5aibxj20qgwnaggfz")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/generic/xypic"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) - (home-page "https://www.ctan.org/pkg/xypic") - (synopsis "Flexible diagramming macros for TeX") - (description - "A package for typesetting a variety of graphs and diagrams with TeX. -Xy-pic works with most formats (including LaTeX, AMS-LaTeX, AMS-TeX, and plain -TeX).") - (license license:gpl3+))) +(define-public texlive-xypic + (let ((template (simple-texlive-package + "texlive-xypic" + (list "/doc/generic/xypic/" + "/dvips/xypic/xy389dict.pro" + "/fonts/enc/dvips/xypic/" + "/fonts/map/dvips/xypic/xypic.map" + + "/fonts/source/public/xypic/" + "/fonts/afm/public/xypic/" + "/fonts/tfm/public/xypic/" + "/fonts/type1/public/xypic/" + + ;;"/tex/generic/xypic/" ; I guess these are generated + ) + (base32 + "0sqkkvjzzsiazvh8803qqyrcv4is3m1qs9x9v2m35jjikbqc08y8")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "tex/generic/xypic") + ((#:phases phases) + `(modify-phases ,phases + (delete 'reset-gzip-timestamps))))) + (home-page "https://www.ctan.org/pkg/xypic") + (synopsis "Flexible diagramming macros") + (description "This is a package for typesetting a variety of graphs and +diagrams with TeX. Xy-pic works with most formats (including LaTeX, +AMS-LaTeX, AMS-TeX, and plain TeX). The distribution includes Michael Barr's +@code{diag} package, which was previously distributed stand-alone.") + (license license:gpl3+)))) (define-public texlive-fonts-xypic - (package - (name "texlive-fonts-xypic") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/source/public/xypic")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0p20v1257kwsqnrk98cdhhiz2viv8l3ly4xay4by0an3j37m9xs3")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "fonts/source/public/xypic") - ("xypic-afm" . "fonts/afm/public/xypic") - ("xypic-type1" . "fonts/type1/public/xypic") - ("xypic-enc" . "fonts/enc/dvips/xypic")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("xypic-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/public/xypic")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "149xdijxp8lw3s0qv2aqxxxyyn748z57dpr596rjvkqdffpnsddh")))) - ("xypic-type1" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/public/xypic")) - (revision %texlive-revision))) - (file-name (string-append name "-type1-" version "-checkout")) - (sha256 - (base32 - "1bln89wib7g3hcv2jny3qi6jb73k9d2vbgx3wnnjwp3ryg0846if")))) - ("xypic-enc" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/enc/dvips/xypic")) - (revision %texlive-revision))) - (file-name (string-append name "-enc-" version "-checkout")) - (sha256 - (base32 - "0yi8vms3203l3p5slnhrrlzzp0f0jw77fkcvcaicrz2vmw9z99x7")))))) - (home-page "https://www.ctan.org/pkg/xypic") - (synopsis "Fonts for XY-pic") - (description "This package provides the XY-pic fonts.") - (license license:gpl3+))) + (deprecated-package "texlive-fonts-xypic" texlive-xypic)) + +(define-public texlive-generic-xypic + (deprecated-package "texblive-generic-xypic" texlive-xypic)) (define-public texlive-bibtex (package -- cgit v1.2.3 From 8fee5067b28f82512621a389ea5cf12fa89ef354 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 13:16:08 +0200 Subject: gnu: texlive-tex-plain: Simplify. * gnu/packages/tex.scm (texlive-tex-plain): Implement with SIMPLE-TEXLIVE-PACKAGE. [description]: Use full sentences. --- gnu/packages/tex.scm | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e1c1d173cf..dfd23ab7d6 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1270,36 +1270,18 @@ incorporates the e-TeX extensions.") (define-public texlive-tex-plain (package - (name "texlive-tex-plain") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/plain")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1xknlb3gcw6jjqh97bhghxi594bzpj1zfzzfsrr9pvr9s1bx7dnf")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/plain"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - #t)))) + (inherit (simple-texlive-package + "texlive-tex-plain" + (list "/tex/plain/") + (base32 + "1rrfay4d7lbyj02wlf23mwvbpjd160nwlgryx97hq1vb7dva4swr") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/plain") (synopsis "Plain TeX format and supporting files") (description - "Contains files used to build the Plain TeX format, as described in the -TeXbook, together with various supporting files (some also discussed in the -book).") + "This package contains files used to build the Plain TeX format, as +described in the TeXbook, together with various supporting files (some also +discussed in the book).") (license license:knuth))) (define-public texlive-hyphen-afrikaans -- cgit v1.2.3 From 1f50ae63465406fbeb45b49bea8d332df0d6b9e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 13:19:24 +0200 Subject: gnu: Add texlive-charter. * gnu/packages/tex.scm (texlive-charter): New variable. (texlive-fonts-charter): Deprecate package. --- gnu/packages/tex.scm | 83 ++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 64 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index dfd23ab7d6..da23c349e6 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7258,74 +7258,29 @@ be specified in the document itself (one often needs a LaTeX citation-style package, such as @command{natbib} as well).") (license license:knuth))) -(define-public texlive-fonts-charter +(define-public texlive-charter (package - (name "texlive-fonts-charter") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/bitstrea/charter")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0yvib45xxff3jm5270zij4q888pivbc18cqs7lz4pqfhn1am4wnv")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "fonts/type1/bitstrea/charter") - ("charter-afm" . "fonts/afm/bitstrea/charter") - ("charter-tfm" . "fonts/tfm/bitstrea/charter")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("charter-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/bitstrea/charter")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "02nbkqrlr3vypnzslmr7dxg1353mmc0rl4ynx0s6qbvf313fq76a")))) - ("charter-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/bitstrea/charter")) - (revision %texlive-revision))) - (file-name (string-append name "-tfm-" version "-checkout")) - (sha256 - (base32 - "0j7ci9vprivbhac70aq0z7m23hqcpx1g0i3wp1k0h8ilhimj80xk")))))) + (inherit (simple-texlive-package + "texlive-charter" + (list "/doc/fonts/charter/readme.charter" + "/fonts/afm/bitstrea/charter/" + "/fonts/tfm/bitstrea/charter/" + "/fonts/type1/bitstrea/charter/" + "/fonts/vf/bitstrea/charter/") + (base32 + "09l5ymgz48s3hyn776l01g3isk3dnhrj1vdavdw4qq4kfxxpqdn9") + #:trivial? #t)) (home-page "https://www.ctan.org/pkg/charter") (synopsis "Charter fonts for TeX") - (description "A commercial text font donated for the common good. Support -for use with LaTeX is available in @code{freenfss}, part of + (description "This package provides a copy of the Charter Type-1 fonts +which Bitstream contributed to the X consortium, renamed for use with TeX. +Support for use with LaTeX is available in @code{freenfss}, part of @command{psnfss}. ") - (license (license:non-copyleft (string-append "http://mirrors.ctan.org/" - "fonts/charter/readme.charter"))))) + (license (license:non-copyleft + "http://mirrors.ctan.org/fonts/charter/readme.charter")))) + +(define-public texlive-fonts-charter + (deprecated-package "texlive-fonts-charter" texlive-charter)) (define-public texlive-context-base (package -- cgit v1.2.3 From 1aaa117c0cbe0f7067ec3ad28b274260c0495c32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 13:54:15 +0200 Subject: gnu: Add texlive-times. * gnu/packages/tex.scm (texlive-times): New variable. (texlive-fonts-adobe-times): Deprecate package. --- gnu/packages/tex.scm | 173 ++++++--------------------------------------------- 1 file changed, 19 insertions(+), 154 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index da23c349e6..79dcbd5ff2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4870,161 +4870,23 @@ fonts. Note that direct substitutes for the bitmapped EC fonts are available, via the CM-super, Latin Modern and (in a restricted way) CM-LGC font sets.") (license license:lppl1.3+))) -(define-public texlive-fonts-adobe-times +(define-public texlive-times (package - (name "texlive-fonts-adobe-times") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/urw/times/")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "15vzyr7favkv1mj00qxr03s89kw78nd066fh69by93272g8p5sgd")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "fonts/type1/urw/times") - - ("times-afm" . "fonts/afm/adobe/times") - ("times-tfm" . "fonts/tfm/adobe/times") - ("times-vf" . "fonts/vf/adobe/times") - - ("urw-afm" . "fonts/afm/urw/times") - ("urw35vf-tfm" . "fonts/tfm/urw35vf/times") - ("urw35vf-vf" . "fonts/vf/urw35vf/times") - - ("times-tex" . "tex/latex/times") - ("dvips" . "dvips/times") - ("fonts-map" . "fonts/map/dvips/times")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("times-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/adobe/times")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "1k7h6vihfc6ri2lq9ggnq2g4zq3qcgq1vd0hr486g9cqrdpys6cy")))) - ("times-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/adobe/times")) - (revision %texlive-revision))) - (file-name (string-append name "-tfm-" version "-checkout")) - (sha256 - (base32 - "1hbgkjnf5xyganbznwpwszvr3iyk4bzb0ys4hd8ybawp60paadrr")))) - ("times-vf" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/vf/adobe/times")) - (revision %texlive-revision))) - (file-name (string-append name "-vf-" version "-checkout")) - (sha256 - (base32 - "18rfspnwdw9r81dy18lb4w96d09b6c4g7y80azwylalkhwdf2lfp")))) - ("urw-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/urw/times")) - (revision %texlive-revision))) - (file-name (string-append name "-urw-afm-" version "-checkout")) - (sha256 - (base32 - "0g0xpsyn6634g0b4rpd420v7i4gkz3zr12vcy2b8csbcscjvwri5")))) - ("urw35vf-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/urw35vf/times")) - (revision %texlive-revision))) - (file-name (string-append name "-urw35vf-tfm-" version "-checkout")) - (sha256 - (base32 - "0a4idlvpaqd0ypqgy1xw0rpx8q23bvssg8xq757zzn3zikj0w7pr")))) - ("urw35vf-vf" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/vf/urw35vf/times")) - (revision %texlive-revision))) - (file-name (string-append name "-urw35vf-vf-" version "-checkout")) - (sha256 - (base32 - "05mppwxd4c5x0yw50gca726f0ylc1rk8jf0jjkrriixq6rnw03di")))) - ("times-tex" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/times")) - (revision %texlive-revision))) - (file-name (string-append name "-tex-" version "-checkout")) - (sha256 - (base32 - "1gmd0x7c3vkvfzgmrsp4866rcdbyimfk3bjr91zaadc41r1i8xrp")))) - ("dvips" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/dvips/times/")) - (revision %texlive-revision))) - (file-name (string-append name "-dvips-" version "-checkout")) - (sha256 - (base32 - "1fvqpgqi7bp2q76nf5kmlhsdijxw65arqfy3ax3djwih3yg12mp0")))) - ("fonts-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/times/")) - (revision %texlive-revision))) - (file-name (string-append name "-fonts-map-" version "-checkout")) - (sha256 - (base32 - "12f00gzs2zgllkm59qdhw2xxj7lvg3p256232f1l275z3pldfqqi")))))) + (inherit (simple-texlive-package + "texlive-times" + (list "/dvips/times/" + "/fonts/afm/adobe/times/" + "/fonts/afm/urw/times/" + "/fonts/tfm/adobe/times/" + "/fonts/tfm/urw35vf/times/" + "/fonts/type1/urw/times/" + "/fonts/vf/adobe/times/" + "/fonts/vf/urw35vf/times/" + "/fonts/map/dvips/times/" + "/tex/latex/times/") + (base32 + "13g41a7vbkvsf7ki9dgl7qm100w382mnlqkcngwgl3axp6s5s8l0") + #:trivial? #t)) (home-page "https://ctan.org/pkg/urw-base35") (synopsis "URW Base 35 font pack for LaTeX") (description @@ -5033,6 +4895,9 @@ Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-fonts-adobe-times + (deprecated-package "texlive-fonts-adobe-times" texlive-times)) + (define-public texlive-fonts-adobe-palatino (package (name "texlive-fonts-adobe-palatino") -- cgit v1.2.3 From 57bee3cc91419880e04798bef5079c151b4ac7e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 14:06:19 +0200 Subject: gnu: Add texlive-palatino. * gnu/packages/tex.scm (texlive-palatino): New variable. (texlive-fonts-adobe-palatino): Deprecate package. --- gnu/packages/tex.scm | 174 ++++++--------------------------------------------- 1 file changed, 20 insertions(+), 154 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 79dcbd5ff2..1438e39121 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4898,161 +4898,24 @@ Adobe's basic set.") (define-public texlive-fonts-adobe-times (deprecated-package "texlive-fonts-adobe-times" texlive-times)) -(define-public texlive-fonts-adobe-palatino +(define-public texlive-palatino (package - (name "texlive-fonts-adobe-palatino") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/urw/palatino/")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "18dw5260c6fy7acxaqwrg3hw04kg63ijq4lkn56q5pa2g6nyylrp")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "fonts/type1/urw/palatino") - - ("palatino-afm" . "fonts/afm/adobe/palatino") - ("palatino-tfm" . "fonts/tfm/adobe/palatino") - ("palatino-vf" . "fonts/vf/adobe/palatino") - - ("urw-afm" . "fonts/afm/urw/palatino") - ("urw35vf-tfm" . "fonts/tfm/urw35vf/palatino") - ("urw35vf-vf" . "fonts/vf/urw35vf/palatino") - - ("palatino-tex" . "tex/latex/palatino") - ("dvips" . "dvips/palatino") - ("fonts-map" . "fonts/map/dvips/palatino")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("palatino-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/adobe/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "0pxizay730cx7rb9y5bqq9dn1zxx3arc33rmdsn7l29pc51flmmi")))) - ("palatino-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/adobe/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-tfm-" version "-checkout")) - (sha256 - (base32 - "1w1vm0sk9kpsy14yhyf1v1q3c6b97cgbba74g578bcwjlh810mg0")))) - ("palatino-vf" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/vf/adobe/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-vf-" version "-checkout")) - (sha256 - (base32 - "1maqfis8hpybcn9lmm8r2b1g56620lfpsncg0742c3kkjd6dh97h")))) - ("urw-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/urw/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-urw-afm-" version "-checkout")) - (sha256 - (base32 - "0gk0xwy1fs2si5kb1j3dzgm52c8sagv32gd9dmw88m7sgh5qkd87")))) - ("urw35vf-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/urw35vf/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-urw35vf-tfm-" version "-checkout")) - (sha256 - (base32 - "19aq3xwfg7vkf1qzjdxgcvcdqwpvpavq3l25y64xni72qx0kmppz")))) - ("urw35vf-vf" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/vf/urw35vf/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-urw35vf-vf-" version "-checkout")) - (sha256 - (base32 - "1lkn4p6zimrs0ah6mxsang4bicp8j7xzl016529a3f168an7mdmj")))) - ("palatino-tex" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/palatino")) - (revision %texlive-revision))) - (file-name (string-append name "-tex-" version "-checkout")) - (sha256 - (base32 - "0ng9w7i0p1nb51amla32jj86vx6p84m6qc7asam3g4x8w5jf7s27")))) - ("dvips" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/dvips/palatino/")) - (revision %texlive-revision))) - (file-name (string-append name "-dvips-" version "-checkout")) - (sha256 - (base32 - "1pdbkfmhx4kk3brh5lg6fyl9ad2kbjmkrhgcx84klnlhq01mfdhb")))) - ("fonts-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/palatino/")) - (revision %texlive-revision))) - (file-name (string-append name "-fonts-map-" version "-checkout")) - (sha256 - (base32 - "0rg13hyp652hp3gnrj5pbyb84zkqmyi1qnm8c6spcyaq8pm06l0d")))))) + (inherit (simple-texlive-package + "texlive-palatino" + (list "/dvips/palatino/" + "/fonts/afm/adobe/palatino/" + "/fonts/afm/urw/palatino/" + "/fonts/tfm/adobe/palatino/" + "/fonts/tfm/urw35vf/palatino/" + "/fonts/type1/urw/palatino/" + "/fonts/vf/adobe/palatino/" + "/fonts/vf/urw35vf/palatino/" + + "/fonts/map/dvips/palatino/" + "/tex/latex/palatino/") + (base32 + "12jc0av7v99857jigmva47qaxyllhpzsnqis10n0qya2kz44xf22") + #:trivial? #t)) (home-page "https://ctan.org/pkg/urw-base35") (synopsis "URW Base 35 font pack for LaTeX") (description @@ -5061,6 +4924,9 @@ Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-fonts-adobe-palatino + (deprecated-package "texlive-fonts-adobe-palatino" texlive-palatino)) + (define-public texlive-fonts-adobe-zapfding (package (name "texlive-fonts-adobe-zapfding") -- cgit v1.2.3 From df19dc2f86a2828502a205021460ae39c1353404 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 14:20:16 +0200 Subject: gnu: Add texlive-zapfding. * gnu/packages/tex.scm (texlive-zapfding): New variable. (texlive-fonts-adobe-zapfding): Deprecate package. --- gnu/packages/tex.scm | 143 ++++++--------------------------------------------- 1 file changed, 17 insertions(+), 126 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1438e39121..c8d08cff5d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4927,133 +4927,21 @@ Adobe's basic set.") (define-public texlive-fonts-adobe-palatino (deprecated-package "texlive-fonts-adobe-palatino" texlive-palatino)) -(define-public texlive-fonts-adobe-zapfding +(define-public texlive-zapfding (package - (name "texlive-fonts-adobe-zapfding") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/type1/urw/zapfding/")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1sp3jblg3khp0yj121blvhph6ib09919kyrsk5x2lg258yypqyis")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils) - (ice-9 match)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match)) - (let ((root (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/")) - (pkgs '(("source" . "fonts/type1/urw/zapfding") - ("zapf-afm" . "fonts/afm/adobe/zapfding") - ("zapf-tfm" . "fonts/tfm/adobe/zapfding") - ("urw-afm" . "fonts/afm/urw/zapfding") - ("urw35vf-tfm" . "fonts/tfm/urw35vf/zapfding") - - ("zapf-tex" . "tex/latex/zapfding") - ("dvips" . "dvips/zapfding") - ("fonts-map" . "fonts/map/dvips/zapfding")))) - (for-each (match-lambda - ((pkg . dir) - (let ((target (string-append root dir))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs pkg) - target)))) - pkgs) - #t)))) - (native-inputs - `(("zapf-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/adobe/zapfding")) - (revision %texlive-revision))) - (file-name (string-append name "-afm-" version "-checkout")) - (sha256 - (base32 - "0qvl4w1bfcpiakkd8rvkism46qnvzj9w7x4r8z9m0y7mspbkblyr")))) - ("zapf-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/adobe/zapfding")) - (revision %texlive-revision))) - (file-name (string-append name "-tfm-" version "-checkout")) - (sha256 - (base32 - "1i8mh9xsl8l4cgsg3nl4ha9q6m55j122riclaxsvkc5ka83432qm")))) - ("urw-afm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/afm/urw/zapfding")) - (revision %texlive-revision))) - (file-name (string-append name "-urw-afm-" version "-checkout")) - (sha256 - (base32 - "0m4qndqh7ji723ff82c5c1q8ziqvblbaip7vx05vnl15fqbsnfx1")))) - ("urw35vf-tfm" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/tfm/urw35vf/zapfding")) - (revision %texlive-revision))) - (file-name (string-append name "-urw35vf-tfm-" version "-checkout")) - (sha256 - (base32 - "167g2x6mpjfqh0w1fhjbw14qcx6ridrj2zm1bd8bi0l2d7phj28m")))) - ("zapf-tex" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/zapfding")) - (revision %texlive-revision))) - (file-name (string-append name "-tex-" version "-checkout")) - (sha256 - (base32 - "0hp7i8f6nbrg7irrwc8fd7n1hrzjysa84d6iyivwlc65v9p7lmd0")))) - ("dvips" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/dvips/zapfding/")) - (revision %texlive-revision))) - (file-name (string-append name "-dvips-" version "-checkout")) - (sha256 - (base32 - "1f18sc4qwxykd786zhn6szcrycqvpvfhlcim71aamxmwghakd7fa")))) - ("fonts-map" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/fonts/map/dvips/zapfding/")) - (revision %texlive-revision))) - (file-name (string-append name "-fonts-map-" version "-checkout")) - (sha256 - (base32 - "17kwxmdrgz2fb072hx57a3pidcrhbgayphx11zyld2hv9149pkyl")))))) + (inherit (simple-texlive-package + "texlive-zapfding" + (list "/dvips/zapfding/" + "/fonts/afm/adobe/zapfding/" + "/fonts/afm/urw/zapfding/" + "/fonts/tfm/adobe/zapfding/" + "/fonts/tfm/urw35vf/zapfding/" + "/fonts/type1/urw/zapfding/" + "/fonts/map/dvips/zapfding/" + "/tex/latex/zapfding/") + (base32 + "17mls8wilz9api9ivsbcczpiqp1f39qy8wa6ajssi8zhnc5lq7zn") + #:trivial? #t)) (home-page "https://ctan.org/pkg/urw-base35") (synopsis "URW Base 35 font pack for LaTeX") (description @@ -5062,6 +4950,9 @@ Adobe's basic set.") ;; No license version specified. (license license:gpl3+))) +(define-public texlive-fonts-adobe-zapfding + (deprecated-package "texlive-fonts-adobe-zapfding" texlive-zapfding)) + (define-public texlive-fonts-rsfs (package (name "texlive-fonts-rsfs") -- cgit v1.2.3 From b7d779db34630f98df817a244adf44b9e486abe9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 15:14:30 +0200 Subject: gnu: Add texlive-cm. * gnu/packages/tex.scm (texlive-cm): New variable. (texlive-fonts-cm): Deprecate package. --- gnu/packages/tex.scm | 156 ++++++++++++++++++++++++--------------------------- 1 file changed, 73 insertions(+), 83 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c8d08cff5d..f847e22705 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -699,92 +699,82 @@ from (almost) arbitrarily complex font names, thus helping portability of TeX documents.") (license license:public-domain))) -(define-public texlive-fonts-cm - (package - (inherit (simple-texlive-package - "texlive-fonts-cm" - (list "/fonts/source/public/cm/" - "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map" - "/doc/fonts/cm/README" - "/doc/fonts/cm/README-cmps.txt") - (base32 - "1h0q71paqmg1xjg6k35ni2i6m93kmlq9rdwm913xg9n4qngywl18"))) - (outputs '("out" "doc")) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1) - (srfi srfi-26)) - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (let ((mf (assoc-ref inputs "texlive-metafont-base"))) - ;; Tell mf where to find mf.base - (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) - ;; Tell mf where to look for source files - (setenv "MFINPUTS" - (string-append (getcwd) "/fonts/source/public/cm/:" - mf "/share/texmf-dist/metafont/base"))) - (for-each make-file-writable - (cons "fonts/source/public/cm/" - (find-files "fonts/source/public/cm/" ".*"))) - (let ((build (string-append (getcwd) "/build")) - (pkdir (string-append (getcwd) "/pk/ljfour/public/cm/dpi600"))) - (mkdir-p pkdir) - (mkdir-p build) - (with-directory-excursion "fonts/source/public/cm/" - (for-each (lambda (font) - (format #t "building font ~a\n" font) - (invoke "mf" "-progname=mf" - (string-append "-output-directory=" build) - (string-append "\\" - "mode:=ljfour; " - "mag:=1+0/600; " - "scrollmode; " - "input " - (basename font ".mf"))) - (invoke "gftopk" - (string-append build "/" - (basename font ".mf") ".600gf") - (string-append pkdir "/" - (basename font ".mf") ".pk"))) - (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")))) - #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (source (assoc-ref inputs "source")) - (fonts (string-append out "/share/texmf-dist/fonts/")) - (pk (string-append fonts "pk")) - (tfm (string-append fonts "tfm/public/cm")) - (mf (string-append fonts "source/public/cm"))) - (for-each (cut install-file <> tfm) - (find-files "build" "\\.*")) - (for-each (cut install-file <> mf) - (find-files "." "\\.mf")) - (copy-recursively "pk" pk) - (copy-recursively - (string-append source "/doc") - (string-append doc "/doc")) - (install-file - (string-append source "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map") - (string-append fonts "/map/dvips/cm/cmtext-bsr-interpolated.map")) - #t)))))) - (native-inputs - `(("texlive-bin" ,texlive-bin) - ("texlive-metafont-base" ,texlive-metafont-base))) - (home-page "https://www.ctan.org/pkg/cm") - (synopsis "Computer Modern fonts for TeX") - (description "This package provides the Computer Modern fonts by Donald +(define-public texlive-cm + (let ((template (simple-texlive-package + "texlive-cm" + (list "/fonts/source/public/cm/" + "/fonts/map/dvips/cm/cmtext-bsr-interpolated.map" + "/doc/fonts/cm/") + (base32 + "1h0q71paqmg1xjg6k35ni2i6m93kmlq9rdwm913xg9n4qngywl18") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:modules modules '()) + '((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((mf (assoc-ref inputs "texlive-metafont-base"))) + ;; Tell mf where to find mf.base + (setenv "MFBASES" (string-append mf "/share/texmf-dist/web2c")) + ;; Tell mf where to look for source files + (setenv "MFINPUTS" + (string-append (getcwd) "/fonts/source/public/cm/:" + mf "/share/texmf-dist/metafont/base"))) + (for-each make-file-writable + (cons "fonts/source/public/cm/" + (find-files "fonts/source/public/cm/" ".*"))) + (let ((build (string-append (getcwd) "/build")) + (pkdir (string-append (getcwd) "/pk/ljfour/public/cm/dpi600"))) + (mkdir-p pkdir) + (mkdir-p build) + (with-directory-excursion "fonts/source/public/cm/" + (for-each (lambda (font) + (format #t "building font ~a\n" font) + (invoke "mf" "-progname=mf" + (string-append "-output-directory=" build) + (string-append "\\" + "mode:=ljfour; " + "mag:=1+0/600; " + "scrollmode; " + "input " + (basename font ".mf"))) + (invoke "gftopk" + (string-append build "/" + (basename font ".mf") ".600gf") + (string-append pkdir "/" + (basename font ".mf") ".pk"))) + (find-files "." "cm(.*[0-9]+.*|inch)\\.mf$")))) + #t)) + (add-after 'install 'install-generated-fonts + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (fonts (string-append out "/share/texmf-dist/fonts/")) + (pk (string-append fonts "pk")) + (tfm (string-append fonts "tfm/public/cm"))) + (for-each (cut install-file <> tfm) + (find-files "build" "\\.*")) + (copy-recursively "pk" pk) + #t))))))) + (native-inputs + `(("texlive-bin" ,texlive-bin) + ("texlive-metafont-base" ,texlive-metafont-base))) + (home-page "https://www.ctan.org/pkg/cm") + (synopsis "Computer Modern fonts for TeX") + (description "This package provides the Computer Modern fonts by Donald Knuth. The Computer Modern font family is a large collection of text, display, and mathematical fonts in a range of styles, based on Monotype Modern 8A.") - (license license:knuth))) + (license license:knuth)))) + +(define-public texlive-fonts-cm + (deprecated-package "texlive-fonts-cm" texlive-cm)) (define-public texlive-cm-super (let ((template (simple-texlive-package -- cgit v1.2.3 From 81ca46147da7dc87ebb010f1b13e791291b0805a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jul 2019 15:19:39 +0200 Subject: gnu: Add texlive-beamer. * gnu/packages/tex.scm (texlive-beamer): New variable. (texlive-latex-beamer): Deprecate package. --- gnu/packages/tex.scm | 55 +++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index f847e22705..d09b7e1e5e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6927,56 +6927,20 @@ supports advanced interactive documents. See the ConTeXt garden for a wealth of support information.") (license license:gpl2+))) -(define-public texlive-latex-beamer +(define-public texlive-beamer (package - (name "texlive-latex-beamer") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/tex/latex/beamer")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "09y3qwbj0nckshvg9afgwcv9v3zdif1d7bnpzrggsa1fbr80mgk2")))) - (build-system trivial-build-system) - (outputs '("out" "doc")) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((target (string-append (assoc-ref %outputs "out") - "/share/texmf-dist/tex/latex/beamer")) - (docs (string-append (assoc-ref %outputs "doc") - "/share/texmf-dist/doc/latex/beamer/"))) - (mkdir-p target) - (copy-recursively (assoc-ref %build-inputs "source") target) - - (mkdir-p docs) - (copy-recursively (assoc-ref %build-inputs "docs") docs) - #t)))) + (inherit (simple-texlive-package + "texlive-beamer" + (list "/doc/latex/beamer/" + "/tex/latex/beamer/") + (base32 + "00z1a32wkz1ffif7dc8h3ar2fn2hlvfnljgim2szjam2k14l82x3") + #:trivial? #t)) (propagated-inputs `(("texlive-latex-hyperref" ,texlive-latex-hyperref) ("texlive-latex-oberdiek" ,texlive-latex-oberdiek) ("texlive-latex-etoolbox" ,texlive-latex-etoolbox) ("texlive-latex-pgf" ,texlive-latex-pgf))) - (native-inputs - `(("docs" - ,(origin - (method svn-fetch) - (uri (svn-reference - (url (string-append "svn://www.tug.org/texlive/tags/" - %texlive-tag "/Master/texmf-dist/" - "/doc/latex/beamer")) - (revision %texlive-revision))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "102b18b9nw9dicqqgjwx0srh1mav8vh9wdvwayn741niza9hac23")))))) (home-page "https://www.ctan.org/pkg/beamer") (synopsis "LaTeX class for producing presentations and slides") (description "The beamer LaTeX class can be used for producing slides. @@ -6992,6 +6956,9 @@ effects, varying slide transitions and animations.") ;; dual-licensed under either FDLv1.3+ or LPPL1.3c+. (license (list license:lppl1.3c+ license:gpl2+ license:fdl1.3+)))) +(define-public texlive-latex-beamer + (deprecated-package "texlive-latex-beamer" texlive-beamer)) + (define-public texlive-latex-xmpincl (package (name "texlive-latex-xmpincl") -- cgit v1.2.3 From 192ad4d16fd68487550fd70c4631fa0297092c56 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Jul 2019 12:13:23 +0200 Subject: gnu: Add texlive-tetex. * gnu/packages/tex.scm (texlive-tetex): New variable. --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d09b7e1e5e..58f0dae7a9 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3014,6 +3014,23 @@ of file names.") (define-public texlive-latex-url (deprecated-package "texlive-latex-url" texlive-url)) +(define-public texlive-tetex + (package + (inherit (simple-texlive-package + "texlive-tetex" + (list "/dvips/tetex/" + "/fonts/enc/dvips/tetex/" + "/fonts/map/dvips/tetex/") + (base32 + "1si3as8mwi8837965djlw6jhwwzsp3r1hkflvdxv2avx9vb45hjb") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/tetex") + (synopsis "Font maps originally from teTeX") + (description "This package provides font maps that were originally part of +the now obsolete teTeX distributions but are still used at the core of the TeX +Live distribution.") + (license license:public-domain))) + (define-public texlive-latex-l3kernel (package (name "texlive-latex-l3kernel") -- cgit v1.2.3 From fdb8841fa68fab2456ffd1bb6fd0fdd3a9112ce6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Jul 2019 12:13:44 +0200 Subject: gnu: texlive-base: Include texlive-tetex. * gnu/packages/tex.scm (texlive-base)[default-packages]: Add texlive-tetex. --- gnu/packages/tex.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 58f0dae7a9..dc88fd952f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3492,7 +3492,8 @@ packages.") texlive-latex-cyrillic texlive-latex-graphics texlive-latex-psnfss - texlive-latex-tools))) + texlive-latex-tools + texlive-tetex))) (package (name "texlive-base") (version (number->string %texlive-revision)) -- cgit v1.2.3 From a6405e0333fe371e8beb84121f01119401fd09e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Jul 2019 12:19:54 +0200 Subject: gnu: Rename references to obsolete "texlive-fonts-cm". * gnu/packages/tex.scm (texlive-amsfonts, texlive-fonts-latex, texlive-etex, texlive-hyph-utf8, texlive-base, texlive-fonts-ec, texlive-fonts-rsfs)[native-inputs]: Rename texlive-fonts-cm to texlive-cm. [arguments]: Adjust. --- gnu/packages/tex.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index dc88fd952f..4e65de9391 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -942,7 +942,7 @@ fonts.") (setenv "MFINPUTS" (string-append (getcwd) ":" mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-fonts-cm") + (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/source/public/cm"))) (mkdir "build") (for-each (lambda (font) @@ -975,7 +975,7 @@ fonts.") (native-inputs `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) - ("texlive-fonts-cm" ,texlive-fonts-cm))) + ("texlive-cm" ,texlive-cm))) (home-page "https://www.ctan.org/pkg/latex-fonts") (synopsis "Collection of fonts used in LaTeX distributions") (description "This is a collection of fonts for use with standard LaTeX @@ -1071,7 +1071,7 @@ Taco Hoekwater.") src "/dummy:" src "/symbols:" mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-fonts-cm") + (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/source/public/cm"))) (let ((build (string-append (getcwd) "/build"))) (mkdir-p build) @@ -1155,7 +1155,7 @@ Taco Hoekwater.") #t)))))) (native-inputs `(("texlive-union" ,(texlive-union (list texlive-tex-fontinst-base - texlive-fonts-cm + texlive-cm texlive-metafont-base))))) (home-page "https://www.ctan.org/pkg/amsfonts") (synopsis "TeX fonts from the American Mathematical Society") @@ -1228,7 +1228,7 @@ output encodings, and features generation of clean UTF-8 patterns.") (string-append (getcwd) "/fonts/source/public/etex/:" mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-fonts-cm") + (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/source/public/cm"))) (invoke "mf" "-progname=mf" (string-append "\\" @@ -1247,7 +1247,7 @@ output encodings, and features generation of clean UTF-8 patterns.") (native-inputs `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) - ("texlive-fonts-cm" ,texlive-fonts-cm))) + ("texlive-cm" ,texlive-cm))) (home-page "https://www.ctan.org/pkg/etex") (synopsis "Extended version of TeX") (description @@ -2274,7 +2274,7 @@ T1/EC and UTF-8 encodings.") ;; Find required fonts for building tex.fmt (setenv "TFMFONTS" - (string-append (assoc-ref inputs "texlive-fonts-cm") + (string-append (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/tfm/public/cm:" (assoc-ref inputs "texlive-fonts-knuth-lib") "/share/texmf-dist/fonts/tfm/public/knuth-lib")) @@ -2329,7 +2329,7 @@ T1/EC and UTF-8 encodings.") ;; The following packages are needed for build "tex.fmt", which we need ;; for a working "tex". ("texlive-tex-plain" ,texlive-tex-plain) - ("texlive-fonts-cm" ,texlive-fonts-cm) + ("texlive-cm" ,texlive-cm) ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) ("texlive-hyphen-base" ,texlive-hyphen-base))) (home-page "https://ctan.org/pkg/hyph-utf8") @@ -2550,7 +2550,7 @@ formats.") "/share/texmf-dist/fonts/tfm/public" dir))) '(("texlive-etex" . "/etex") - ("texlive-fonts-cm" . "/cm") + ("texlive-cm" . "/cm") ("texlive-fonts-latex" . "/latex-fonts") ("texlive-fonts-knuth-lib" . "/knuth-lib"))) ":")) @@ -2628,7 +2628,7 @@ formats.") ("texlive-tex-ini-files" ,texlive-tex-ini-files) ("texlive-tex-plain" ,texlive-tex-plain) ("texlive-kpathsea" ,texlive-kpathsea) - ("texlive-fonts-cm" ,texlive-fonts-cm) + ("texlive-cm" ,texlive-cm) ("texlive-fonts-latex" ,texlive-fonts-latex) ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) ("texlive-luatexconfig" @@ -3480,7 +3480,7 @@ packages.") (list texlive-bin texlive-dvips texlive-fontname - texlive-fonts-cm + texlive-cm texlive-fonts-latex texlive-metafont-base texlive-latex-base @@ -4804,7 +4804,7 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.") (setenv "MFINPUTS" (string-append (getcwd) ":" mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-fonts-cm") + (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/source/public/cm"))) (mkdir "build") (for-each (lambda (font) @@ -4833,7 +4833,7 @@ in SGML; use maths minus in text as appropriate; simple Young tableaux.") (native-inputs `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) - ("texlive-fonts-cm" ,texlive-fonts-cm))) + ("texlive-cm" ,texlive-cm))) (home-page "https://www.ctan.org/pkg/ec") (synopsis "Computer modern fonts in T1 and TS1 encodings") (description @@ -4995,7 +4995,7 @@ Adobe's basic set.") (setenv "MFINPUTS" (string-append (getcwd) ":" mf "/share/texmf-dist/metafont/base:" - (assoc-ref inputs "texlive-fonts-cm") + (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/source/public/cm"))) (mkdir "build") (for-each (lambda (font) @@ -5024,7 +5024,7 @@ Adobe's basic set.") (native-inputs `(("texlive-bin" ,texlive-bin) ("texlive-metafont-base" ,texlive-metafont-base) - ("texlive-fonts-cm" ,texlive-fonts-cm))) + ("texlive-cm" ,texlive-cm))) (home-page "https://www.ctan.org/pkg/rsfs") (synopsis "Ralph Smith's Formal Script font") (description -- cgit v1.2.3 From d350d5e71434704d147b1252d21e46daf6bb9885 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Jul 2019 18:25:12 +0200 Subject: gnu: texlive-amsfonts: Build .ins file instead of installing fonts twice. * gnu/packages/tex.scm (texlive-amsfonts)[arguments]: Override build targets; rename font build directory to avoid installing it a second time. --- gnu/packages/tex.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages/tex.scm') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4e65de9391..5be86e7d9e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -1045,6 +1045,8 @@ Taco Hoekwater.") (inherit template) (arguments (substitute-keyword-arguments (package-arguments template) + ((#:build-targets _ #t) + '(list "amsfonts.ins")) ((#:tex-directory _ #t) "latex/amsfonts") ((#:modules modules '()) @@ -1073,7 +1075,7 @@ Taco Hoekwater.") mf "/share/texmf-dist/metafont/base:" (assoc-ref inputs "texlive-cm") "/share/texmf-dist/fonts/source/public/cm"))) - (let ((build (string-append (getcwd) "/build"))) + (let ((build (string-append (getcwd) "/build-fonts"))) (mkdir-p build) (with-directory-excursion "fonts/source/public/amsfonts" (for-each (lambda (font) @@ -1092,7 +1094,7 @@ Taco Hoekwater.") ;; There are no metafont sources for the Euler fonts, so we ;; convert the afm files instead. - (let ((build (string-append (getcwd) "/build/euler"))) + (let ((build (string-append (getcwd) "/build-fonts/euler"))) (mkdir build) (with-directory-excursion "fonts/afm/public/amsfonts/" (for-each (lambda (font) @@ -1107,9 +1109,10 @@ Taco Hoekwater.") ;; eufm10.afm to eufm8.pl, and then generate the tfm file from ;; the pl file. (setenv "TEXINPUTS" - (string-append build "//:" - (getcwd) "/fonts/afm/public/amsfonts//:" - (assoc-ref inputs "texlive-union") "//")) + (string-append build "//:" + (getcwd) "/fonts/afm/public/amsfonts//:" + (getcwd) "/source/latex/amsfonts//:" + (assoc-ref inputs "texlive-union") "//")) (with-directory-excursion build (for-each (match-lambda (((target-base target-size) @@ -1148,7 +1151,7 @@ Taco Hoekwater.") #t)) (add-after 'install 'install-generated-fonts (lambda* (#:key inputs outputs #:allow-other-keys) - (copy-recursively "build" + (copy-recursively "build-fonts" (string-append (assoc-ref outputs "out") "/share/texmf-dist/fonts/tfm/public/amsfonts")) -- cgit v1.2.3