diff options
author | Lars Thorsen <[email protected]> | 2011-11-11 12:10:35 +0100 |
---|---|---|
committer | Lars Thorsen <[email protected]> | 2011-11-11 12:10:35 +0100 |
commit | 9151895daf12ddce320a3abe8d9d67200a86af11 (patch) | |
tree | d8ef0bf3b9c3be19f5569920793f2e3443ce9ee4 /lib/xmerl/include/xmerl.hrl | |
parent | edf830a338e78cfe88eee181b1e60a5f3f6b671b (diff) | |
parent | 5b2375ff231353c059a340d95b317d998df279fc (diff) | |
download | otp-9151895daf12ddce320a3abe8d9d67200a86af11.tar.gz otp-9151895daf12ddce320a3abe8d9d67200a86af11.tar.bz2 otp-9151895daf12ddce320a3abe8d9d67200a86af11.zip |
Merge branch 'nox/xmerl-namespace-axis/OTP-9664'
* nox/xmerl-namespace-axis/OTP-9664:
Fix bugs and add a flag to skip comments
Implement namespace axis
Add `#xmlPI` support to xmerl_xpath:write_node/1
Fix processing-instruction(name?)
Fix path filters
Support more top-level primary expressions
Accumulate comments in element nodes
Add `default_attrs` option
Allow whole documents to be returned
Track parents and namespace in `#xmlAttribute` nodes
Track parents in `#xmlPI` nodes
Set `vsn` field in `#xmlDecl` record
Fix namespace-conformance constraints
Diffstat (limited to 'lib/xmerl/include/xmerl.hrl')
-rw-r--r-- | lib/xmerl/include/xmerl.hrl | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/xmerl/include/xmerl.hrl b/lib/xmerl/include/xmerl.hrl index 7bb3f4de9b..3760a5cce0 100644 --- a/lib/xmerl/include/xmerl.hrl +++ b/lib/xmerl/include/xmerl.hrl @@ -61,10 +61,11 @@ }). %% namespace node - i.e. a {Prefix, URI} pair -%% TODO: these are not currently used?? /RC -record(xmlNsNode,{ - prefix, - uri = [] + parents = [], % [{atom(),integer()}] + pos, % integer() + prefix, % string() + uri = [] % [] | atom() }). %% XML Element @@ -103,9 +104,10 @@ %% processing instruction -record(xmlPI,{ - name, % atom() - pos, % integer() - value % IOlist() + name, % atom() + parents = [], % [{atom(),integer()}] + pos, % integer() + value % IOlist() }). -record(xmlDocument,{ @@ -154,6 +156,9 @@ declarations = [], % [{Name, Attrs}] doctype_name, doctype_DTD = internal, % internal | DTDId + comments = true, + document = false, + default_attrs = false, rules, keep_rules = false, % delete (ets) tab if false namespace_conformant = false, % true | false |