Merge pull request #11 from foobnix/master

обновление
foobnix · Oct 24, 2019 · 0982d1b · 0982d1b
2 parents eca3076 + 045acea
commit 0982d1b
Show file tree

Hide file tree

Showing 381 changed files with 902 additions and 1,569 deletions.
diff --git a/Builder/src/main/java/web/GenerateFAQ.java b/Builder/src/main/java/web/GenerateFAQ.java
@@ -26,7 +26,7 @@ public static void updateIndex(final String in, String pageTitle) throws Excepti
         out.println("---");
         out.println("layout: main");
         out.println("---");
-        out.println("[<](/wiki/)");
+        //out.println("[<](/wiki/)");
         out.println("");
         out.println("# " + pageTitle);
         out.println("");

diff --git a/app/gradle.properties b/app/gradle.properties
@@ -1,5 +1,5 @@
-#Tue Oct 22 17:28:02 EEST 2019
-appCodeNumber=3328
+#Wed Oct 23 17:09:38 EEST 2019
+appCodeNumber=3332
 appVersionNumberBase=8.1
+appVersionNumberIndex=318
 appDB=8
-appVersionNumberIndex=317
diff --git a/app/src/main/java/com/foobnix/android/utils/TxtUtils.java b/app/src/main/java/com/foobnix/android/utils/TxtUtils.java
@@ -475,12 +475,12 @@ public static String replaceHTMLforTTS(String pageHTML) {
             }
 
 
-            pageHTML = replaceAll(pageHTML, " (\\S)\\.(\\S)\\.(\\S)\\.(\\S)\\.", "  $1 $2 $3 $4 ");
-            pageHTML = replaceAll(pageHTML, " (\\S{1,3})\\.(\\S{1,3})\\.(\\S{1,3})\\.", "  $1 $2 $3 ");
-            pageHTML = replaceAll(pageHTML, " (\\S{1,3})\\.(\\S{1,4})\\.", "  $1 $2 ");
-            pageHTML = replaceAll(pageHTML, " (\\S{1,2})\\. (\\S{1,2})\\.", "  $1 $2 ");
-            pageHTML = replaceAll(pageHTML, " (\\S{1,2})\\. ", " $1 ");
-            pageHTML = replaceAll(pageHTML, "(\\d*)\\.(\\d+)", "$1 $2"); //skip numbers 3.3 .343
+            pageHTML = replaceAll(pageHTML, " (\\p{Alpha})\\.(\\p{Alpha})\\.(\\p{Alpha})\\.(\\p{Alpha})\\.", " $1 $2 $3 $4 ");
+            pageHTML = replaceAll(pageHTML, " (\\p{Alpha}{1,3})\\.(\\p{Alpha}S{1,3})\\.(\\p{Alpha}S{1,3})\\.", " $1 $2 $3 ");
+            pageHTML = replaceAll(pageHTML, " (\\p{Alpha}{1,3})\\.(\\p{Alpha}S{1,4})\\.", " $1 $2 ");
+            pageHTML = replaceAll(pageHTML, " (\\p{Alpha}{1,2})\\. (\\p{Alpha}S{1,2})\\.", " $1 $2 ");
+            pageHTML = replaceAll(pageHTML, " (\\p{Alpha}{1,2})\\. ", " $1 ");
+            pageHTML = replaceAll(pageHTML, "(\\p{Digit}*)\\.(\\p{Digit}+)", "$1 $2"); //skip numbers 3.3 .343
 
 
             for (int i = 0; i < AppState.get().ttsSentecesDivs.length(); i++) {
@@ -489,7 +489,7 @@ public static String replaceHTMLforTTS(String pageHTML) {
             }
 
 
-            //pageHTML = pageHTML.replace("{dot}", ".");
+            pageHTML = pageHTML.replace("{dot}", ".");
         }
 
 
