yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

options "Use CSS defined font family"

Browse source
This commit is contained in:
Nikolay Pultsin 2014-03-31 20:38:21 +01:00
parent 00c372ee14
commit 010ab66757
33 changed files with 129 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/resources/application/be.xml
View file

@ -560,6 +560,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Ужыць ці праіґнараваць значэньні з CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Памер шрыфту">
<node name="summaryOn" value="Ужыць памер шрыфту з CSS"/>
<node name="summaryOff" value="Праіґнараваць памер шрыфту з CSS"/>

4
assets/resources/application/bg.xml
View file

@ -559,6 +559,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="CSS форматиране"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Размер на шрифта">
<node name="summaryOn" value="Използвай размера на шрифта, зададен в CSS"/>
<node name="summaryOff" value="Игнорирай размера на шрифта, зададен в CSS"/>

4
assets/resources/application/ca.xml
View file

@ -560,6 +560,10 @@
</node>
<node name="css" value="CSS (Fulls d'estil)">
<node name="summary" value="Aplicar/ignorar els valors en CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Mida de la font">
<node name="summaryOn" value="Aplica la mida de font definida en CSS"/>
<node name="summaryOff" value="Ignora la mida de font definida en CSS"/>

4
assets/resources/application/cs.xml
View file

@ -563,6 +563,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Použít/ignorovat hodnoty definované v CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Velikost písma">
<node name="summaryOn" value="Použít velikost písma definovanou v CSS"/>
<node name="summaryOff" value="Ignorovat velikost písma definovanou v CSS"/>

4
assets/resources/application/da.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Brug/ignorer værdier defineret i CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Skriftstørrelse">
<node name="summaryOn" value="Brug skriftstørrelse defineret i CSS"/>
<node name="summaryOff" value="Ignorer skriftstørrelse defineret i CSS"/>

4
assets/resources/application/de.xml
View file

@ -548,6 +548,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/el.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/en.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Apply/ignore values defined in CSS"/>
<node name="fontFamily" value="Font family">
<node name="summaryOn" value="Use font family defined in CSS"/>
<node name="summaryOff" value="Ignore font family defined in CSS"/>
</node>
<node name="fontSize" value="Font size">
<node name="summaryOn" value="Apply font size defined in CSS"/>
<node name="summaryOff" value="Ignore font size defined in CSS"/>

4
assets/resources/application/es.xml
View file

@ -559,6 +559,10 @@
</node>
<node name="css" value="CSS (Hojas de estilo en cascada)">
<node name="summary" value="Aplicar/ignorar valores definidos en CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Tamaño de fuente">
<node name="summaryOn" value="Aplicar tamaño de fuente definido en las CSS"/>
<node name="summaryOff" value="Ignorar tamaño de fuente definido en las CSS"/>

4
assets/resources/application/eu.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="CSSetan zehaztutako balioak aplikatu/baztertu"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Letra-tipoaren tamaina">
<node name="summaryOn" value="Aplikatu CSSetan zehaztutako letra-tipoaren tamaina"/>
<node name="summaryOff" value="Baztertu CSSetan zehaztutako letra-tipoaren tamaina"/>

4
assets/resources/application/fa.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="اجرا / رد مقادير تعريف شده در CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="اندازه فونت">
<node name="summaryOn" value="اجراي اندازه فونت تعريف شده در CSS "/>
<node name="summaryOff" value="رد اندازه فونت تعريف شده در CSS"/>

4
assets/resources/application/fr.xml
View file

@ -547,6 +547,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Appliquer/ignorer les styles définis dans le CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Taille de la police" toBeTranslated="true">
<node name="summaryOn" value="Appliquer la taille de police définie dans le CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignorer la taille de police définie dans le CSS" toBeTranslated="true"/>

4
assets/resources/application/gl.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/hu.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/hy.xml
View file

@ -559,6 +559,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Գործածե՞լ CSS ձևաչափով"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Տառատեսակի չափը">
<node name="summaryOn" value="Կիրառել CSS-ում տրվող տառատեսակի չափը"/>
<node name="summaryOff" value="Մերժել CSS-ում տրվող տառատեսակի չափը"/>

4
assets/resources/application/it.xml
View file

@ -545,6 +545,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/ka.xml
View file

@ -559,6 +559,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="გამოიყენოს CSS ფორმატირება"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="შრიფტის ზომა">
<node name="summaryOn" value="CSS-ში მითითებული შრიფტის ზომის გამოყენება"/>
<node name="summaryOff" value="CSS-ში მითითებული შრიფტის ზომის იგნორირება"/>

4
assets/resources/application/nb.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Bruk/ignorer verdier definert i CSS-stilark"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Skriftstørrelse">
<node name="summaryOn" value="Bruk skriftstørrelse definert i CSS"/>
<node name="summaryOff" value="Ignorer skriftstørrelse definert i CSS"/>

4
assets/resources/application/nl.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Gebruik/Negeer waarden gedefineerd in CSS"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Lettergrootte">
<node name="summaryOn" value="Gebruik lettergrootte gedefineerd in CSS"/>
<node name="summaryOff" value="Negeer Lettergroote gedefineerd in CSS"/>

4
assets/resources/application/pl.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/pt.xml
View file

@ -556,6 +556,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/ro.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/ru.xml
View file

@ -559,6 +559,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="Использовать ли форматирование CSS"/>
<node name="fontFamily" value="Названия шрифтов">
<node name="summaryOn" value="Использовать шрифты, указанные в CSS"/>
<node name="summaryOff" value="Игнорировать указания шрифтов в CSS"/>
</node>
<node name="fontSize" value="Размер шрифта">
<node name="summaryOn" value="Использовать размер шрифта, заданный в CSS"/>
<node name="summaryOff" value="Игнорировать размер шрифта, заданный в CSS"/>

4
assets/resources/application/sr.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/th.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/tr.xml
View file

@ -554,6 +554,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/uk.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/vi.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

4
assets/resources/application/zh.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS">
<node name="summary" value="使用/忽略CSS中定义的值"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="字体大小">
<node name="summaryOn" value="使用CSS中定义的字体大小"/>
<node name="summaryOff" value="忽略CSS中定义的字体大小"/>

4
assets/resources/application/zh_TW.xml
View file

@ -544,6 +544,10 @@
</node>
<node name="css" value="CSS" toBeTranslated="true">
<node name="summary" value="Apply/ignore values defined in CSS" toBeTranslated="true"/>
<node name="fontFamily" value="Font family" toBeTranslated="true">
<node name="summaryOn" value="Use font family defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font family defined in CSS" toBeTranslated="true"/>
</node>
<node name="fontSize" value="Font size" toBeTranslated="true">
<node name="summaryOn" value="Apply font size defined in CSS" toBeTranslated="true"/>
<node name="summaryOff" value="Ignore font size defined in CSS" toBeTranslated="true"/>

1
src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
View file

@ -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");

2
src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
View file

@ -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);

6
src/org/geometerplus/zlibrary/text/view/style/ZLTextExplicitlyDecoratedStyle.java
View file

@ -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<FontEntry> 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);