--- texmf-dist/web2c/texmf.cnf | 49 +++++++++++---------------------------------- 1 file changed, 13 insertions(+), 36 deletions(-) --- texlive-base-2023.20240401.orig/texmf-dist/web2c/texmf.cnf +++ texlive-base-2023.20240401/texmf-dist/web2c/texmf.cnf @@ -59,7 +59,7 @@ % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive). % Sorry for the off-by-one-generation names. -TEXMFROOT = $SELFAUTOPARENT +TEXMFROOT = /usr/share/texlive % The various texmf trees used by TeX Live, follow. % They must must all have the TDS directory structure (https://tug.org/tds). @@ -71,14 +71,17 @@ % Keep the variable name. TEXMFMAIN = $TEXMFDIST +% The Debian search tree +TEXMFDEBIAN = /usr/share/texmf + % Local additions to the distribution trees. -TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local +TEXMFLOCAL = /usr/local/share/texmf % TEXMFSYSVAR, where *-sys store cached runtime data. -TEXMFSYSVAR = $TEXMFROOT/texmf-var +TEXMFSYSVAR = /var/lib/texmf % TEXMFSYSCONFIG, where *-sys store configuration data. -TEXMFSYSCONFIG = $TEXMFROOT/texmf-config +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 @@ -111,7 +114,7 @@ % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree % is defined (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 = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFDIST} % Where to look for, and where mktexlsr creates, ls-R files. By default, % this is all and only the !! elements of TEXMF, so that mktexlsr does not @@ -119,13 +122,13 @@ % present, it will be used, and the disk will not (usually) be searched, % regardless of !!. Although in theory a directory listed here need % not contain an ls-R file, in practice they all should. -TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$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;$TEXMFLOCAL;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST;$TEXMFDEBIAN % First writable tree here is used by Lua(La)TeX for the font cache. % LuaLaTeX uses the value here, while ConTeXt uses the same variable but @@ -136,7 +139,7 @@ % 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 +VARTEXFONTS = /var/cache/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 @@ -396,7 +399,7 @@ % 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 = /please/set/osfontdir/in/the/environment +OSFONTDIR = /usr/share/fonts % PostScript Type 1 outline fonts. T1FONTS = $TEXMFDOTDIR;$TEXMF/fonts/type1//;$OSFONTDIR// @@ -574,33 +577,7 @@ % since we don't want to scatter ../'s throughout the value. Hence we % explicitly list every directory. Arguably more understandable anyway. % -TEXMFCNF = {\ -$SELFAUTOLOC,\ -$SELFAUTOLOC/share/texmf-local/web2c,\ -$SELFAUTOLOC/share/texmf-dist/web2c,\ -$SELFAUTOLOC/share/texmf/web2c,\ -$SELFAUTOLOC/texmf-local/web2c,\ -$SELFAUTOLOC/texmf-dist/web2c,\ -$SELFAUTOLOC/texmf/web2c,\ -\ -$SELFAUTODIR,\ -$SELFAUTODIR/share/texmf-local/web2c,\ -$SELFAUTODIR/share/texmf-dist/web2c,\ -$SELFAUTODIR/share/texmf/web2c,\ -$SELFAUTODIR/texmf-local/web2c,\ -$SELFAUTODIR/texmf-dist/web2c,\ -$SELFAUTODIR/texmf/web2c,\ -\ -$SELFAUTOGRANDPARENT/texmf-local/web2c,\ -$SELFAUTOPARENT,\ -\ -$SELFAUTOPARENT/share/texmf-local/web2c,\ -$SELFAUTOPARENT/share/texmf-dist/web2c,\ -$SELFAUTOPARENT/share/texmf/web2c,\ -$SELFAUTOPARENT/texmf-local/web2c,\ -$SELFAUTOPARENT/texmf-dist/web2c,\ -$SELFAUTOPARENT/texmf/web2c\ -} +TEXMFCNF = /etc/texmf/web2c;/usr/local/share/texmf/web2c;/usr/share/texlive/texmf-dist/web2c % % For reference, here is the old brace-using definition: %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}