diff --git a/resources/fonts/liberation/LiberationMono-Bold.ttf b/resources/fonts/liberation/LiberationMono-Bold.ttf deleted file mode 100644 index 8ee867bbe4..0000000000 Binary files a/resources/fonts/liberation/LiberationMono-Bold.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationMono-BoldItalic.ttf b/resources/fonts/liberation/LiberationMono-BoldItalic.ttf deleted file mode 100644 index edbcb2bb74..0000000000 Binary files a/resources/fonts/liberation/LiberationMono-BoldItalic.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationMono-Italic.ttf b/resources/fonts/liberation/LiberationMono-Italic.ttf deleted file mode 100644 index cfcab289a2..0000000000 Binary files a/resources/fonts/liberation/LiberationMono-Italic.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationMono-Regular.ttf b/resources/fonts/liberation/LiberationMono-Regular.ttf deleted file mode 100644 index 481f7ef8e1..0000000000 Binary files a/resources/fonts/liberation/LiberationMono-Regular.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSans-Bold.ttf b/resources/fonts/liberation/LiberationSans-Bold.ttf deleted file mode 100644 index ab135f0e6e..0000000000 Binary files a/resources/fonts/liberation/LiberationSans-Bold.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSans-BoldItalic.ttf b/resources/fonts/liberation/LiberationSans-BoldItalic.ttf deleted file mode 100644 index 48a3577e67..0000000000 Binary files a/resources/fonts/liberation/LiberationSans-BoldItalic.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSans-Italic.ttf b/resources/fonts/liberation/LiberationSans-Italic.ttf deleted file mode 100644 index 8124753cec..0000000000 Binary files a/resources/fonts/liberation/LiberationSans-Italic.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSans-Regular.ttf b/resources/fonts/liberation/LiberationSans-Regular.ttf deleted file mode 100644 index a1c556ef66..0000000000 Binary files a/resources/fonts/liberation/LiberationSans-Regular.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSerif-Bold.ttf b/resources/fonts/liberation/LiberationSerif-Bold.ttf deleted file mode 100644 index 5f067fdfbf..0000000000 Binary files a/resources/fonts/liberation/LiberationSerif-Bold.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSerif-BoldItalic.ttf b/resources/fonts/liberation/LiberationSerif-BoldItalic.ttf deleted file mode 100644 index 21775ab588..0000000000 Binary files a/resources/fonts/liberation/LiberationSerif-BoldItalic.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSerif-Italic.ttf b/resources/fonts/liberation/LiberationSerif-Italic.ttf deleted file mode 100644 index 0b6b5f1bba..0000000000 Binary files a/resources/fonts/liberation/LiberationSerif-Italic.ttf and /dev/null differ diff --git a/resources/fonts/liberation/LiberationSerif-Regular.ttf b/resources/fonts/liberation/LiberationSerif-Regular.ttf deleted file mode 100644 index b263423035..0000000000 Binary files a/resources/fonts/liberation/LiberationSerif-Regular.ttf and /dev/null differ diff --git a/setup/commands.py b/setup/commands.py index d9e741e937..c8d56a604b 100644 --- a/setup/commands.py +++ b/setup/commands.py @@ -21,7 +21,7 @@ __all__ = [ 'upload_user_manual', 'upload_demo', 'reupload', 'stage1', 'stage2', 'stage3', 'stage4', 'stage5', 'publish', 'publish_betas', 'linux', 'linux32', 'linux64', 'win', 'win32', 'win64', 'osx', 'build_dep', - 'export_packages', 'hyphenation', 'csslint' + 'export_packages', 'hyphenation', 'liberation_fonts', 'csslint' ] from setup.installers import Linux, Win, OSX, Linux32, Linux64, Win32, Win64, ExtDev, BuildDep, ExportPackages @@ -51,6 +51,9 @@ mathjax = MathJax() from setup.hyphenation import Hyphenation hyphenation = Hyphenation() +from setup.liberation import LiberationFonts +liberation_fonts = LiberationFonts() + from setup.git_version import GitVersion git_version = GitVersion() diff --git a/setup/liberation.py b/setup/liberation.py new file mode 100644 index 0000000000..fc2ec01adb --- /dev/null +++ b/setup/liberation.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai +# License: GPLv3 Copyright: 2019, Kovid Goyal +from __future__ import absolute_import, division, print_function, unicode_literals + +import glob +import os + +from setup.revendor import ReVendor + + +class LiberationFonts(ReVendor): + + description = 'Download the Liberation fonts' + NAME = 'liberation_fonts' + TAR_NAME = 'liberation-fonts' + VERSION = '2.1.1' + DOWNLOAD_URL = 'https://github.com/liberationfonts/liberation-fonts/files/4743886/liberation-fonts-ttf-%s.tar.gz' % VERSION + + @property + def vendored_dir(self): + return self.j(self.RESOURCES, 'fonts', 'liberation') + + def run(self, opts): + self.clean() + os.makedirs(self.vendored_dir) + with self.temp_dir() as dl_src: + src = opts.path_to_hyphenation or self.download_vendor_release(dl_src, opts.hyphenation_url) + font_files = glob.glob(os.path.join(src, '*/Liberation*.ttf')) + if not font_files: + raise SystemExit(f'No font files found in {src}') + + for x in font_files: + self.add_file(x, os.path.basename(x)) diff --git a/setup/resources.py b/setup/resources.py index 200a6e685b..28844fa02b 100644 --- a/setup/resources.py +++ b/setup/resources.py @@ -199,7 +199,7 @@ class RapydScript(Command): # {{{ class Resources(Command): # {{{ description = 'Compile various needed calibre resources' - sub_commands = ['kakasi', 'mathjax', 'rapydscript', 'hyphenation'] + sub_commands = ['kakasi', 'liberation_fonts', 'mathjax', 'rapydscript', 'hyphenation'] def run(self, opts): from calibre.utils.serialize import msgpack_dumps