| 1 |
--- |
| 2 |
texmf-dist/web2c/texmf.cnf | 49 +++++++++++---------------------------------- |
| 3 |
1 file changed, 13 insertions(+), 36 deletions(-) |
| 4 |
|
| 5 |
--- texlive-base-2023.20240401.orig/texmf-dist/web2c/texmf.cnf |
| 6 |
+++ texlive-base-2023.20240401/texmf-dist/web2c/texmf.cnf |
| 7 |
@@ -59,7 +59,7 @@ |
| 8 |
% SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and |
| 9 |
% SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive). |
| 10 |
% Sorry for the off-by-one-generation names. |
| 11 |
-TEXMFROOT = $SELFAUTOPARENT |
| 12 |
+TEXMFROOT = /usr/share/texlive |
| 13 |
|
| 14 |
% The various texmf trees used by TeX Live, follow. |
| 15 |
% They must must all have the TDS directory structure (https://tug.org/tds). |
| 16 |
@@ -71,14 +71,17 @@ |
| 17 |
% Keep the variable name. |
| 18 |
TEXMFMAIN = $TEXMFDIST |
| 19 |
|
| 20 |
+% The Debian search tree |
| 21 |
+TEXMFDEBIAN = /usr/share/texmf |
| 22 |
+ |
| 23 |
% Local additions to the distribution trees. |
| 24 |
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local |
| 25 |
+TEXMFLOCAL = /usr/local/share/texmf |
| 26 |
|
| 27 |
% TEXMFSYSVAR, where *-sys store cached runtime data. |
| 28 |
-TEXMFSYSVAR = $TEXMFROOT/texmf-var |
| 29 |
+TEXMFSYSVAR = /var/lib/texmf |
| 30 |
|
| 31 |
% TEXMFSYSCONFIG, where *-sys store configuration data. |
| 32 |
-TEXMFSYSCONFIG = $TEXMFROOT/texmf-config |
| 33 |
+TEXMFSYSCONFIG = /etc/texmf |
| 34 |
|
| 35 |
% Per-user texmf tree(s) -- organized per the TDS, as usual. To define |
| 36 |
% more than one per-user tree, set this to a list of directories in |
| 37 |
@@ -111,7 +114,7 @@ |
| 38 |
% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree |
| 39 |
% is defined (99% common case), no extra elements will be added to |
| 40 |
% the search paths. tlmgr takes care to end any value with a trailing comma. |
| 41 |
-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} |
| 42 |
+TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFDIST} |
| 43 |
|
| 44 |
% Where to look for, and where mktexlsr creates, ls-R files. By default, |
| 45 |
% this is all and only the !! elements of TEXMF, so that mktexlsr does not |
| 46 |
@@ -119,13 +122,13 @@ |
| 47 |
% present, it will be used, and the disk will not (usually) be searched, |
| 48 |
% regardless of !!. Although in theory a directory listed here need |
| 49 |
% not contain an ls-R file, in practice they all should. |
| 50 |
-TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST} |
| 51 |
+TEXMFDBS = {!!$TEXMFLOCAL,!!$TEXMFSYSVAR,!!$TEXMFDEBIAN,!!$TEXMFDIST} |
| 52 |
|
| 53 |
% The system trees. These are the trees that are shared by all users. |
| 54 |
% If a tree appears in this list, the mktex* scripts will use |
| 55 |
% VARTEXFONTS for generated files, if the original tree isn't writable; |
| 56 |
% otherwise the current working directory is used. |
| 57 |
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST |
| 58 |
+SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST;$TEXMFDEBIAN |
| 59 |
|
| 60 |
% First writable tree here is used by Lua(La)TeX for the font cache. |
| 61 |
% LuaLaTeX uses the value here, while ConTeXt uses the same variable but |
| 62 |
@@ -136,7 +139,7 @@ |
| 63 |
% Where generated fonts may be written. This tree is used when the sources |
| 64 |
% were found in a system tree and either that tree wasn't writable, or the |
| 65 |
% varfonts feature was enabled in MT_FEATURES in mktex.cnf. |
| 66 |
-VARTEXFONTS = $TEXMFVAR/fonts |
| 67 |
+VARTEXFONTS = /var/cache/fonts |
| 68 |
|
| 69 |
% On some systems, there will be a system tree which contains all the font |
| 70 |
% files that may be created as well as the formats. For example |
| 71 |
@@ -396,7 +399,7 @@ |
| 72 |
% OSFONTDIR is to provide a convenient hook for allowing TeX to find |
| 73 |
% fonts installed on the system (outside of TeX). An empty default |
| 74 |
% value would add "//" to the search paths, so we give it a dummy value. |
| 75 |
-OSFONTDIR = /please/set/osfontdir/in/the/environment |
| 76 |
+OSFONTDIR = /usr/share/fonts |
| 77 |
|
| 78 |
% PostScript Type 1 outline fonts. |
| 79 |
T1FONTS = $TEXMFDOTDIR;$TEXMF/fonts/type1//;$OSFONTDIR// |
| 80 |
@@ -574,33 +577,7 @@ |
| 81 |
% since we don't want to scatter ../'s throughout the value. Hence we |
| 82 |
% explicitly list every directory. Arguably more understandable anyway. |
| 83 |
% |
| 84 |
-TEXMFCNF = {\ |
| 85 |
-$SELFAUTOLOC,\ |
| 86 |
-$SELFAUTOLOC/share/texmf-local/web2c,\ |
| 87 |
-$SELFAUTOLOC/share/texmf-dist/web2c,\ |
| 88 |
-$SELFAUTOLOC/share/texmf/web2c,\ |
| 89 |
-$SELFAUTOLOC/texmf-local/web2c,\ |
| 90 |
-$SELFAUTOLOC/texmf-dist/web2c,\ |
| 91 |
-$SELFAUTOLOC/texmf/web2c,\ |
| 92 |
-\ |
| 93 |
-$SELFAUTODIR,\ |
| 94 |
-$SELFAUTODIR/share/texmf-local/web2c,\ |
| 95 |
-$SELFAUTODIR/share/texmf-dist/web2c,\ |
| 96 |
-$SELFAUTODIR/share/texmf/web2c,\ |
| 97 |
-$SELFAUTODIR/texmf-local/web2c,\ |
| 98 |
-$SELFAUTODIR/texmf-dist/web2c,\ |
| 99 |
-$SELFAUTODIR/texmf/web2c,\ |
| 100 |
-\ |
| 101 |
-$SELFAUTOGRANDPARENT/texmf-local/web2c,\ |
| 102 |
-$SELFAUTOPARENT,\ |
| 103 |
-\ |
| 104 |
-$SELFAUTOPARENT/share/texmf-local/web2c,\ |
| 105 |
-$SELFAUTOPARENT/share/texmf-dist/web2c,\ |
| 106 |
-$SELFAUTOPARENT/share/texmf/web2c,\ |
| 107 |
-$SELFAUTOPARENT/texmf-local/web2c,\ |
| 108 |
-$SELFAUTOPARENT/texmf-dist/web2c,\ |
| 109 |
-$SELFAUTOPARENT/texmf/web2c\ |
| 110 |
-} |
| 111 |
+TEXMFCNF = /etc/texmf/web2c;/usr/local/share/texmf/web2c;/usr/share/texlive/texmf-dist/web2c |
| 112 |
% |
| 113 |
% For reference, here is the old brace-using definition: |
| 114 |
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} |