@@ -500,6 +500,7 @@ public static String replaceAll(String input, String regex, String replacement)
         try {
             return Pattern.compile(regex, Pattern.UNICODE_CASE).matcher(input).replaceAll(replacement);
         } catch (Exception e) {
+            LOG.e(e);
             return Pattern.compile(regex).matcher(input).replaceAll(replacement);
         }
     }

diff --git a/docs/_includes/codes.md b/docs/_includes/codes.md
@@ -0,0 +1,16 @@
+{% assign lang = '' %}
+{% assign full = 'English' %}
+{% assign parent = '/' %}
+
+{% if page.url contains 'ar.html' %}{% assign lang = 'ar' %}{% assign full = 'العربية' %}{% endif %}
+{% if page.url contains 'de.html' %}{% assign lang = 'de' %}{% assign full = 'Deutsch' %}{% endif %}
+{% if page.url contains 'es.html' %}{% assign lang = 'es' %}{% assign full = 'Español' %}{% endif %}
+{% if page.url contains 'fr.html' %}{% assign lang = 'fr' %}{% assign full = 'Français' %}{% endif %}
+{% if page.url contains 'it.html' %}{% assign lang = 'it' %}{% assign full = 'Italiano' %}{% endif %}
+{% if page.url contains 'ru.html' %}{% assign lang = 'ru' %}{% assign full = 'Русский' %}{% endif %}
+{% if page.url contains 'zh.html' %}{% assign lang = 'zh' %}{% assign full = '中文' %}{% endif %}
+{% if page.url contains 'pt.html' %}{% assign lang = 'pt' %}{% assign full = 'Portugal' %}{% endif %}
+
+{% assign mylast = page.dir | split: "/" | last | append: "/" %}
+{% assign parent = page.dir | remove: mylast %}
+
diff --git a/docs/_includes/menu.md b/docs/_includes/menu.md
@@ -1,75 +1,25 @@
-{% assign find = false %}
-{% assign lang = 'English' %}
-
-{% if page.url contains 'ru.html' %}
-{% assign find = true %}
-{% assign lang = 'Русский' %}
-{% include ru.md %}
-{% endif %}
-
-
-{% if page.url contains 'fr.html' %}
-{% assign find = true %}
-{% assign lang = 'Français' %}
-{% include fr.md %}
-{% endif %}
-
-{% if page.url contains 'de.html' %}
-{% assign find = true %}
-{% assign lang = 'Deutsch' %}
-{% include de.md %}
-{% endif %}
-
-{% if page.url contains 'it.html' %}
-{% assign find = true %}
-{% assign lang = 'Italiano' %}
-{% include it.md %}
-{% endif %}
-
-
-{% if page.url contains 'es.html' %}
-{% assign find = true %}
-{% assign lang = 'Español' %}
-{% include es.md %}
-{% endif %}
-
-{% if page.url contains 'pt.html' %}
-{% assign find = true %}
-{% assign lang = 'Portugal' %}
-{% include pt.md %}
-{% endif %}
-
-
-{% if page.url contains 'zh.html' %}
-{% assign find = true %}
-{% assign lang = '中文' %}
-{% include zh.md %}
-{% endif %}
-
-{% if page.url contains 'ar.html' %}
-{% assign find = true %}
-{% assign lang = 'العربية' %}
-{% include ar.md %}
-{% endif %}
-
-
-{% if find == false %}
-{% assign lang = 'English' %}
-{% include index.md %}
-{% endif %}
-
+{% include codes.md %}
+
+{% if lang == 'ar' %}{% include ar.md %}{% endif %}
+{% if lang == 'de' %}{% include de.md %}{% endif %}
+{% if lang == 'es' %}{% include es.md %}{% endif %}
+{% if lang == 'fr' %}{% include fr.md %}{% endif %}
+{% if lang == 'it' %}{% include it.md %}{% endif %}
+{% if lang == 'zh' %}{% include zh.md %}{% endif %}
+{% if lang == 'ru' %}{% include ru.md %}{% endif %}
+{% if lang == 'pt' %}{% include pt.md %}{% endif %}
+{% if lang == '' %}{% include index.md %}{% endif %}
 
 <ul class="languagepicker roundborders large">
