From 212c688afb2d9a9c8ac2348b1b5aa50c6afc33e8 Mon Sep 17 00:00:00 2001 From: Isaac David Date: Sat, 12 Aug 2017 00:31:51 -0500 Subject: texlive-{bin,core,fontsextra,latexextra}: update to 2017.44... versions --- libre/texlive-bin/09-texlive-fonts.conf | 9 - libre/texlive-bin/PKGBUILD | 77 ++- libre/texlive-bin/luatex-gcc7.patch | 32 + libre/texlive-bin/luatex-poppler-0.20.patch | 77 --- .../luatex-r4449-radical-rule-thickness.patch | 23 - libre/texlive-bin/mktexlsr.hook | 16 - libre/texlive-bin/mktexlsr.script | 12 - libre/texlive-bin/poppler-0.20.patch | 22 - libre/texlive-bin/poppler-0.26.patch | 104 --- libre/texlive-bin/texlive-fmtutil.hook | 12 - libre/texlive-bin/texlive-fmtutil.script | 19 - libre/texlive-bin/texlive-updmap.hook | 13 - libre/texlive-bin/texlive-updmap.script | 13 - libre/texlive-bin/texmf.cnf | 724 --------------------- libre/texlive-core/PKGBUILD | 85 ++- libre/texlive-core/mktexlsr.hook | 16 + libre/texlive-core/mktexlsr.script | 12 + libre/texlive-core/texlive-fmtutil.hook | 12 + libre/texlive-core/texlive-fmtutil.script | 19 + libre/texlive-core/texlive-updmap.hook | 13 + libre/texlive-core/texlive-updmap.script | 13 + libre/texlive-core/texmf.cnf | 102 +-- libre/texlive-fontsextra/PKGBUILD | 13 +- libre/texlive-fontsextra/texlive-fontsextra.maps | 2 + libre/texlive-latexextra/PKGBUILD | 23 +- 25 files changed, 308 insertions(+), 1155 deletions(-) delete mode 100644 libre/texlive-bin/09-texlive-fonts.conf create mode 100644 libre/texlive-bin/luatex-gcc7.patch delete mode 100644 libre/texlive-bin/luatex-poppler-0.20.patch delete mode 100644 libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch delete mode 100644 libre/texlive-bin/mktexlsr.hook delete mode 100644 libre/texlive-bin/mktexlsr.script delete mode 100644 libre/texlive-bin/poppler-0.20.patch delete mode 100644 libre/texlive-bin/poppler-0.26.patch delete mode 100644 libre/texlive-bin/texlive-fmtutil.hook delete mode 100644 libre/texlive-bin/texlive-fmtutil.script delete mode 100644 libre/texlive-bin/texlive-updmap.hook delete mode 100644 libre/texlive-bin/texlive-updmap.script delete mode 100644 libre/texlive-bin/texmf.cnf create mode 100644 libre/texlive-core/mktexlsr.hook create mode 100644 libre/texlive-core/mktexlsr.script create mode 100644 libre/texlive-core/texlive-fmtutil.hook create mode 100644 libre/texlive-core/texlive-fmtutil.script create mode 100644 libre/texlive-core/texlive-updmap.hook create mode 100644 libre/texlive-core/texlive-updmap.script (limited to 'libre') diff --git a/libre/texlive-bin/09-texlive-fonts.conf b/libre/texlive-bin/09-texlive-fonts.conf deleted file mode 100644 index f870fbd7a..000000000 --- a/libre/texlive-bin/09-texlive-fonts.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - /usr/share/texmf-dist/fonts/opentype - /usr/share/texmf-dist/fonts/truetype - /usr/local/share/texmf/fonts/opentype - /usr/local/share/texmf/fonts/truetype - - diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD index d83c1e4fa..01e26a0a1 100644 --- a/libre/texlive-bin/PKGBUILD +++ b/libre/texlive-bin/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 283854 2016-12-16 18:03:22Z foutrelis $ # Maintainer (Arch): Rémy Oudompheng # Contributor (Arch): francois # Contributor (Hyperbola): André Silva @@ -6,8 +5,8 @@ # Contributor: Isaac David pkgname=texlive-bin -pkgver=2016.41290 -pkgrel=12.parabola4 +pkgver=2017.44590 +pkgrel=2.parabola1 license=('GPL') arch=('i686' 'x86_64' 'armv7h') makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.57.0' @@ -15,20 +14,23 @@ makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler=0.57.0' 'icu=59.1' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper' 'perl' 'clisp' 'ffcall') url='http://tug.org/texlive/' -source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz" - "mktexlsr.hook" - "mktexlsr.script" - "texlive-updmap.hook" - "texlive-updmap.script" - "texlive-fmtutil.hook" - "texlive-fmtutil.script") -md5sums=('7303361f2d441eb5c962a996fd77e8fa' - 'a4e54f0cb05f401728b2b230fd63b300' - '2bbbef810687f4b2804a4b8cb91ce02f' - '0ecdbd88cae12dbeb5d0d63127c5fc38' - 'c64d77b5111a26b9995263b49df4937c' - '582af708588fd09eeaa0f08111e60091' - '3f05fa08f84b94fcb3a76be271116a95') +source=("http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz" + "luatex-gcc7.patch") +sha256sums=('4645b4d55fc500ba9be7156a6a330afb44fbf7fda40dfd73fe9cb16d207f2038' + 'ee97f3e07e235dee4ad6d0c3e85c2260914c965e94d5ffbf481fa506df5f01ec') + +prepare() { + cd "$srcdir/source" + + # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) + sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c + + ## prevent compiling Xdvi with libXp + sed -i~ 's|-lXp ||' texk/xdvik/configure + + # Luatex crashes when compiled with GCC7.1 + patch -Np0 -i "${srcdir}/luatex-gcc7.patch" +} build() { cd "$srcdir" @@ -39,14 +41,10 @@ build() { local config_xindy="--enable-xindy" fi - # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) - sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c ############################################################# ### configure cd source - ## prevent compiling Xdvi with libXp - sed -i~ 's|-lXp ||' texk/xdvik/configure - test ! -d Work && mkdir Work + mkdir -p Work cd Work echo "--> Initial configuration..." # we use temporary prefix to avoid messing the existing @@ -160,19 +158,13 @@ package() { ln -s pdftex ${pkgdir}/usr/bin/xmltex ln -s xetex ${pkgdir}/usr/bin/xelatex - ## install pacman hooks - install -D -m644 ${srcdir}/mktexlsr.hook "$pkgdir/usr/share/libalpm/hooks/mktexlsr.hook" - install -D -m644 ${srcdir}/texlive-updmap.hook "$pkgdir/usr/share/libalpm/hooks/texlive-updmap.hook" - install -D -m644 ${srcdir}/texlive-fmtutil.hook "$pkgdir/usr/share/libalpm/hooks/texlive-fmtutil.hook" - install -D -m755 ${srcdir}/mktexlsr.script "$pkgdir/usr/share/libalpm/scripts/mktexlsr" - install -D -m755 ${srcdir}/texlive-updmap.script "$pkgdir/usr/share/libalpm/scripts/texlive-updmap" - install -D -m755 ${srcdir}/texlive-fmtutil.script "$pkgdir/usr/share/libalpm/scripts/texlive-fmtutil" - ############################################################# # remove dangling symlinks _bibtexextra_scripts=" -bibexport +bbl2bib bibdoiadd +bibexport +bibmradd bibzbladd listbib ltx2crossrefxml @@ -212,15 +204,26 @@ epstopdf findhyph fmtutil fmtutil-sys +fmtutil-user fontinst fragmaster +ht +htcontext +htlatex +htmex +httex +httexi +htxelatex +htxetex installfont-tl kpsepath kpsetool kpsewhere kpsexpand latex-git-log +latex-papersize latex2man +latex2nemeth latexdiff latexdiff-vc latexfileversion @@ -234,9 +237,11 @@ ltximg lua2dox_filter luaotfload-tool luatools +lwarpmk make4ht match_parens mf2pt1 +mk4ht mkjobtexmf mkt1font mktexfmt @@ -257,6 +262,7 @@ pdfjam-pocketmod pdfjam-slides3up pdfjam-slides6up pdfjoin +pdflatexpicscale pdfnup pdfpun pdfxup @@ -291,12 +297,17 @@ texlinks texliveonfly texloganalyser texmfstart +texosquery +texosquery-jre5 +texosquery-jre8 thumbpdf typeoutfileinfo updmap updmap-sys +updmap-user vpl2ovp vpl2vpl +xhlatex xindy " @@ -305,7 +316,6 @@ xindy fi _games_scripts="rubikrotation" - _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" _humanities_scripts="diadia" _langcyrillic_scripts="rubibtex rumakeindex" _langextra_scripts="ebong" @@ -314,6 +324,7 @@ xindy kanji-fontmap-creator kanji-config-updmap kanji-config-updmap-sys +kanji-config-updmap-user " _langkorean_scripts="jamo-normalize komkindex ttf2kotexfont" _latexextra_scripts=" @@ -330,7 +341,7 @@ svn-multi vpe yplan" _music_scripts="lily-glyph-commands lily-image-commands lily-rebuild-pdfs -m-tx musixtex musixflx pmx2pdf pmxchords" +m-tx musixtex musixflx pmxchords" _pictures_scripts=" cachepic epspdf diff --git a/libre/texlive-bin/luatex-gcc7.patch b/libre/texlive-bin/luatex-gcc7.patch new file mode 100644 index 000000000..7bbf55732 --- /dev/null +++ b/libre/texlive-bin/luatex-gcc7.patch @@ -0,0 +1,32 @@ +Author: Dr. Werner Fink + +--- + texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++ + texk/web2c/luatexdir/luaffi/ffi.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +--- texk/web2c/luatexdir/luaffi/ctype.c ++++ texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000 +@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st + + lua_pop(L, 1); /* mt */ + cd = (struct cdata*) lua_touserdata(L, idx); ++ if (!cd) { ++ lua_pushnil(L); ++ return NULL; ++ } + *ct = cd->type; + lua_getuservalue(L, idx); + +--- texk/web2c/luatexdir/luaffi/ffi.h ++++ texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000 +@@ -370,7 +370,7 @@ __declspec(align(16)) + #endif + struct cdata { + const struct ctype type +-#ifdef __GNUC__ ++#if 0 /* def __GNUC__ */ + __attribute__ ((aligned(16))) + #endif + ; + diff --git a/libre/texlive-bin/luatex-poppler-0.20.patch b/libre/texlive-bin/luatex-poppler-0.20.patch deleted file mode 100644 index 175824f3e..000000000 --- a/libre/texlive-bin/luatex-poppler-0.20.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000 -+++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000 -@@ -157,7 +157,7 @@ - pdfdoc_changed_error(L); - uout = new_Annot_userdata(L); - uout->d = -- new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d, -+ new Annot((PDFDoc *) uxref->pd, (Dict *) udict->d, - (Object *) uref->d); - uout->atype = ALLOC_LEPDF; - uout->pc = uxref->pc; -@@ -179,7 +179,7 @@ - pdfdoc_changed_error(L); - uout = new_Annots_userdata(L); - uout->d = -- new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d, -+ new Annots((PDFDoc *) uxref->pd, - (Object *) uannotsobj->d); - uout->atype = ALLOC_LEPDF; - uout->pc = uxref->pc; -@@ -369,7 +369,7 @@ - // Annot - - m_poppler_get_BOOL(Annot, isOk); --m_poppler_get_OBJECT(Annot, getAppearance); -+m_poppler_get_OBJECT(Annot, getAppearanceResDict); - m_poppler_get_poppler(Annot, AnnotBorder, getBorder); - - static int m_Annot_match(lua_State * L) -@@ -408,7 +408,7 @@ - - static const struct luaL_Reg Annot_m[] = { - {"isOk", m_Annot_isOk}, -- {"getAppearance", m_Annot_getAppearance}, -+ {"getAppearance", m_Annot_getAppearanceResDict}, - {"getBorder", m_Annot_getBorder}, - {"match", m_Annot_match}, - {"__tostring", m_Annot__tostring}, -@@ -1433,7 +1433,7 @@ - - static int m_Object_getTypeName(lua_State * L) - { -- char *s; -+ const char *s; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_Object); - if (uin->pd != NULL && uin->pd->pc != uin->pc) -@@ -2120,7 +2120,7 @@ - if ((uin->pd != NULL && uin->pd->pc != uin->pc) - || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc)) - pdfdoc_changed_error(L); -- links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d); -+ links = ((Page *) uin->d)->getLinks(); - if (links != NULL) { - uout = new_Links_userdata(L); - uout->d = links; -@@ -2738,7 +2738,10 @@ - return 1; - } - --m_poppler_get_INT(XRef, getSize); -+static int m_XRef_getSize(lua_State * L) -+{ -+ return m_XRef_getNumObjects(L); -+} - - static int m_XRef_getEntry(lua_State * L) - { -@@ -2748,7 +2751,7 @@ - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); - i = luaL_checkint(L, 2); -- size = ((XRef *) uin->d)->getSize(); -+ size = ((XRef *) uin->d)->getNumObjects(); - if (i > 0 && i <= size) { - uout = new_XRefEntry_userdata(L); - uout->d = ((XRef *) uin->d)->getEntry(i); diff --git a/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch deleted file mode 100644 index f925a1a93..000000000 --- a/libre/texlive-bin/luatex-r4449-radical-rule-thickness.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: source/texk/web2c/luatexdir/tex/mlist.w -=================================================================== ---- source/texk/web2c/luatexdir/tex/mlist.w (revision 4448) -+++ source/texk/web2c/luatexdir/tex/mlist.w (revision 4449) -@@ -1798,7 +1798,17 @@ - theta = fraction_rule(cur_style); - y = var_delimiter(left_delimiter(q), cur_size, - height(x) + depth(x) + clr + theta, NULL, cur_style); -- theta = height(y); -+ /* If |y| is a composite then set |theta| to the height of its top -+ character, else set it to the height of |y|. */ -+ if (list_ptr(y) != null -+ && type(list_ptr(y)) == hlist_node -+ && list_ptr(list_ptr(y)) != null -+ && type(list_ptr(list_ptr(y))) == glyph_node) { /* and it should be */ -+ theta = char_height(font(list_ptr(list_ptr(y))), -+ character(list_ptr(list_ptr(y)))); -+ } else { -+ theta = height(y); -+ } - } else { - y = var_delimiter(left_delimiter(q), cur_size, - height(x) + depth(x) + clr + theta, NULL, cur_style); diff --git a/libre/texlive-bin/mktexlsr.hook b/libre/texlive-bin/mktexlsr.hook deleted file mode 100644 index f1a3b8b38..000000000 --- a/libre/texlive-bin/mktexlsr.hook +++ /dev/null @@ -1,16 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/bin/mktexlsr -Target = etc/texmf/* -Target = usr/share/texmf/* -Target = usr/share/texmf-dist/* -Target = var/lib/texmf/* - -[Action] -Description = Updating TeXLive filename database... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/mktexlsr - diff --git a/libre/texlive-bin/mktexlsr.script b/libre/texlive-bin/mktexlsr.script deleted file mode 100644 index 689441538..000000000 --- a/libre/texlive-bin/mktexlsr.script +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -/usr/bin/mktexlsr -(cd /etc/texmf && /usr/bin/mtxrun --generate >/dev/null) -# We need to remove directory "." from luatex cache to avoid absurd -# behaviour. -for item in /var/lib/texmf/luatex-cache/context/*/trees/*.lua; do - if grep -F '["root"]="."' "$item" >/dev/null; then - rm -f "$item" "${item%.lua}.luc" - fi -done - diff --git a/libre/texlive-bin/poppler-0.20.patch b/libre/texlive-bin/poppler-0.20.patch deleted file mode 100644 index 3bd8183ab..000000000 --- a/libre/texlive-bin/poppler-0.20.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-10-06 06:14:20.000000000 +0000 -+++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-17 11:30:26.327236883 +0000 -@@ -1433,7 +1433,7 @@ - - static int m_Object_getTypeName(lua_State * L) - { -- char *s; -+ const char *s; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_Object); - if (uin->pd != NULL && uin->pd->pc != uin->pc) ---- source/texk/web2c/pdftexdir/pdftosrc.cc.orig 2012-06-24 17:12:34.376329435 +0200 -+++ source/texk/web2c/pdftexdir/pdftosrc.cc 2012-06-24 17:12:25.490003152 +0200 -@@ -134,7 +134,7 @@ - exit(1); - } - if (extract_xref_table) { -- int size = xref->getSize(); -+ int size = xref->getNumObjects(); - int i; - for (i = 0; i < size; i++) { - if (xref->getEntry(i)->offset == 0xffffffff) diff --git a/libre/texlive-bin/poppler-0.26.patch b/libre/texlive-bin/poppler-0.26.patch deleted file mode 100644 index fde123f62..000000000 --- a/libre/texlive-bin/poppler-0.26.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- trunk/source/texk/web2c/luatexdir/image/epdf.h 2013/01/20 19:58:26 4559 -+++ trunk/source/texk/web2c/luatexdir/image/epdf.h 2014/01/02 15:35:31 4718 -@@ -40,21 +40,22 @@ - # include - # include - # include --# include "Object.h" --# include "Stream.h" --# include "Gfx.h" --# include "Annot.h" --# include "Array.h" --# include "Dict.h" --# include "XRef.h" --# include "Catalog.h" --# include "Link.h" --# include "Page.h" --# include "GfxFont.h" --# include "PDFDoc.h" --# include "GlobalParams.h" --# include "Error.h" --# include "FileSpec.h" -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include - - extern "C" { - -@@ -81,8 +82,8 @@ - # include "utils/avlstuff.h" - # include "pdf/pdftypes.h" - --# include "lua52/lua.h" --# include "lua52/lauxlib.h" -+# include "lua.h" -+# include "lauxlib.h" - - /* pdfgen.w */ - extern int ten_pow[10]; ---- trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013/04/05 10:54:08 4629 -+++ trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014/01/02 15:35:31 4718 -@@ -65,6 +65,7 @@ - #define M_PDFRectangle "PDFRectangle" - #define M_Ref "Ref" - #define M_Stream "Stream" -+#define M_StructTreeRoot "StructTreeRoot" - #define M_XRefEntry "XRefEntry" - #define M_XRef "XRef" - -@@ -96,6 +97,7 @@ - new_poppler_userdata(PDFRectangle); - new_poppler_userdata(Ref); - new_poppler_userdata(Stream); -+new_poppler_userdata(StructTreeRoot); - new_poppler_userdata(XRef); - - //********************************************************************** -@@ -573,7 +575,11 @@ - - m_poppler_get_GOOSTRING(Catalog, getBaseURI); - m_poppler_get_GOOSTRING(Catalog, readMetadata); -+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT - m_poppler_get_poppler(Catalog, Object, getStructTreeRoot); -+#else -+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot); -+#endif - - static int m_Catalog_findPage(lua_State * L) - { -@@ -2146,14 +2152,22 @@ - - static int m_PDFDoc_getStructTreeRoot(lua_State * L) - { -+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT - Object *obj; -+#else -+ StructTreeRoot *obj; -+#endif - udstruct *uin, *uout; - uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); - if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { - obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); -+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT - uout = new_Object_userdata(L); -+#else -+ uout = new_StructTreeRoot_userdata(L); -+#endif - uout->d = obj; - uout->pc = uin->pc; - uout->pd = uin->pd; diff --git a/libre/texlive-bin/texlive-fmtutil.hook b/libre/texlive-bin/texlive-fmtutil.hook deleted file mode 100644 index cb5bcc932..000000000 --- a/libre/texlive-bin/texlive-fmtutil.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = var/lib/texmf/arch/installedpkgs/*.fmts - -[Action] -Description = Updating TeXLive format files... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/texlive-fmtutil - diff --git a/libre/texlive-bin/texlive-fmtutil.script b/libre/texlive-bin/texlive-fmtutil.script deleted file mode 100644 index 0e3b94393..000000000 --- a/libre/texlive-bin/texlive-fmtutil.script +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -FMTUTIL="etc/texmf/web2c/fmtutil.cnf" -FMTUTILLOCAL="etc/texmf/web2c/fmtutil-local.cnf" - -cp usr/share/texmf-dist/web2c/fmtutil-hdr.cnf $FMTUTIL -for file in var/lib/texmf/arch/installedpkgs/*.fmts; do - echo >> $FMTUTIL - echo "# $file" >> $FMTUTIL - cat $file >> $FMTUTIL -done -if [[ -f "$FMTUTILLOCAL" ]]; then - echo >> $FMTUTIL - echo "# $FMTUTILLOCAL" >> $FMTUTIL - cat "$FMTUTILLOCAL" >> $FMTUTIL -fi - -/usr/bin/fmtutil-sys --all --cnffile $FMTUTIL > /dev/null - diff --git a/libre/texlive-bin/texlive-updmap.hook b/libre/texlive-bin/texlive-updmap.hook deleted file mode 100644 index 8bacce9a1..000000000 --- a/libre/texlive-bin/texlive-updmap.hook +++ /dev/null @@ -1,13 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/bin/tex -Target = var/lib/texmf/arch/installedpkgs/*.maps - -[Action] -Description = Updating TeXLive font maps... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/texlive-updmap - diff --git a/libre/texlive-bin/texlive-updmap.script b/libre/texlive-bin/texlive-updmap.script deleted file mode 100644 index 1d79186ff..000000000 --- a/libre/texlive-bin/texlive-updmap.script +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -UPDMAP="etc/texmf/web2c/updmap.cfg" -UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg" - -cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP -cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP -if [[ -f "$UPDMAPLOCAL" ]]; then - cat "$UPDMAPLOCAL" >> $UPDMAP -fi - -/usr/bin/updmap-sys --quiet --nohash - diff --git a/libre/texlive-bin/texmf.cnf b/libre/texlive-bin/texmf.cnf deleted file mode 100644 index 20beb0811..000000000 --- a/libre/texlive-bin/texmf.cnf +++ /dev/null @@ -1,724 +0,0 @@ -% texmf.cnf for TeXLive/Parabola -- runtime path configuration file for kpathsea. -% Public domain. -% -% If you modify this original file, YOUR CHANGES WILL BE LOST when it is -% updated. Instead, put your changes -- and only your changes, not an -% entire copy of the full texmf.cnf! -- in ../../texmf.cnf. That is, if -% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. -% -% What follows is a super-summary of what this .cnf file can -% contain. Please read the Kpathsea manual for more information. -% -% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. -% The `=' (and surrounding spaces) is optional. -% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. -% Long lines can be continued with a \. -% -% Earlier entries (in the same or another file) override later ones, and -% an environment variable foo overrides any texmf.cnf definition of foo. -% -% All definitions are read before anything is expanded, so you can use -% variables before they are defined. -% -% If a variable assignment is qualified with `.PROGRAM', it is ignored -% unless the current executable (last filename component of argv[0]) is -% named PROGRAM. This foo.PROGRAM construct is not recognized on the -% right-hand side. For environment variables, use FOO_PROGRAM. -% -% Which file formats use which paths for searches is described in the -% various programs' and the Kpathsea documentation (http://tug.org/kpathsea). -% -% // means to search subdirectories (recursively). -% A leading !! means to look only in the ls-R db, never on the disk. -% In this file, either ; or : can be used to separate path components. -% A leading/trailing/doubled path separator in the paths will be -% expanded into the compile-time default. Probably not what you want. -% -% Brace notation is supported, for example: /usr/local/{mytex,othertex} -% expands to /usr/local/mytex:/usr/local/othertex. We make extensive -% use of this. - - -% Part 1: Search paths and directories. - -% This is the parent directory of our several trees, i.e., -% /usr/local/texlive/YYYY in the original TeX Live distribution. -% -% All trees must be organized according to the TeX Directory Structure -% (http://tug.org/tds), or files may not be found. -% -% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. -TEXMFROOT = $SELFAUTODIR/share - -% The tree containing runtime files related to the specific -% distribution and version. -TEXMFMAIN = $TEXMFROOT/texmf - -% The main tree of packages, distribution-agnostic: -TEXMFDIST = $TEXMFROOT/texmf-dist - -% Local additions to the distribution trees. -TEXMFLOCAL = /usr/local/share/texmf - -% TEXMFSYSVAR, where *-sys store cached runtime data. -TEXMFSYSVAR = /var/lib/texmf - -% TEXMFSYSCONFIG, where *-sys store configuration data. -TEXMFSYSCONFIG = /etc/texmf - -% Per-user texmf tree(s) -- organized per the TDS, as usual. To define -% more than one per-user tree, set this to a list of directories in -% braces, as described above. (This used to be HOMETEXMF.) ~ expands -% to %USERPROFILE% on Windows, $HOME otherwise. -TEXMFHOME = ~/texmf - -% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive/texmf-var - -% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive/texmf-config - -% List all the texmf trees. -% -% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named -% explicitly and before all other trees. -% -% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the -% files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as configuration files. Overriding them would -% be more likely to cause trouble than help. On the other hand, the -% bulk of packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those -- although it is generally -% a source of confusion to have different versions of a package -% installed, whatever the trees, so try to avoid it. -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} - -% Where to look for ls-R files. There need not be an ls-R in the -% directories in this path, but if there is one, Kpathsea will use it. -% By default, this is only the !! elements of TEXMF, so that mktexlsr -% does not create ls-R files in the non-!! elements -- because if an -% ls-R is present, it will be used, and the disk will not be searched. -% This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} - -% The system trees. These are the trees that are shared by all users. -% If a tree appears in this list, the mktex* scripts will use -% VARTEXFONTS for generated files, if the original tree isn't writable; -% otherwise the current working directory is used. -SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST - -% Where generated fonts may be written. This tree is used when the sources -% were found in a system tree and either that tree wasn't writable, or the -% varfonts feature was enabled in MT_FEATURES in mktex.cnf. -VARTEXFONTS = $TEXMFVAR/fonts - -% On some systems, there will be a system tree which contains all the font -% files that may be created as well as the formats. For example -% TEXMFVAR = /var/lib/texmf -% is used in many distros. In this case, set VARTEXFONTS like this -%VARTEXFONTS = $TEXMFVAR/fonts -% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). -% -% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below -% one of the TEXMF directories (avoids overlapping ls-R files). - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Usually you will not need to edit any of the following variables. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% WEB2C is for Web2C specific files. The current directory may not be -% a good place to look for them. -WEB2C = $TEXMF/web2c - -% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input -% or \openin, including .sty, .eps, etc. We specify paths for all known -% formats, past or present. Not all of them are built these days. - -% Plain TeX. Have the command tex check all directories as a last -% resort, we may have plain-compatible stuff anywhere. -TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// - -% Fontinst needs to read afm files. -TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}// - -% Other plain-based formats. -TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// -TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}// -TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// -TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// -TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// - -% LaTeX 2e specific macros are stored in latex/, macros that can only be -% used with 2.09 in latex209/. In addition, we look in the directory -% latex209, useful for macros that were written for 2.09 and do not -% mention 2e at all, but can be used with 2e. -TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// -TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// - -% MLTeX. -TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}// -TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}// -TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}// - -% e-TeX. -TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// - -% pdfTeX. -TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// -TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// -TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// -TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// -TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// - -% pdfeTeX. -TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// - -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - -% LuaTeX. -TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// -TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// - -% XeTeX. -TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// -TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}// -TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}// - -% Omega / Aleph. -TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// -TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// -TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// -TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// - -% p(La)TeX. -TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// -TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}// - -% epTeX. -TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}// - -% pBibTeX bibliographies and style files. -BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// -BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// - -% ConTeXt. -TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// - -% jadetex. -TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// -TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// - -% XMLTeX. -TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// -TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// - -% Miscellany, no longer built. -TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// -TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// -TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// -TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// - -% Earlier entries override later ones, so put this generic one last. -TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// - -% ttf2tfm. -TTF2TFMINPUTS = .;$TEXMF/ttf2pk// - -% Metafont, MetaPost inputs. -MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// -MPINPUTS = .;$TEXMF/metapost// - -% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. -% We want to find the engine-specific file, e.g., cont-en.fmt can -% exist under both pdftex/ and xetex/. But just in case some formats -% end up without an engine directory, look directly in web2c/ too. -% We repeat the same definition three times because of the way fmtutil -% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats -% will not be found. -TEXFORMATS = .;$TEXMF/web2c{/$engine,} -MFBASES = .;$TEXMF/web2c{/$engine,} -MPMEMS = .;$TEXMF/web2c{/$engine,} -% -% As of 2008, pool files don't exist any more (the strings are compiled -% into the binaries), but just in case something expects to find these: -TEXPOOL = .;$TEXMF/web2c -MFPOOL = ${TEXPOOL} -MPPOOL = ${TEXPOOL} - -% support the original xdvi. Must come before the generic settings. -PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// -VFFONTS.XDvi = .;$TEXMF/%s -PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// -TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// - -% Device-independent font metric files. -VFFONTS = .;$TEXMF/fonts/vf// -TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// - -% The $MAKETEX_MODE below means the drivers will not use a cx font when -% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init -% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. -% The modeless part guarantees that bitmaps for PostScript fonts are found. -PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// - -% Similarly for the GF format, which only remains in existence because -% Metafont outputs it (and MF isn't going to change). -GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE// - -% A backup for PKFONTS and GFFONTS. Not used for anything. -GLYPHFONTS = .;$TEXMF/fonts - -% A place to puth everything that doesn't fit the other font categories. -MISCFONTS = .;$TEXMF/fonts/misc// - -% font name map files. This isn't just fonts/map// because ConTeXt -% wants support for having files with the same name in the different -% subdirs. Maybe if the programs ever get unified to accepting the same -% map file syntax the definition can be simplified again. -TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}// - -% BibTeX bibliographies and style files. bibtex8 also uses these. -BIBINPUTS = .;$TEXMF/bibtex/bib// -BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// - -% MlBibTeX. -MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// -MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// - -% .ris and .bltxml bibliography formats. -RISINPUTS = .;$TEXMF/bibtex/ris// -BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// - -% MFT style files. -MFTINPUTS = .;$TEXMF/mft// - -% PostScript headers and prologues (.pro); unfortunately, some programs -% also use this for acessing font files (enc, type1, truetype) -TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}// -TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}// - -% OSFONTDIR is to provide a convenient hook for allowing TeX to find -% fonts installed on the system (outside of TeX). An empty default -% value would add "//" to the search paths, so we give it a dummy value. -% OSFONTDIR = /usr/share/fonts - -% PostScript Type 1 outline fonts. -T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR// - -% PostScript AFM metric files. -AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// - -% TrueType outline fonts. -TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// - -% OpenType outline fonts. -OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// - -% Type 42 outline fonts. -T42FONTS = .;$TEXMF/fonts/type42// - -% Ligature definition files. -LIGFONTS = .;$TEXMF/fonts/lig// - -% Dvips' config.* files (this name should not start with `TEX'!). -TEXCONFIG = $TEXMF/dvips// - -% Makeindex style (.ist) files. -INDEXSTYLE = .;$TEXMF/makeindex// - -% Font encoding files (.enc). -ENCFONTS = .;$TEXMF/fonts/enc// - -% CMap files. -CMAPFONTS = .;$TEXMF/fonts/cmap// - -% Subfont definition files. -SFDFONTS = .;$TEXMF/fonts/sfd// - -% OpenType feature files (.fea). -FONTFEATURES=.;$TEXMF/fonts/fea// - -% .cid and .cidmap -FONTCIDMAPS=.;$TEXMF/fonts/cid// - -% pdftex config files: -PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// - -% Used by DMP (ditroff-to-mpx), called by makempx -troff. -TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps -MPSUPPORT = .;$TEXMF/metapost/support - -% For xdvi to find mime.types and .mailcap, if they do not exist in -% ~. These are single directories, not paths. -% (But the default mime.types, at least, may well suffice.) -MIMELIBDIR = /etc -MAILCAPLIBDIR = /etc - -% Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. -% -FONTCONFIG_FILE = fonts.conf -FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf -FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache - -% TeX documentation and source files, for use with texdoc and kpsewhich. -TEXDOCS = $TEXMF/doc// -TEXSOURCES = .;$TEXMF/source// - -% Web and CWeb input paths. -WEBINPUTS = .;$TEXMF/web// -CWEBINPUTS = .;$TEXMF/cweb// - -% Omega-related fonts and other files. -OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// -OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// -OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// -OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// -OTPINPUTS = .;$TEXMF/omega/otp// -OCPINPUTS = .;$TEXMF/omega/ocp// - -% Some additional input variables for several programs. If you add -% a program that uses the `other text files' or `other binary files' -% search formats, you'll want to add their variables here as well. -T4HTINPUTS = .;$TEXMF/tex4ht// - -%% t4ht utility, sharing files with TeX4ht -TEX4HTFONTSET=alias,iso8859,unicode -TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}// - -% TeXworks editor configuration and settings -TW_LIBPATH = $TEXMFCONFIG/texworks -TW_INIPATH = $TW_LIBPATH - -% For security, do not look in . for dvipdfmx.cfg, since the D option -% would allow command execution. -DVIPDFMXINPUTS = $TEXMF/dvipdfmx - -% Lua needs to look in TEXINPUTS for lua scripts distributed with packages. -% -% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in -% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended -% default expansion of TEXINPUTS will not happen and .lua files under -% the /tex/ will not be found. -% -% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. -% The default LUAINPUTS sufficess for luatex and dviluatex. -% -LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// - -% Lua needs to look for binary lua libraries distributed with packages. -CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// - -% Architecture independent executables. -TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}// - -% Other languages. -JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java// -PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl// -PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python// -RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// - - -%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. -% KPSE_DOT = . - -% This definition isn't used from this .cnf file itself (that would be -% paradoxical), but the compile-time default in paths.h is built from it. -% The SELFAUTO* variables are set automatically from the location of -% argv[0], in kpse_set_program_name. -% -% This main texmf.cnf file is installed, for a release YYYY, in a -% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. -% Since this file is subject to future updates, the TeX Live installer -% or human administrator may also create a file -% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file -% will take precedence over the distributed one under texmf/web2c. -% -% For security reasons, it is better not to include . in this path. -% -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} - -% kpathsea 3.5.3 and later sets these at runtime. To avoid empty -% expansions from binaries linked against an earlier version of the -% library, we set $progname and $engine to something non-empty: -progname = unsetprogname -engine = unsetengine - - -% Part 2: Options. - -% If this option is set to true, `tex a.b' will look first for a.b.tex -% (within each path element), and then for a.b, i.e., we try standard -% extensions first. If this is false, we first look for a.b and then -% a.b.tex, i.e., we try the name as-is first. -% -% Both names are always tried; the difference is the order in which they -% are tried. The setting applies to all searches, not just .tex. -% -% This setting only affects names being looked up which *already* have -% an extension. A name without an extension (e.g., `tex story') will -% always have an extension added first. -% -% The default is true, because we already avoid adding the standard -% extension(s) in the usual cases. E.g., babel.sty will only look for -% babel.sty, not babel.sty.tex, regardless of this setting. -try_std_extension_first = t - -% Enable system commands via \write18{...}. When enabled fully (set to -% t), obviously insecure. When enabled partially (set to p), only the -% commands listed in shell_escape_commands are allowed. Although this -% is not fully secure either, it is much better, and so useful that we -% enable it for everything but bare tex. -shell_escape = p - -% No spaces in this command list. -% -% The programs listed here are as safe as any we know: they either do -% not write any output files, respect openout_any, or have hard-coded -% restrictions similar or higher to openout_any=p. They also have no -% features to invoke arbitrary other programs, and no known exploitable -% bugs. All to the best of our knowledge. They also have practical use -% for being called from TeX. -% -shell_escape_commands = \ -bibtex,bibtex8,\ -kpsewhich,\ -makeindex,\ -repstopdf,\ - -% we'd like to allow: -% dvips - but external commands can be executed, need at least -R1. -% epspdf, ps2pdf, pstopdf - need to respect openout_any, -% and gs -dSAFER must be used and check for shell injection with filenames. -% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, -% without Unix convert it hardly seems worth it, and Windows convert -% is something completely different that destroys filesystems, so skip. -% pygmentize - but is the filter feature insecure? -% ps4pdf - but it calls an unrestricted latex. -% rpdfcrop - maybe ok, but let's get experience with repstopdf first. -% texindy,xindy - but is the module feature insecure? -% ulqda - but requires optional SHA1.pm, so why bother. -% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any. - -% plain TeX should remain unenhanced. -shell_escape.tex = f -shell_escape.initex = f - -% This is used by the Windows script wrapper for restricting searching -% for the purportedly safe shell_escape_commands above to system -% directories. -TEXMF_RESTRICTED_SCRIPTS = \ - {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// - -% Allow TeX \openin, \openout, or \input on filenames starting with `.' -% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? -% a (any) : any file can be opened. -% r (restricted) : disallow opening "dotfiles". -% p (paranoid) : as `r' and disallow going to parent directories, and -% restrict absolute paths to be under $TEXMFOUTPUT. -openout_any = p -openin_any = a - -% Write .log/.dvi/etc. files here, if the current directory is unwritable. -%TEXMFOUTPUT = /tmp - -% If a dynamic file creation fails, log the command to this file, in -% either the current directory or TEXMFOUTPUT. Set to the -% empty string or 0 to avoid logging. -MISSFONT_LOG = missfont.log - -% Set to a colon-separated list of words specifying warnings to suppress. -% To suppress everything, use TEX_HUSH = all; this is currently equivalent to -% TEX_HUSH = checksum:lostchar:readable:special -% To suppress nothing, use TEX_HUSH = none or do not set the variable at all. -TEX_HUSH = none - -% Allow TeX, and MF to parse the first line of an input file for -% the %&format construct. -parse_first_line = t - -% But don't parse the first line if invoked as "tex", since we want that -% to remain Knuth-compatible. The src_specials and -% file_line_error_style settings, as well as the options -enctex, -% -mltex, -8bit, etc., also affect this, but they are all off by default. -parse_first_line.tex = f -parse_first_line.initex = f - -% Control file:line:error style messages. -file_line_error_style = f - -% Enable the mktex... scripts by default? These must be set to 0 or 1. -% Particular programs can and do override these settings, for example -% dvips's -M option. Your first chance to specify whether the scripts -% are invoked by default is at configure time. -% -% These values are ignored if the script names are changed; e.g., if you -% set DVIPSMAKEPK to `foo', what counts is the value of the environment -% variable/config value `FOO', not the `MKTEXPK' value. -% -%MKTEXTEX = 0 -%MKTEXPK = 0 -%MKTEXMF = 0 -%MKTEXTFM = 0 -%MKTEXFMT = 0 -%MKOCP = 0 -%MKOFM = 0 - -% Used by makempx to run TeX. We use "etex" because MetaPost is -% expecting DVI, and not "tex" because we want first line parsing. -TEX = etex - -% These variables specify the external program called for the -% interactive `e' option. %d is replaced by the line number and %s by -% the current filename. The default is specified at compile-time, and -% we let that stay in place since different platforms like different values. -%TEXEDIT = vi +%d '%s' % default for Unix -%TEXEDIT = texworks --position=+%d "%s" % default for Windows -%MFEDIT = ${TEXEDIT} -%MPEDIT = ${TEXEDIT} - -% The default `codepage and sort order' file for BibTeX8, when none is -% given as command line option or environment variable. -BIBTEX_CSFILE = 88591lat.csf - -% This variable is specific to Windows. It must be set to 0 or 1. The -% default is 0. Setting it to 1 tells the Windows script wrappers to -% use an already installed Perl interpreter if one is found on the -% search path, in preference to the Perl shipped with TeX Live. Thus, -% it may be useful if you both (a) installed a full Perl distribution -% for general use, and (b) need to run Perl programs from TL that use -% additional modules we don't provide. The TL Perl does provide all the -% standard Perl modules. -% -%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 - - -% Part 3: Array and other sizes for TeX (and Metafont). -% -% If you want to change some of these sizes only for a certain TeX -% variant, the usual dot notation works, e.g., -% main_memory.hugetex = 20000000 -% -% If a change here appears to be ignored, try redumping the format file. - -% Memory. Must be less than 8,000,000 total. -% -% main_memory is relevant only to initex, extra_mem_* only to non-ini. -% Thus, have to redump the .fmt file after changing main_memory; to add -% to existing fmt files, increase extra_mem_*. (To get an idea of how -% much, try \tracingstats=2 in your TeX source file; -% web2c/tests/memtest.tex might also be interesting.) -% -% To increase space for boxes (as might be needed by, e.g., PiCTeX), -% increase extra_mem_bot. -% -% For some xy-pic samples, you may need as much as 700000 words of memory. -% For the vast majority of documents, 60000 or less will do. -% -main_memory = 3000000 % words of inimemory available; also applies to inimf&mp -extra_mem_top = 0 % extra high memory for chars, tokens, etc. -extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. - -% ConTeXt needs lots of memory. -extra_mem_top.context = 2000000 -extra_mem_bot.context = 4000000 - -% Words of font info for TeX (total size of all TFM files, approximately). -% Must be >= 20000 and <= 147483647 (without tex.ch changes). -font_mem_size = 3000000 - -% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). -font_max = 9000 - -% Extra space for the hash table of control sequences. -hash_extra = 200000 - -% Max number of characters in all strings, including all error messages, -% help texts, font names, control sequences. These values apply to TeX. -pool_size = 3250000 -% Minimum pool space after TeX's own strings; must be at least -% 25000 less than pool_size, but doesn't need to be nearly that large. -string_vacancies = 90000 -% Maximum number of strings. -max_strings = 500000 -% min pool space left after loading .fmt -pool_free = 47500 - -% Buffer size. TeX uses the buffer to contain input lines, but macro -% expansion works by writing material into the buffer and reparsing the -% line. As a consequence, certain constructs require the buffer to be -% very large, even though most documents can be handled with a small value. -buf_size = 200000 - -% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in -% the sources), but we don't need that much. The value here suffices -% for all known free hyphenation patterns to be loaded simultaneously -% (as TeX Live does). -% -trie_size = 1000000 - -hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. - % http://primes.utm.edu/curios/page.php/8191.html -nest_size = 500 % simultaneous semantic levels (e.g., groups) -max_in_open = 15 % simultaneous input files and error insertions, - % also applies to MetaPost -param_size = 10000 % simultaneous macro parameters, also applies to MP -save_size = 50000 % for saving values outside current group -stack_size = 5000 % simultaneous input sources - -% These are Omega-specific. -ocp_buf_size = 500000 % character buffers for ocp filters. -ocp_stack_size = 10000 % stacks for ocp computations. -ocp_list_size = 1000 % control for multiple ocps. - -% These work best if they are the same as the I/O buffer size, but it -% doesn't matter much. Must be a multiple of 8. -dvi_buf_size = 16384 % TeX -gf_buf_size = 16384 % MF - -% It's probably inadvisable to change these. At any rate, we must have: -% 45 < error_line < 255; -% 30 < half_error_line < error_line - 15; -% 60 <= max_print_line; -% These apply to TeX, Metafont, and MetaPost. -error_line = 79 -half_error_line = 50 -max_print_line = 79 - -% Metafont only. -screen_width.mf = 1664 -screen_depth.mf = 1200 - -% BibTeX only (max_strings also determines hash_size and hash_prime). -ent_str_size = 250 -glob_str_size = 5000 -max_strings.bibtex = 35307 -max_strings.bibtex8 = 35307 -max_strings.bibtexu = 35307 -max_strings.pbibtex = 35307 - -% GFtype only. -line_length.gftype = 500 -max_rows.gftype = 8191 -max_cols.gftype = 8191 diff --git a/libre/texlive-core/PKGBUILD b/libre/texlive-core/PKGBUILD index 7e7e9cc16..f38aac735 100644 --- a/libre/texlive-core/PKGBUILD +++ b/libre/texlive-core/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 281688 2016-11-21 06:23:47Z remy $ # Maintainer (Arch): Rémy Oudompheng # Contributor (Hyperbola): André Silva # Maintainer: Michał Masłowski +# Contributor: Isaac David _pkgname=texlive-core-libre pkgname=texlive-core -pkgver=2016.43757 -_revnr=${pkgver#2016.} +pkgver=2017.44918 +_revnr=${pkgver#2017.} pkgrel=1.parabola1 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)" license=('GPL') @@ -24,18 +24,44 @@ optdepends=( 't1utils: can be useful when installing Type1 fonts' ) groups=('texlive-most') -conflicts=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-core-libre') -provides=('tetex' 'texlive-latex3' 'pdfjam') -replaces=('tetex' 'texlive-latex3' 'pdfjam' 'texlive-core-libre') +conflicts=('tetex' 'texlive-latex3' 'pdfjam' + 'texlive-genericextra' + 'texlive-plainextra' + 'texlive-core-libre') +provides=('tetex' 'texlive-latex3' 'pdfjam' + 'texlive-genericextra' + 'texlive-plainextra') +replaces=('tetex' 'texlive-latex3' 'pdfjam' + 'texlive-genericextra' + 'texlive-plainextra' + 'texlive-core-libre') url='http://tug.org/texlive/' mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip") noextract=("$pkgname-$pkgver-src.zip") source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz" "$pkgname.maps" "$pkgname.fmts" + "mktexlsr.hook" + "mktexlsr.script" + "texlive-updmap.hook" + "texlive-updmap.script" + "texlive-fmtutil.hook" + "texlive-fmtutil.script" "texmf.cnf" "texmfcnf.lua" "09-texlive-fonts.conf") +sha256sums=('442852ef075b8851086eef4036f4494d6c128a69c9b2003e6e776d0bb499ffdf' + '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3' + '009ab6be9e4fa18709fc74d26a3777372f4b5af9313421ff0546ba94a9d5ff13' + '1d62d46d4d3a538ccad48d31192fccdfc8d6c0a60b331575a10a007d46812d46' + '05afeae62a5d4c9de79c838c9636e2aefe9ad1d6b787fed4e5930c13baf60eba' + '9a0e462ad44d2ced432860ff62288b1c2f55b04c8d0c92887672478752417cf4' + '539a6face78ba7c18c8001769f0047ab3248fc7db777832f8eecec33877f4944' + '1f2c67e3cab02398980008f3095257ade3bb79f188cf0815a2671af3080e21af' + 'f96e9f815fa0a4b85e677f2a9215d9106b8abe46eceb3f3e36a6c76eda3e4a85' + '59236d61760bf89142a347d6d5b3e59c5daec4e430d12d25cc1d5c6528688f75' + '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d' + '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962') install=texlive.install backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ @@ -48,13 +74,7 @@ backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/web2c/fmtutil.cnf \ etc/texmf/web2c/mktex.cnf \ etc/texmf/xdvi/XDvi) -mksha256sums=('9dbff2097ca56b8a7f9aa8648b71f1dcbdf39bcdad4cc46afbe2d5b6e5f67edc') -sha256sums=('0b2c8b35e323057cfa7e8aeea1e91947d60c8c9c16cef9ae4083da7ddef8732d' - '275253728d884b2b75e01840b0824c1fe5afbdda91fafeacd33deb6cd92341a3' - '009ab6be9e4fa18709fc74d26a3777372f4b5af9313421ff0546ba94a9d5ff13' - 'cca1d0b92a103d43dff7fa3f1a40bdec879e9efc122ac415f54701c36a7c94ee' - '0b6c3ee516608ce04d7133db52cadfa1be5d885b3f82bb39dc5897b213847e0d' - '5e79c40cf3ab93348fc89e97890198601767ea2c8fea89ea76088c17a2b35962') +mksha256sums=('2bc3d2afff271b7c28650aa6e398977597e85cb4850f97a41925e8f61f36d2e9') mksource() { mkdir $pkgname-$pkgver @@ -73,20 +93,20 @@ mksource() { } prepare() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" echo -n " --> extracting all packages... " - for p in *.tar.xz; do + for p in *.tar.xz; do bsdtar -xf $p done echo "done" - rm -rf {doc,source} || true + rm -rf source doc # remove nonfree packages references from updmap.cfg sed -i '/ccpl.map/d' texmf-dist/web2c/updmap.cfg sed -i '/cs-charter.map/d' texmf-dist/web2c/updmap.cfg sed -i '/csfonts.map/d' texmf-dist/web2c/updmap.cfg sed -i '/plother.map/d' texmf-dist/web2c/updmap.cfg - sed -i '/pltext.map/d' texmf-dist/web2c/updmap.cfg + sed -i '/pltext.map/d' texmf-dist/web2c/updmap.cfg # remove nonfree packages references from texlive-core.maps sed -i '/ccpl.map/d' $srcdir/$pkgname.maps @@ -106,7 +126,9 @@ prepare() { } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + + # Install packages. install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs @@ -147,7 +169,7 @@ package() { cp -a "$pkgdir"/usr/share/texmf-dist/web2c/updmap-hdr.cfg \ "$pkgdir"/etc/texmf/web2c/ cp -a "$pkgdir"/usr/share/texmf-dist/web2c/fmtutil-hdr.cnf \ - "$pkgdir"/etc/texmf/web2c/fmtutil.cnf + "$pkgdir"/etc/texmf/web2c/fmtutil.cnf cp -a "$pkgdir"/usr/share/texmf-dist/dvips/config/config.ps \ "$pkgdir"/etc/texmf/dvips/config/ cp -a "$pkgdir"/usr/share/texmf-dist/dvipdfmx/dvipdfmx.cfg \ @@ -187,6 +209,14 @@ package() { mv "$pkgdir"/usr/share/texmf-dist/tlpkg "$pkgdir"/usr/share rm -rf "$pkgdir"/usr/share/tlpkg/tlpobj + ## install pacman hooks + install -D -m644 ${srcdir}/mktexlsr.hook "$pkgdir/usr/share/libalpm/hooks/mktexlsr.hook" + install -D -m644 ${srcdir}/texlive-updmap.hook "$pkgdir/usr/share/libalpm/hooks/texlive-updmap.hook" + install -D -m644 ${srcdir}/texlive-fmtutil.hook "$pkgdir/usr/share/libalpm/hooks/texlive-fmtutil.hook" + install -D -m755 ${srcdir}/mktexlsr.script "$pkgdir/usr/share/libalpm/scripts/mktexlsr" + install -D -m755 ${srcdir}/texlive-updmap.script "$pkgdir/usr/share/libalpm/scripts/texlive-updmap" + install -D -m755 ${srcdir}/texlive-fmtutil.script "$pkgdir/usr/share/libalpm/scripts/texlive-fmtutil" + # copy config file to texmf-config #mkdir -p $pkgdir/etc/texmf/tex/context/config #cp -a $pkgdir/usr/share/texmf-dist/tex/context/config/cont-usr.tex \ @@ -229,6 +259,7 @@ de-macro/de-macro dosepsbin/dosepsbin.pl dtxgen/dtxgen dviasm/dviasm.py +dviinfox/dviinfox.pl epstopdf/epstopdf.pl findhyph/findhyph fontools/afm2afm @@ -237,7 +268,9 @@ fontools/ot2kpx fragmaster/fragmaster.pl installfont/installfont-tl latex-git-log/latex-git-log +latex-papersize/latex-papersize.py latex2man/latex2man +latex2nemeth/latex2nemeth latexdiff/latexdiff-vc.pl latexdiff/latexdiff.pl latexdiff/latexrevise.pl @@ -249,6 +282,7 @@ ltxfileinfo/ltxfileinfo ltximg/ltximg.pl lua2dox/lua2dox_filter luaotfload/luaotfload-tool.lua +lwarp/lwarpmk.lua make4ht/make4ht match_parens/match_parens mf2pt1/mf2pt1.pl @@ -268,6 +302,7 @@ pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun +pdflatexpicscale/pdflatexpicscale.pl pdfxup/pdfxup pfarrei/a5toa4.tlu pfarrei/pfarrei.tlu @@ -282,6 +317,16 @@ srcredact/srcredact.pl sty2dtx/sty2dtx.pl texcount/texcount.pl tex4ebook/tex4ebook +tex4ht/ht.sh +tex4ht/htcontext.sh +tex4ht/htlatex.sh +tex4ht/htmex.sh +tex4ht/httex.sh +tex4ht/httexi.sh +tex4ht/htxelatex.sh +tex4ht/htxetex.sh +tex4ht/mk4ht.pl +tex4ht/xhlatex.sh texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten @@ -294,6 +339,7 @@ texlive/dvi2fax.sh texlive/dvired.sh texlive/e2pall.pl texlive/fmtutil-sys.sh +texlive/fmtutil-user.sh texlive/fmtutil.pl texlive/fontinst.sh texlive/kpsetool.sh @@ -306,6 +352,7 @@ texlive/texconfig-sys.sh texlive/texconfig.sh texlive/texlinks.sh texlive/updmap-sys.sh +texlive/updmap-user.sh texlive/updmap.pl texliveonfly/texliveonfly.py texloganalyser/texloganalyser diff --git a/libre/texlive-core/mktexlsr.hook b/libre/texlive-core/mktexlsr.hook new file mode 100644 index 000000000..f1a3b8b38 --- /dev/null +++ b/libre/texlive-core/mktexlsr.hook @@ -0,0 +1,16 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/bin/mktexlsr +Target = etc/texmf/* +Target = usr/share/texmf/* +Target = usr/share/texmf-dist/* +Target = var/lib/texmf/* + +[Action] +Description = Updating TeXLive filename database... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/mktexlsr + diff --git a/libre/texlive-core/mktexlsr.script b/libre/texlive-core/mktexlsr.script new file mode 100644 index 000000000..689441538 --- /dev/null +++ b/libre/texlive-core/mktexlsr.script @@ -0,0 +1,12 @@ +#!/bin/bash + +/usr/bin/mktexlsr +(cd /etc/texmf && /usr/bin/mtxrun --generate >/dev/null) +# We need to remove directory "." from luatex cache to avoid absurd +# behaviour. +for item in /var/lib/texmf/luatex-cache/context/*/trees/*.lua; do + if grep -F '["root"]="."' "$item" >/dev/null; then + rm -f "$item" "${item%.lua}.luc" + fi +done + diff --git a/libre/texlive-core/texlive-fmtutil.hook b/libre/texlive-core/texlive-fmtutil.hook new file mode 100644 index 000000000..cb5bcc932 --- /dev/null +++ b/libre/texlive-core/texlive-fmtutil.hook @@ -0,0 +1,12 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = var/lib/texmf/arch/installedpkgs/*.fmts + +[Action] +Description = Updating TeXLive format files... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/texlive-fmtutil + diff --git a/libre/texlive-core/texlive-fmtutil.script b/libre/texlive-core/texlive-fmtutil.script new file mode 100644 index 000000000..0e3b94393 --- /dev/null +++ b/libre/texlive-core/texlive-fmtutil.script @@ -0,0 +1,19 @@ +#!/bin/bash + +FMTUTIL="etc/texmf/web2c/fmtutil.cnf" +FMTUTILLOCAL="etc/texmf/web2c/fmtutil-local.cnf" + +cp usr/share/texmf-dist/web2c/fmtutil-hdr.cnf $FMTUTIL +for file in var/lib/texmf/arch/installedpkgs/*.fmts; do + echo >> $FMTUTIL + echo "# $file" >> $FMTUTIL + cat $file >> $FMTUTIL +done +if [[ -f "$FMTUTILLOCAL" ]]; then + echo >> $FMTUTIL + echo "# $FMTUTILLOCAL" >> $FMTUTIL + cat "$FMTUTILLOCAL" >> $FMTUTIL +fi + +/usr/bin/fmtutil-sys --all --cnffile $FMTUTIL > /dev/null + diff --git a/libre/texlive-core/texlive-updmap.hook b/libre/texlive-core/texlive-updmap.hook new file mode 100644 index 000000000..8bacce9a1 --- /dev/null +++ b/libre/texlive-core/texlive-updmap.hook @@ -0,0 +1,13 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/bin/tex +Target = var/lib/texmf/arch/installedpkgs/*.maps + +[Action] +Description = Updating TeXLive font maps... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/texlive-updmap + diff --git a/libre/texlive-core/texlive-updmap.script b/libre/texlive-core/texlive-updmap.script new file mode 100644 index 000000000..1d79186ff --- /dev/null +++ b/libre/texlive-core/texlive-updmap.script @@ -0,0 +1,13 @@ +#!/bin/bash + +UPDMAP="etc/texmf/web2c/updmap.cfg" +UPDMAPLOCAL="etc/texmf/web2c/updmap-local.cfg" + +cp usr/share/texmf-dist/web2c/updmap-hdr.cfg $UPDMAP +cat var/lib/texmf/arch/installedpkgs/*.maps >> $UPDMAP +if [[ -f "$UPDMAPLOCAL" ]]; then + cat "$UPDMAPLOCAL" >> $UPDMAP +fi + +/usr/bin/updmap-sys --quiet --nohash + diff --git a/libre/texlive-core/texmf.cnf b/libre/texlive-core/texmf.cnf index a29aef739..695bfed93 100644 --- a/libre/texlive-core/texmf.cnf +++ b/libre/texlive-core/texmf.cnf @@ -4,16 +4,20 @@ % If you modify this original file, YOUR CHANGES WILL BE LOST when it is % updated. Instead, put your changes -- and only your changes, not an % entire copy! -- in ../../texmf.cnf. That is, if this file is -% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2013/texmf.cnf. +% installed in /some/path/to/texlive/2017/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2017/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. % +% Each statement in this file boils down to: +% [.] [=] +% +% Neither the nor the may be empty. % Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. % The `=' (and surrounding spaces) is optional. % $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. -% Long lines can be continued with a \. +% Lines can be continued with a \; no whitespace removal is done. % % Earlier entries (in the same or another file) override later ones, and % an environment variable foo overrides any texmf.cnf definition of foo. @@ -36,8 +40,7 @@ % expanded into the compile-time default. Probably not what you want. % % Brace notation is supported, for example: /usr/local/{mytex,othertex} -% expands to /usr/local/mytex:/usr/local/othertex. We make extensive -% use of this. +% expands to /usr/local/mytex:/usr/local/othertex. % Part 1: Search paths and directories. @@ -81,16 +84,25 @@ TEXMFVAR = ~/.texlive/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/texmf-config +% This is the value manipulated by tlmgr's auxtrees subcommand in the +% root texmf.cnf. Kpathsea warns about a literally empty string for a +% value, hence the empty braces. +TEXMFAUXTREES = {} + % List all the texmf trees. For an explanation of what they are, see the % TeX Live manual. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named -% explicitly and before all other trees. +% explicitly and before other trees. % % TEXMFLOCAL precedes TEXMFDIST because locally-installed versions % should take precedence over distribution files -- although it is % generally a source of confusion to have different versions of a % package installed, whatever the trees, so try to avoid it. +% +% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is +% ever defined (the 99% common case), no extra elements will be added to +% the search paths. tlmgr takes care to end any value with a trailing comma. TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the @@ -99,7 +111,7 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % does not create ls-R files in the non-!! elements -- because if an % ls-R is present, it will be used, and the disk will not be searched. % This is arguably a bug in kpathsea. -TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} % The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use @@ -189,16 +201,13 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - % LuaTeX. -TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// -TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luajitlatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// % XeTeX. TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// @@ -221,17 +230,22 @@ TEXINPUTS.platex = .;$TEXMF/tex/{platex,latex,generic,}// TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,plain,generic,}// TEX.pmpost = eptex -% (e)up(La)TeX. +% p(La)TeX-ng +TEXINPUTS.ptex-ng = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// +TEXINPUTS.platex-ng = .;$TEXMF/tex/{uplatex,platex,latex,generic,}// + +% (e)up(La)TeX, and for upmpost TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}// TEXINPUTS.uptex = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// -TEXINPUTS.euptex = .;$TEXMF/tex/{uptex,ptex,plain,generic}// +TEXINPUTS.euptex = .;$TEXMF/tex/{uptex,ptex,plain,generic,}// +TEX.upmpost = euptex % pBibTeX bibliographies and style files. BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// % ConTeXt. -TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}// +TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// % jadetex. TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// @@ -315,8 +329,8 @@ MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// % .ris and .bltxml bibliography formats. -RISINPUTS = .;$TEXMF/bibtex/ris// -BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml// +RISINPUTS = .;$TEXMF/biber/ris// +BLTXMLINPUTS = .;$TEXMF/biber/bltxml// % MFT style files. MFTINPUTS = .;$TEXMF/mft// @@ -355,6 +369,10 @@ TEXCONFIG = $TEXMF/dvips// % Makeindex style (.ist) files. INDEXSTYLE = .;$TEXMF/makeindex// +% mendex dictionary files. Used internally by mendex and upmendex. +% It is not necessary to introduce a new format in Kpathsea. +INDEXDICTIONARY = .;$TEXMF/makeindex// + % Font encoding files (.enc). ENCFONTS = .;$TEXMF/fonts/enc// @@ -553,24 +571,24 @@ shell_escape = p % % The programs listed here are as safe as any we know: they either do % not write any output files, respect openout_any, or have hard-coded -% restrictions similar or higher to openout_any=p. They also have no -% features to invoke arbitrary other programs, and no known exploitable -% bugs. All to the best of our knowledge. They also have practical use -% for being called from TeX. +% restrictions similar to or higher than openout_any=p. They also have +% no features to invoke arbitrary other programs, and no known +% exploitable bugs. All to the best of our knowledge. They also have +% practical use for being called from TeX. % shell_escape_commands = \ bibtex,bibtex8,\ +extractbb,\ +gregorio,\ kpsewhich,\ makeindex,\ repstopdf,\ +texosquery-jre8,\ % we'd like to allow: % dvips - but external commands can be executed, need at least -R1. % epspdf, ps2pdf, pstopdf - need to respect openout_any, % and gs -dSAFER must be used and check for shell injection with filenames. -% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, -% without Unix convert it hardly seems worth it, and Windows convert -% is something completely different that destroys filesystems, so skip. % pygmentize - but is the filter feature insecure? % ps4pdf - but it calls an unrestricted latex. % rpdfcrop - maybe ok, but let's get experience with repstopdf first. @@ -578,7 +596,7 @@ repstopdf,\ % ulqda - but requires optional SHA1.pm, so why bother. % tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any. -% plain TeX should remain unenhanced. +% plain "tex" should remain unenhanced. shell_escape.tex = f shell_escape.initex = f @@ -588,16 +606,17 @@ shell_escape.initex = f TEXMF_RESTRICTED_SCRIPTS = \ {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// -% Allow TeX \openin, \openout, or \input on filenames starting with `.' -% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? +% Do we allow TeX \input or \openin (openin_any), or \openout +% (openout_any) on filenames starting with `.' (e.g., .rhosts) or +% outside the current tree (e.g., /etc/passwd)? % a (any) : any file can be opened. -% r (restricted) : disallow opening "dotfiles". +% r (restricted) : disallow opening dot files % p (paranoid) : as `r' and disallow going to parent directories, and % restrict absolute paths to be under $TEXMFOUTPUT. -openout_any = p openin_any = a +openout_any = p -% Write .log/.dvi/etc. files here, if the current directory is unwritable. +% Write .log/.dvi/.aux/etc. files here, if the current directory is unwritable. %TEXMFOUTPUT = /tmp % If a dynamic file creation fails, log the command to this file, in @@ -611,7 +630,7 @@ MISSFONT_LOG = missfont.log % To suppress nothing, use TEX_HUSH = none or do not set the variable at all. TEX_HUSH = none -% Allow TeX, and MF to parse the first line of an input file for +% Allow TeX and MF to parse the first line of an input file for % the %&format construct. parse_first_line = t @@ -646,6 +665,9 @@ file_line_error_style = f % expecting DVI, and not "tex" because we want first line parsing. TEX = etex +% Use Japanese eptex for Japanese pmpost. +TEX.pmpost = eptex + % These variables specify the external program called for the % interactive `e' option. %d is replaced by the line number and %s by % the current filename. The default is specified at compile-time, and @@ -671,7 +693,7 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 -% Part 3: Array and other sizes for TeX (and Metafont). +% Part 3: Array and other sizes for TeX, Metafont, etc. % % If you want to change some of these sizes only for a certain TeX % variant, the usual dot notation works, e.g., @@ -770,12 +792,16 @@ screen_depth.mf = 1200 % BibTeX only (max_strings also determines hash_size and hash_prime). ent_str_size = 250 glob_str_size = 20000 -max_strings.bibtex = 35307 -max_strings.bibtex8 = 35307 -max_strings.bibtexu = 35307 -max_strings.pbibtex = 35307 +max_strings.bibtex = 100000 +max_strings.bibtex8 = 100000 +max_strings.bibtexu = 100000 +max_strings.pbibtex = 100000 % GFtype only. line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 + +% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? +% Default is 0, to not guess. +guess_input_kanji_encoding = 1 diff --git a/libre/texlive-fontsextra/PKGBUILD b/libre/texlive-fontsextra/PKGBUILD index 10182565e..9a6feade4 100644 --- a/libre/texlive-fontsextra/PKGBUILD +++ b/libre/texlive-fontsextra/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 279047 2016-10-20 14:44:55Z remy $ # Maintainer (Arch): Rémy Oudompheng # Contributor (Hyperbola): André Silva # Maintainer: Michał Masłowski +# Contributor: Isaac David _pkgname=texlive-fontsextra-libre pkgname=texlive-fontsextra -pkgver=2016.43763 -_revnr=${pkgver#2016.} +pkgver=2017.44818 +_revnr=${pkgver#2017.} pkgrel=1.parabola1 pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages" license=('GPL') @@ -20,8 +20,8 @@ mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip" noextract=("$pkgname-$pkgver-src.zip") source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz" "$pkgname.maps") options=('!emptydirs') -mksha256sums=('d926118535fa17e1097b2bd6695f16344cec6e12ca7fe9ae2e6da2b76c32d182') -sha256sums=('d5d2d26398edd8e4aea1aafcad5cbb1d904c0601d782f583cdfc745a17969b7e' +mksha256sums=('e6fc784cdb144f65a787d050b0f3ea7f109f3ec92cd76fc6acb180e190d715ec') +sha256sums=('da08dc17f0e4d3dbe76fd4e475310b8d23780d970698265e1d32bc633e626a32' 'b29c8998130c7df8f9841ac09544cae5d7b8a4b669a1e3f449fd537375d648bd') mksource() { @@ -40,9 +40,8 @@ prepare() { cd $srcdir/$pkgname-$pkgver echo -n " --> extracting all packages... " for p in *.tar.xz; do - bsdtar -xf $p + bsdtar -xf $p done - echo "done" rm -rf {tlpkg,doc,source} || true # remove nonfree packages references from package list diff --git a/libre/texlive-fontsextra/texlive-fontsextra.maps b/libre/texlive-fontsextra/texlive-fontsextra.maps index 1e9afde70..14cf7bd3d 100644 --- a/libre/texlive-fontsextra/texlive-fontsextra.maps +++ b/libre/texlive-fontsextra/texlive-fontsextra.maps @@ -52,6 +52,7 @@ Map Typocaps.map Map XCharter.map Map Zallman.map Map accanthis.map +Map algolrevived.map Map antt.map Map ap.map Map archaicprw.map @@ -143,6 +144,7 @@ Map newpx.map Map newtx.map Map newtxsf.map Map newtxtt.map +Map niceframe.map Map nimbus15.map Map noto.map Map oasy.map diff --git a/libre/texlive-latexextra/PKGBUILD b/libre/texlive-latexextra/PKGBUILD index 3a21e3e98..fc8bfaa55 100644 --- a/libre/texlive-latexextra/PKGBUILD +++ b/libre/texlive-latexextra/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 279045 2016-10-20 14:43:10Z remy $ # Maintainer (Arch): Firmicus # Maintainer (Arch): Rémy Oudompheng # Contributor (Hyperbola): André Silva # Maintainer: Michał Masłowski +# Contributor: Isaac David _pkgname=texlive-latexextra-libre pkgname=texlive-latexextra -pkgver=2016.43768 -_revnr=${pkgver#2016.} +pkgver=2017.44907 +_revnr=${pkgver#2017.} pkgrel=1.parabola1 pkgdesc="TeX Live - Large collection of add-on packages for LaTeX, without nonfree add-on packages" license=('GPL') @@ -27,13 +27,11 @@ url='http://tug.org/texlive/' mksource=("https://sources.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip") noextract=("$pkgname-$pkgver-src.zip") source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz" - "$pkgname.maps" - "komacv-spurious-changes.patch") + "$pkgname.maps") options=('!emptydirs') -mksha256sums=('80f5886d4ae9864d672fad8e11e8aa6178305f4ddd7ae232703120768d411d3c') -sha256sums=('63ef1e484bad108f4bc4d75b526a0536ef72b19a677499423b9a6cad690dfe97' - 'd53750a03a52472a1c7c5ba5142959ba382a5d69215471691c0b12c3663950ce' - 'bca65abf9b833f379702753697d5f57074367fc359c6b16ed48b097752998d72') +mksha256sums=('fc170af03ed0c4065d19fa12d517db2cd672dcb917763061a86cdb0bb1df9fbd') +sha256sums=('c254f27dcd29b4b4e83322d2e2206ca4ff4c6937b07aed9669391824320cea53' + 'd53750a03a52472a1c7c5ba5142959ba382a5d69215471691c0b12c3663950ce') mksource() { mkdir $pkgname-$pkgver @@ -51,20 +49,17 @@ prepare() { cd $srcdir/$pkgname-$pkgver echo -n " --> extracting all packages... " for p in *.tar.xz; do - bsdtar -xf $p + bsdtar -xf $p done - echo "done" rm -rf {tlpkg,doc,source} || true - # Patch for spurious komacv \changes{...} lines - patch -Np1 -i "${srcdir}/komacv-spurious-changes.patch" - # remove nonfree packages references from package list sed -ri '/^(authoraftertitle|fnpara) /d' CONTENTS } package() { cd $srcdir/$pkgname-$pkgver + install -m755 -d "$pkgdir"/var/lib/texmf/arch/installedpkgs sed -i '/^#/d' CONTENTS install -m644 CONTENTS "$pkgdir"/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs -- cgit v1.2.3