[Debian-tex-commits] SVN tex-common commit + diffs: r4211 - in tex-common/branches/for-tl2008: conf/texmf.d debian scripts
Frank Küster
frank at alioth.debian.org
Thu Sep 24 17:26:41 UTC 2009
Author: frank
Date: 2009-09-24 17:26:40 +0000 (Thu, 24 Sep 2009)
New Revision: 4211
Modified:
tex-common/branches/for-tl2008/conf/texmf.d/05TeXMF.cnf
tex-common/branches/for-tl2008/conf/texmf.d/15Plain.cnf
tex-common/branches/for-tl2008/conf/texmf.d/45TeXinputs.cnf
tex-common/branches/for-tl2008/conf/texmf.d/95NonPath.cnf
tex-common/branches/for-tl2008/debian/changelog
tex-common/branches/for-tl2008/scripts/postrm-texlsr
Log:
* Make the wording of the warning message in postrm-texlsr broader,
since there are a couple of reasons why this can fail
* Update some texmf.cnf settings. Before uploading to unstable, this
needs a closer inspection
Modified: tex-common/branches/for-tl2008/conf/texmf.d/05TeXMF.cnf
===================================================================
--- tex-common/branches/for-tl2008/conf/texmf.d/05TeXMF.cnf 2009-09-24 14:53:16 UTC (rev 4210)
+++ tex-common/branches/for-tl2008/conf/texmf.d/05TeXMF.cnf 2009-09-24 17:26:40 UTC (rev 4211)
@@ -17,6 +17,8 @@
% (However, %'s and @'s can be edited into texmf.cnf or put in envvar values.)
% $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.
%
Modified: tex-common/branches/for-tl2008/conf/texmf.d/15Plain.cnf
===================================================================
--- tex-common/branches/for-tl2008/conf/texmf.d/15Plain.cnf 2009-09-24 14:53:16 UTC (rev 4210)
+++ tex-common/branches/for-tl2008/conf/texmf.d/15Plain.cnf 2009-09-24 17:26:40 UTC (rev 4211)
@@ -11,13 +11,17 @@
% 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,}//
+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,}//
+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,}//
Modified: tex-common/branches/for-tl2008/conf/texmf.d/45TeXinputs.cnf
===================================================================
--- tex-common/branches/for-tl2008/conf/texmf.d/45TeXinputs.cnf 2009-09-24 14:53:16 UTC (rev 4210)
+++ tex-common/branches/for-tl2008/conf/texmf.d/45TeXinputs.cnf 2009-09-24 17:26:40 UTC (rev 4211)
@@ -8,9 +8,6 @@
TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
-
% MLTeX.
TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}//
TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}//
Modified: tex-common/branches/for-tl2008/conf/texmf.d/95NonPath.cnf
===================================================================
--- tex-common/branches/for-tl2008/conf/texmf.d/95NonPath.cnf 2009-09-24 14:53:16 UTC (rev 4210)
+++ tex-common/branches/for-tl2008/conf/texmf.d/95NonPath.cnf 2009-09-24 17:26:40 UTC (rev 4211)
@@ -9,6 +9,23 @@
% Part 2: Non-path 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
+
% Write .log/.dvi/etc. files here, if the current directory is unwritable.
% TEXMFOUTPUT = /tmp
@@ -23,9 +40,28 @@
% To suppress nothing, use TEX_HUSH = none or do not set the variable at all.
TEX_HUSH = none
-% Enable system commands via \write18{...}?
-shell_escape = f
+% Enable system commands via \write18{...}. When enabled fully (set to
+% 1), 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
+% Special: convert is the standard command name for ImageMagick, but it
+% is also the name of a dangerous filesystem-changing command on
+% Windows. So enable imgconvert (used in w32tex), but not convert.
+
+% No spaces in this command list.
+shell_escape_commands = \
+bibtex,bibtex8,dvips,epstopdf,epspdf,etex,fc-match,\
+imgconvert,\
+kpsewhich,makeindex,mkgrkindex,\
+pdfluatex,ps2pdf,ps4pdf,pstopdf,pygmentize,\
+rpdfcrop,texindy,xindy,ulqda\
+
+% plain TeX should remain unenhanced.
+shell_escape.tex = f
+
% 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.
@@ -35,13 +71,14 @@
openout_any = p
openin_any = a
-% Disable search on multiple suffixes filenames. In many case, when `foo.bar'
-% is looked for, you do not want to look for `foo.bar.tex' before. This flag
-% disables searching for standard suffixes if the file name has already an
-% extension of 3 characters. Default value is true (old behaviour).
-allow_multiple_suffixes = f
+%% Deprecated option
+%% % Disable search on multiple suffixes filenames. In many case, when `foo.bar'
+%% % is looked for, you do not want to look for `foo.bar.tex' before. This flag
+%% % disables searching for standard suffixes if the file name has already an
+%% % extension of 3 characters. Default value is true (old behaviour).
+%% allow_multiple_suffixes = f
-% Allow TeX, MF, and MP 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
@@ -79,7 +116,15 @@
% 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"
+%MFEDIT = ${TEXEDIT}
+%MPEDIT = ${TEXEDIT}
+
% Part 3: Array and other sizes for TeX (and Metafont and MetaPost).
%
% If you want to change some of these sizes only for a certain TeX
@@ -103,7 +148,7 @@
% 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 = 1500000 % words of inimemory available; also applies to inimf&mp
+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.
@@ -116,10 +161,10 @@
% Words of font info for TeX (total size of all TFM files, approximately).
% Must be >= 20000 and <= 4000000 (without tex.ch changes).
-font_mem_size = 1200000
+font_mem_size = 3000000
-% Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes).
-font_max = 2000
+% 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 (which allows 10K
% names as distributed).
@@ -132,7 +177,7 @@
% 25000 less than pool_size, but doesn't need to be nearly that large.
string_vacancies = 90000
% Maximum number of strings.
-max_strings = 100000
+max_strings = 500000
% min pool space left after loading .fmt
pool_free = 47500
@@ -149,23 +194,23 @@
%
trie_size = 400000
-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
-param_size = 10000 % simultaneous macro parameters
-save_size = 5000 % for saving values outside current group
-stack_size = 5000 % simultaneous input sources
+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
+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.
+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.
% Parameter specific to MetaPost.
-% Maximum number of knots between breakpoints of a path.
-% Set to 2000 by default.
-% path_size.mpost = 10000
+% Size of the hash table for control sequences, default 65536.
+% hash_size.mpost = 65536
% 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.
Modified: tex-common/branches/for-tl2008/debian/changelog
===================================================================
--- tex-common/branches/for-tl2008/debian/changelog 2009-09-24 14:53:16 UTC (rev 4210)
+++ tex-common/branches/for-tl2008/debian/changelog 2009-09-24 17:26:40 UTC (rev 4211)
@@ -1,8 +1,13 @@
tex-common (2.01~7) experimental; urgency=low
+ [ Frank Küster ]
* Remove bashisms and unsafe echo use from update-fontlang
+ * Make the wording of the warning message in postrm-texlsr broader,
+ since there are a couple of reasons why this can fail
+ * Update some texmf.cnf settings. Before uploading to unstable, this
+ needs a closer inspection
- -- Frank Küster <frank at debian.org> Thu, 24 Sep 2009 11:20:29 +0200
+ -- Frank Küster <frank at debian.org> Thu, 24 Sep 2009 19:26:53 +0200
tex-common (2.01~6) experimental; urgency=low
Modified: tex-common/branches/for-tl2008/scripts/postrm-texlsr
===================================================================
--- tex-common/branches/for-tl2008/scripts/postrm-texlsr 2009-09-24 14:53:16 UTC (rev 4210)
+++ tex-common/branches/for-tl2008/scripts/postrm-texlsr 2009-09-24 17:26:40 UTC (rev 4211)
@@ -44,9 +44,8 @@
echo
echo "$* failed. Output has been stored in"
echo "$tempfile"
- echo "If tex-common is not configured you can ignore this error" \
- "message!"
- echo "Otherwise, please include this file if you report a bug."
+ echo "This is probably not a bug. But if you encounter problems, report a bug" \
+ echo "and include this file in the bug report."
echo
fi
set -e
More information about the Debian-tex-commits
mailing list