diff --git a/.gitignore b/.gitignore index 027c80a..474022f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ all_chars.txt **/fonts/**/*-Subset.* woff2/ **/serve_* -**/lexers.* diff --git a/build.sh b/build.sh index 6cb5c98..0bcbf29 100755 --- a/build.sh +++ b/build.sh @@ -18,11 +18,6 @@ function soup_config { source ./pgvv/bin/activate -if ! [[ -f lexers.out ]] || [[ "$(head -1 lexers.out)" != "$(pygmentize -V)" ]]; then - pygmentize -L lexer | grep '* ' >lexers.out - echo "Created pygments lexer cache at lexers.out" -fi - find acl.cool/site/ ytheleus.org/site/ -type f \( -name '*.dj' -o -name '*.html' \) -exec cat {} + >all_chars.txt cat common_chars.txt >>all_chars.txt @@ -49,10 +44,7 @@ for font in \ subset_ttf="${font%.ttf}-Subset.ttf" hb-subset "$font" \ --output-file="$subset_ttf" \ - --text-file=all_chars.txt \ - --layout-features='*' \ - --passthrough-tables \ - --unicodes+="0x0435" # this is the cyrillic e. For some reason, alegreya's ff calt breaks without it + --keep-everything \ woff2_compress "$subset_ttf" diff --git a/syntax_wrapper.sh b/syntax_wrapper.sh index b4ba4d1..a74245c 100755 --- a/syntax_wrapper.sh +++ b/syntax_wrapper.sh @@ -1,7 +1,7 @@ #! /usr/bin/env sh -if [ $# -lt 1 ] || ! grep -qw "$1" lexers.out; then +if [ $# -lt 1 ] || ! pygmentize -L lexers | grep -qw "$1"; then recode utf8..html else - pygmentize -l $1 -f html | awk -F '
' '{print substr($NF, 14)}'
+    pygmentize -l $1 -f html | head -c -13 | awk -F '
' '{print $NF}'
 fi
\ No newline at end of file