diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2020-02-29 08:57:45 +0100 |
|---|---|---|
| committer | Lars-Dominik Braun <lars@6xq.net> | 2020-02-29 08:57:45 +0100 |
| commit | 05eb1d4c06a8d2f29e5220739648882ece4470ff (patch) | |
| tree | 3f65c72b49063f4bc4b74cc77ea17645f20da2b3 | |
| parent | 06731bcc53cff75fc83d851f1cc0c61ba6155b61 (diff) | |
| download | lulua-05eb1d4c06a8d2f29e5220739648882ece4470ff.tar.gz lulua-05eb1d4c06a8d2f29e5220739648882ece4470ff.tar.bz2 lulua-05eb1d4c06a8d2f29e5220739648882ece4470ff.zip | |
Upgrade IBM Plex to 4.0.2
Arabic font was renamed.
| m--------- | 3rdparty/plex | 0 | ||||
| -rwxr-xr-x | gen.sh | 6 | ||||
| -rw-r--r-- | lulua/data/render-svg.css | 2 | ||||
| -rw-r--r-- | lulua/data/report/style.css | 10 | ||||
| -rw-r--r-- | lulua/plot.py | 4 | ||||
| -rw-r--r-- | lulua/render.py | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/3rdparty/plex b/3rdparty/plex -Subproject f51d07200ae54caed11da4de140142ed61af1be +Subproject ef0ab4998329e17e34e9aaa301b3ebbe4035d70 @@ -15,7 +15,7 @@ statsdir=stats docdir=doc wikiextractor=3rdparty/wikiextractor/WikiExtractor.py osmconvert=3rdparty/osmctools/src/osmconvert -fontdir=3rdparty/plex/IBM-Plex-Arabic/fonts/complete/woff2/ +fontdir=3rdparty/plex/IBM-Plex-Sans-Arabic/fonts/complete/woff2/ optrounds=100000 # pin layers, keep hand-optimized numbers, keep top row free optpins=0;1;2;0,B*;3,* @@ -126,8 +126,8 @@ build \$docdir/_temp/lulua.combined: wordlist \$statsdir/ar-lulua/all.pickle || build \$docdir/_build/lulua.combined.gz: gz \$docdir/_temp/lulua.combined || \$docdir/_build -build \$docdir/_build/fonts/IBMPlexArabic-Regular.woff2: cp \$fontdir/IBMPlexArabic-Regular.woff2 || \$docdir/_build/fonts -build \$docdir/_build/fonts/IBMPlexArabic-Thin.woff2: cp \$fontdir/IBMPlexArabic-Thin.woff2 || \$docdir/_build/fonts +build \$docdir/_build/fonts/IBMPlexSansArabic-Regular.woff2: cp \$fontdir/IBMPlexSansArabic-Regular.woff2 || \$docdir/_build/fonts +build \$docdir/_build/fonts/IBMPlexSansArabic-Thin.woff2: cp \$fontdir/IBMPlexSansArabic-Thin.woff2 || \$docdir/_build/fonts # build osmconvert build \$osmconvert: configure-make 3rdparty/osmctools diff --git a/lulua/data/render-svg.css b/lulua/data/render-svg.css index 4bbfd2f..4c31e0f 100644 --- a/lulua/data/render-svg.css +++ b/lulua/data/render-svg.css @@ -1,6 +1,6 @@ /* inkscape-compatibility, explicitly apply font settings to .label */ svg, .label { - font-family: "IBM Plex Arabic"; + font-family: "IBM Plex Sans Arabic"; font-size: 90px; font-weight: 400; } diff --git a/lulua/data/report/style.css b/lulua/data/report/style.css index 26b2e96..b95add7 100644 --- a/lulua/data/report/style.css +++ b/lulua/data/report/style.css @@ -17,17 +17,17 @@ using http://colormind.io/bootstrap/ } @font-face { - font-family: 'IBM Plex Arabic'; + font-family: 'IBM Plex Sans Arabic'; font-style: normal; font-weight: 100; - src: local('IBM Plex Arabic Thin'), local('IBMPlexArabic-Thin'), url('fonts/IBMPlexArabic-Thin.woff2') format('woff2'); + src: local('IBM Plex Sans Arabic Thin'), local('IBMPlexSansArabic-Thin'), url('fonts/IBMPlexSansArabic-Thin.woff2') format('woff2'); } @font-face { - font-family: 'IBM Plex Arabic'; + font-family: 'IBM Plex Sans Arabic'; font-style: normal; font-weight: 400; - src: local('IBM Plex Arabic Regular'), local('IBMPlexArabic-Regular'), url('fonts/IBMPlexArabic-Regular.woff2') format('woff2'); + src: local('IBM Plex Sans Arabic Regular'), local('IBMPlexSansArabic-Regular'), url('fonts/IBMPlexSansArabic-Regular.woff2') format('woff2'); } body { @@ -38,7 +38,7 @@ body { /* is there a better way to select _both_ fonts at the same time? */ :lang(ar) { direction: rtl; - font-family: "IBM Plex Arabic"; + font-family: "IBM Plex Sans Arabic"; } /* inside ltr text */ :lang(ar)[dir=ltr] { diff --git a/lulua/plot.py b/lulua/plot.py index de95892..fdfc16c 100644 --- a/lulua/plot.py +++ b/lulua/plot.py @@ -93,8 +93,8 @@ def letterfreq (args): p.xgrid.grid_line_color = None p.xaxis.major_label_text_font_size = "1.5em" p.xaxis.major_label_text_font_size = "1.5em" - p.xaxis.major_label_text_font = 'IBM Plex Arabic' - p.yaxis.major_label_text_font = 'IBM Plex Arabic' + p.xaxis.major_label_text_font = 'IBM Plex Sans Arabic' + p.yaxis.major_label_text_font = 'IBM Plex Sans Arabic' # no border fill p.border_fill_color = None p.background_fill_alpha = 0.5 diff --git a/lulua/render.py b/lulua/render.py index 4fd92c3..7ffae5a 100644 --- a/lulua/render.py +++ b/lulua/render.py @@ -275,8 +275,8 @@ def renderSvg (args): # which we cannot use since it does not support font-weight style = '' fonts = [ - ('IBM Plex Arabic', 100, '3rdparty/plex/IBM-Plex-Arabic/fonts/complete/woff2/IBMPlexArabic-Thin.woff2'), - ('IBM Plex Arabic', 400, '3rdparty/plex/IBM-Plex-Arabic/fonts/complete/woff2/IBMPlexArabic-Regular.woff2') + ('IBM Plex Sans Arabic', 100, '3rdparty/plex/IBM-Plex-Sans-Arabic/fonts/complete/woff2/IBMPlexSansArabic-Thin.woff2'), + ('IBM Plex Sans Arabic', 400, '3rdparty/plex/IBM-Plex-Sans-Arabic/fonts/complete/woff2/IBMPlexSansArabic-Regular.woff2') ] for font, weight, path in fonts: with open (path, 'rb') as fd: |