Move src/fonts/OTF/TeX to src/fonts

KaTeX · Sep 5, 2018 · 3a76616 · 3a76616
1 parent 393a3ba
commit 3a76616
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,12 +13,12 @@ jobs:
             cd src
             cp default.cfg custom.cfg
             make custom.cfg.pl
-            make -C fonts/OTF/TeX fonts
+            make -C fonts/ fonts
             cd ..
             rm -f fonts/*.*
-            cp src/fonts/OTF/TeX/ttf/*.ttf fonts
-            cp src/fonts/OTF/TeX/woff/*.woff fonts
-            cp src/fonts/OTF/TeX/woff2/*.woff2 fonts
+            cp src/fonts/ttf/*.ttf fonts
+            cp src/fonts/woff/*.woff fonts
+            cp src/fonts/woff2/*.woff2 fonts
             tar zcf fonts.tar.gz fonts
 
       - run:

diff --git a/buildFonts.sh b/buildFonts.sh
@@ -58,11 +58,11 @@ IMAGE="katex/fonts:DF-$(openssl sha1 Dockerfile | tail -c 9)"
 TMPFILE="$(mktemp "${TMPDIR:-/tmp}/mjf.XXXXXXXX")"
 FILE="$TMPFILE"
 pushd "src"
-if [[ ! -f fonts/OTF/TeX/Makefile ]]; then
-    echo "src does not look like MathJax-dev" >&2
+if [[ ! -f fonts/Makefile ]]; then
+    echo "src does not look like katex-fonts" >&2
     exit 1
 fi
-tar cf "$FILE" Makefile default.cfg fonts/OTF/TeX
+tar cf "$FILE" Makefile default.cfg fonts
 popd
 
 # build image if missing
@@ -76,8 +76,8 @@ export SOURCE_DATE_EPOCH=${LAST_COMMIT_DATE}
 tar xf MathJax-dev.tar.gz
 cp default.cfg custom.cfg
 make custom.cfg.pl
-make -C fonts/OTF/TeX fonts
-tar cf /fonts.tar ${filetypes[*]/#/fonts/OTF/TeX/}"
+make -C fonts fonts
+tar cf /fonts.tar ${filetypes[*]/#/fonts/}"
 
 echo "Creating and starting docker container from image $IMAGE"
 CONTAINER=$(docker create "$IMAGE" /bin/sh -c "${CMDS}")
@@ -95,7 +95,7 @@ mkdir fonts
 for filetype in "${filetypes[@]}"; do
     for font in "${used_fonts[@]}"; do
         echo "$filetype/$font"
-        mv "temp/OTF/TeX/$filetype/$font".* ./fonts/
+        mv "temp/$filetype/$font".* ./fonts/
     done
 done
 rm -rf temp fonts.tar
diff --git a/src/fonts/OTF/TeX/.gitignore → src/fonts/.gitignore b/src/fonts/OTF/TeX/.gitignore → src/fonts/.gitignore
diff --git a/src/fonts/OTF/TeX/Makefile → src/fonts/Makefile b/src/fonts/OTF/TeX/Makefile → src/fonts/Makefile
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include ../../../custom.cfg
+include ../custom.cfg
 
 MFTRACE_MODIFIED=lib/mftrace-modified
 

diff --git a/src/fonts/OTF/TeX/eubase.mf → src/fonts/eubase.mf b/src/fonts/OTF/TeX/eubase.mf → src/fonts/eubase.mf
diff --git a/src/fonts/OTF/TeX/eufb10.mf → src/fonts/eufb10.mf b/src/fonts/OTF/TeX/eufb10.mf → src/fonts/eufb10.mf
diff --git a/src/fonts/OTF/TeX/eufbch.mf → src/fonts/eufbch.mf b/src/fonts/OTF/TeX/eufbch.mf → src/fonts/eufbch.mf
diff --git a/src/fonts/OTF/TeX/eufm10.mf → src/fonts/eufm10.mf b/src/fonts/OTF/TeX/eufm10.mf → src/fonts/eufm10.mf
diff --git a/src/fonts/OTF/TeX/eufmch.mf → src/fonts/eufmch.mf b/src/fonts/OTF/TeX/eufmch.mf → src/fonts/eufmch.mf
diff --git a/src/fonts/OTF/TeX/generate_fonts.py → src/fonts/generate_fonts.py b/src/fonts/OTF/TeX/generate_fonts.py → src/fonts/generate_fonts.py
@@ -30,7 +30,7 @@
     del font['GDEF']
 
 # set font version from package.json
-with open(os.path.join(os.path.dirname(__file__), '../../../../package.json')) as f:
+with open(os.path.join(os.path.dirname(__file__), '../../package.json')) as f:
     version = json.load(f)['version']
 
 font['name'].setName(unicode('Version ' + version), 5, 3, 1, 1033)

diff --git a/src/fonts/OTF/TeX/lib/Extra.otf → src/fonts/lib/Extra.otf b/src/fonts/OTF/TeX/lib/Extra.otf → src/fonts/lib/Extra.otf
diff --git a/src/fonts/OTF/TeX/lib/Space.ttx → src/fonts/lib/Space.ttx b/src/fonts/OTF/TeX/lib/Space.ttx → src/fonts/lib/Space.ttx
diff --git a/src/fonts/OTF/TeX/makeBlacker → src/fonts/makeBlacker b/src/fonts/OTF/TeX/makeBlacker → src/fonts/makeBlacker
@@ -2,10 +2,10 @@
 
 #  Creates the metafont file needed for darker copies of the TeX fonts,
 #  and modifies mftrace to use it.
-#  
+#
 #  Usage:  ./makeBlacker blackness
 
-require "../../../custom.cfg.pl";
+require "../custom.cfg.pl";
 
 $blacker = shift;
 unless ($blacker) {

diff --git a/src/fonts/OTF/TeX/makeFF → src/fonts/makeFF b/src/fonts/OTF/TeX/makeFF → src/fonts/makeFF
@@ -6,7 +6,7 @@
 #
 #  Usage:  ./makeFF
 
-require "../../../custom.cfg.pl";
+require "../custom.cfg.pl";
 
 #########################################################################