sync config scripts and files from Build to Master

git-svn-id: svn://tug.org/texlive/trunk@36791 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 24 insertions, 4 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:[]{}