use the image() CSS function in XHTML, DocBook and DITA
Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/visualization/CssBasedBoxModelBuilder.java b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/visualization/CssBasedBoxModelBuilder.java
index 72e85e9..b7eeea6 100644
--- a/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/visualization/CssBasedBoxModelBuilder.java
+++ b/org.eclipse.vex.core/src/org/eclipse/vex/core/internal/visualization/CssBasedBoxModelBuilder.java
@@ -443,9 +443,9 @@
private <P extends IParentBox<IInlineBox>> P visualizeInlineNodeContent(final INode node, final Styles styles, final Collection<VisualizeResult> childrenResults, final P parent) {
if (!childrenResults.isEmpty()) {
- return surroundWithInlinePseudoElements(visualizeChildrenInline(childrenResults, parent), node, styles);
+ return surroundWithInlinePseudoElements(visualizeChildrenInline(childrenResults, visualizeContentProperty(node, styles, parent)), node, styles);
} else {
- return surroundWithInlinePseudoElements(placeholderForEmptyNode(node, styles, parent), node, styles);
+ return surroundWithInlinePseudoElements(placeholderForEmptyNode(node, styles, visualizeContentProperty(node, styles, parent)), node, styles);
}
}
diff --git a/org.eclipse.vex.dita/css/dita_classed_shell_vex.css b/org.eclipse.vex.dita/css/dita_classed_shell_vex.css
index b6ad999..aedd3fd 100644
--- a/org.eclipse.vex.dita/css/dita_classed_shell_vex.css
+++ b/org.eclipse.vex.dita/css/dita_classed_shell_vex.css
@@ -26,7 +26,7 @@
}
*[class~="topic\/image"] {
- background-image: attr(href);
+ content: image(attr(href));
}
*[class~="topic\/image"][placement="break"] {
diff --git a/org.eclipse.vex.docbook/styles/docbook-plain.css b/org.eclipse.vex.docbook/styles/docbook-plain.css
index f3dfdc6..74bdd68 100644
--- a/org.eclipse.vex.docbook/styles/docbook-plain.css
+++ b/org.eclipse.vex.docbook/styles/docbook-plain.css
@@ -48,7 +48,7 @@
}
arg {
- display: inline;
+ display: inline;
}
article,book,chapter,colophon {
@@ -340,7 +340,7 @@
constant {
display: inline;
- font-family: "Courier New", monospace;
+ font-family: "Courier New", monospace;
}
copyright {
@@ -495,7 +495,7 @@
}
formalpara {
- display: block;
+ display: block;
}
formalpara > title {
@@ -576,7 +576,7 @@
graphic {
display: block;
- background-image: attr(fileref);
+ content: image(attr(fileref));
}
group {
@@ -628,8 +628,8 @@
}
imagedata {
- display: block;
- background-image: attr(fileref);
+ display: inline;
+ content: image(attr(fileref));
}
imageobject {
@@ -668,7 +668,7 @@
inlinegraphic {
display: inline;
- background-image: attr(fileref);
+ content: image(attr(fileref));
}
inlinemediaobject {
@@ -722,7 +722,7 @@
keycode {
display: inline;
- font-family: "Courier New", monospace;
+ font-family: "Courier New", monospace;
}
keycombo {
@@ -1166,7 +1166,7 @@
screenshot {
display: block;
- white-space: pre;
+ white-space: pre;
}
secondary {
@@ -1247,7 +1247,7 @@
step {
display: list-item;
- list-style-type: decimal;
+ list-style-type: decimal;
}
stepalternatives {
@@ -1260,7 +1260,7 @@
substeps {
display: list-item;
- list-style-type: lower-alpha;
+ list-style-type: lower-alpha;
}
subtitle {
@@ -1285,7 +1285,7 @@
}
symbolt {
- display: inline;
+ display: inline;
}
synopsis {
@@ -1300,13 +1300,13 @@
}
tag {
- display: inline;
+ display: inline;
}
tag:before {
- content: '<';
+ content: '<';
}
tag:after {
- content: '>';
+ content: '>';
}
table {
@@ -1362,7 +1362,7 @@
/* TODO display referenced text */
display: inline;
font-size: smaller;
- background-color: #B0B0B0;
+ background-color: #B0B0B0;
}
tip {
@@ -1562,13 +1562,13 @@
wordasword {
display: inline;
- font-style: italic;
+ font-style: italic;
}
xref {
display: inline;
color: blue;
- font-style: italic;
+ font-style: italic;
}
xref:before {
diff --git a/org.eclipse.vex.xhtml/styles/xhtml1-plain.css b/org.eclipse.vex.xhtml/styles/xhtml1-plain.css
index d1a71e6..86ac32d 100644
--- a/org.eclipse.vex.xhtml/styles/xhtml1-plain.css
+++ b/org.eclipse.vex.xhtml/styles/xhtml1-plain.css
@@ -192,7 +192,7 @@
}
img {
- background-image: attr(src);
+ content: image(attr(src));
height: attr(height);
width: attr(width);
}
