Rename font/ => fonts/ First suggested by https://mathquill.slack.com/archives/mathquill/p1486494860000902 It's definitely the consensus: KaTeX https://github.com/Khan/KaTeX/tree/f3df1ccbac4c61efd55bec423bc8509f8d173fb2/static/fonts MathJax https://github.com/mathjax/MathJax/tree/6273842a9746731b9ecca0de18ec9fd50a36df99/fonts FontAwesome https://github.com/FortAwesome/Font-Awesome/tree/04dad1e192b129ab09cddcd9b1aefb8b189c8d79/fonts materialize https://github.com/Dogfalo/materialize/tree/189722c9cac812f5e9b3b05299298e8d4e90d7c5/fonts a blogpost on React-Meteor https://medium.com/@abhaytalreja/custom-fonts-in-react-meteor-app-ebe2a7fc7a2b#.43mnzbxaj clinical-meteor https://github.com/clinical-meteor/fonts It's even the consensus for Rails and Django: react_on_rails "recommended project structure" https://github.com/shakacode/react_on_rails/blob/9483bf8aaa2610a0ba5c5f04a551001f99589b0d/docs/additional-reading/recommended-project-structure.md#directory-structure "Custom Web Fonts and the Rails Asset Pipeline": "The recommended way" https://gist.github.com/anotheruiguy/7379570#the-recommended-way "Ultimate Django" https://ultimatedjango.com/learn-django/lessons/serving-static-files/ someone on stackoverflow "Best practice for Django project working directory structure" http://stackoverflow.com/a/35244323/362030
diff --git a/.gitattributes b/.gitattributes index 8e06004..66fbd75 100644 --- a/.gitattributes +++ b/.gitattributes
@@ -2,4 +2,4 @@ * text=lf # don't mess with fonts -src/font/* text=binary +src/fonts/* text=binary
diff --git a/docs/Contributing.md b/docs/Contributing.md index bcbd3ae..1b8aaa8 100644 --- a/docs/Contributing.md +++ b/docs/Contributing.md
@@ -8,7 +8,7 @@ `make basic` builds a stripped-down version of MathQuill for basic mathematics, without advanced LaTeX commands. This version doesn't allow typed LaTeX backslash commands with `\` or text blocks with `$`, and also won't render any LaTeX commands that can't by typed without `\`. This version of MathQuill's JS is only somewhat smaller, but the font is like 100x smaller. -To run this smaller version, serve and load `mathquill-basic.{js,min.js,css}` and `font/Symbola-basic.{eot,ttf}` instead. +To run this smaller version, serve and load `mathquill-basic.{js,min.js,css}` and `fonts/Symbola-basic.{eot,ttf}` instead. # Testing
diff --git a/package.json b/package.json index 5bf3263..9cb6c4b 100644 --- a/package.json +++ b/package.json
@@ -9,7 +9,7 @@ }, "files": [ "build/mathquill.{css,js,min.js}", - "build/font/Symbola.*", + "build/fonts/Symbola.*", "quickstart.html" ], "devDependencies": {
diff --git a/src/css/font.less b/src/css/font.less index af1e7f6..6c7b1dc 100644 --- a/src/css/font.less +++ b/src/css/font.less
@@ -9,24 +9,24 @@ @basic:; .font-srcs() when not (@basic) { - src: url(font/Symbola.eot); + src: url(fonts/Symbola.eot); src: local("Symbola Regular"), local("Symbola"), - url(font/Symbola.woff2) format("woff2"), - url(font/Symbola.woff) format("woff"), - url(font/Symbola.ttf) format("truetype"), - url(font/Symbola.svg#Symbola) format("svg") + url(fonts/Symbola.woff2) format("woff2"), + url(fonts/Symbola.woff) format("woff"), + url(fonts/Symbola.ttf) format("truetype"), + url(fonts/Symbola.svg#Symbola) format("svg") ; } .font-srcs() when (@basic) { - src: url(font/Symbola-basic.eot); + src: url(fonts/Symbola-basic.eot); src: local("Symbola Regular"), local("Symbola"), - url(font/Symbola-basic.woff2) format("woff2"), - url(font/Symbola-basic.woff) format("woff"), - url(font/Symbola-basic.ttf) format("truetype") + url(fonts/Symbola-basic.woff2) format("woff2"), + url(fonts/Symbola-basic.woff) format("woff"), + url(fonts/Symbola-basic.ttf) format("truetype") ; }
diff --git a/src/font/Symbola-basic.eot b/src/fonts/Symbola-basic.eot similarity index 100% rename from src/font/Symbola-basic.eot rename to src/fonts/Symbola-basic.eot Binary files differ
diff --git a/src/font/Symbola-basic.ttf b/src/fonts/Symbola-basic.ttf similarity index 100% rename from src/font/Symbola-basic.ttf rename to src/fonts/Symbola-basic.ttf Binary files differ
diff --git a/src/font/Symbola-basic.woff b/src/fonts/Symbola-basic.woff similarity index 100% rename from src/font/Symbola-basic.woff rename to src/fonts/Symbola-basic.woff Binary files differ
diff --git a/src/font/Symbola-basic.woff2 b/src/fonts/Symbola-basic.woff2 similarity index 100% rename from src/font/Symbola-basic.woff2 rename to src/fonts/Symbola-basic.woff2 Binary files differ
diff --git a/src/font/Symbola.eot b/src/fonts/Symbola.eot similarity index 100% rename from src/font/Symbola.eot rename to src/fonts/Symbola.eot Binary files differ
diff --git a/src/font/Symbola.svg b/src/fonts/Symbola.svg similarity index 100% rename from src/font/Symbola.svg rename to src/fonts/Symbola.svg
diff --git a/src/font/Symbola.ttf b/src/fonts/Symbola.ttf similarity index 100% rename from src/font/Symbola.ttf rename to src/fonts/Symbola.ttf Binary files differ
diff --git a/src/font/Symbola.woff b/src/fonts/Symbola.woff similarity index 100% rename from src/font/Symbola.woff rename to src/fonts/Symbola.woff Binary files differ
diff --git a/src/font/Symbola.woff2 b/src/fonts/Symbola.woff2 similarity index 100% rename from src/font/Symbola.woff2 rename to src/fonts/Symbola.woff2 Binary files differ