From d9653ccd37740fd5a6a6de454091db6e957de8ec Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Tue, 24 Nov 2020 22:53:22 +0100 Subject: [PATCH] Export relative image size --- src/main/java/w2phtml/office/XMLString.java | 1 + .../java/w2phtml/xhtml/content/DrawParser.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/w2phtml/office/XMLString.java b/src/main/java/w2phtml/office/XMLString.java index d9818f1..6c37936 100644 --- a/src/main/java/w2phtml/office/XMLString.java +++ b/src/main/java/w2phtml/office/XMLString.java @@ -203,6 +203,7 @@ public class XMLString { 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_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_WRITING_MODE = "style:writing-mode"; public static final String STYLE_REPEAT = "style:repeat"; diff --git a/src/main/java/w2phtml/xhtml/content/DrawParser.java b/src/main/java/w2phtml/xhtml/content/DrawParser.java index 6b62cea..beaf586 100644 --- a/src/main/java/w2phtml/xhtml/content/DrawParser.java +++ b/src/main/java/w2phtml/xhtml/content/DrawParser.java @@ -620,7 +620,7 @@ public class DrawParser extends Parser { StyleInfo info = new StyleInfo(); String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME); if (nMode!=FULL_SCREEN) { getFrameSP().readStyle(sStyleName,info); } - applyImageSize(frame,info.props,nMode,false); + applyImageSize(frame,info.props,nMode,isRelativeScale(frame)); // Apply placement 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 // This method handles this 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); if (sWidth.length()>0) { if (style!=null) { @@ -1031,6 +1035,14 @@ public class DrawParser extends Parser { 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 private String getFrameHeight(Element node, StyleWithProperties style) { String sHeight = node.getAttribute(XMLString.SVG_HEIGHT); @@ -1067,6 +1079,7 @@ public class DrawParser extends Parser { if (!bOnlyWidth) { String sHeight = getFrameHeight(node,style); + if (sHeight!=null) { props.addProperty("height",scale(sHeight)); }