summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/chktex/chktexrc28
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgrgui.pl2
-rwxr-xr-xMaster/texmf-dist/scripts/xindy/xindy.pl3
-rw-r--r--Master/texmf-dist/web2c/mktex.opt7
-rwxr-xr-xMaster/texmf-dist/web2c/mktexdir11
-rwxr-xr-xMaster/texmf-dist/web2c/mktexnam14
-rwxr-xr-xMaster/texmf-dist/web2c/mktexupd15
-rw-r--r--Master/texmf-dist/xindy/VERSION2
-rw-r--r--Master/tlpkg/doc/releng.txt27
9 files changed, 83 insertions, 26 deletions
diff --git a/Master/texmf-dist/chktex/chktexrc b/Master/texmf-dist/chktex/chktexrc
index f14c2522972..da28a5dcfad 100644
--- a/Master/texmf-dist/chktex/chktexrc
+++ b/Master/texmf-dist/chktex/chktexrc
@@ -248,8 +248,8 @@ UserWarnRegex
(?!#1:Capitalize! before! references)POSIX:([^[:alnum:]]|^)(chapter|(sub)?section|theorem|lemma|proposition|corollary|appendix)~\\ref
# spell it out.
- PCRE:(?i)\bintro\b(?!#Spell! it! out.! This! comment! is! not! used.)
- POSIX:([^[:alnum:]]|^)intro([^[:alnum:]]|$)
+ # PCRE:(?i)\bintro\b(?!#Spell! it! out.! This! comment! is! not! used.)
+ # POSIX:([^[:alnum:]]|^)intro([^[:alnum:]]|$)
# Pretty tables--see http://texdoc.net/texmf-dist/doc/latex/booktabs/booktabs.pdf
(?!#-2:Use! \toprule,! midrule,! or! \bottomrule! from! booktabs)\\hline
@@ -391,7 +391,9 @@ Silent
# designed for the case where you have many custom macros sharing a
# common prefix, but can of course be used for other things.
-# \\my.*
+# Support ConTeXt to at least some extent
+\\start.* \\stop.*
+
]
#####################################################################
@@ -440,6 +442,24 @@ WordDash
#####################################################################
#
+# Here are exceptions to the dash rules above. For example, an
+# n-dash -- between words is usually wrong, but in some cases it is
+# correct, such as when naming a theorem. The Birch--Swinnerton-Dyer
+# conjecture is one example where the difference matters. You can
+# tell that Birch is one person and Swinnerton-Dyer is another.
+#
+# Adding line suppressions for these is possible, but can quickly
+# become tedious if a certain theorem is referenced often. For this
+# reason exceptions can be specified here. They are case-sensitive.
+#
+
+DashExcpt
+{
+ Birch--Swinnerton-Dyer
+}
+
+#####################################################################
+#
# This keyword indicates commands whose argument isn't LaTeX code,
# and thus should be ignored.
#
@@ -460,7 +480,7 @@ WordDash
WipeArg
{
\label:{} \ref:{} \eqref:{} \vref:{} \pageref:{} \index:[]{}
- \cite:[]{} \nocite:{}
+ \cite:[][]{} \nocite:{}
\input:{} \verbatiminput:[]{} \listinginput:[]{}{}
\verbatimtabinput:[]{} \include:{} \includeonly:{}
\bibitem:[]{}
diff --git a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
index 6a469c5c37f..5c1e7ad6042 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# $Id$
#
-# Copyright 2009-2014 Norbert Preining
+# Copyright 2009-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
diff --git a/Master/texmf-dist/scripts/xindy/xindy.pl b/Master/texmf-dist/scripts/xindy/xindy.pl
index f2810fc8396..0aae0762b4f 100755
--- a/Master/texmf-dist/scripts/xindy/xindy.pl
+++ b/Master/texmf-dist/scripts/xindy/xindy.pl
@@ -732,6 +732,9 @@ sub xindy_expression () {
#
# FIXME: I didn't see all languages. What's on with gypsy and
# hausa?
+ if ( !$language ) {
+ $language = "general";
+ }
if ( $language ) {
# If there is no language directory, this might be a variant.
# Language names and variants are separated by hyphens. The
diff --git a/Master/texmf-dist/web2c/mktex.opt b/Master/texmf-dist/web2c/mktex.opt
index bd5d0fbcc8f..48c594f2905 100644
--- a/Master/texmf-dist/web2c/mktex.opt
+++ b/Master/texmf-dist/web2c/mktex.opt
@@ -1,14 +1,15 @@
# mktex.opt -- common mktex* options, etc.
-# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set.
+# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set,
+# and optionally mt_min_args and/or mt_max_args.
#
# Originally written by Thomas Esser. Public domain.
-# $Id: mktex.opt 18383 2010-05-20 18:31:24Z karl $
+# $Id: mktex.opt 34656 2014-07-18 23:38:50Z karl $
if test "x$1" = x--help || test "x$1" = x-help; then
echo "$usage"
exit 0
elif test "x$1" = x--version || test "x$1" = x-version; then
- echo "`basename $0` $version"
+ echo "$0 $version"
kpsewhich --version
exit 0
elif test $# -lt ${mt_min_args-1}; then
diff --git a/Master/texmf-dist/web2c/mktexdir b/Master/texmf-dist/web2c/mktexdir
index e9c2100d879..f39408b4c1f 100755
--- a/Master/texmf-dist/web2c/mktexdir
+++ b/Master/texmf-dist/web2c/mktexdir
@@ -6,8 +6,15 @@
# Modified for sticky directory creation, --help, --version, more,
# by Thomas Esser, Karl Berry, Olaf Weber, et al.
-version='$Id: mktexdir 18383 2010-05-20 18:31:24Z karl $'
-usage="Usage: $0 DIRS...
+version='$Id: mktexdir 34656 2014-07-18 23:38:50Z karl $'
+progname=`echo $0 | sed 's%.*/%%'`
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
+usage="Usage: $0 DIR...
Create each DIR, including any missing leading directories."
mt_max_args=$#
diff --git a/Master/texmf-dist/web2c/mktexnam b/Master/texmf-dist/web2c/mktexnam
index e8956624118..7751f53ffd1 100755
--- a/Master/texmf-dist/web2c/mktexnam
+++ b/Master/texmf-dist/web2c/mktexnam
@@ -3,9 +3,19 @@
# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
# Public domain.
-version='$Id: mktexnam 16497 2009-12-24 18:38:47Z karl $'
+version='$Id: mktexnam 34656 2014-07-18 23:38:50Z karl $'
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
usage="Usage: $0 NAME [DPI MODE] [DESTDIR].
- Output the PK, TFM, and MF names for a font NAME."
+ Output the PK, TFM, and MF names for a font NAME.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
mt_max_args=4
# Common code for all scripts.
diff --git a/Master/texmf-dist/web2c/mktexupd b/Master/texmf-dist/web2c/mktexupd
index 1636e683f45..a4938d96eec 100755
--- a/Master/texmf-dist/web2c/mktexupd
+++ b/Master/texmf-dist/web2c/mktexupd
@@ -3,11 +3,20 @@
#
# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
# Public domain.
-# $Id: mktexupd 18383 2010-05-20 18:31:24Z karl $
-version='$Id: mktexupd 18383 2010-05-20 18:31:24Z karl $'
+version='$Id: mktexupd 34656 2014-07-18 23:38:50Z karl $'
+
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
+
usage="Usage: $0 DIR FILE.
- Update the ls-R file with an entry for FILE in DIR."
+ Update the ls-R file with an entry for FILE in DIR.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
mt_min_args=2
mt_max_args=2
diff --git a/Master/texmf-dist/xindy/VERSION b/Master/texmf-dist/xindy/VERSION
index 437459cd94c..73462a5a134 100644
--- a/Master/texmf-dist/xindy/VERSION
+++ b/Master/texmf-dist/xindy/VERSION
@@ -1 +1 @@
-2.5.0
+2.5.1
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 745552ffd0b..088489fcb2a 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -61,13 +61,23 @@ Master/texmf-dist/web2c/texmf.cnf # from Build/.../kpathsea
(check/update other copyright years in *.pm, tlmgr*, install-tl)
Build/source/{version.ac,texk/{kpathsea,ptexenc}/configure.ac: no /dev
-5. After committing, see if formats build, to check for config file problems.
-Then rm -rf ~/.texlive`date +%Y` # the new one
-Consider new xz and wget binaries.
-Then commit new binaries (see version checks below).
-Rebuild tlpretest as above.
+5. Ensure version numbers in sources are updated; see list below.
+Then commit new binaries with tl-update-bindir.
-N. Later, when closer to release:
+6. After committing, run tex \\end to check that mktexfmt works. Run
+fmtutil-sys --all to check that all formats build, no config file
+problems. Then, so things will get redone later as another check:
+ rm -rf ~/.texlive`date +%Y` # the new one
+
+7. Check for Build-maintained updates to config files, etc.
+(and might have to merge back if Master was mistakenly updated):
+ diff -ru0 --exclude=man --exclude=info \
+ Build/source/inst/texmf-dist Master/texmf-dist
+
+8. Rebuild tlpretest as above.
+
+M.
+N. Later, when closer to release, to build ISO images:
- in cron.tl, set images_frozen=false.
- in tl-update-images, ensure V= the new YYYY and target=/.../test
- update /home/ftp/texlive/Images/test/README
@@ -104,11 +114,7 @@ After tlnet freeze:
http://puszcza.gnu.org.ua/projects/texcollection/
When binary set and docs are stable enough:
- peb, akira, takuji, khaled, taco, laurens: no commits.
Update texlive-en.tex (+ .pdf, .html), tell tldoc to translate.
- Check for Build-maintained updates to config files, etc.
- (and might have to merge back if Master was mistakenly updated):
- diff -r Build/source/inst/texmf-dist Master/texmf-dist
Remake updmap man page with help2man (and reread and update Master):
make -C Build/source/Work/texk/texlive/tl_scripts xupdmap.1
Texinfo manuals from Build to Master:
@@ -116,6 +122,7 @@ When binary set and docs are stable enough:
Man pages from Build to Master:
tl-update-man # then run make in texmf/doc/man
# and check /tmp/so.rules against man1/Makefile
+ peb, akira, takuji, khaled, taco, laurens: no commits.
Just before the final pretest (i.e., to-be-published) build:
option adjustrepo 1 in tl-update-tlnet, else install-tl-unx won't go to ctan