-	<a href="#"><li>{{ lang }}</li></a>
-{% if lang != 'English'%}<a href="index"><li>English</li></a>{% endif %}
-{% if lang != 'Русский'%}<a href="ru"><li>Русский</li></a>{% endif %}
-{% if lang != 'Français'%}<a href="fr"><li>Français</li></a>{% endif %}
-{% if lang != 'Deutsch'%}<a href="de"><li>Deutsch</li></a>{% endif %}
-{% if lang != 'Italiano'%}<a href="it"><li>Italiano</li></a>{% endif %}
-{% if lang != 'Portugal'%}<a href="pt"><li>Portugal</li></a>{% endif %}
-{% if lang != 'Español'%}<a href="es"><li>Español</li></a>{% endif %}
-{% if lang != 'العربية'%}<a href="ar"><li>العربية</li></a>{% endif %}
-{% if lang != '中文'%}<a href="zh"><li>中文</li></a>{% endif %}
+	<a href="#"><li>{{ full }}</li></a>
+{% if full != 'English'%}<a href="index"><li>English</li></a>{% endif %}
+{% if full != 'Русский'%}<a href="ru"><li>Русский</li></a>{% endif %}
+{% if full != 'Français'%}<a href="fr"><li>Français</li></a>{% endif %}
+{% if full != 'Deutsch'%}<a href="de"><li>Deutsch</li></a>{% endif %}
+{% if full != 'Italiano'%}<a href="it"><li>Italiano</li></a>{% endif %}
+{% if full != 'Portugal'%}<a href="pt"><li>Portugal</li></a>{% endif %}
+{% if full != 'Español'%}<a href="es"><li>Español</li></a>{% endif %}
+{% if full != 'العربية'%}<a href="ar"><li>العربية</li></a>{% endif %}
+{% if full != '中文'%}<a href="zh"><li>中文</li></a>{% endif %}
 </ul>
-<p></p>           
-	        
+<p></p>
diff --git a/docs/_includes/versions.md b/docs/_includes/versions.md
@@ -1,13 +1,3 @@
-{% assign lang = '' %}
-
-{% if page.url contains 'ar.html' %}{% assign lang = 'ar' %}{% endif %}
-{% if page.url contains 'de.html' %}{% assign lang = 'de' %}{% endif %}
-{% if page.url contains 'es.html' %}{% assign lang = 'es' %}{% endif %}
-{% if page.url contains 'fr.html' %}{% assign lang = 'fr' %}{% endif %}
-{% if page.url contains 'it.html' %}{% assign lang = 'it' %}{% endif %}
-{% if page.url contains 'ru.html' %}{% assign lang = 'ru' %}{% endif %}
-{% if page.url contains 'zh.html' %}{% assign lang = 'zh' %}{% endif %}
-
 * [Librera 8.1](/wiki/what-is-new/8.1/{{lang}})
 * [Librera 8.0](/wiki/what-is-new/8.0/{{lang}})
 * [Librera 7.12](/wiki/what-is-new/7.12/{{lang}})

diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html
@@ -1,3 +1,4 @@
+{% include codes.md %}
 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
@@ -21,7 +22,7 @@
     <div class="navigation">
 
 
-        <h1 class="site-title"><a href="/wiki">Librera Wiki</a></h1>
+        <h1 class="site-title"><a href="/wiki/{{lang}}">Librera Wiki</a></h1>
 
      {% capture my_include %}{% include menu.md %}{% endcapture %}
    {{ my_include | markdownify }}
@@ -40,6 +41,11 @@ <h1 class="site-title"><a href="/wiki">Librera Wiki</a></h1>
 <div class="content">
 
     <section class="page">
+
+        {% if parent == '/wiki/faq/' or  parent == '/wiki/' or parent == '/wiki/what-is-new/' %}
+            <a href="{{parent}}{{lang}}"> < </a>
+        {% endif %}
+
         {{content}}
 
         {% if page.url contains 'what-is-new' %}

