Commit 6a9a5e52 authored by Kaushal Modi's avatar Kaushal Modi

Replace Libre Baskerville and Andada with Merriweather

parent 49db6044
......@@ -24,8 +24,7 @@
/* Iosevka */
/* Linux Biolinum */
/* Source Sans Pro */
/* Libre Baskerville */
/* Andada */
/* Merriweather */
/* Symbola */
/* ** Poole ** */
/* Tables */
......@@ -114,8 +113,8 @@
--title-heading-color: #212121;
--blinking-cursor-color: #212121;
--mono: 'Iosevka', 'Lucida Console', Monaco, 'Courier New', monospace;
--serif: 'Libre Baskerville', 'Palatino Linotype', 'Book Antiqua', Palatino, Georgia, serif;
--italics: 'Andada', 'Palatino Linotype', 'Book Antiqua', Palatino, Georgia, serif;
--serif: 'Merriweather', 'Palatino Linotype', 'Book Antiqua', Palatino, Georgia, serif;
--italics: 'Merriweather', 'Palatino Linotype', 'Book Antiqua', Palatino, Georgia, serif;
--sans-serif-1: 'Linux Biolinum', Arial, Helvetica, sans-serif;
--sans-serif-2: 'Source Sans Pro', Arial, Helvetica, sans-serif;
--symbola: 'Symbola';
......@@ -190,34 +189,60 @@
font-style: italic;
}
/* *** Libre Baskerville */
/* *** Merriweather */
@font-face {
font-family: 'Libre Baskerville';
src: url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Regular.woff2') format('woff2'),
url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Regular.woff') format('woff');
font-family: 'Merriweather';
src: url('../fonts/merriweather/2.002/subset/Merriweather-Regular.woff2') format('woff2'),
url('../fonts/merriweather/2.002/subset/Merriweather-Regular.woff') format('woff');
}
@font-face {
font-family: 'Libre Baskerville';
src: url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Bold.woff2') format('woff2'),
url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Bold.woff') format('woff');
font-family: 'Merriweather';
src: url('../fonts/merriweather/2.002/subset/Merriweather-Bold.woff2') format('woff2'),
url('../fonts/merriweather/2.002/subset/Merriweather-Bold.woff') format('woff');
font-weight: bold;
}
/* *** Andada */
@font-face {
font-family: 'Andada';
src: url('../fonts/andada/2013/subset/Andada-Italic.woff2') format('woff2'),
url('../fonts/andada/2013/subset/Andada-Italic.woff') format('woff');
font-family: 'Merriweather';
src: url('../fonts/merriweather/2.002/subset/Merriweather-Italic.woff2') format('woff2'),
url('../fonts/merriweather/2.002/subset/Merriweather-Italic.woff') format('woff');
font-style: italic;
}
@font-face {
font-family: 'Andada';
src: url('../fonts/andada/2013/subset/Andada-BoldItalic.woff2') format('woff2'),
url('../fonts/andada/2013/subset/Andada-BoldItalic.woff') format('woff');
font-family: 'Merriweather';
src: url('../fonts/merriweather/2.002/subset/Merriweather-BoldItalic.woff2') format('woff2'),
url('../fonts/merriweather/2.002/subset/Merriweather-BoldItalic.woff') format('woff');
font-style: italic;
font-weight: bold;
}
/* /\* *** Libre Baskerville *\/ */
/* @font-face { */
/* font-family: 'Libre Baskerville'; */
/* src: url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Regular.woff2') format('woff2'), */
/* url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Regular.woff') format('woff'); */
/* } */
/* @font-face { */
/* font-family: 'Libre Baskerville'; */
/* src: url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Bold.woff2') format('woff2'), */
/* url('../fonts/libre-baskerville/2012/subset/LibreBaskerville-Bold.woff') format('woff'); */
/* font-weight: bold; */
/* } */
/* /\* *** Andada *\/ */
/* @font-face { */
/* font-family: 'Andada'; */
/* src: url('../fonts/andada/2013/subset/Andada-Italic.woff2') format('woff2'), */
/* url('../fonts/andada/2013/subset/Andada-Italic.woff') format('woff'); */
/* font-style: italic; */
/* } */
/* @font-face { */
/* font-family: 'Andada'; */
/* src: url('../fonts/andada/2013/subset/Andada-BoldItalic.woff2') format('woff2'), */
/* url('../fonts/andada/2013/subset/Andada-BoldItalic.woff') format('woff'); */
/* font-style: italic; */
/* font-weight: bold; */
/* } */
/* *** Symbola */
@font-face {
font-family: 'Symbola';
......
ttf
\ No newline at end of file
#!/usr/bin/env bash
# Time-stamp: <2018-06-18 12:19:57 kmodi>
# Time-stamp: <2018-07-11 22:28:47 kmodi>
# https://github.com/be5invis/Iosevka/issues/238#issuecomment-351527918
# pyftsubset - https://github.com/fonttools/fonttools
......@@ -33,7 +33,7 @@ run_pyftsubset () {
mkdir -p "${out_dir}"
echo "${font}: Generating subset WOFF files .."
for file in ${font}/src/*
for file in ${font}/ttf/*
do
# Get basename without extension from ${file}
# https://stackoverflow.com/a/2664746/1219634
......@@ -42,28 +42,29 @@ run_pyftsubset () {
# echo "file = ${file}"
# echo "basename_no_ext = ${basename_no_ext}"
# https://stackoverflow.com/a/407334/1219634
if [[ $file == *.ttf ]] # The ${font}/src HAS to contain .ttf font files.
if [[ $file == *.ttf ]] # The ${font}/ttf HAS to contain .ttf font files.
then
eval "pyftsubset ${file} ${common_args} --unicodes=${unicodes} --flavor=woff --with-zopfli --output-file=${out_dir}/${basename_no_ext}.woff"
fi
done
echo "${font}: Generating subset WOFF2 files .."
for file in ${font}/src/*
for file in ${font}/ttf/*
do
tmp="${file##*/}"
basename_no_ext="${tmp%.*}"
if [[ $file == *.ttf ]] # The ${font}/src HAS to contain .ttf font files.
if [[ $file == *.ttf ]] # The ${font}/ttf HAS to contain .ttf font files.
then
eval "pyftsubset ${file} ${common_args} --flavor=woff2 --output-file=${out_dir}/${basename_no_ext}.woff2"
fi
done
}
run_pyftsubset "libre-baskerville/2012" "U+0020-007E,U+00A7-00BE,U+2000-205E,U+00C0-00FF"
# run_pyftsubset "libre-baskerville/2012" "U+0020-007E,U+00A7-00BE,U+2000-205E,U+00C0-00FF"
# run_pyftsubset "andada/2013" "U+0020-007E,U+00A7-00BE,U+2000-205E"
run_pyftsubset "merriweather/2.002" "U+0020-007E,U+00A7-00BE,U+2000-205E,U+00C0-00FF"
run_pyftsubset "source-sans-pro/2.020R-ro-1.075R-it" "U+0020-007E,U+00A7-00BE,U+2000-205E"
run_pyftsubset "linux-libertine/5.3.0" "U+0020-007E,U+00A7-00BE,U+2000-205E"
run_pyftsubset "andada/2013" "U+0020-007E,U+00A7-00BE,U+2000-205E"
run_pyftsubset "iosevka/1.14.1" "U+0020-007E,U+00A7-00BE,U+2000-205E"
run_pyftsubset "symbola/v11.0" "U+25A0,U+25CB,U+2B89,U+2B8B"
......
ttf
\ No newline at end of file
Downloaded TTF from https://github.com/google/fonts/tree/master/ofl/merriweather.
ttf
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment