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

Modified option for minimal letter-spacing

Browse source
This commit is contained in:
Georgy Litvinov 2020-01-10 13:01:31 +01:00
parent bd2a30ce44
commit 18ba5f3414
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/writer2latex/xhtml/TextStyleConverter.java
View file

@ -71,7 +71,8 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
// Use default font? // Use default font?
private boolean bConvertFont = false; private boolean bConvertFont = false;
//convert letter spacing //convert letter spacing
private boolean addLetterSpacing = false; private Double minLetterSpacing = null;
/** Create a new <code>TextStyleConverter</code> /** Create a new <code>TextStyleConverter</code>
* @param ofr an <code>OfficeReader</code> to read style information from * @param ofr an <code>OfficeReader</code> to read style information from
@ -94,7 +95,11 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
} }
} }
this.bConvertFont = !config.useDefaultFont(); this.bConvertFont = !config.useDefaultFont();
this.addLetterSpacing = config.exportLetterSpacing();
String minLS = config.minLetterSpacing().replaceAll("[a-zA-Z]", "");
if (!minLS.equals("")) {
this.minLetterSpacing = Double.parseDouble(minLS);
}
} }
/** Apply a link style, using a combination of two text styles /** Apply a link style, using a combination of two text styles
@ -387,7 +392,18 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
// Letter spacing: This property fit with css // Letter spacing: This property fit with css
s = style.getProperty(XMLString.FO_LETTER_SPACING,bInherit); s = style.getProperty(XMLString.FO_LETTER_SPACING,bInherit);
if (s!=null && addLetterSpacing ) { props.addValue("letter-spacing",scale(s)); } if ( s != null ) {
if ( minLetterSpacing != null ) {
String onlyNums = scale(s).replaceAll("[a-zA-Z]", "");
Double curLS = Double.parseDouble(onlyNums);
if ( minLetterSpacing < curLS ) {
props.addValue("letter-spacing",scale(s));
}
} else {
props.addValue("letter-spacing",scale(s));
}
}
// Capitalization: This property fit with css // Capitalization: This property fit with css
s = style.getProperty(XMLString.FO_TEXT_TRANSFORM,bInherit); s = style.getProperty(XMLString.FO_TEXT_TRANSFORM,bInherit);

7
src/main/java/writer2latex/xhtml/XhtmlConfig.java
View file

@ -160,7 +160,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
private static final int DOCUMENT_ICON = 58; private static final int DOCUMENT_ICON = 58;
private static final int HEADING_TAGS = 59; private static final int HEADING_TAGS = 59;
private static final int PAGE_TAGS = 60; private static final int PAGE_TAGS = 60;
private static final int EXPORT_LETTER_SPACING = 61; private static final int MIN_LETTER_SPACING = 61;
protected ComplexOption xheading = addComplexOption("heading-map"); protected ComplexOption xheading = addComplexOption("heading-map");
protected ComplexOption xpar = addComplexOption("paragraph-map"); protected ComplexOption xpar = addComplexOption("paragraph-map");
@ -296,7 +296,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
options[DOCUMENT_ICON] = new Option("document_icon",""); options[DOCUMENT_ICON] = new Option("document_icon","");
options[HEADING_TAGS] = new Option("heading_tags","sections"); options[HEADING_TAGS] = new Option("heading_tags","sections");
options[PAGE_TAGS] = new Option("page_tags","div"); options[PAGE_TAGS] = new Option("page_tags","div");
options[EXPORT_LETTER_SPACING] = new BooleanOption("export_letter_spacing","false"); options[MIN_LETTER_SPACING] = new Option("min_letter_spacing","");
} }
@ -446,8 +446,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
} }
return options[HEADING_TAGS].getString(); } return options[HEADING_TAGS].getString(); }
public String getPageTags() { return options[PAGE_TAGS].getString(); } public String getPageTags() { return options[PAGE_TAGS].getString(); }
public boolean exportLetterSpacing() { return ((BooleanOption) options[EXPORT_LETTER_SPACING]).getValue(); } public String minLetterSpacing() { return ( options[MIN_LETTER_SPACING]).getString(); }
public XhtmlStyleMap getXParStyleMap() { return getStyleMap(xpar); } public XhtmlStyleMap getXParStyleMap() { return getStyleMap(xpar); }
public XhtmlStyleMap getXHeadingStyleMap() { return getStyleMap(xheading); } public XhtmlStyleMap getXHeadingStyleMap() { return getStyleMap(xheading); }