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

Added font-size style conversion to rem

Browse source
This commit is contained in:
George Litvinov 2018-03-21 16:12:54 +03:00 • committed by Georgy Litvinov
parent a477c18f9b
commit 7c630236ac
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/writer2latex/util/Calc.java
View file

@ -104,6 +104,18 @@ public class Calc {
return Float.toString(fPixels>-1 ? -1 : fPixels)+"px"; return Float.toString(fPixels>-1 ? -1 : fPixels)+"px";
} }
} }
public static final String length2rem(String sLength) {
if (sLength.equals("0")) { return "0"; }
float fLength=getFloat(sLength.substring(0,sLength.length()-2),1);
String sUnit=sLength.substring(sLength.length()-2);
float fPixels = 96.0F/getUpi(sUnit)*fLength;
float rem = fPixels / 16;
if (Math.abs(fPixels)<0.01) {
// Very small, treat as zero
return "0";
}
return Float.toString(rem) + "rem";
}
/** Divide dividend by divisor and return the quotient as an integer percentage /** Divide dividend by divisor and return the quotient as an integer percentage
* (e.g. "0.5cm" divided by "2cm" returns "25%"). * (e.g. "0.5cm" divided by "2cm" returns "25%").

2
src/main/java/writer2latex/xhtml/StyleConverterHelper.java
View file

@ -75,7 +75,7 @@ public abstract class StyleConverterHelper extends ConverterHelper {
return Calc.length2px(Calc.multiply(sScale,s)); return Calc.length2px(Calc.multiply(sScale,s));
} }
else { else {
return Calc.multiply(sScale,s); return Calc.length2rem(Calc.multiply(sScale,s));
} }
} }

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

@ -318,6 +318,7 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
} }
if (s!=null) { if (s!=null) {
if (bRelativeFontSize) { if (bRelativeFontSize) {
String sFontSize = Calc.divide(Calc.multiply(sFontScaling, Calc.multiply(s4,s)), sBaseFontSize); String sFontSize = Calc.divide(Calc.multiply(sFontScaling, Calc.multiply(s4,s)), sBaseFontSize);
if (!"100%".equals(sFontSize)) props.addValue("font-size", sFontSize); if (!"100%".equals(sFontSize)) props.addValue("font-size", sFontSize);
} }
@ -333,13 +334,17 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper {
} }
} }
else if (s!=null) { else if (s!=null) {
if (bRelativeFontSize) { if (bRelativeFontSize) {
String sFontSize = Calc.divide(Calc.multiply(sFontScaling, s),sBaseFontSize); String sFontSize = Calc.divide(Calc.multiply(sFontScaling, s),sBaseFontSize);
if (!"100%".equals(sFontSize)) props.addValue("font-size", sFontSize); if (!"100%".equals(sFontSize)) {
props.addValue("font-size", sFontSize);
}
} }
else { else {
props.addValue("font-size",scale(s)); props.addValue("font-size",scale(s));
} }
} }
} }