diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 00:27:11 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 00:27:11 +0100 |
| commit | 253492406f04657fe71e6c0c6603496241280478 (patch) | |
| tree | 5a9c1b785a5559025ff7d26bf9ed880ce98ff0ce /testdata/xmlparser/book_domain.oxm | |
| parent | 551b7be64f207845cb05b8ec593f9bf2d7f0c940 (diff) | |
| parent | b708dd4cce828c1089a18fefcc22804f7cdad908 (diff) | |
Merge branch 'master' into astoecke_parser_stack_new
Conflicts:
application/CMakeLists.txt
application/src/core/parser/stack/DocumentHandler.hpp
application/src/core/parser/stack/DomainHandler.hpp
application/src/core/parser/stack/ImportIncludeHandler.hpp
Diffstat (limited to 'testdata/xmlparser/book_domain.oxm')
| -rw-r--r-- | testdata/xmlparser/book_domain.oxm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/testdata/xmlparser/book_domain.oxm b/testdata/xmlparser/book_domain.oxm index 8b46460..c86d4e3 100644 --- a/testdata/xmlparser/book_domain.oxm +++ b/testdata/xmlparser/book_domain.oxm @@ -33,11 +33,11 @@ effectively use forward declarations here. So the resolve() process may only be started _after_ all delcarations are read. --> - <child ref="book.chapter"/> + <childRef ref="book.chapter"/> <!-- The dot notation as path separator might be changed but I think it to be intuitive. If we want a more CSS like style we can use whitespaces here. --> - <child ref="book.paragraph"/> + <childRef ref="book.paragraph"/> </field> </struct> <struct name="chapter"> @@ -49,8 +49,8 @@ <!-- implicitly: <field name="" isSubtree="false" optional="false"> --> - <child ref="book.section"/> - <child ref="book.paragraph"/> + <childRef ref="book.section"/> + <childRef ref="book.paragraph"/> </field> </struct> <struct name="section"> @@ -62,8 +62,8 @@ <!-- implicitly: <field name="" isSubtree="false" optional="false"> --> - <child ref="book.subsection"/> - <child ref="book.paragraph"/> + <childRef ref="book.subsection"/> + <childRef ref="book.paragraph"/> </field> </struct> <struct name="subsection"> @@ -75,7 +75,7 @@ <!-- implicitly: <field name="" isSubtree="false" optional="false"> --> - <child ref="book.paragraph"/> + <childRef ref="book.paragraph"/> </field> </struct> <struct name="paragraph" transparent="true" role="paragraph"> @@ -87,7 +87,7 @@ <!-- implicitly: <field name="" type="TREE" optional="false"> --> - <child ref="book.text"/> + <childRef ref="book.text"/> </field> </struct> <struct name="text" transparent="true" role="text"> |