diff --git a/Makefile b/Makefile index cbc8ae2d2..115fa9766 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ endif ifeq ($(or $(EMULATE_READER),$(WIN32)),) # clean up, remove unused files for releases rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual} - rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttc + rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttf endif $(KOR_BASE)/$(OUTPUT_DIR)/luajit: diff --git a/base b/base index 298a034a1..1da820194 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 298a034a145ec3a66f7034c1e5d659459bc3aefa +Subproject commit 1da8201942114d5dce312b0511bb75c8465683b2 diff --git a/frontend/device.lua b/frontend/device.lua index da86f3cc2..504a03255 100644 --- a/frontend/device.lua +++ b/frontend/device.lua @@ -16,13 +16,13 @@ local function probeDevice() return require("device/kindle/device") end - local kg_test_fd = lfs.attributes("/bin/kobo_config.sh") - if kg_test_fd then + local kg_test_stat = lfs.attributes("/bin/kobo_config.sh") + if kg_test_stat then return require("device/kobo/device") end - local pbook_test_fd = lfs.attributes("/ebrmain") - if pbook_test_fd then + local pbook_test_stat = lfs.attributes("/ebrmain") + if pbook_test_stat then return require("device/pocketbook/device") end diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index e2529a908..49a135f67 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -108,9 +108,14 @@ function Kobo:init() end function Kobo:getCodeName() - local std_out = io.popen("/bin/kobo_config.sh 2>/dev/null", "r") - local codename = std_out:read() - std_out:close() + -- Try to get it from the env first + local codename = os.getenv("PRODUCT") + -- If that fails, run the script ourselves + if not codename then + local std_out = io.popen("/bin/kobo_config.sh 2>/dev/null", "r") + codename = std_out:read() + std_out:close() + end return codename end diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua index fd8e9d4d7..402fcc9b2 100644 --- a/frontend/document/credocument.lua +++ b/frontend/document/credocument.lua @@ -22,7 +22,7 @@ local CreDocument = Document:new{ line_space_percent = 100, default_font = G_reader_settings:readSetting("cre_font") or "Noto Serif", header_font = G_reader_settings:readSetting("header_font") or "Noto Sans", - fallback_font = G_reader_settings:readSetting("fallback_font") or "Droid Sans Fallback H", + fallback_font = G_reader_settings:readSetting("fallback_font") or "Droid Sans Fallback", default_css = "./data/cr3.css", options = CreOptions, } diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua index 221b7376a..c832a1469 100644 --- a/frontend/ui/font.lua +++ b/frontend/ui/font.lua @@ -35,7 +35,7 @@ local Font = { infofont = "noto/NotoSans-Regular.ttf", }, fallbacks = { - [1] = "droid/DroidSansFallback.ttc", + [1] = "droid/DroidSansFallback.ttf", [2] = "noto/NotoSans-Regular.ttf", [3] = "droid/DroidSans.ttf", [4] = "freefont/FreeSans.ttf", diff --git a/platform/kobo/koreader.sh b/platform/kobo/koreader.sh index 733db0d79..91539f97a 100755 --- a/platform/kobo/koreader.sh +++ b/platform/kobo/koreader.sh @@ -89,7 +89,7 @@ else # if we were called from advboot then we must reboot to go to the menu # NOTE: This is actually achieved by checking if KSM is running: # This might lead to false-positives if you use neither KSM nor advboot to launch KOReader *without nickel running*. - if ! pkill -0 ksmhome.sh ; then + if ! pidof ksmhome.sh > /dev/null 2>&1 ; then reboot fi fi diff --git a/platform/kobo/nickel.sh b/platform/kobo/nickel.sh index 11af26de8..126807277 100644 --- a/platform/kobo/nickel.sh +++ b/platform/kobo/nickel.sh @@ -4,7 +4,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/lib" # Handle the rotation weirdness on some devices cur_rotate="$(cat "/sys/class/graphics/fb0/rotate")" -# start fmon again: +# start fmon again. Note that we don't have to worry about reaping this, nickel kills on-animator.sh on start. ( usleep 400000; /etc/init.d/on-animator.sh ) & # environment needed by nickel, from /etc/init.d/rcS: @@ -27,9 +27,9 @@ export LD_LIBRARY_PATH="/usr/local/Kobo" export LANG="en_US.UTF-8" -# start nickel again (from tshering's start menu v0.4), this should -# cover all firmware versions from 2.6.1 to 3.4.1 (tested on a kobo -# mini with 3.4.1 firmware) +# start nickel again (inspired from KSM, vlasovsoft & the base rcS), this should +# cover at least firmware versions from 2.6.1 to 3.12.1 (tested on a kobo +# mini with 3.4.1 firmware & a H2O on 3.12.1) ( /usr/local/Kobo/pickel disable.rtc.alarm diff --git a/resources/fonts/droid/DroidSansFallback.ttf b/resources/fonts/droid/DroidSansFallback.ttf new file mode 100644 index 000000000..96b16bb1c Binary files /dev/null and b/resources/fonts/droid/DroidSansFallback.ttf differ diff --git a/resources/fonts/droid/DroidSansFallbackFull.ttf b/resources/fonts/droid/DroidSansFallbackFull.ttf new file mode 100644 index 000000000..89959f52f Binary files /dev/null and b/resources/fonts/droid/DroidSansFallbackFull.ttf differ diff --git a/resources/fonts/droid/DroidSansMono.ttf b/resources/fonts/droid/DroidSansMono.ttf new file mode 100644 index 000000000..4085cee84 Binary files /dev/null and b/resources/fonts/droid/DroidSansMono.ttf differ diff --git a/resources/fonts/droid/NOTICE b/resources/fonts/droid/NOTICE new file mode 100644 index 000000000..c5b1efa7a --- /dev/null +++ b/resources/fonts/droid/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-2008, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/resources/fonts/noto/NotoSans-Bold.ttf b/resources/fonts/noto/NotoSans-Bold.ttf index 120ee5323..a9f023e06 100644 Binary files a/resources/fonts/noto/NotoSans-Bold.ttf and b/resources/fonts/noto/NotoSans-Bold.ttf differ diff --git a/resources/fonts/noto/NotoSans-BoldItalic.ttf b/resources/fonts/noto/NotoSans-BoldItalic.ttf index a35b9c429..053362293 100644 Binary files a/resources/fonts/noto/NotoSans-BoldItalic.ttf and b/resources/fonts/noto/NotoSans-BoldItalic.ttf differ diff --git a/resources/fonts/noto/NotoSans-Italic.ttf b/resources/fonts/noto/NotoSans-Italic.ttf index 7388e2b62..bead498f8 100644 Binary files a/resources/fonts/noto/NotoSans-Italic.ttf and b/resources/fonts/noto/NotoSans-Italic.ttf differ diff --git a/resources/fonts/noto/NotoSans-Regular.ttf b/resources/fonts/noto/NotoSans-Regular.ttf index 04a2f52ed..a5a25a4a8 100644 Binary files a/resources/fonts/noto/NotoSans-Regular.ttf and b/resources/fonts/noto/NotoSans-Regular.ttf differ diff --git a/resources/fonts/noto/NotoSerif-Bold.ttf b/resources/fonts/noto/NotoSerif-Bold.ttf index c75224b44..eace8ea2f 100644 Binary files a/resources/fonts/noto/NotoSerif-Bold.ttf and b/resources/fonts/noto/NotoSerif-Bold.ttf differ diff --git a/resources/fonts/noto/NotoSerif-BoldItalic.ttf b/resources/fonts/noto/NotoSerif-BoldItalic.ttf index a0ae9b7e6..afddb9b29 100644 Binary files a/resources/fonts/noto/NotoSerif-BoldItalic.ttf and b/resources/fonts/noto/NotoSerif-BoldItalic.ttf differ diff --git a/resources/fonts/noto/NotoSerif-Italic.ttf b/resources/fonts/noto/NotoSerif-Italic.ttf index 0c08bab8d..d74cc7a09 100644 Binary files a/resources/fonts/noto/NotoSerif-Italic.ttf and b/resources/fonts/noto/NotoSerif-Italic.ttf differ diff --git a/resources/fonts/noto/NotoSerif-Regular.ttf b/resources/fonts/noto/NotoSerif-Regular.ttf index 96c7d74ab..830eeca1a 100644 Binary files a/resources/fonts/noto/NotoSerif-Regular.ttf and b/resources/fonts/noto/NotoSerif-Regular.ttf differ