yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

XHTML_TAG_P in preferences

Browse source
This commit is contained in:
Nikolay Pultsin 2014-06-06 06:11:07 +01:00
parent e4280c88ec
commit 6b133d0ad8
34 changed files with 196 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

137
assets/default/styles.css
View file

@ -5,23 +5,6 @@ p {
margin-bottom: 1em;
}
pre {
fbreader-id: 9;
fbreader-name: "Preformatted text";
font-family: Monospace;
text-align: left;
hyphens: none;
margin-top: 1em;
margin-bottom: 1em;
}
code {
fbreader-id: 21;
fbreader-name: "Code";
font-family: Monospace;
hyphens: none;
}
title {
fbreader-id: 1;
fbreader-name: Title;
@ -49,22 +32,6 @@ subtitle {
font-weight: bold;
}
stanza {
fbreader-id: 7;
fbreader-name: "Stanza";
margin-top: 0.3em;
margin-bottom: 0.3em;
text-align: left;
hyphens: none;
}
image {
fbreader-id: 10;
fbreader-name: "Image";
margin-top: 0.4em;
text-align: center;
}
h1 {
fbreader-id: 31;
fbreader-name: "Header 1";
@ -120,16 +87,41 @@ h6 {
margin-bottom: 2.33em;
}
em {
fbreader-id: 17;
fbreader-name: "Emphasis";
stanza {
fbreader-id: 7;
fbreader-name: "Stanza";
margin-top: 0.3em;
margin-bottom: 0.3em;
text-align: left;
hyphens: none;
}
cite {
fbreader-id: 12;
fbreader-name: "Cite";
font-style: italic;
}
strong {
fbreader-id: 18;
fbreader-name: "Strong";
font-weight: bold;
a.internal {
fbreader-id: 15;
fbreader-name: "Internal Hyperlink";
hyphens: none;
text-decoration: underline;
}
a.external {
fbreader-id: 37;
fbreader-name: "External Hyperlink";
hyphens: none;
text-decoration: underline;
}
footnote {
fbreader-id: 16;
fbreader-name: "Footnote";
font-size: 0.7em;
vertical-align: 0.5em;
hyphens: none;
}
i {
@ -138,35 +130,22 @@ i {
font-style: italic;
}
em {
fbreader-id: 17;
fbreader-name: "Emphasis";
font-style: italic;
}
b {
fbreader-id: 28;
fbreader-name: "Bold";
font-weight: bold;
}
a.internal {
fbreader-id: 15;
fbreader-name: "Internal Hyperlink";
hyphens: none;
}
a.internal {
fbreader-id: 37;
fbreader-name: "External Hyperlink";
hyphens: none;
text-decoration: underline;
}
strike {
fbreader-id: 22;
fbreader-name: "StrikeThrough";
text-decoration: line-through;
}
cite {
fbreader-id: 12;
fbreader-name: "Cite";
font-style: italic;
strong {
fbreader-id: 18;
fbreader-name: "Strong";
font-weight: bold;
}
dfn {
@ -181,12 +160,27 @@ dd {
font-style: italic;
}
footnote {
fbreader-id: 16;
fbreader-name: "Footnote";
font-size: 0.7em;
vertical-align: 0.5em;
pre {
fbreader-id: 9;
fbreader-name: "Preformatted text";
font-family: Monospace;
text-align: left;
hyphens: none;
margin-top: 1em;
margin-bottom: 1em;
}
code {
fbreader-id: 21;
fbreader-name: "Code";
font-family: Monospace;
hyphens: none;
}
strike {
fbreader-id: 22;
fbreader-name: "StrikeThrough";
text-decoration: line-through;
}
sup {
@ -204,3 +198,10 @@ sub {
vertical-align: -0.5em;
hyphens: none;
}
image {
fbreader-id: 10;
fbreader-name: "Image";
margin-top: 0.4em;
text-align: center;
}

3
assets/resources/application/ar.xml
View file

@ -459,6 +459,9 @@
<node name="Regular Paragraph" value="Regular Paragraph" toBeTranslated="true">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Title" toBeTranslated="true">
<node name="summary" value=""/>
</node>

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

@ -467,6 +467,9 @@
<node name="Regular Paragraph" value="Звычайны абзац">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Назва">
<node name="summary" value=""/>
</node>

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

@ -466,6 +466,9 @@
<node name="Regular Paragraph" value="Стандартен параграф">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Заглавие">
<node name="summary" value=""/>
</node>

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

@ -467,6 +467,9 @@
<node name="Regular Paragraph" value="Paràgraf normal">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Títol">
<node name="summary" value=""/>
</node>

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

@ -470,6 +470,9 @@
<node name="Regular Paragraph" value="Běžný odstavec">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Název">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Almindelig paragraf">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Titel">
<node name="summary" value=""/>
</node>

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

@ -466,6 +466,9 @@
<node name="Regular Paragraph" value="Normaler Absatz">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Titel">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="Κανονικλη παράγραφος">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Τίτλος">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Regular Paragraph">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph">
<node name="summary" value="&lt;p&gt; XHTML tag content"/>
</node>
<node name="Title" value="Title">
<node name="summary" value=""/>
</node>

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

@ -466,6 +466,9 @@
<node name="Regular Paragraph" value="Párrafo normal">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Título">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Paragrafo arrunta">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Izenburua">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="پاراگراف عادي">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="عنوان">
<node name="summary" value=""/>
</node>

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

@ -454,6 +454,9 @@
<node name="Regular Paragraph" value="Paragraphe normal">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Titre">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="Parágrafo normal">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Título">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="Normál bekezdés">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Cím">
<node name="summary" value=""/>
</node>

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

@ -466,6 +466,9 @@
<node name="Regular Paragraph" value="Կանոնավոր պարբերություն">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Վերնագիր">
<node name="summary" value=""/>
</node>

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

@ -452,6 +452,9 @@
<node name="Regular Paragraph" value="Paragrafo Regolare">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Titolo">
<node name="summary" value=""/>
</node>

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

@ -466,6 +466,9 @@
<node name="Regular Paragraph" value="ჩვეულებრივი ტექსტი">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="სათაური">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Vanlig avsnitt">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Tittel">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Normale paragraaf">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Titel">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="Zwykły akapit">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Tytuł">
<node name="summary" value=""/>
</node>

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

@ -463,6 +463,9 @@
<node name="Regular Paragraph" value="Parágrafo normal">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Título">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="Paragraf normal">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Titlu">
<node name="summary" value=""/>
</node>

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

@ -466,6 +466,9 @@
<node name="Regular Paragraph" value="Обычный текст">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="Текст ePub">
<node name="summary" value="Содержимое тега &lt;p&gt; в файлах XHTML"/>
</node>
<node name="Title" value="Заголовок">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Обичан пасус">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Наслов">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="ย่อหน้า">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="ชื่อเรื่อง">
<node name="summary" value=""/>
</node>

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

@ -461,6 +461,9 @@
<node name="Regular Paragraph" value="Normal Paragraf">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="İsim">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="звичайного тексту">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="заголовку">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="Đoạn văn Thường">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="Tiêu đề">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="连续段落">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="书名">
<node name="summary" value=""/>
</node>

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

@ -451,6 +451,9 @@
<node name="Regular Paragraph" value="正常段落">
<node name="summary" value=""/>
</node>
<node name="xhtml-tag-p" value="ePub paragraph" toBeTranslated="true">
<node name="summary" value="&lt;p&gt; XHTML tag content" toBeTranslated="true"/>
</node>
<node name="Title" value="標題">
<node name="summary" value=""/>
</node>

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

@ -93,11 +93,11 @@ public class PreferenceActivity extends ZLPreferenceActivity {
final Screen directoriesScreen = createPreferenceScreen("directories");
final Runnable libraryUpdater = new Runnable() {
public void run() {
final BookCollectionShadow collection = new BookCollectionShadow();
collection.bindToService(PreferenceActivity.this, new Runnable() {
final BookCollectionShadow bookCollection = new BookCollectionShadow();
bookCollection.bindToService(PreferenceActivity.this, new Runnable() {
public void run() {
collection.reset(false);
collection.unbind();
bookCollection.reset(false);
bookCollection.unbind();
}
});
}
@ -257,45 +257,25 @@ public class PreferenceActivity extends ZLPreferenceActivity {
byte styles[] = {
FBTextKind.REGULAR,
FBTextKind.TITLE,
FBTextKind.SECTION_TITLE,
FBTextKind.SUBTITLE,
FBTextKind.H1,
FBTextKind.H2,
FBTextKind.H3,
FBTextKind.H4,
FBTextKind.H5,
FBTextKind.H6,
//FBTextKind.XHTML_TAG_P,
//FBTextKind.TITLE,
//FBTextKind.SECTION_TITLE,
//FBTextKind.SUBTITLE,
//FBTextKind.H1,
//FBTextKind.H2,
//FBTextKind.H3,
//FBTextKind.H4,
//FBTextKind.H5,
//FBTextKind.H6,
FBTextKind.ANNOTATION,
FBTextKind.EPIGRAPH,
FBTextKind.AUTHOR,
FBTextKind.POEM_TITLE,
FBTextKind.STANZA,
//FBTextKind.STANZA,
FBTextKind.VERSE,
FBTextKind.CITE,
FBTextKind.INTERNAL_HYPERLINK,
FBTextKind.EXTERNAL_HYPERLINK,
FBTextKind.FOOTNOTE,
FBTextKind.ITALIC,
FBTextKind.EMPHASIS,
FBTextKind.BOLD,
FBTextKind.STRONG,
FBTextKind.DEFINITION,
FBTextKind.DEFINITION_DESCRIPTION,
FBTextKind.PREFORMATTED,
FBTextKind.CODE
//FBTextKind.CITE,
};
for (int i = 0; i < styles.length; ++i) {
final ZLTextNGStyleDescription description = collection.getDescription(styles[i]);
if (description != null) {
final Screen ngScreen = moreStylesScreen.createPreferenceScreen(description.Name);
ngScreen.addPreference(new FontPreference(
this, textScreen.Resource, "font",
description.FontFamilyOption, true
));
continue;
}
final ZLTextStyleDecoration decoration = collection.getDecoration(styles[i]);
if (decoration == null) {
continue;
@ -371,6 +351,14 @@ public class PreferenceActivity extends ZLPreferenceActivity {
));
}
for (ZLTextNGStyleDescription description : collection.getDescriptionList()) {
final Screen ngScreen = moreStylesScreen.createPreferenceScreen(description.Name);
ngScreen.addPreference(new FontPreference(
this, textScreen.Resource, "font",
description.FontFamilyOption, true
));
}
final PreferenceSet footerPreferences = new PreferenceSet.Enabler() {
@Override
protected Boolean detectState() {

10
src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
View file

@ -19,7 +19,7 @@
package org.geometerplus.zlibrary.text.view.style;
import java.util.Map;
import java.util.*;
import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
import org.geometerplus.zlibrary.core.library.ZLibrary;
@ -31,6 +31,7 @@ public class ZLTextStyleCollection {
public final String Screen;
private int myDefaultFontSize;
private ZLTextBaseStyle myBaseStyle;
private final List<ZLTextNGStyleDescription> myDescriptionList;
private final ZLTextNGStyleDescription[] myDescriptionMap = new ZLTextNGStyleDescription[256];
private final ZLTextStyleDecoration[] myDecorationMap = new ZLTextStyleDecoration[256];
@ -38,6 +39,9 @@ public class ZLTextStyleCollection {
Screen = screen;
final Map<Integer,ZLTextNGStyleDescription> descriptions =
new SimpleCSSReader().read(ZLResourceFile.createResourceFile("default/styles.css"));
myDescriptionList = Collections.unmodifiableList(
new ArrayList<ZLTextNGStyleDescription>(descriptions.values())
);
for (Map.Entry<Integer,ZLTextNGStyleDescription> entry : descriptions.entrySet()) {
myDescriptionMap[entry.getKey() & 0xFF] = entry.getValue();
}
@ -52,6 +56,10 @@ public class ZLTextStyleCollection {
return myBaseStyle;
}
public List<ZLTextNGStyleDescription> getDescriptionList() {
return myDescriptionList;
}
public ZLTextNGStyleDescription getDescription(byte kind) {
return myDescriptionMap[kind & 0xFF];
}