diff --git a/docs/wiki/PrivacyPolicy/ar.md b/docs/wiki/PrivacyPolicy/ar.md
@@ -1,15 +1,13 @@
 ---
 layout: main
-version: 5
 ---
-[Wiki](/wiki/ar) &nbsp; &nbsp; &nbsp; [ما الجديد](/wiki/what-is-new/) &nbsp; &nbsp; &nbsp; [حول التطبيق](/wiki/about/)
 
 # سياسات الخصوصية
 
-* [قارئ Librera](/wiki/PrivacyPolicy/com.foobnix.pdf.reader/ar)
-* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader/ar)
-* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri/ar)
-* [قارئ PDF](/wiki/PrivacyPolicy/pdf.pdf.reader/ar)
-* [قارئ EPUB](/wiki/PrivacyPolicy/epub.reader/ar)
-* [قارئ Ebooka](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3/ar)
-* [قارئ TTS](/wiki/PrivacyPolicy/tts.reader/ar)
+* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader)
+* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader)
+* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri)
+* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader)
+* [EPUB Reader](/wiki/PrivacyPolicy/epub.reader)
+* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3)
+* [TTS Reader](/wiki/PrivacyPolicy/tts.reader)
diff --git a/...icy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri.md b/...icy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri.md
@@ -1,9 +1,6 @@
 ---
 layout: main
-version: 3
 ---
-[Back](/wiki/PrivacyPolicy/)
-
 # Privacy Policy
 
 Librera built the PDF Classic app as a Free app. This SERVICE is provided by Librera at no cost and is intended for use as is.

diff --git a/docs/wiki/PrivacyPolicy/com.foobnix.pdf.reader.md b/docs/wiki/PrivacyPolicy/com.foobnix.pdf.reader.md
@@ -1,9 +1,6 @@
 ---
 layout: main
-version: 3
 ---
-[Back](/wiki/PrivacyPolicy/)
-
 # Privacy Policy
 
 Librera built the Librera Reader app as a Free app. This SERVICE is provided by Librera at no cost and is intended for use as is.

diff --git a/docs/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader.md b/docs/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader.md
@@ -1,9 +1,6 @@
 ---
 layout: main
-version: 3
 ---
-[Back](/wiki/PrivacyPolicy/)
-
 # Privacy Policy
 
 Librera built the Librera PRO app as a Commercial app. This SERVICE is provided by Librera and is intended for use as is.

diff --git a/docs/wiki/PrivacyPolicy/de.md b/docs/wiki/PrivacyPolicy/de.md
@@ -1,15 +1,12 @@
 ---
 layout: main
-version: 5
 ---
-[Wiki](/wiki/de) &nbsp; &nbsp; &nbsp; [Was ist neu](/wiki/what-is-new/) &nbsp; &nbsp; &nbsp; [Über die App](/wiki/about/)
-
 # Datenschutzbestimmungen
 
-* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader/de)
-* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader/de)
-* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri/de)
-* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader/de)
-* [EPUB Reader](/wiki/PrivacyPolicy/epub.reader/de)
-* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3/de)
-* [TTS Reader](/wiki/PrivacyPolicy/tts.reader/de)
+* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader)
+* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader)
+* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri)
+* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader)
+* [EPUB Reader](/wiki/PrivacyPolicy/epub.reader)
+* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3)
+* [TTS Reader](/wiki/PrivacyPolicy/tts.reader)
diff --git a/docs/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3.md b/docs/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3.md
@@ -1,9 +1,6 @@
 ---
 layout: main
-version: 3
 ---
-[Back](/wiki/PrivacyPolicy/)
-
 # Privacy Policy
 
 Librera built the Ebooka Reader app as a Free app. This SERVICE is provided by Librera at no cost and is intended for use as is.

diff --git a/docs/wiki/PrivacyPolicy/epub.reader.md b/docs/wiki/PrivacyPolicy/epub.reader.md
@@ -1,9 +1,6 @@
 ---
 layout: main
-version: 3
 ---
