Older
-
r92
(Fixing a typo in the makingdictionaries docs) committed by acronym
- Fixing a typo in the makingdictionaries docs
Fixing a typo in the makingdictionaries docs
-
r91
(Latest doc revision) committed by acronym
- Latest doc revision
-
r90
(Final doc tweak) committed by acronym
- Final doc tweak
-
r89
(Adding rmcprofile dictionary) committed by acronym
- Adding rmcprofile dictionary
Adding rmcprofile dictionary
-
r88
(Adding an example file we can generate a dictionary from) committed by acronym
- Adding an example file we can generate a dictionary from
Adding an example file we can generate a dictionary from
-
r87
(Doc tweaks) committed by acronym
- Doc tweaks
-
r86
(Version number, default warning levels) committed by acronym
- Version number, default warning levels
Version number, default warning levels
-
r85
(Updated docs) committed by acronym
- Updated docs
-
r84
(Windows tweaks to documentation) committed by acronym
- Windows tweaks to documentation
Windows tweaks to documentation
-
r83
(Patch to deal with the lack of globbing on Windows) committed by acronym
- Patch to deal with the lack of globbing on Windows
Patch to deal with the lack of globbing on Windows
-
r82
(Stripping some MG-specific stuff out of the CASTEP dictionar...) committed by acronym
- Stripping some MG-specific stuff out of the CASTEP dictionary
Stripping some MG-specific stuff out of the CASTEP dictionary
-
r81
(Removing dictionaries which we're not shipping.) committed by acronym
- Removing dictionaries which we're not shipping.
Removing dictionaries which we're not shipping.
-
r80
(Updated, and hopefully final, documentation.) committed by acronym
- Updated, and hopefully final, documentation.
Updated, and hopefully final, documentation.
-
r79
(Checking in post-Martin docs) committed by acronym
- Checking in post-Martin docs
Checking in post-Martin docs
-
r78
(Added Martin's suggested changes.) committed by acronym
- Added Martin's suggested changes.
Added Martin's suggested changes.
-
r77
(More doc fixes, starting to incorporate Martin's suggestions) committed by acronym
- More doc fixes, starting to incorporate Martin's suggestions
More doc fixes, starting to incorporate Martin's suggestions
-
r76
(Rearranging nearly all of the docs.) committed by acronym
- Rearranging nearly all of the docs.
Rearranging nearly all of the docs.
-
r75
(Final version of docs!) committed by acronym
- Final version of docs!
-
r74
(Updated documentation, bumped version number to 1.0...) committed by acronym
- Updated documentation, bumped version number to 1.0...
Updated documentation, bumped version number to 1.0...
-
r73
(Adding PDF docs.) committed by acronym
- Adding PDF docs.
-
-
r71
(Typo in an example) committed by acronym
- Typo in an example
-
r70
(Latest doc improvements.) committed by acronym
- Latest doc improvements.
-
r69
(Adding better docs for make_dictionary + improving its help ...) committed by acronym
- Adding better docs for make_dictionary + improving its help message
Adding better docs for make_dictionary + improving its help message
-
r68
(A few niggles raised by Martin in the Summon docs) committed by acronym
- A few niggles raised by Martin in the Summon docs
A few niggles raised by Martin in the Summon docs
-
r67
(Summon documentation (and a bugfix in Summon itself)) committed by acronym
- Summon documentation (and a bugfix in Summon itself)
Summon documentation (and a bugfix in Summon itself)
-
r66
(The arguments to make_dictionary make more sense the other w...) committed by acronym
- The arguments to make_dictionary make more sense the other way round.
The arguments to make_dictionary make more sense the other way round.
-
r65
(Merge branch 'master' of git@github.com:adw/golem) committed by acronym
- Merge branch 'master' of git@github.com:adw/golem
Merge branch 'master' of git@github.com:adw/golem
-
r64
(Updating documentation/pydoc) committed by acronym
- Updating documentation/pydoc
Updating documentation/pydoc
-
r63
(Tidying up pydoc to make it work better with Sphinx) committed by acronym
- Tidying up pydoc to make it work better with Sphinx
Tidying up pydoc to make it work better with Sphinx
-
r62
(Working on make_dictionary docs) committed by acronym
- Working on make_dictionary docs
Working on make_dictionary docs
-
r61
(More docs...) committed by acronym
- More docs...
-
r60
(Updated docs/docstrings) committed by acronym
- Updated docs/docstrings
-
r59
(Adding autodoc to sphinx.conf) committed by acronym
- Adding autodoc to sphinx.conf
Adding autodoc to sphinx.conf
-
r58
(Moving api docs into the right file) committed by acronym
- Moving api docs into the right file
Moving api docs into the right file
-
r57
(Adding API docs.) committed by acronym
- Adding API docs.
-
r56
(Adding more docs) committed by acronym
- Adding more docs
-
r55
(Goodbye golem.py.) committed by acronym
- Goodbye golem.py.
-
r54
(moving golem.py to __init__.py!) committed by acronym
- moving golem.py to __init__.py!
moving golem.py to __init__.py!
-
r53
(Adding start of doco in Sphinx format) committed by acronym
- Adding start of doco in Sphinx format
Adding start of doco in Sphinx format
-
r52
(Adding standoff golem dict + support for it) committed by acronym
- Adding standoff golem dict + support for it
Adding standoff golem dict + support for it
-
r51
(Golem work [2/3] - template deferral across dictionaries
We...) committed by acronym
- Golem work [2/3] - template deferral across dictionaries
We add an additional, optional, attribute to the golem:template element.
This attribute is "namespace" and specifies the namespace of the
dictionary in which the named template can be found.
Practically, this means that you can write a slimmed-down dictionary,
where instead of doing:
<golem:template call="array" role="getvalue"
binding="pygolem_serialization" />
and including an array entry in your dictionary, you could do:
<golem:template namespace="http://cmlcomp.org/golem/"
call="array" role="getvalue" binding="pygolem_serialization" />
and defer to the template which lives in the dictionary with that
namespace.
This turns out to be a *very* small edit to golem.py.
We also add a dictionary ("golemDict.xml", with the namespace
http://cmlcomp.org/golem/) which contains all the commonly-used golem
internal entries, to which we might commonly want to refer.
-------------------------------- golem/golem.py
--------------------------------
index 9dbef64..f7452b2 100644
@@ -849,6 +849,8 @@ At present, this is only used by the dictionary
generator
# you *have* to get role first, because it's only then
# we can macro-substitute in the other template...
call = t.get("call")
+ ns = t.get("namespace")
+ if not ns: ns = self.namespace
binding = t.get("binding")
self.txml[(role, binding)] = t
input = t.get("input")
@@ -858,7 +860,7 @@ At present, this is only used by the dictionary
generator
self.sort_out_binding(role, binding, input,
template)
else:
# Note that we need to fill in the blanks later.
- self.defer[(role, binding, input)] = "{%s}%s" %
(self.namespace, call)
+ self.defer[(role, binding, input)] = "{%s}%s" %
(ns, call)
except IndexError:
pass
Golem work [2/3] - template deferral across dictionaries
We add an additional, optional, attribute to the golem:template element.
This attribute is "namespace" and specifies the namespace of the
dictionary in which the named template can be found.
Practically, this means that you can write a slimmed-down dictionary,
where instead of doing:
<golem:template call="array" role="getvalue"
binding="pygolem_serialization" />
and including an array entry in your dictionary, you could do:
<golem:template namespace="http://cmlcomp.org/golem/"
call="array" role="getvalue" binding="pygolem_serialization" />
and defer to the template which lives in the dictionary with that
namespace.
This turns out to be a *very* small edit to golem.py.
We also add a dictionary ("golemDict.xml", with the namespace
http://cmlcomp.org/golem/) which contains all the commonly-used golem
internal entries, to which we might commonly want to refer.
-------------------------------- golem/golem.py
--------------------------------
index 9dbef64..f7452b2 100644
@@ -849,6 +849,8 @@ At present, this is only used by the dictionary
generator
# you *have* to get role first, because it's only then
# we can macro-substitute in the other template...
call = t.get("call")
+ ns = t.get("namespace")
+ if not ns: ns = self.namespace
binding = t.get("binding")
self.txml[(role, binding)] = t
input = t.get("input")
@@ -858,7 +860,7 @@ At present, this is only used by the dictionary
generator
self.sort_out_binding(role, binding, input,
template)
else:
# Note that we need to fill in the blanks later.
- self.defer[(role, binding, input)] = "{%s}%s" %
(self.namespace, call)
+ self.defer[(role, binding, input)] = "{%s}%s" %
(ns, call)
except IndexError:
pass
-
r50
(Removing unwanted debug message
) committed by acronym
- Removing unwanted debug message
Removing unwanted debug message
-
r49
(Changing simplejson dependencies
) committed by acronym
- Changing simplejson dependencies
Changing simplejson dependencies
|