New minor release 4.5.12

dirkroorda · Feb 21, 2016 · 10ca778 · 10ca778
1 parent dda5418
commit 10ca778
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 13 deletions.
diff --git a/dist/laf-fabric-4.5.11.tar.gz b/dist/laf-fabric-4.5.11.tar.gz
diff --git a/dist/laf-fabric-4.5.12.tar.gz b/dist/laf-fabric-4.5.12.tar.gz
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,7 @@
 project = u'LAF Fabric'
 copyright = u'2013, Dirk Roorda'
 version = '4.5'
-release = '4.5.11'
+release = '4.5.12'
 exclude_patterns = ['_build']
 add_function_parentheses = True
 add_module_names = False

diff --git a/docs/conf.py.bck b/docs/conf.py.bck
@@ -25,7 +25,7 @@ master_doc = 'index'
 project = u'LAF Fabric'
 copyright = u'2013, Dirk Roorda'
 version = '4.5'
-release = '4.5.10'
+release = '4.5.11'
 exclude_patterns = ['_build']
 add_function_parentheses = True
 add_module_names = False

diff --git a/docs/texts/ETCBC-reference.rst b/docs/texts/ETCBC-reference.rst
@@ -110,27 +110,27 @@ Yields `None` if there is no such verse.::
 This yields a dictionary of all formats that the ``T`` API is capable to deliver.
 The keys are acronymns for the formats, the values are tuples
 ``(desc, method)``
-where ``desc`` is a short description of the format, and ``method`` is a Python function that delivers that representation given a single word node.::
+where ``desc`` is a short description of the format, and ``method`` is a Python function that delivers that representation given a single word node.:
 
     T.words(word_nodes, fmt='ha')
 
-Give the plain text belongin to a series of words in format ``fmt``.
+Give the plain text belonging to a series of words in format ``fmt``.
 Default format is ``ha``, i.e. fully pointed Hebrew Unicode, where ketivs have been replaced by 
 fully pointed qeres.
 The ``word_nodes`` can be any iterable of nodes carrying ``otype = 'word'``.
-They do not have to correspond to consecutive words in the bible.::
+They do not have to correspond to consecutive words in the bible.:
 
     T.verse(book, chapter, verse, fmt='ha', html=True, verse_label=True, format_label=True)
 
 Give the plain text of the indicated verse in format ``fmt``. 
 You can choose wether to include a verse label (like ``Genesis 3:7``) and a format label
 (like ``hebrew accent``).
 If ``html`` is ``True`` then the result is formatted as a html table, with the right style characteristics.
-You can still tweak the styles a bit, see the function ``T.style()`` later on.::
+You can still tweak the styles a bit, see the function ``T.style()`` later on.:
 
     T.whole(fmt='ha', verse_labels=False)
 
-Give the plain text of the whole Bible in format ``fmt``.::
+Give the plain text of the whole Bible in format ``fmt``.:
 
     T.style(params=None, show_params=False)
 

diff --git a/docs/texts/release-notes.rst b/docs/texts/release-notes.rst
@@ -1,5 +1,10 @@
 Release Notes
 #############
+4.5.12
+==========
+Small fixes: The new T API needs to load the annox ``lexicon``. Now this will be done without the
+user having to bother about it.
+
 4.5.11
 ==========
 Higher level text producing functions in a new ETCBC API element: ``T`` (texts).

diff --git a/emdros2laf/settings.py b/emdros2laf/settings.py
@@ -7,7 +7,7 @@
 import argparse
 
 NAME = 'LAF-Fabric'
-VERSION = '4.5.11'
+VERSION = '4.5.12'
 APIREF = 'http://laf-fabric.readthedocs.org/en/latest/texts/API-reference.html'
 DEFAULT_DATA_DIR = 'laf-fabric-data'
 MAIN_CFG = 'laf-fabric.cfg'

diff --git a/etcbc/text.py b/etcbc/text.py
@@ -14,7 +14,7 @@ def __init__(self, lafapi):
             lex_utf8
             phono phono_sep
             book chapter verse
-''', '')}, add=True, verbose='INFO')
+''', '')}, annox='lexicon', add=True, verbose='INFO')
         self._verses = lafapi.data_items['zV00(verses)']
         self.lafapi = lafapi
         self.env = lafapi.names.env

diff --git a/laf/fabric.py b/laf/fabric.py
@@ -405,9 +405,10 @@ def load(self, source, annox, task, load_spec, add=False, compile_main=False, co
         self.lafapi.stamp.set_verbose(verbose)
         return self.api
 
-    def load_again(self, load_spec, add=False, compile_main=False, compile_annox=False, verbose='NORMAL'):
+    def load_again(self, load_spec, annox=None, add=False, compile_main=False, compile_annox=False, verbose='NORMAL'):
         env = self.lafapi.names.env
-        x = self.load(env['source'], env['annox'], env['task'], load_spec, add, compile_main=compile_main, compile_annox=compile_annox, verbose=verbose, time_reset=False)
+        if annox == None: annox = env['annox']
+        x = self.load(env['source'], annox, env['task'], load_spec, add, compile_main=compile_main, compile_annox=compile_annox, verbose=verbose, time_reset=False)
         return x
 
     def resolve_feature(self, kind, feature_given):

diff --git a/laf/settings.py b/laf/settings.py
@@ -3,7 +3,7 @@
 from .timestamp import Timestamp
 
 NAME = 'LAF-Fabric'
-VERSION = '4.5.11'
+VERSION = '4.5.12'
 APIREF = 'http://laf-fabric.readthedocs.org/en/latest/texts/API-reference.html'
 FEATDOC = 'https://shebanq.ancient-data.org/static/docs/featuredoc/texts/welcome.html'
 MAIN_CFG = 'laf-fabric.cfg'

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     package_data = {
         'emdros2laf': ['templates/*', 'xml/*'],
     },
-    version='4.5.11',
+    version='4.5.12',
     description='''Processor for Linguistic Annotation Framework ISO 24612:2012), applied to Biblical Hebrew''',
     author='Dirk Roorda',
     author_email='shebanq@ancient-data.org',