sdh11
diff --git a/‎README.rst‎
Lines changed: 34 additions & 8 deletions b/‎README.rst‎
Lines changed: 34 additions & 8 deletions
diff --git a/‎pythontex/README‎
Lines changed: 67 additions & 0 deletions b/‎pythontex/README‎
Lines changed: 67 additions & 0 deletions
diff --git a/‎pythontex/README.rst‎
Lines changed: 0 additions & 23 deletions b/‎pythontex/README.rst‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎pythontex/depythontex.py‎
Lines changed: 18 additions & 0 deletions b/‎pythontex/depythontex.py‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎pythontex/depythontex2.py‎
Lines changed: 18 additions & 15 deletions b/‎pythontex/depythontex2.py‎
Lines changed: 18 additions & 15 deletions
diff --git a/‎pythontex/depythontex3.py‎
Lines changed: 18 additions & 15 deletions b/‎pythontex/depythontex3.py‎
Lines changed: 18 additions & 15 deletions
diff --git a/‎pythontex/pythontex.bat‎
Lines changed: 2 additions & 0 deletions b/‎pythontex/pythontex.bat‎
Lines changed: 2 additions & 0 deletions
@@ -9,7 +9,7 @@
 
 :Author: Geoffrey Poore
 
-:Version: 0.11beta
+:Version: 0.11
 
 :License:  LPPL_ (LaTeX code) and `BSD 3-Clause`_ (Python code)
 
@@ -20,25 +20,51 @@
 
 PythonTeX provides fast, user-friendly access to Python from within LaTeX.  It allows Python code entered within a LaTeX document to be executed, and the results to be included within the original document.  It also provides syntax highlighting for code within LaTeX documents via the Pygments syntax highlighter.
 
-See ``pythontex.pdf`` for installation instructions.  See ``pythontex_gallery.pdf`` for examples of what is possible with PythonTeX.
+See ``pythontex.pdf`` for detailed installation instructions, or use the installation script for TeX Live.  See ``pythontex_quickstart.pdf`` to get started, and ``pythontex_gallery.pdf`` for examples of what is possible with PythonTeX.
 
 The ``depythontex`` utility creates a copy of a PythonTeX document in which all Python code has been replaced by its output.  This plain LaTeX document is more suitable for journal submission, sharing, or conversion to other document formats.  See ``pythontex_gallery.html`` and the accompanying conversion script for an example of a PythonTeX document that was converted to HTML via ``depythontex`` and `Pandoc <http://johnmacfarlane.net/pandoc/>`_.
 
 
-Current status (2013/04/03)
----------------------------
+Current status
+--------------
 
-A thorough review of all current and planned features has just been completed.  This clears the way for a full release as soon as a few modifications are made .  The goal is to freeze all syntax and command names after the full release, so ensuring their compatibility with planned features is important.
+Immediate development goals:
 
-Upcoming development will focus on refactoring.  This has two goals:
+* Create a simple system for adding support for additional programming languages beyond Python.  Add basic support for at least one additional language as proof-of-concept.
+* Improve treatment of stderr, so that UserWarnings generated by packages may be processed correctly.
 
-* Better support for macro programming with PythonTeX.
-* Creating a simple system for adding support for additional programming languages beyond Python.
+
+Upcoming objectives:
+
+* Add better support for macro programming with PythonTeX.
 
 
 Version History
 ---------------
 
