diff --git a/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl b/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl index b198b6dc..0d8ed521 100644 --- a/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl +++ b/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl @@ -9,6 +9,9 @@ version="1.0"> + + +
+ + + + + + + + + + + + + + + + + + + - - - - - + + + @@ -125,11 +145,9 @@ - - - - - + + + @@ -243,11 +261,9 @@ - - - - - + + + @@ -268,13 +284,13 @@ - - - + + + - + @@ -307,11 +323,9 @@ - - - - - + + + @@ -334,11 +348,9 @@ - - - - - + + + @@ -351,11 +363,9 @@ - - - - - + + + @@ -397,11 +407,9 @@ - - - - - + + + @@ -625,11 +633,9 @@ - - - - - + + + @@ -672,11 +678,9 @@ - - - - - + + + @@ -721,10 +725,10 @@ - - - - + + + + diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml index 270e5b12..d1a8a2ce 100644 --- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml +++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml @@ -6,6 +6,6 @@ xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom" version="5.0-variant ezpublish-1.0"> some anchor with a name attribute. - some anchor with a name attribute. - another anchor that should be removed due to lack of name uniqueness. + some anchor with a name attribute. + another anchor with the same name attribute.
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml index e5d9792e..79b39bc5 100644 --- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml +++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml @@ -2,5 +2,5 @@

some anchor with a name attribute.

some anchor with a name attribute.

-

another anchor that should be removed due to lack of name uniqueness.

+

another anchor with the same name attribute.

diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/010-duplicatedIds.docbook.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/010-duplicatedIds.docbook.xml new file mode 100644 index 00000000..b990bf33 --- /dev/null +++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/010-duplicatedIds.docbook.xml @@ -0,0 +1,290 @@ + +
+ Lorem ipsum + Nunc in dignissim ex + and some more text here]]> + and some more text here]]> + and some more text here]]> + and some more text here]]> + The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target. + The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target. + The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target. + The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target. + Jump to content + Jump to content + Jump to content + Jump to content + This is a heading. + This is a heading. + This is a heading. + This is a heading. + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + value 1 + value 2 + value 3 + + + + value 2 + + + + value 2 + This is a list item. + + + + value 3 + + + + value 3 + This is a list item 2. + + + + + + + + + + +
Table caption.
1112
+ + + + + + + + +
Table caption.
1112
+ + + + + + + + +
Table caption.
1112
+ + + + + + + + +
Table caption.
1112
+ + + + + Somevalue 1value 2 content. + Somevalue 1value 2 content. + Somevalue 1value 2 content. + Somevalue 1value 2 content. + + + + + + + + + + + + + Some + Some + Some + Some + + + + + Some for the otherwise unremarkable paragraph. +
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/010-duplicatedIds.xhtml5.edit.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/010-duplicatedIds.xhtml5.edit.xml new file mode 100644 index 00000000..ae4ba441 --- /dev/null +++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/010-duplicatedIds.xhtml5.edit.xml @@ -0,0 +1,122 @@ + +
+

Lorem ipsum

+

Nunc in dignissim ex

+
Literal with CNAME end sequence here : ]]> and some more text here
+
Literal with CNAME end sequence here : ]]> and some more text here
+
Literal with CNAME end sequence here : ]]> and some more text here
+
Literal with CNAME end sequence here : ]]> and some more text here
+

The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target.

+

The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target.

+

The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target.

+

The anchor element is empty and contributes nothing to the flow of the content in which it occurs. It is only useful as a target.

+

Jump to content

+

Jump to content

+

Jump to content

+

Jump to content

+

This is a heading.

+

This is a heading.

+

This is a heading.

+

This is a heading.

+
    +
  1. This is a list item.
  2. +
  3. This is a list item 2.
  4. +
+
    +
  1. This is a list item.
  2. +
  3. This is a list item 2.
  4. +
+
    +
  1. This is a list item.
  2. +
  3. This is a list item 2.
  4. +
+
    +
  1. This is a list item.
  2. +
  3. This is a list item 2.
  4. +
+
    +
  • This is a list item.
  • +
  • This is a list item 2.
  • +
+
    +
  • This is a list item.
  • +
  • This is a list item 2.
  • +
+
    +
  • This is a list item.
  • +
  • This is a list item 2.
  • +
+
    +
  • This is a list item.
  • +
  • This is a list item 2.
  • +
+ + + + + + + + +
Table caption.
1112
+ + + + + + + + +
Table caption.
1112
+ + + + + + + + +
Table caption.
1112
+ + + + + + + + +
Table caption.
1112
+
+
+
+
+

Someoe-upcast-placeholder content.

+

Someoe-upcast-placeholder content.

+

Someoe-upcast-placeholder content.

+

Someoe-upcast-placeholder content.

+
+ +
+
+ +
+
+ +
+
+ +
+

Some +

+

Some +

+

Some +

+

Some +

+
+
+
+
+

Some for the otherwise unremarkable paragraph.

+