merge

buggins · Nov 3, 2019 · 766addb · 766addb
2 parents c15803e + 1414dc3
commit 766addb
Show file tree

Hide file tree

Showing 123 changed files with 17,095 additions and 9,737 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,32 @@
+language: cpp
+compiler: gcc
+sudo: require
+dist: trusty
+
+before_install:
+  - sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
+  - sudo apt-get update -qq
+
+install:
+  - sudo apt-get -y install pkg-config qt59base qt59tools libpng12-dev libfreetype6-dev libjpeg62-dev libfontconfig1-dev zlib1g-dev
+  - source /opt/qt*/bin/qt*-env.sh
+
+script:
+  - sudo ln -s /usr/include/freetype2/ft2build.h /usr/include/ # https://github.com/matplotlib/matplotlib/issues/3029#issuecomment-43318941
+  - mkdir qtbuild
+  - cd qtbuild
+  - cmake -DGUI=QT5 -DCMAKE_CXX_FLAGS="-DUSE_FREETYPE2" -DCMAKE_BUILD_TYPE=Release -DMAX_IMAGE_SCALE_MUL=2 -DDOC_DATA_COMPRESSION_LEVEL=3 -DDOC_BUFFER_SIZE=0x1400000 -DCMAKE_INSTALL_PREFIX=/usr ..
+  - make -j$(nproc)
+  - make DESTDIR=appdir -j$(nproc) install ; find appdir/
+  - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+  - chmod a+x linuxdeployqt-continuous-x86_64.AppImage
+  - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
+
+after_success:
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash upload.sh Cool*.AppImage*
+
+branches:
+  except:
+    - # Do not build tags that we create when we upload to GitHub Releases
+    - /^(?i:continuous)/
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
diff --git a/android/.idea/codeStyles/codeStyleConfig.xml b/android/.idea/codeStyles/codeStyleConfig.xml
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -31,6 +31,7 @@
         android:icon="@mipmap/cr3_logo"
         android:allowClearUserData="true"
         android:process="org.coolreader"
+        android:usesCleartextTraffic="true"
         >
 <!--
             android:configChanges="orientation|keyboardHidden|locale|screenSize"
@@ -50,7 +51,9 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:host="*" android:scheme="file" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="file" android:host="*" />
+                <data android:scheme="content" />
                 <data android:mimeType="application/octet-stream" />
                 <data android:pathPattern=".*\\.fb2\\.zip"/>
                 <data android:pathPattern=".*\\..*\\.fb2\\.zip"/>
@@ -61,6 +64,18 @@
                 <data android:pathPattern=".*\\..*\\.fb2"/>
                 <data android:pathPattern=".*\\..*\\..*\\.fb2"/>
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.fb2"/>
+                <!-- for inner files in archive opened from system file manager -->
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.fb2"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.fb2"/>
+                <!-- end of inner files in archive -->
+                <data android:pathPattern=".*\\.fb3"/>
+                <data android:pathPattern=".*\\..*\\.fb3"/>
+                <data android:pathPattern=".*\\..*\\..*\\.fb3"/>
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.fb3"/>
                 <data android:pathPattern=".*\\.txt"/>
                 <data android:pathPattern=".*\\.html"/>
                 <data android:pathPattern=".*\\.xhtml"/>
@@ -76,6 +91,7 @@
                 <data android:pathPattern=".*\\..*\\..*\\..*\\.fb2\\.epub"/>
                 <data android:pathPattern=".*\\.pdb"/>
                 <data android:pathPattern=".*\\.doc"/>
+                <data android:pathPattern=".*\\.docx"/>
                 <data android:pathPattern=".*\\.prc"/>
                 <data android:pathPattern=".*\\.pml"/>
                 <data android:pathPattern=".*\\.mobi"/>
@@ -92,34 +108,41 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:host="" android:scheme="file" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="file" android:host="*" />
+                <data android:scheme="content" />
                 <data android:mimeType="text/plain"/>
                 <data android:mimeType="text/html"/>
+                <data android:mimeType="text/richtext"/>
+                <data android:mimeType="application/x-cbr"/>
+                <data android:mimeType="application/x-cbz"/>
+
                 <data android:mimeType="application/zip"/>
                 <data android:mimeType="application/rtf"/>
-                <data android:mimeType="application/msword"/>
                 <data android:mimeType="application/x-rtf"/>
-                <data android:mimeType="text/richtext"/>
-                <data android:mimeType="application/epub+zip"/>
                 <data android:mimeType="application/x-chm"/>
-                <data android:mimeType="application/msword"/>
                 <data android:mimeType="application/fb2"/>
                 <data android:mimeType="application/fb2.zip"/>
