diff --git a/Makefile b/Makefile index e6bd9f70..6f14af99 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ $(NIS) setup: package.json lint: $(NIS) $(NPM) run lint -webpack: katex.js $(wildcard src/*.js) $(wildcard static/*.less) $(NIS) +webpack: katex.js $(wildcard src/*.js) $(wildcard static/*.less) submodules/katex-fonts/fonts.less $(NIS) $(NPM) run build .PHONY: build/fonts build/contrib diff --git a/package.json b/package.json index 72b4d2fa..e805a603 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ }, "bin": "cli.js", "scripts": { - "lint": "eslint katex.js katex.webpack.js cli.js webpack.common.js webpack.config.js webpack.dev.js src test contrib dockers && stylelint static/fonts.less static/katex.less", + "lint": "eslint katex.js katex.webpack.js cli.js webpack.common.js webpack.config.js webpack.dev.js src test contrib dockers && stylelint static/katex.less", "flow": "flow", "jest": "jest", "jest-update": "jest --updateSnapshot", diff --git a/static/fonts b/static/fonts deleted file mode 120000 index f5fc1672..00000000 --- a/static/fonts +++ /dev/null @@ -1 +0,0 @@ -../submodules/katex-fonts/fonts \ No newline at end of file diff --git a/static/fonts.less b/static/fonts.less deleted file mode 100644 index 96bb466d..00000000 --- a/static/fonts.less +++ /dev/null @@ -1,63 +0,0 @@ -@font-folder: "fonts"; -@use-ttf: true; -@use-woff: true; -@use-woff2: true; - -.use-woff2(@family, @family-suffix) when (@use-woff2 = true) { - src+: url('@{font-folder}/KaTeX_@{family}-@{family-suffix}.woff2') format('woff2') -} - -.use-woff(@family, @family-suffix) when (@use-woff = true) { - src+: url('@{font-folder}/KaTeX_@{family}-@{family-suffix}.woff') format('woff') -} - -.use-ttf(@family, @family-suffix) when (@use-ttf = true) { - src+: url('@{font-folder}/KaTeX_@{family}-@{family-suffix}.ttf') format('truetype') -} - -.generate-suffix(@weight, @style) when (@weight = normal) and (@style = normal) { - @suffix: 'Regular'; -} -.generate-suffix(@weight, @style) when (@weight = normal) and (@style = italic) { - @suffix: 'Italic'; -} -.generate-suffix(@weight, @style) when (@weight = bold) and (@style = normal) { - @suffix: 'Bold'; -} -.generate-suffix(@weight, @style) when (@weight = bold) and (@style = italic) { - @suffix: 'BoldItalic'; -} - -.font-face(@family, @weight, @style) { - .generate-suffix(@weight, @style); - @font-face { - font-family: 'KaTeX_@{family}'; - .use-woff2(@family, @suffix); - .use-woff(@family, @suffix); - .use-ttf(@family, @suffix); - font-weight: @weight; - font-style: @style; - } -} - -.font-face('AMS', normal, normal); -.font-face('Caligraphic', bold, normal); -.font-face('Caligraphic', normal, normal); -.font-face('Fraktur', bold, normal); -.font-face('Fraktur', normal, normal); -.font-face('Main', bold, normal); -.font-face('Main', bold, italic); -.font-face('Main', normal, italic); -.font-face('Main', normal, normal); -// .font-face('Math', bold, italic); -.font-face('Math', normal, italic); -// .font-face('Math', normal, normal); -.font-face('SansSerif', bold, normal); -.font-face('SansSerif', normal, italic); -.font-face('SansSerif', normal, normal); -.font-face('Script', normal, normal); -.font-face('Size1', normal, normal); -.font-face('Size2', normal, normal); -.font-face('Size3', normal, normal); -.font-face('Size4', normal, normal); -.font-face('Typewriter', normal, normal); diff --git a/static/katex.less b/static/katex.less index a014a2ba..b0458a6c 100644 --- a/static/katex.less +++ b/static/katex.less @@ -1,4 +1,4 @@ -@import "fonts.less"; +@import "../submodules/katex-fonts/fonts.less"; // The mu unit is defined as 1/18 em @mu: 1.0/18.0em; diff --git a/submodules/katex-fonts b/submodules/katex-fonts index 58a6f225..28bac265 160000 --- a/submodules/katex-fonts +++ b/submodules/katex-fonts @@ -1 +1 @@ -Subproject commit 58a6f22506aceb1254a57ff19c402d77de055463 +Subproject commit 28bac265ded3222e8f37c4311c27134c10daa61d