diff --git a/src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng b/src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng
index 8e02061d..82ba13ce 100644
--- a/src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng
+++ b/src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng
@@ -62,6 +62,23 @@
+
+
+
+ arabic
+ Specifies Arabic numeration (1, 2, 3, …)
+ arabicleadingzero
+ Specifies Arabic numeration with leading zero(01, 02, 03, …)
+ upperalpha
+ Specifies upper-case alphabetic numeration (A, B, C, …)
+ loweralpha
+ Specifies lower-case alphabetic numeration (a, b, c, …)
+ upperroman
+ Specifies upper-case Roman numeration (I, II, III, …)
+ lowerroman
+ Specifies lower-case Roman numeration (i, ii, iii …)
+
+
A list in which each entry is marked with a sequentially incremented label
diff --git a/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/edit/core.xsl b/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/edit/core.xsl
index 8729c08d..a08cc6c3 100644
--- a/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/edit/core.xsl
+++ b/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/edit/core.xsl
@@ -317,6 +317,12 @@
+ list-style-type:decimal;
+ list-style-type:decimal-leading-zero;
+ list-style-type:lower-roman;
+ list-style-type:upper-roman;
+ list-style-type:lower-latin;
+ list-style-type:upper-latin;
@@ -334,6 +340,11 @@
+
+
+
+
+
diff --git a/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/output/core.xsl b/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/output/core.xsl
index 2197c6b9..d3ca973d 100644
--- a/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/output/core.xsl
+++ b/src/bundle/Resources/richtext/stylesheets/docbook/xhtml5/output/core.xsl
@@ -325,6 +325,12 @@
+ list-style-type:decimal;
+ list-style-type:decimal-leading-zero;
+ list-style-type:lower-roman;
+ list-style-type:upper-roman;
+ list-style-type:lower-latin;
+ list-style-type:upper-latin;
@@ -342,6 +348,11 @@
+
+
+
+
+
diff --git a/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl b/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl
index 91d4f50d..560082e0 100644
--- a/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl
+++ b/src/bundle/Resources/richtext/stylesheets/xhtml5/edit/docbook.xsl
@@ -344,6 +344,16 @@
+
+
+ arabic
+ arabicleadingzero
+ lowerroman
+ upperroman
+ loweralpha
+ upperalpha
+
+
@@ -361,6 +371,14 @@
+
+
+
+
+
+
+
+
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/docbook/036-itemizedListFormatted.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/docbook/036-itemizedListFormatted.xml
new file mode 100644
index 00000000..47891d38
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/docbook/036-itemizedListFormatted.xml
@@ -0,0 +1,88 @@
+
+
+
+
+ value 1
+ value 2
+ value 3
+
+
+
+ value 2
+
+
+
+ value 2
+ This is a list item.
+
+
+
+ value 3
+
+
+
+ value 3
+
+ This is a list item
+with a line break.
+
+
+
+
+
+ value 1
+ value 2
+ value 3
+
+
+
+ value 2
+
+
+
+ value 2
+ This is a list item.
+
+
+
+ value 3
+
+
+
+ value 3
+
+ This is a list item
+with a line break.
+
+
+
+
+
+ value 1
+ value 2
+ value 3
+
+
+
+ value 2
+
+ value 2This is a list item.
+
+
+
+ value 3
+
+
+
+ value 3
+
+ This is a list item
+with a line break.
+
+
+
+
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/docbook/037-orderedListFormatted.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/docbook/037-orderedListFormatted.xml
new file mode 100644
index 00000000..88bd0d77
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/docbook/037-orderedListFormatted.xml
@@ -0,0 +1,72 @@
+
+
+ default
+
+
+ default 1
+
+
+ default 2
+
+
+ decimal
+
+
+ decimal 1
+
+
+ decimal 2
+
+
+ decimal leading zero
+
+
+ decimal leading zero 1
+
+
+ decimal leading zero 2
+
+
+ lower roman
+
+
+ lower roman 1
+
+
+ lower roman 2
+
+
+ upper roman
+
+
+ upper roman 1
+
+
+
+
+ upper roman 2
+
+
+ lower latin
+
+
+ lower latin 1
+
+
+ lower latin 2
+
+
+ upper latin
+
+
+ upper latin 1
+
+
+ upper latin 2
+
+
+
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/036-itemizedListFormatted.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/036-itemizedListFormatted.xml
new file mode 100644
index 00000000..374cffdf
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/036-itemizedListFormatted.xml
@@ -0,0 +1,15 @@
+
+
+
+ - This is a list item.
+ - This is a list item
with a line break.
+
+
+ - This is a list item.
+ - This is a list item
with a line break.
+
+
+ - This is a list item.
+ - This is a list item
with a line break.
+
+
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/037-orderedListFormatted.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/037-orderedListFormatted.xml
new file mode 100644
index 00000000..708795bf
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/037-orderedListFormatted.xml
@@ -0,0 +1,40 @@
+
+
+ default
+
+ - default 1
+ - default 2
+
+ decimal
+
+ - decimal 1
+ - decimal 2
+
+ decimal leading zero
+
+ - decimal leading zero 1
+ - decimal leading zero 2
+
+ lower roman
+
+ - lower roman 1
+ - lower roman 2
+
+ upper roman
+
+ - upper roman 1
+
+
+ - upper roman 2
+
+ lower latin
+
+ - lower latin 1
+ - lower latin 2
+
+ upper latin
+
+ - upper latin 1
+ - upper latin 2
+
+
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/036-itemizedListFormatted.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/036-itemizedListFormatted.xml
new file mode 100644
index 00000000..8edb4f1f
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/036-itemizedListFormatted.xml
@@ -0,0 +1,15 @@
+
+
+
+ - This is a list item.
+ - This is a list item
with a line break.
+
+
+ - This is a list item.
+ - This is a list item
with a line break.
+
+
+ - This is a list item.
+ - This is a list item
with a line break.
+
+
diff --git a/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/037-orderedListFormatted.xml b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/037-orderedListFormatted.xml
new file mode 100644
index 00000000..e03f647c
--- /dev/null
+++ b/tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/037-orderedListFormatted.xml
@@ -0,0 +1,40 @@
+
+
+ default
+
+ - default 1
+ - default 2
+
+ decimal
+
+ - decimal 1
+ - decimal 2
+
+ decimal leading zero
+
+ - decimal leading zero 1
+ - decimal leading zero 2
+
+ lower roman
+
+ - lower roman 1
+ - lower roman 2
+
+ upper roman
+
+ - upper roman 1
+
+
+ - upper roman 2
+
+ lower latin
+
+ - lower latin 1
+ - lower latin 2
+
+ upper latin
+
+ - upper latin 1
+ - upper latin 2
+
+