+v0.11 (2013/04/21)
+
+* As the first non-beta release, this version adds several features and introduces several changes.  You should read these release notes carefully, since some changes are not backwards-compatible.  Changes are based on a thorough review of all current and planned features.  PythonTeX's capabilities have already grown beyond what was originally intended, and a long list of features still remains to be implemented.  As a result, some changes are needed to ensure consistent syntax and naming in the future.  Insofar as possible, all command names and syntax will be frozen after this release.
+* Added the ``pythontex.py`` and ``depythontex.py`` wrapper scripts.  When run, these detect the current version of Python and import the correct PythonTeX code.  It is still possible to run ``pythontex*.py`` and ``depythontex*.py`` directly, but the new wrapper scripts should be used instead for simplicity.  There is now only a single ``pythontex_utils.py``, which works with both Python 2 and Python 3.  
+* Added the ``beta`` package option.  This makes the current version behave like v0.11beta, for compatibility.  This option is temporary and will probably only be retained for a few releases.
+* Backward-incompatible changes (require the ``beta`` option to restore old behavior)
+
+    - The ``pyverb`` environment has been renamed ``pyverbatim``.  The old name was intended to be concise, but promoted confusion with LaTeX's ``\verb`` macro.
+    - For ``\printpythontex``, ``\stdoutpythontex``, and ``\stderrpythontex``, the modes ``inlineverb`` and ``v`` have been replaced by ``verb``, and the old mode ``verb`` has been replaced by ``verbatim``.  This brings naming conventions in line with standard LaTeX ``\verb`` and ``verbatim``, avoiding a source of potential confusion.
+    - The ``\setpythontexpyglexer``, ``\setpythontexpygopt``, and ``\setpygmentspygopt`` commands now take an optional argument and a mandatory argument, rather than two mandatory arguments.  This creates better uniformity among current and planned settings macros.
+    - The ``\setpythontexformatter`` and ``\setpygmentsformatter`` commands have been replaced by the ``\setpythontexprettyprinter`` and ``\setpygmentsprettyprinter`` commands.  This anticipates possible upcoming features.  It also avoids potential confusion with Pygments's formatters and the utilities class's ``formatter()`` method.
+
+* Deprecated (still work, but raise warnings; after a few releases, they will raise errors instead, and after that eventually be removed)
+
+    - The ``rerun`` setting ``all`` was renamed ``always``, in preparation for upcoming features.
+    - The ``stderr`` option is replaced by ``makestderr``.  The ``print``/``stdout`` option is replaced by ``debug``.  These are intended to prevent confusion with future features.
+    - The ``fixlr`` option is deprecated.  It was originally introduced to deal with some of SymPy's LaTeX formatting, which has since changed.
+    - The utilities class method ``init_sympy_latex()`` is deprecated.  The ``sympy_latex()`` and ``set_sympy_latex()`` methods now automatically initialize themselves on first use.
+
+* Added ``autostdout`` package option and ``\setpythontexautostdout``, to complement ``autoprint``.  Added ``prettyprinter`` and ``prettyprintinline`` package options to complement new settings commands.
+* Added quickstart guide.
+* Installer now installs gallery and quickstart files, if present.
+
 
 v0.11beta (2013/02/17)
 
 
@@ -0,0 +1,67 @@
+===================================================================
+                  The PythonTeX Package
+===================================================================
+
+:Author:  Geoffrey Poore
+:Version:  0.11 (2013/04/21)
+:License:  LPPL v1.3 or later (LaTeX code) and BSD 3-Clause (Python code)
+:Development:  https://github.com/gpoore/pythontex
+:Requirements:  Python 2.7 or 3.2+; Pygments
+
+
+The PythonTeX package allows you to enter Python code within a LaTeX 
+document, execute the code, and access its output in the original document.
+
+PythonTeX provides fast, user-friendly access to Python from within LaTeX.
+Python code is only executed when it has been modified, or when it meets 
+user-specified criteria.  Code may be divided into user-defined sessions,
+which automatically run in parallel.  Errors and warnings are synchronized 
+with the LaTeX document, so that they refer to the document's line numbers.  
+External dependencies can be tracked, so that code is re-executed when the 
+data it depends on is modified.  PythonTeX also provides syntax highlighting 
+for code in LaTeX documents via the Pygments syntax highlighter.
+
+PythonTeX includes a "depythontex" utility that creates a copy of a document
+in which all Python code has been replaced by its output.  This can be
+convenient for journal submissions, sharing documents, and converting to 
+other formats.
+
+Consult pythontex_quickstart.pdf and pythontex_gallery.pdf to get
+started and for examples of what PythonTeX can do.
+
+Compiling a PythonTeX document involves three steps:
+
+1. Run latex (all Python code is saved to an auxiliary file)
+2. Run pythontex.py (all code is executed)
+3. Run latex again (Python output is inputted)
+
+See the main documentation in pythontex.pdf for detailed installation 
+instructions.  An installation script is provided for TeX Live.  Files 
+should be installed in the directories indicated below.  In summary, 
+all files must be installed, and symlinks or launching wrappers should be 
+created for pythontex.py and depythontex.py.
+
+* /doc/latex/pythontex/
+
+  - pythontex.pdf
+  - README
+  - pythontex_quickstart.tex
+  - pythontex_quickstart.pdf
+  - pythontex_gallery.tex
+  - pythontex_gallery.pdf
+
+* /scripts/pythontex/
+
+  - pythontex.py, pythontex2.py, and pythontex3.py
+  - pythontex_types2.py and pythontex_types3.py
+  - pythontex_utils.py
+  - depythontex.py, depythontex2.py, and depythontex3.py
+
+* /source/latex/pythontex/
+
+  - pythontex.dtx
+  - pythontex.ins
+
+* /tex/latex/pythontex/
+
+  - pythontex.sty
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+'''
+This is the PythonTeX wrapper script.  It automatically detects the version
+of Python, and then imports the correct code from depythontex2.py or 
+depythontex3.py.
+
+Copyright (c) 2013, Geoffrey M. Poore
+All rights reserved.
+Licensed under the BSD 3-Clause License:
+    http://www.opensource.org/licenses/BSD-3-Clause
+
+'''
+
+import sys
+if sys.version_info[0] == 2:
+    import depythontex2 as depythontex
+elif sys.version_info[0] == 3:
+    import depythontex3 as depythontex
@@ -73,7 +73,7 @@
 
 # Script parameters
 # Version
-version = 'v0.11beta'
+version = 'v0.11'
 
 
 
@@ -143,7 +143,7 @@ def replace_code_cmd(name, arglist, linenum, code_replacement,
 
     # We only consider two possible modes of typesetting, verbatim and inline
     # verbatim
-    if code_replacement_mode == 'verb':
+    if code_replacement_mode == 'verbatim':
         # Sometimes we must replace a command with an environment, for 
         # example, for `\inputpygments`
 
@@ -223,7 +223,7 @@ def replace_code_env(name, arglist, linenum, code_replacement,
     
     '''
     # Currently, there is no need to test for code_replacement_mode, because
-    # this function is only ever called if the mode is 'verb'.  That may
+    # this function is only ever called if the mode is 'verbatim'.  That may
     # change in the future, but it seems unlikely that code entered in an
     # environment would end up typeset with a command.
     if listing == 'verbatim':
@@ -309,7 +309,7 @@ def replace_print_cmd(name, arglist, linenum,
         (replacement, after) (tuple, of str)
     
     '''    
-    if print_replacement_mode in ('inlineverb', 'v'):
+    if print_replacement_mode == 'verb':
         if print_replacement.count('\n') > 1:
             print('* DePythonTeX error:')
             print('    Attempt to print multiple lines of content near line ' + str(linenum))
@@ -321,7 +321,7 @@ def replace_print_cmd(name, arglist, linenum,
             if delim not in print_replacement:
                 break
         print_replacement = r'\verb' + delim + print_replacement + delim
-    elif print_replacement_mode in ('verb', ):
+    elif print_replacement_mode == 'verbatim':
         if bool(match('\s*?\n', after)):
             # Usually, we would end the verbatim environment with a newline.
             # This is fine if there is content in `after` before the next 
@@ -496,7 +496,7 @@ def replace_print_env(name, arglist, linenum,
     since there are currently no environments that use them; they are only
     used by `\printpythontex`, which is a command.
     ''' 
-    if print_replacement_mode in ('inlineverb', 'v'):
+    if print_replacement_mode == 'verb':
         if print_replacement.count('\n') > 1:
             print('* DePythonTeX error:')
             print('    Attempt to print multiple lines of content near line ' + str(linenum))
@@ -517,7 +517,7 @@ def replace_print_env(name, arglist, linenum,
             # line, where they would have been discarded.
             if not bool(match('\s*$', after)):
                 after = sub('^\s*?\n\s*', '', after)
-    elif print_replacement_mode in ('verb', ):
+    elif print_replacement_mode == 'verbatim':
         if bool(match('\s*?\n', after)):
             # Usually, we would end the verbatim environment with a newline.
             # This is fine if there is content in `after` before the next 
@@ -659,13 +659,6 @@ def replace_print_env(name, arglist, linenum,
 
 
 
-# Let the user know things have started
-print('This is DePythonTeX {0}'.format(version))
-sys.stdout.flush()
-
-
-
-
 # Deal with argv
 # Parse argv
 parser = argparse.ArgumentParser()
@@ -715,6 +708,16 @@ def replace_print_env(name, arglist, linenum,
 elif args.listing == 'pythontex':
     preamble_additions.append('\\usepackage{pythontex}')
 
+
+
+
+# Let the user know things have started
+print('This is DePythonTeX {0}'.format(version))
+sys.stdout.flush()
+
+
+
+
 # Make sure we have a valid texfile
 texfile_name = os.path.expanduser(os.path.normcase(args.TEXNAME))
 if not os.path.isfile(texfile_name):
@@ -978,7 +981,7 @@ def replace_print_env(name, arglist, linenum,
                 f.close()
                 if typeset == 'c':
                     code_replacement_mode = mode
-                    if depy_type == 'cmd' and code_replacement_mode != 'verb':
+                    if depy_type == 'cmd' and code_replacement_mode != 'verbatim':
                         # Usually, code from commands is typeset with commands
                         # and code from environments is typeset in 
                         # environments.  The except is code from commands 
 
@@ -73,7 +73,7 @@
 
 # Script parameters
 # Version
-version = 'v0.11beta'
+version = 'v0.11'
 
 
 
@@ -143,7 +143,7 @@ def replace_code_cmd(name, arglist, linenum, code_replacement,
 
     # We only consider two possible modes of typesetting, verbatim and inline
     # verbatim
-    if code_replacement_mode == 'verb':
+    if code_replacement_mode == 'verbatim':
         # Sometimes we must replace a command with an environment, for 
         # example, for `\inputpygments`
 
@@ -223,7 +223,7 @@ def replace_code_env(name, arglist, linenum, code_replacement,
     
     '''
     # Currently, there is no need to test for code_replacement_mode, because
-    # this function is only ever called if the mode is 'verb'.  That may
+    # this function is only ever called if the mode is 'verbatim'.  That may
     # change in the future, but it seems unlikely that code entered in an
     # environment would end up typeset with a command.
     if listing == 'verbatim':
@@ -309,7 +309,7 @@ def replace_print_cmd(name, arglist, linenum,
         (replacement, after) (tuple, of str)
     
     '''    
-    if print_replacement_mode in ('inlineverb', 'v'):
+    if print_replacement_mode == 'verb':
         if print_replacement.count('\n') > 1:
             print('* DePythonTeX error:')
             print('    Attempt to print multiple lines of content near line ' + str(linenum))
@@ -321,7 +321,7 @@ def replace_print_cmd(name, arglist, linenum,
             if delim not in print_replacement:
                 break
         print_replacement = r'\verb' + delim + print_replacement + delim
-    elif print_replacement_mode in ('verb', ):
+    elif print_replacement_mode == 'verbatim':
         if bool(match('\s*?\n', after)):
             # Usually, we would end the verbatim environment with a newline.
             # This is fine if there is content in `after` before the next 
@@ -496,7 +496,7 @@ def replace_print_env(name, arglist, linenum,
     since there are currently no environments that use them; they are only
     used by `\printpythontex`, which is a command.
     ''' 
-    if print_replacement_mode in ('inlineverb', 'v'):
+    if print_replacement_mode == 'verb':
         if print_replacement.count('\n') > 1:
             print('* DePythonTeX error:')
             print('    Attempt to print multiple lines of content near line ' + str(linenum))
@@ -517,7 +517,7 @@ def replace_print_env(name, arglist, linenum,
             # line, where they would have been discarded.
             if not bool(match('\s*$', after)):
                 after = sub('^\s*?\n\s*', '', after)
-    elif print_replacement_mode in ('verb', ):
+    elif print_replacement_mode == 'verbatim':
         if bool(match('\s*?\n', after)):
             # Usually, we would end the verbatim environment with a newline.
             # This is fine if there is content in `after` before the next 
@@ -659,13 +659,6 @@ def replace_print_env(name, arglist, linenum,
 
 
 
-# Let the user know things have started
-print('This is DePythonTeX {0}'.format(version))
-sys.stdout.flush()
-
-
-
-
 # Deal with argv
 # Parse argv
 parser = argparse.ArgumentParser()
@@ -715,6 +708,16 @@ def replace_print_env(name, arglist, linenum,
 elif args.listing == 'pythontex':
     preamble_additions.append('\\usepackage{pythontex}')
 
+
+
+
+# Let the user know things have started
+print('This is DePythonTeX {0}'.format(version))
+sys.stdout.flush()
+
+
+
+
 # Make sure we have a valid texfile
 texfile_name = os.path.expanduser(os.path.normcase(args.TEXNAME))
 if not os.path.isfile(texfile_name):
@@ -978,7 +981,7 @@ def replace_print_env(name, arglist, linenum,
                 f.close()
                 if typeset == 'c':
                     code_replacement_mode = mode
-                    if depy_type == 'cmd' and code_replacement_mode != 'verb':
+                    if depy_type == 'cmd' and code_replacement_mode != 'verbatim':
                         # Usually, code from commands is typeset with commands
                         # and code from environments is typeset in 
                         # environments.  The except is code from commands 
 
@@ -0,0 +1,2 @@
+@echo off
+pythontex.py %*