pythontex (21jul16)

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

4 files changed, 22 insertions, 18 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 3f55a4ac815..e2b97a40fa8 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2016-07-20  Karl Berry  <karl@tug.org>
+
+	* scripts.lst: update scripts.lst
+
 2016-04-10  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (texmf_other_scripts): remove m-tx and pmx2pdf.
diff --git a/Build/source/texk/texlive/linked_scripts/pythontex/depythontex.py b/Build/source/texk/texlive/linked_scripts/pythontex/depythontex.py
index 2aae645084f..30256c6d1c3 100755
--- a/Build/source/texk/texlive/linked_scripts/pythontex/depythontex.py
+++ b/Build/source/texk/texlive/linked_scripts/pythontex/depythontex.py
@@ -3,13 +3,13 @@
 
 '''
 This is the depythontex wrapper script.  It automatically detects the version
-of Python, and then imports the correct code from depythontex2.py or 
-depythontex3.py.  It is intended for use with the default Python installation 
-on your system.  If you wish to use a different version of Python, you could 
+of Python, and then imports the correct code from depythontex2.py or
+depythontex3.py.  It is intended for use with the default Python installation
+on your system.  If you wish to use a different version of Python, you could
 launch depythontex2.py or depythontex3.py directly.  The version of Python
 does not matter for depythontex, since no code is executed.
 
-Copyright (c) 2013-2014, Geoffrey M. Poore
+Copyright (c) 2013-2016, Geoffrey M. Poore
 All rights reserved.
 Licensed under the BSD 3-Clause License:
     http://www.opensource.org/licenses/BSD-3-Clause
diff --git a/Build/source/texk/texlive/linked_scripts/pythontex/pythontex.py b/Build/source/texk/texlive/linked_scripts/pythontex/pythontex.py
index 68814f54884..0c6e5c70bb1 100755
--- a/Build/source/texk/texlive/linked_scripts/pythontex/pythontex.py
+++ b/Build/source/texk/texlive/linked_scripts/pythontex/pythontex.py
@@ -3,20 +3,20 @@
 
 '''
 This is the PythonTeX wrapper script.  It automatically detects the version
-of Python, and then imports the correct code from pythontex2.py or 
-pythontex3.py.  It is intended for use with the default Python installation 
-on your system.  If you wish to use a different version of Python, you could 
-launch pythontex2.py or pythontex3.py directly.  You should also consider the 
+of Python, and then imports the correct code from pythontex2.py or
+pythontex3.py.  It is intended for use with the default Python installation
+on your system.  If you wish to use a different version of Python, you could
+launch pythontex2.py or pythontex3.py directly.  You should also consider the
 command-line option `--interpreter`.  This allows you to specify the command
-that is actually used to execute the code from your LaTeX documents.  Except 
-for Python console content, it doesn't matter which version of Python is used 
+that is actually used to execute the code from your LaTeX documents.  Except
+for Python console content, it doesn't matter which version of Python is used
 to launch pythontex.py; pythontex.py just manages the execution of code from
-your LaTeX document.  The interpreter setting is what determines the version 
+your LaTeX document.  The interpreter setting is what determines the version
 under which your code is actually executed.
 
 Licensed under the BSD 3-Clause License:
 
-Copyright (c) 2012-2014, Geoffrey M. Poore
+Copyright (c) 2012-2016, Geoffrey M. Poore
 
 All rights reserved.
 
@@ -55,8 +55,8 @@ elif sys.version_info.major == 3:
         import pythontex3 as pythontex
     else:
         sys.exit('PythonTeX require Python 3.2+; you are using 3.{0}'.format(sys.version_info.minor))
- 
-# The "if" statement is needed for multiprocessing under Windows; see the 
+
+# The "if" statement is needed for multiprocessing under Windows; see the
 # multiprocessing documentation.
 if __name__ == '__main__':
     pythontex.main()
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 3400035e48a..ddefd2433d4 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -6929,10 +6929,10 @@ specifies to be disabled, and finally appending the local file.
 
 (Historical note: The formerly supported C<updmap-local.cfg> and
 C<fmtutil-local.cnf> are no longer read, since C<updmap> and C<fmtutil>
-now reads and supports multiple configuration files.  Thus, local
-additions can and should be put into an C<updmap.cfg>
-resp. C<fmtutil.cnf> file in C<TEXMFLOCAL>.  The C<generate updmap> and
-C<generate fmtutil> actions no longer exist.)
+now reads and supports multiple configuration files.  Thus,
+local additions can and should be put into an C<updmap.cfg> of C<fmtutil.cnf>
+file in C<TEXMFLOCAL>.  The C<generate updmap> and C<generate fmtutil> actions
+no longer exist.)
 
 Local files specify entries to be disabled with a comment line, namely
 one of these: