Skip to content

Commit 9da322e

Browse files
fix windows naming issue, bump to version 142
1 parent 83be8d5 commit 9da322e

File tree

95 files changed

+22
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+22
-30
lines changed

404.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
@@ -19,7 +19,7 @@
1919
<style>
2020
@font-face {
2121
font-family: "CommitMono";
22-
src: url("/src/fonts/fontlab/CommitMonoV141-VF.woff2");
22+
src: url("/src/fonts/fontlab/CommitMonoV142-VF.woff2");
2323
font-style: normal;
2424
font-weight: 400;
2525
font-display: swap;

index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
@@ -1190,15 +1190,15 @@ <h2>Programs used</h2>
11901190
<div tabindex="0" id="block_tab_end"></div>
11911191
</div>
11921192
<script>
1193-
const versionOfCommitMono = "V141"
1193+
const versionOfCommitMono = "V142"
11941194
let fontsLoaded = false
11951195
const commitMono = new FontFace(
11961196
"CommitMono",
11971197
`url(/src/fonts/fontlab/CommitMono${versionOfCommitMono}-VF.woff2)`,
11981198
{
11991199
style: "normal",
12001200
weight: "400",
1201-
},
1201+
}
12021202
)
12031203
// Add to the document.fonts (FontFaceSet)
12041204
document.fonts.add(commitMono)

src/fonts/CommitMono-1.141.zip

-701 KB
Binary file not shown.
-152 KB
Binary file not shown.
-147 KB
Binary file not shown.
-155 KB
Binary file not shown.
-148 KB
Binary file not shown.
-155 KB
Binary file not shown.
-148 KB
Binary file not shown.
-154 KB
Binary file not shown.
-148 KB
Binary file not shown.
-155 KB
Binary file not shown.
-148 KB
Binary file not shown.
-154 KB
Binary file not shown.
-148 KB
Binary file not shown.
-156 KB
Binary file not shown.
-149 KB
Binary file not shown.
-155 KB
Binary file not shown.
-149 KB
Binary file not shown.
-155 KB
Binary file not shown.
-148 KB
Binary file not shown.
-155 KB
Binary file not shown.
-149 KB
Binary file not shown.
-154 KB
Binary file not shown.
-149 KB
Binary file not shown.
-155 KB
Binary file not shown.
-149 KB
Binary file not shown.
-155 KB
Binary file not shown.
-149 KB
Binary file not shown.
-154 KB
Binary file not shown.
-149 KB
Binary file not shown.
-155 KB
Binary file not shown.
-149 KB
Binary file not shown.
-154 KB
Binary file not shown.
-150 KB
Binary file not shown.
-156 KB
Binary file not shown.
-149 KB
Binary file not shown.
-155 KB
Binary file not shown.
-150 KB
Binary file not shown.
-155 KB
Binary file not shown.
-150 KB
Binary file not shown.
-154 KB
Binary file not shown.
-151 KB
Binary file not shown.
-153 KB
Binary file not shown.
-150 KB
Binary file not shown.
-83.5 KB
Binary file not shown.
153 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
154 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
156 KB
Binary file not shown.
Binary file not shown.
156 KB
Binary file not shown.
Binary file not shown.
154 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
154 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
156 KB
Binary file not shown.
Binary file not shown.
155 KB
Binary file not shown.
Binary file not shown.
153 KB
Binary file not shown.
Binary file not shown.
83.9 KB
Binary file not shown.

src/js/code_section.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async function updateCodeFont() {
4545
.load(
4646
`/src/fonts/fontlab/CommitMono${versionOfCommitMono}-${websiteData.weight}${
4747
websiteData.italic ? "Italic" : "Regular"
48-
}.otf`,
48+
}.otf`
4949
)
5050
.then((font) => {
5151
// // console.log(font)
@@ -54,7 +54,7 @@ async function updateCodeFont() {
5454
})
5555
.catch((err) => console.log(err))
5656
// opentype
57-
// .load("src/fonts/fontlab/CommitMonoV141-500Regular.otf")
57+
// .load("src/fonts/fontlab/CommitMonoV142-500Regular.otf")
5858
// .then((font) => {
5959
// console.log(font)
6060
// console.log(font.toTables())
@@ -81,7 +81,7 @@ function updateCode(event, form) {
8181
displayName = character.name
8282
const ps = document.querySelectorAll(".code_char")
8383
ps.forEach((p) =>
84-
p.dataset.char == character.name ? (p.style.display = "block") : (p.style.display = "none"),
84+
p.dataset.char == character.name ? (p.style.display = "block") : (p.style.display = "none")
8585
)
8686
}
8787
})

src/js/download_wizard.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ function initializeDownload(button, blob) {
100100
downloadStarted = false
101101
button.classList.remove("loading")
102102
button.classList.add("loaded")
103-
// downloadFile(blob)
104-
saveFile(blob, `${websiteData.fontName}.zip`)
103+
saveFile(blob, `${websiteData.fontName}${versionOfCommitMono}.zip`)
105104
}
106105
function catchError(button, error) {
107106
downloadStarted = false
@@ -110,7 +109,7 @@ function catchError(button, error) {
110109
console.log(error)
111110
}
112111

113-
function makeCustomFont(settings) {
112+
async function makeCustomFont(settings) {
114113
const fontBaseURL = "/src/fonts/fontlab/"
115114
const fontName = "CommitMono" + versionOfCommitMono
116115
const fontWeight = settings.weight
@@ -302,7 +301,6 @@ function makeCustomFont(settings) {
302301
font.names.windows.uniqueID.en = `${font.names.windows.version.en};;${websiteData.fontName}-${settings.style
303302
.split(" ")
304303
.join("")};2023;FL820`
305-
delete font.names.windows.preferredFamily
306304

307305
font.tables.cff.topDict.familyName = fontFamily
308306
font.tables.cff.topDict.fullName = fullName
@@ -360,12 +358,6 @@ async function getZipFileBlob(kindOfDownload, fonts) {
360358
return zipFileBlob
361359
}
362360

363-
function downloadFile(blob) {
364-
const a = document.createElement("a")
365-
a.download = `${websiteData.fontName}.zip`
366-
a.href = URL.createObjectURL(blob)
367-
a.click()
368-
}
369361
function saveFile(blob, filename) {
370362
if (window.navigator.msSaveOrOpenBlob) {
371363
window.navigator.msSaveOrOpenBlob(blob, filename)

src/js/nav.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ function simulateTab(e) {
235235
.forEach((el) => el.classList.remove("shake", "shake_left", "shake_right", "shake_up", "shake_down"))
236236

237237
const allTabbable = document.querySelectorAll(
238-
"#nav_form input:checked, section.visible input:checked, section.visible [tabindex='0']",
238+
"#nav_form input:checked, section.visible input:checked, section.visible [tabindex='0']"
239239
)
240240
let addShake = false
241241
let indexOfActive = 0
@@ -402,7 +402,7 @@ function onFocusIn(e) {
402402
const paddingOffsetBottom = 200
403403
if (bounds.top > window.innerHeight - paddingOffsetBottom) {
404404
const numberOfMoves = Math.floor(
405-
(bounds.top - (window.innerHeight - paddingOffsetBottom)) / websiteData.pushPage.distance,
405+
(bounds.top - (window.innerHeight - paddingOffsetBottom)) / websiteData.pushPage.distance
406406
)
407407
for (let i = 0; i < numberOfMoves; i++) {
408408
pushPage("KeyS")
@@ -412,7 +412,7 @@ function onFocusIn(e) {
412412
if (!document.activeElement.className.includes("nav")) {
413413
if (bounds.top < paddingOffsetTop) {
414414
const numberOfMoves = Math.ceil(
415-
Math.abs(bounds.top - paddingOffsetTop - 32) / websiteData.pushPage.distance,
415+
Math.abs(bounds.top - paddingOffsetTop - 32) / websiteData.pushPage.distance
416416
)
417417
// console.log("num of moves:", numberOfMoves, "bounds.top:", bounds.top)
418418
for (let i = 0; i < numberOfMoves; i++) {
@@ -476,8 +476,8 @@ function checkTutorialKeys(e) {
476476
tutorialFinished = true
477477
const tutorialContainer = document.querySelector("#tutorial_complete")
478478
tutorialContainer.innerHTML = `<p>Tutorial complete! Your present is the variable version of Commit Mono:</p>
479-
<p><a href="/src/fonts/fontlab/CommitMonoV141-VF.ttf" tabindex="0">Download CommitMono-VF.ttf</a></p>
480-
<p><a href="/src/fonts/fontlab/CommitMonoV141-VF.woff2" tabindex="0">Download CommitMono-VF.woff2</a></p>
479+
<p><a href="/src/fonts/fontlab/CommitMonoV142-VF.ttf" tabindex="0">Download CommitMono-VF.ttf</a></p>
480+
<p><a href="/src/fonts/fontlab/CommitMonoV142-VF.woff2" tabindex="0">Download CommitMono-VF.woff2</a></p>
481481
<br />`
482482
}
483483
}

src/txt/ttfautohint.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# step 3: run this from the root directory
44

55
rm src/fonts/*.zip
6-
mkdir src/fonts/CommitMono-1.141
7-
mv src/fonts/website-export/CommitMono.zip src/fonts/CommitMono-1.141/CommitMono.zip
8-
cd src/fonts/CommitMono-1.141
6+
mkdir src/fonts/CommitMono-1.142
7+
mv src/fonts/website-export/CommitMono.zip src/fonts/CommitMono-1.142/CommitMono.zip
8+
cd src/fonts/CommitMono-1.142
99
unzip CommitMono.zip
1010
rm CommitMono.zip
1111
mkdir ttfautohint
@@ -22,8 +22,8 @@ rm CommitMono-400-Italic-unhinted.ttf
2222
rm CommitMono-700-Regular-unhinted.ttf
2323
rm CommitMono-700-Italic-unhinted.ttf
2424
cd ..
25-
zip -vr CommitMono-1.141.zip CommitMono-1.141/ -x "*.DS_Store"
26-
rm -R CommitMono-1.141
25+
zip -vr CommitMono-1.142.zip CommitMono-1.142/ -x "*.DS_Store"
26+
rm -R CommitMono-1.142
2727
cd ..
2828
cd ..
2929

src/txt/woff2_conversion_guide.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#1 Rename variable font to "CommitMonoV141-VF.ttf"
1+
#1 Rename variable font to "CommitMonoV142-VF.ttf"
22
#2 Navigate to /Developer/woff2
33
#3
4-
~/Developer/woff2/woff2_compress ~/Library/CloudStorage/Dropbox/Privat/Eigils\ ting/projects/typography/Font\ Projects/code-mono-font/commit-mono/export/CommitMonoV141/CommitMonoV141-VF.ttf
4+
~/Developer/woff2/woff2_compress ~/Library/CloudStorage/Dropbox/Privat/Eigils\ ting/projects/typography/Font\ Projects/code-mono-font/commit-mono/export/CommitMonoV142/CommitMonoV142-VF.ttf

0 commit comments

Comments
 (0)