Improve DocBook support.

[gpl/argeo-suite.git] / publishing / org.argeo.publishing.ui / src / org / argeo / docbook / ui / docbook.cnd

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/docbook.cnd b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/docbook.cnd
index f22288def1de4a757143a8c03ac195901edc5b0b..3c44533309ca75130bbf0e11e8657f3f61a784fc 100644 (file)
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/docbook.cnd
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/docbook.cnd
@@ -22,7 +22,7 @@ mixin
 mixin
  + dbk:phrase (dbk:phrase) = dbk:phrase *
  + dbk:replaceable (dbk:replaceable) = dbk:replaceable *
- + jcr:xmltext (dbk:xmltext) = dbk:xmltext *
+ + jcr:xmltext (jcrx:xmltext) = jcrx:xmltext *
 
 [argeodbk:markupInlines]
 mixin
@@ -106,7 +106,7 @@ orderable
 
 [dbk:alt] > argeodbk:base
  + dbk:inlinemediaobject (dbk:inlinemediaobject) = dbk:inlinemediaobject *
- + jcr:xmltext (dbk:xmltext) = dbk:xmltext *
+ + jcr:xmltext (jcrx:xmltext) = jcrx:xmltext *
 
 [dbk:anchor] > argeodbk:base
 
@@ -158,7 +158,7 @@ orderable
  + dbk:annotation (dbk:annotation) = dbk:annotation *
  + dbk:mediaobject (dbk:mediaobject) = dbk:mediaobject *
  + dbk:remark (dbk:remark) = dbk:remark *
- + jcr:xmltext (dbk:xmltext) = dbk:xmltext *
+ + jcr:xmltext (jcrx:xmltext) = jcrx:xmltext *
  - dbk:class (String) 
  - dbk:lang (String) 
  - dbk:onclick (String) 
@@ -255,6 +255,7 @@ orderable
  + dbk:orgname (dbk:orgname) = dbk:orgname *
  + dbk:subtitle (dbk:subtitle) = dbk:subtitle *
  + dbk:title (dbk:title) = dbk:title *
+ + * (nt:base) = nt:unstructured *
 
 [dbk:inlinemediaobject] > argeodbk:base, argeodbk:linkingAttributes
  + dbk:alt (dbk:alt) = dbk:alt
@@ -519,9 +520,6 @@ orderable
  + dbk:info (dbk:info) = dbk:info
  + dbk:videodata (dbk:videodata) = dbk:videodata
 
-[dbk:xmltext] > nt:base
- - jcr:xmlcharacters (String) 
-
 [dbk:xref] > argeodbk:base, argeodbk:linkingAttributes
  - dbk:endterm (Reference) 
  - dbk:xrefstyle (String)