litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Export relative image size

Browse source
This commit is contained in:
Georgy Litvinov 2020-11-24 22:53:22 +01:00
parent 5bb268f9ff
commit d9653ccd37
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/w2phtml/office/XMLString.java
View file

@ -203,6 +203,7 @@ public class XMLString {
public static final String STYLE_DISTANCE_AFTER_SEP = "style:distance-after-sep"; public static final String STYLE_DISTANCE_AFTER_SEP = "style:distance-after-sep";
public static final String STYLE_WIDTH = "style:width"; public static final String STYLE_WIDTH = "style:width";
public static final String STYLE_REL_WIDTH = "style:rel-width"; public static final String STYLE_REL_WIDTH = "style:rel-width";
public static final String STYLE_REL_HEIGHT = "style:rel-height";
public static final String STYLE_COLOR = "style:color"; public static final String STYLE_COLOR = "style:color";
public static final String STYLE_WRITING_MODE = "style:writing-mode"; public static final String STYLE_WRITING_MODE = "style:writing-mode";
public static final String STYLE_REPEAT = "style:repeat"; public static final String STYLE_REPEAT = "style:repeat";

15
src/main/java/w2phtml/xhtml/content/DrawParser.java
View file

@ -620,7 +620,7 @@ public class DrawParser extends Parser {
StyleInfo info = new StyleInfo(); StyleInfo info = new StyleInfo();
String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME); String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME);
if (nMode!=FULL_SCREEN) { getFrameSP().readStyle(sStyleName,info); } if (nMode!=FULL_SCREEN) { getFrameSP().readStyle(sStyleName,info); }
applyImageSize(frame,info.props,nMode,false); applyImageSize(frame,info.props,nMode,isRelativeScale(frame));
// Apply placement // Apply placement
applyPlacement(frame, hnodeBlock, hnodeInline, nMode, imageElement, info); applyPlacement(frame, hnodeBlock, hnodeInline, nMode, imageElement, info);
@ -1008,6 +1008,10 @@ public class DrawParser extends Parser {
// We thus have to subtract the borders and padding to get the correct width // We thus have to subtract the borders and padding to get the correct width
// This method handles this // This method handles this
private String getFrameWidth(Element node, StyleWithProperties style) { private String getFrameWidth(Element node, StyleWithProperties style) {
String relativeWidth = node.getAttribute(XMLString.STYLE_REL_WIDTH);
if (relativeWidth != null && relativeWidth.length()>0) {
return relativeWidth;
}
String sWidth = node.getAttribute(XMLString.SVG_WIDTH); String sWidth = node.getAttribute(XMLString.SVG_WIDTH);
if (sWidth.length()>0) { if (sWidth.length()>0) {
if (style!=null) { if (style!=null) {
@ -1031,6 +1035,14 @@ public class DrawParser extends Parser {
return null; return null;
} }
private boolean isRelativeScale(Element node) {
String relativeHeight = node.getAttribute(XMLString.STYLE_REL_HEIGHT);
if (relativeHeight != null && relativeHeight.equals("scale")) {
return true;
}
return false;
}
// Same for height // Same for height
private String getFrameHeight(Element node, StyleWithProperties style) { private String getFrameHeight(Element node, StyleWithProperties style) {
String sHeight = node.getAttribute(XMLString.SVG_HEIGHT); String sHeight = node.getAttribute(XMLString.SVG_HEIGHT);
@ -1067,6 +1079,7 @@ public class DrawParser extends Parser {
if (!bOnlyWidth) { if (!bOnlyWidth) {
String sHeight = getFrameHeight(node,style); String sHeight = getFrameHeight(node,style);
if (sHeight!=null) { if (sHeight!=null) {
props.addProperty("height",scale(sHeight)); props.addProperty("height",scale(sHeight));
} }