+                <data android:mimeType="application/fb3"/>
                 <data android:mimeType="application/epub"/>
+                <data android:mimeType="application/epub+zip"/>
                 <data android:mimeType="application/x-fictionbook"/>
+                <data android:mimeType="application/x-fictionbook+xml"/>
+                <data android:mimeType="application/x-pilot-prc"/>
+                <data android:mimeType="application/x-mobipocket-ebook"/>
+                <data android:mimeType="application/msword"/>
                 <data android:mimeType="application/doc"/>
-                <data android:mimeType="application/vnd.msword"/> 
+                <data android:mimeType="application/vnd.msword"/>
                 <data android:mimeType="application/vnd.ms-word"/>
                 <data android:mimeType="application/winword"/>
                 <data android:mimeType="application/word"/>
                 <data android:mimeType="application/x-msw6"/>
                 <data android:mimeType="application/x-msword"/>
+                <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
             </intent-filter>
         </activity>
 
 
-        <!-- Sync support -->
-        <service android:name=".sync.SyncService" />
         <!-- Database service -->
         <service android:name=".db.CRDBService" />
 

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
@@ -34,9 +34,9 @@ set(LOCAL_CFLAGS "${LOCAL_CFLAGS} -funwind-tables")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LOCAL_CFLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LOCAL_CFLAGS}")
 
-set(CMAKE_C_FLAGS_DEBUG             "-O0 -g3")
-set(CMAKE_C_FLAGS_RELEASE           "-O2 -g0 -DNDEBUG")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO    "-O2 -g1 -DNDEBUG")
+set(CMAKE_C_FLAGS_DEBUG             "-O0 -g")
+set(CMAKE_C_FLAGS_RELEASE           "-O3 -g0 -flto -DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO    "-O3 -g1 -flto -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG           ${CMAKE_C_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_RELEASE         ${CMAKE_C_FLAGS_RELEASE})
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO  ${CMAKE_C_FLAGS_RELWITHDEBINFO})
@@ -57,12 +57,17 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/epubfmt.cpp
     ${CR3_ROOT}/crengine/src/pdbfmt.cpp
     ${CR3_ROOT}/crengine/src/wordfmt.cpp
+    ${CR3_ROOT}/crengine/src/lvopc.cpp
+    ${CR3_ROOT}/crengine/src/docxfmt.cpp
+    ${CR3_ROOT}/crengine/src/fb3fmt.cpp
     ${CR3_ROOT}/crengine/src/lvstsheet.cpp
     ${CR3_ROOT}/crengine/src/txtselector.cpp
     ${CR3_ROOT}/crengine/src/crtest.cpp
     ${CR3_ROOT}/crengine/src/lvbmpbuf.cpp
     ${CR3_ROOT}/crengine/src/lvfnt.cpp
     ${CR3_ROOT}/crengine/src/hyphman.cpp
+    ${CR3_ROOT}/crengine/src/lvfont.cpp
+    ${CR3_ROOT}/crengine/src/lvembeddedfont.cpp
     ${CR3_ROOT}/crengine/src/lvfntman.cpp
     ${CR3_ROOT}/crengine/src/lvimg.cpp
     ${CR3_ROOT}/crengine/src/crskin.cpp
@@ -74,6 +79,12 @@ set(CRENGINE_SRC_FILES
     ${CR3_ROOT}/crengine/src/wolutil.cpp
     ${CR3_ROOT}/crengine/src/crconcurrent.cpp
     ${CR3_ROOT}/crengine/src/hist.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontglyphcache.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontboldtransform.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontcache.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfontdef.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfreetypeface.cpp
+    ${CR3_ROOT}/crengine/src/private/lvfreetypefontman.cpp
     ${CR3_ROOT}/crengine/fc-lang/fc-lang-cat.c
 )
 #    ${CR3_ROOT}/crengine/src/cri18n.cpp

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         applicationId "org.coolreader"
         minSdkVersion 3
-        targetSdkVersion 26
+        targetSdkVersion 28
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
         versionCode 32330
@@ -54,7 +54,6 @@ android {
         debug {
             minifyEnabled false
             shrinkResources false
-            useProguard false
             jniDebuggable true
             debuggable true
             externalNativeBuild {
@@ -115,17 +114,12 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-    }
-
-    // https://developer.android.com/about/versions/marshmallow/android-6.0-changes#behavior-apache-http-client
-    useLibrary 'org.apache.http.legacy'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/android/app/src/androidTest/AndroidManifest.xml b/android/app/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.coolreader"
+          android:installLocation="auto">
+
+    <uses-sdk tools:overrideLibrary="android.support.test, android.support.test.espresso" />
+
+</manifest>