diff --git a/suse2013/common/l10n/en.xml b/suse2013/common/l10n/en.xml
index 5740ec34..70df2d58 100644
--- a/suse2013/common/l10n/en.xml
+++ b/suse2013/common/l10n/en.xml
@@ -46,6 +46,9 @@
+
+
+
@@ -73,6 +76,8 @@
+
+
@@ -102,6 +107,7 @@
+
@@ -134,6 +140,7 @@
+
diff --git a/suse2013/common/labels.xsl b/suse2013/common/labels.xsl
index 88c736aa..92b0ad1b 100644
--- a/suse2013/common/labels.xsl
+++ b/suse2013/common/labels.xsl
@@ -17,5 +17,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/suse2013/fo/attributesets.xsl b/suse2013/fo/attributesets.xsl
index 2f92036d..ec90749b 100644
--- a/suse2013/fo/attributesets.xsl
+++ b/suse2013/fo/attributesets.xsl
@@ -491,6 +491,35 @@ are overridden somewhere. Probably because of the original stylesheets. -->
start
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pt
+ uppercase
+ false
+ start
+
+
+
+ 1.2em
+ 1.5em
+ 2em
+
+
diff --git a/suse2013/fo/docbook.xsl b/suse2013/fo/docbook.xsl
index 6eb68808..57c69e17 100644
--- a/suse2013/fo/docbook.xsl
+++ b/suse2013/fo/docbook.xsl
@@ -63,6 +63,7 @@
+
diff --git a/suse2013/fo/formal.xsl b/suse2013/fo/formal.xsl
index e4dbee03..00386783 100644
--- a/suse2013/fo/formal.xsl
+++ b/suse2013/fo/formal.xsl
@@ -129,7 +129,7 @@
@@ -137,7 +137,7 @@
-
diff --git a/suse2013/fo/lists.xsl b/suse2013/fo/lists.xsl
index 67497b5e..cd051576 100644
--- a/suse2013/fo/lists.xsl
+++ b/suse2013/fo/lists.xsl
@@ -195,7 +195,7 @@
-
+
&mediumline;mm solid
diff --git a/suse2013/fo/task.xsl b/suse2013/fo/task.xsl
new file mode 100644
index 00000000..1b41079a
--- /dev/null
+++ b/suse2013/fo/task.xsl
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+ %fonts;
+ %colors;
+ %metrics;
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ mm
+ mm
+
+ &mediumline;mm solid
+
+
+ &dark-gray;
+
+
+ &dark-green;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/suse2013/static/css/style.css b/suse2013/static/css/style.css
index 6b4cdc2c..26f8d51e 100644
--- a/suse2013/static/css/style.css
+++ b/suse2013/static/css/style.css
@@ -1742,13 +1742,13 @@ p, .simplelist td {
}
.title .xref, .subtitle .xref, .table-title .xref, .example-title .xref,
-.figure-title .xref, .procedure-title .xref, .orderedlist-title .xref,
+.figure-title .xref, .procedure-title .xref, .task-title .xref, .orderedlist-title .xref,
.itemizedlist-title .xref, .variablelist-title .xref, .qandadiv-title .xref,
.title .link, .subtitle .link, .table-title .link, .example-title .link,
-.figure-title .link, .procedure-title .link, .orderedlist-title .link,
+.figure-title .link, .procedure-title .link, .task-title .link, .orderedlist-title .link,
.itemizedlist-title .link, .variablelist-title .link, .qandadiv-title .link,
.title .ulink, .subtitle .ulink, .table-title .ulink, .example-title .ulink,
-.figure-title .ulink, .procedure-title .ulink, .orderedlist-title .ulink,
+.figure-title .ulink, .procedure-title .ulink, .task-title .ulink, .orderedlist-title .ulink,
.itemizedlist-title .ulink, .variablelist-title .ulink, .qandadiv-title .ulink {
text-decoration: underline;
}
@@ -1783,6 +1783,7 @@ p, .simplelist td {
.figure-title .xref:hover, .figure-title .xref:focus, .figure-title .xref:active,
.example-title .xref:hover, .example-title .xref:focus, .example-title .xref:active,
.procedure-title .xref:hover, .procedure-title .xref:focus, .procedure-title .xref:active,
+.task-title .xref:hover, .task-title .xref:focus, .task-title .xref:active,
.orderedlist-title .xref:hover, .orderedlist-title .xref:focus, .orderedlist-title .xref:active,
.itemizedlist-title .xref:hover, .itemizedlist-title .xref:focus, .itemizedlist-title .xref:active,
.variablelist-title .xref:hover, .variablelist-title .xref:focus, .variablelist-title .xref:active,
@@ -2019,6 +2020,7 @@ catch those. */
.list-of-figures dl, .list-of-tables dl,
.list-of-examples dl, .list-of-procedures dl,
+.list-of-tasks dl,
.list-of-equations dl {
margin: 5px 0 17px 0;
padding: 0 0 0 30px;
@@ -2125,7 +2127,7 @@ a:hover .package, a:focus .package, a:active .package {
color: #666;
}
-.procedure-title, .table-title, .example-title,
+.procedure-title, .table-title, .example-title, .task-title,
.figure-title, .orderedlist-title, .variablelist-title,
.itemizedlist-title, .qandadiv-title {
font-size: 14px;
@@ -2194,7 +2196,7 @@ a:hover .package, a:focus .package, a:active .package {
text-transform: none;
}
-.procedure-contents {
+.procedure-contents, .task-contents {
border-left: 3px solid #9CC897;
font-weight: normal;
margin: 17px 0 17px;
@@ -2205,11 +2207,29 @@ a:hover .package, a:focus .package, a:active .package {
display: block;
}
-.procedure-title-wrap + .procedure-contents {
+.task-title-wrap {
+ margin-top: 1.5em;
+}
+
+.taskprerequisites {
+ margin-top: 1.2em;
+}
+
+.tasksummary {
+ margin-top: -0.5em;
+}
+
+.task-contents .procedure-contents {
+ border-left: none;
+}
+
+.procedure-title-wrap + .procedure-contents,
+.task-title-wrap + .task-contents {
margin: 10px 0 24px;
}
.procedure-contents > p:first-child,
+.task-contents > p:first-child,
.procedure-contents > ol:first-child > li:first-child > p:first-child {
margin-top: 0;
}
@@ -2218,8 +2238,10 @@ a:hover .package, a:focus .package, a:active .package {
margin-top: 4px;
}
-.procedure-contents > p, .procedure-contents > .informalfigure,
-.procedure-contents > .admonition {
+.procedure-contents > p,
+.procedure-contents > .informalfigure,
+.procedure-contents > .admonition,
+.task-contents > * {
margin-left: 12px;
margin-right: 17px;
}
@@ -3107,6 +3129,7 @@ p.ds-message {
.sect4 > .verbatim-wrap, .sect5 > .verbatim-wrap, .sect6 > .verbatim-wrap,
.sect > .verbatim-wrap, .chapter > .verbatim-wrap, .article > .verbatim-wrap,
.procedure-contents, .procedure-title-wrap + .procedure-contents,
+ .task-contents, .task-title-wrap + .task-contents,
div.figure, .complex-example .example-contents {
margin-left: -10px;
margin-right: -10px;
diff --git a/suse2013/xhtml/docbook.xsl b/suse2013/xhtml/docbook.xsl
index 5a8ec15c..38571e5d 100644
--- a/suse2013/xhtml/docbook.xsl
+++ b/suse2013/xhtml/docbook.xsl
@@ -64,6 +64,7 @@
+
diff --git a/suse2013/xhtml/formal.xsl b/suse2013/xhtml/formal.xsl
index 10a07e8a..aa0a142d 100644
--- a/suse2013/xhtml/formal.xsl
+++ b/suse2013/xhtml/formal.xsl
@@ -35,7 +35,7 @@
@@ -43,7 +43,7 @@
-
diff --git a/suse2013/xhtml/task.xsl b/suse2013/xhtml/task.xsl
new file mode 100644
index 00000000..651ecd1d
--- /dev/null
+++ b/suse2013/xhtml/task.xsl
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/tests/dapscompare-tests/db5-procedure/xml/test.xml b/tests/dapscompare-tests/db5-procedure/xml/test.xml
index 16161819..3e35e7f2 100644
--- a/tests/dapscompare-tests/db5-procedure/xml/test.xml
+++ b/tests/dapscompare-tests/db5-procedure/xml/test.xml
@@ -49,27 +49,195 @@
- Procedures
-
- Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
- salvia shabby chic ramps tofu microdosing.
-
-
-
+ Procedures and Tasks
+
+ Procedure Without Title
- Aesthetic put a bird on it waistcoat brunch tumeric.
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
-
-
+
+
+
+ Aesthetic put a bird on it waistcoat brunch tumeric.
+
+
+
+
+ Snackwave chambray succulents sartorial.
+
+
+
+
+ Stumptown banjo disrupt intelligentsia 8-bit slow-carb.
+
+
+
+
+
+ Procedure With Title
- Snackwave chambray succulents sartorial.
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
-
-
+
+ Put a Bird on It
+
+
+ Aesthetic put a bird on it waistcoat brunch tumeric.
+
+
+
+
+ Snackwave chambray succulents sartorial.
+
+
+
+
+ Stumptown banjo disrupt intelligentsia 8-bit slow-carb.
+
+
+
+
+
+ Procedure With Title and Preamble
- Stumptown banjo disrupt intelligentsia 8-bit slow-carb.
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
-
-
+
+ Put a Bird on It
+
+ Intelligentsia drinking vinegar enim tumblr poutine VHS. 8-bit try-hard
+ etsy copper mug. Umami yr culpa austin, 8-bit synth swag poke cray pabst
+ blue bottle irure ad affogato meggings.
+
+
+
+ Aesthetic put a bird on it waistcoat brunch tumeric.
+
+
+
+
+ Snackwave chambray succulents sartorial.
+
+
+
+
+ Stumptown banjo disrupt intelligentsia 8-bit slow-carb.
+
+
+
+
+
+ Task
+
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
+
+
+ Task
+
+
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
+
+
+
+
+ Skateboard tbh lo-fi, letterpress single-origin coffee pickled
+ chicharrones man braid food truck poke. Intelligentsia veniam in you
+ probably haven't heard of them chia eiusmod.
+
+
+
+
+
+
+ Aesthetic put a bird on it waistcoat brunch tumeric.
+
+
+
+
+ Snackwave chambray succulents sartorial.
+
+
+
+
+ Stumptown banjo disrupt intelligentsia 8-bit slow-carb.
+
+
+
+
+
+ Chicharrones green juice narwhal cred, tote bag sustainable tattooed.
+ Food truck art party meggings beard squid
+
+
+
+
+
+ Task with Procedure Title
+
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
+
+
+ Task
+
+
+ Truffaut prism pinterest, biodiesel ethical schlitz etsy blog. Venmo
+ salvia shabby chic ramps tofu microdosing.
+
+
+
+
+ Skateboard tbh lo-fi, letterpress single-origin coffee pickled
+ chicharrones man braid food truck poke. Intelligentsia veniam in you
+ probably haven't heard of them chia eiusmod.
+
+
+
+ My Funny Procedure
+
+
+ Aesthetic put a bird on it waistcoat brunch tumeric.
+
+
+
+
+ Snackwave chambray succulents sartorial.
+
+
+
+
+ Stumptown banjo disrupt intelligentsia 8-bit slow-carb.
+
+
+
+
+
+ Chicharrones green juice narwhal cred, tote bag sustainable tattooed.
+ Food truck art party meggings beard squid
+
+
+
+