diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index abbd7dfeb..902a667bd 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -560,6 +560,10 @@ + + + + diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml index 0913c6a1d..ee32e98d8 100644 --- a/assets/resources/application/bg.xml +++ b/assets/resources/application/bg.xml @@ -559,6 +559,10 @@ + + + + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index 54b575b56..cc758e6fb 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -560,6 +560,10 @@ + + + + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 432dff28c..299f5034c 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -563,6 +563,10 @@ + + + + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index 64d1539d5..2ea50ffd2 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index af915eacf..92f079752 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -548,6 +548,10 @@ + + + + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index 2f0b9b4ff..4a457e02a 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index 56c5f61c8..b5f5a966d 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index 23130f9e2..ee79e1e7f 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -559,6 +559,10 @@ + + + + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index 6008dcd55..3d5b30b74 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index 9cdc5992c..da867b927 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index 45c05d7c7..c6a2f26d2 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -547,6 +547,10 @@ + + + + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index 72130344f..fc1a1f726 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 79d737e7e..4d9fa4869 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml index c82e8ac16..0cdbadf67 100644 --- a/assets/resources/application/hy.xml +++ b/assets/resources/application/hy.xml @@ -559,6 +559,10 @@ + + + + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 24686d9ca..6eecddaa3 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -545,6 +545,10 @@ + + + + diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml index 28b16d884..1354c7636 100644 --- a/assets/resources/application/ka.xml +++ b/assets/resources/application/ka.xml @@ -559,6 +559,10 @@ + + + + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index 79b966efa..585aed051 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index a2ea5cc72..6167f7e3e 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index 870a63ee9..d4c387f37 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml index 3e80b5602..73ccd2bd4 100644 --- a/assets/resources/application/pt.xml +++ b/assets/resources/application/pt.xml @@ -556,6 +556,10 @@ + + + + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index 6370d1938..951062997 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index 5665f8346..9e8c18db0 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -559,6 +559,10 @@ + + + + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index e14964c0e..e62de2877 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index 5c643dea4..97496e4c0 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index 9417c223f..f54fe3c12 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -554,6 +554,10 @@ + + + + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index 4e3e881de..ae7b8e1a1 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index f79605da2..e8c611cfa 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 25ab8a220..727310d92 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -544,6 +544,10 @@ + + + + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index bb7c257d0..ad17cfdca 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -544,6 +544,10 @@ + + + + diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index 172291661..264f4ee4d 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -346,6 +346,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { final ZLPreferenceSet bgPreferences = new ZLPreferenceSet(); final Screen cssScreen = createPreferenceScreen("css"); + cssScreen.addOption(baseStyle.UseCSSFontFamilyOption, "fontFamily"); cssScreen.addOption(baseStyle.UseCSSFontSizeOption, "fontSize"); cssScreen.addOption(baseStyle.UseCSSTextAlignmentOption, "textAlignment"); diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java index fb3ab21d7..adfcb6c3e 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java @@ -36,6 +36,8 @@ public class ZLTextBaseStyle extends ZLTextStyle { new ZLBooleanOption("Style", "css:textAlignment", true); public final ZLBooleanOption UseCSSFontSizeOption = new ZLBooleanOption("Style", "css:fontSize", true); + public final ZLBooleanOption UseCSSFontFamilyOption = + new ZLBooleanOption("Style", "css:fontFamily", true); public final ZLBooleanOption AutoHyphenationOption = new ZLBooleanOption(OPTIONS, "AutoHyphenation", true); diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java index 8b74f741a..2dd5883fa 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java @@ -36,6 +36,10 @@ public class ZLTextExplicitlyDecoratedStyle extends ZLTextDecoratedStyle impleme @Override protected FontEntry getFontFamilyInternal() { + if (myEntry instanceof ZLTextCSSStyleEntry && !BaseStyle.UseCSSFontFamilyOption.getValue()) { + return Parent.getFontFamily(); + } + if (myEntry.isFeatureSupported(FONT_FAMILY)) { // TODO: support all families final List entries = myEntry.getFontEntries(); @@ -45,11 +49,13 @@ public class ZLTextExplicitlyDecoratedStyle extends ZLTextDecoratedStyle impleme } return Parent.getFontFamily(); } + @Override protected int getFontSizeInternal(ZLTextMetrics metrics) { if (myEntry instanceof ZLTextCSSStyleEntry && !BaseStyle.UseCSSFontSizeOption.getValue()) { return Parent.getFontSize(metrics); } + if (myEntry.isFeatureSupported(FONT_STYLE_MODIFIER)) { if (myEntry.getFontModifier(FONT_MODIFIER_INHERIT) == ZLBoolean3.B3_TRUE) { return Parent.Parent.getFontSize(metrics);