-[Back](/wiki/PrivacyPolicy/)
-
 # Privacy Policy
 
 Librera built the EPUB Reader app as a Free app. This SERVICE is provided by Librera at no cost and is intended for use as is.

diff --git a/docs/wiki/PrivacyPolicy/es.md b/docs/wiki/PrivacyPolicy/es.md
@@ -1,15 +1,12 @@
 ---
 layout: main
-version: 5
 ---
-[Wiki](/wiki/es) &nbsp; &nbsp; &nbsp; [Novedades](/wiki/what-is-new/) &nbsp; &nbsp; &nbsp; [Acerca de la aplicación](/wiki/about/)
-
 # Políticas de privacidad
 
-* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader/es)
-* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader/es)
-* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri/es)
-* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader/es)
-* [lector EPUB](/wiki/PrivacyPolicy/epub.reader/es)
-* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3/es)
-* [TTS Reader](/wiki/PrivacyPolicy/tts.reader/es)
+* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader)
+* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader)
+* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri)
+* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader)
+* [EPUB Reader](/wiki/PrivacyPolicy/epub.reader)
+* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3)
+* [TTS Reader](/wiki/PrivacyPolicy/tts.reader)
diff --git a/docs/wiki/PrivacyPolicy/fr.md b/docs/wiki/PrivacyPolicy/fr.md
@@ -1,15 +1,13 @@
 ---
 layout: main
-version: 5
 ---
-[Wiki](/wiki/fr) &nbsp; &nbsp; &nbsp; [Quoi de neuf](/wiki/what-is-is-new/) &nbsp; &nbsp; &nbsp; [À propos de l'application](/wiki/à propos de/)
 
 # Règles de confidentialité
 
-* [Lecteur Librera](/wiki/PrivacyPolicy/com.foobnix.pdf.reader/fr)
-* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader/fr)
-* [PDF classique](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri/fr)
-* [Lecteur PDF](/wiki/PrivacyPolicy/pdf.pdf.reader/fr)
-* [Lecteur EPUB](/wiki/PrivacyPolicy/epub.reader/fr)
-* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3/fr)
-* [Lecteur TTS](/wiki/PrivacyPolicy/tts.reader/fr)
+* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader)
+* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader)
+* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri)
+* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader)
+* [EPUB Reader](/wiki/PrivacyPolicy/epub.reader)
+* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3)
+* [TTS Reader](/wiki/PrivacyPolicy/tts.reader)
diff --git a/docs/wiki/PrivacyPolicy/index.md b/docs/wiki/PrivacyPolicy/index.md
@@ -1,15 +1,12 @@
 ---
 layout: main
-version: 5
 ---
-[Wiki](/wiki)&nbsp;&nbsp;&nbsp;[What is new](/wiki/what-is-new/)&nbsp;&nbsp;&nbsp;[About app](/wiki/about/)
-
 # Privacy Policies
 
-*   [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader)
-*   [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader)
-*   [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri)
-*   [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader)
-*   [EPUB Reader](/wiki/PrivacyPolicy/epub.reader)
-*   [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3)
-*   [TTS Reader](/wiki/PrivacyPolicy/tts.reader)
+* [Librera Reader](/wiki/PrivacyPolicy/com.foobnix.pdf.reader)
+* [Librera PRO](/wiki/PrivacyPolicy/com.foobnix.pro.pdf.reader)
+* [PDF Classic](/wiki/PrivacyPolicy/classic.pdf.reader.viewer.djvu.epub.fb2.txt.mobi.book.reader.lirbi.libri)
+* [PDF Reader](/wiki/PrivacyPolicy/pdf.pdf.reader)
+* [EPUB Reader](/wiki/PrivacyPolicy/epub.reader)
+* [Ebooka Reader](/wiki/PrivacyPolicy/droid.reader.book.epub.mobi.pdf.djvu.fb2.txt.azw.azw3)
+* [TTS Reader](/wiki/PrivacyPolicy/tts.reader)