fix windows naming issue, bump to version 142

2024-08-17 14:30:25 +03:00 · 2023-11-18 13:05:27 +01:00 · 2023-11-18 13:05:27 +01:00 · 9da322eb1e
commit 9da322eb1e
parent 83be8d5052
95 changed files with 22 additions and 30 deletions
--- a/404.html
+++ b/404.html
@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
    <head>
        <meta charset="UTF-8" />
@ -19,7 +19,7 @@
        <style>
            @font-face {
                font-family: "CommitMono";
-                src: url("/src/fonts/fontlab/CommitMonoV141-VF.woff2");
+                src: url("/src/fonts/fontlab/CommitMonoV142-VF.woff2");
                font-style: normal;
                font-weight: 400;
                font-display: swap;
--- a/index.html
+++ b/index.html
@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
    <head>
        <meta charset="UTF-8" />
@ -1190,7 +1190,7 @@
            <div tabindex="0" id="block_tab_end"></div>
        </div>
        <script>
-            const versionOfCommitMono = "V141"
+            const versionOfCommitMono = "V142"
            let fontsLoaded = false
            const commitMono = new FontFace(
                "CommitMono",
@ -1198,7 +1198,7 @@
                {
                    style: "normal",
                    weight: "400",
-                },
+                }
            )
            // Add to the document.fonts (FontFaceSet)
            document.fonts.add(commitMono)
--- a/src/fonts/CommitMono-1.141.zip
+++ b/src/fonts/CommitMono-1.141.zip
--- a/src/fonts/fontlab/CommitMonoV141-200Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-200Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-200Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-200Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-225Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-225Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-225Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-225Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-250Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-250Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-250Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-250Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-275Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-275Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-275Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-275Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-300Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-300Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-300Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-300Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-325Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-325Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-325Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-325Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-350Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-350Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-350Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-350Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-375Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-375Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-375Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-375Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-400Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-400Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-400Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-400Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-425Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-425Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-425Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-425Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-450Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-450Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-450Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-450Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-475Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-475Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-475Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-475Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-500Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-500Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-500Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-500Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-525Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-525Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-525Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-525Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-550Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-550Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-550Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-550Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-575Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-575Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-575Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-575Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-600Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-600Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-600Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-600Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-625Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-625Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-625Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-625Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-650Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-650Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-650Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-650Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-675Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-675Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-675Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-675Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-700Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV141-700Italic.otf
--- a/src/fonts/fontlab/CommitMonoV141-700Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV141-700Regular.otf
--- a/src/fonts/fontlab/CommitMonoV141-VF.woff2
+++ b/src/fonts/fontlab/CommitMonoV141-VF.woff2
--- a/src/fonts/fontlab/CommitMonoV142-200Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-200Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-200Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-200Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-225Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-225Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-225Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-225Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-250Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-250Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-250Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-250Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-275Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-275Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-275Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-275Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-300Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-300Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-300Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-300Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-325Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-325Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-325Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-325Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-350Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-350Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-350Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-350Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-375Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-375Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-375Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-375Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-400Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-400Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-400Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-400Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-425Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-425Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-425Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-425Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-450Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-450Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-450Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-450Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-475Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-475Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-475Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-475Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-500Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-500Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-500Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-500Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-525Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-525Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-525Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-525Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-550Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-550Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-550Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-550Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-575Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-575Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-575Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-575Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-600Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-600Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-600Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-600Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-625Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-625Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-625Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-625Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-650Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-650Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-650Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-650Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-675Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-675Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-675Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-675Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-700Italic.otf
+++ b/src/fonts/fontlab/CommitMonoV142-700Italic.otf
--- a/src/fonts/fontlab/CommitMonoV142-700Regular.otf
+++ b/src/fonts/fontlab/CommitMonoV142-700Regular.otf
--- a/src/fonts/fontlab/CommitMonoV142-VF.ttf
+++ b/src/fonts/fontlab/CommitMonoV142-VF.ttf
--- a/src/fonts/fontlab/CommitMonoV142-VF.woff2
+++ b/src/fonts/fontlab/CommitMonoV142-VF.woff2
--- a/src/js/code_section.js
+++ b/src/js/code_section.js
@ -45,7 +45,7 @@ async function updateCodeFont() {
        .load(
            `/src/fonts/fontlab/CommitMono${versionOfCommitMono}-${websiteData.weight}${
                websiteData.italic ? "Italic" : "Regular"
-            }.otf`,
+            }.otf`
        )
        .then((font) => {
            // // console.log(font)
@ -54,7 +54,7 @@ async function updateCodeFont() {
        })
        .catch((err) => console.log(err))
    // opentype
-    //     .load("src/fonts/fontlab/CommitMonoV141-500Regular.otf")
+    //     .load("src/fonts/fontlab/CommitMonoV142-500Regular.otf")
    //     .then((font) => {
    //         console.log(font)
    //         console.log(font.toTables())
@ -81,7 +81,7 @@ function updateCode(event, form) {
                    displayName = character.name
                    const ps = document.querySelectorAll(".code_char")
                    ps.forEach((p) =>
-                        p.dataset.char == character.name ? (p.style.display = "block") : (p.style.display = "none"),
+                        p.dataset.char == character.name ? (p.style.display = "block") : (p.style.display = "none")
                    )
                }
            })
--- a/src/js/download_wizard.js
+++ b/src/js/download_wizard.js
@ -100,8 +100,7 @@ function initializeDownload(button, blob) {
    downloadStarted = false
    button.classList.remove("loading")
    button.classList.add("loaded")
-    // downloadFile(blob)
-    saveFile(blob, `${websiteData.fontName}.zip`)
+    saveFile(blob, `${websiteData.fontName}${versionOfCommitMono}.zip`)
 }
 function catchError(button, error) {
    downloadStarted = false
@ -110,7 +109,7 @@ function catchError(button, error) {
    console.log(error)
 }

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

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

-function downloadFile(blob) {
-    const a = document.createElement("a")
-    a.download = `${websiteData.fontName}.zip`
-    a.href = URL.createObjectURL(blob)
-    a.click()
-}
 function saveFile(blob, filename) {
    if (window.navigator.msSaveOrOpenBlob) {
        window.navigator.msSaveOrOpenBlob(blob, filename)
--- a/src/js/nav.js
+++ b/src/js/nav.js
@ -235,7 +235,7 @@ function simulateTab(e) {
        .forEach((el) => el.classList.remove("shake", "shake_left", "shake_right", "shake_up", "shake_down"))

    const allTabbable = document.querySelectorAll(
-        "#nav_form input:checked, section.visible input:checked, section.visible [tabindex='0']",
+        "#nav_form input:checked, section.visible input:checked, section.visible [tabindex='0']"
    )
    let addShake = false
    let indexOfActive = 0
@ -402,7 +402,7 @@ function onFocusIn(e) {
        const paddingOffsetBottom = 200
        if (bounds.top > window.innerHeight - paddingOffsetBottom) {
            const numberOfMoves = Math.floor(
-                (bounds.top - (window.innerHeight - paddingOffsetBottom)) / websiteData.pushPage.distance,
+                (bounds.top - (window.innerHeight - paddingOffsetBottom)) / websiteData.pushPage.distance
            )
            for (let i = 0; i < numberOfMoves; i++) {
                pushPage("KeyS")
@ -412,7 +412,7 @@ function onFocusIn(e) {
        if (!document.activeElement.className.includes("nav")) {
            if (bounds.top < paddingOffsetTop) {
                const numberOfMoves = Math.ceil(
-                    Math.abs(bounds.top - paddingOffsetTop - 32) / websiteData.pushPage.distance,
+                    Math.abs(bounds.top - paddingOffsetTop - 32) / websiteData.pushPage.distance
                )
                // console.log("num of moves:", numberOfMoves, "bounds.top:", bounds.top)
                for (let i = 0; i < numberOfMoves; i++) {
@ -476,8 +476,8 @@ function checkTutorialKeys(e) {
            tutorialFinished = true
            const tutorialContainer = document.querySelector("#tutorial_complete")
            tutorialContainer.innerHTML = `<p>Tutorial complete! Your present is the variable version of Commit Mono:</p>
-<p><a href="/src/fonts/fontlab/CommitMonoV141-VF.ttf" tabindex="0">Download CommitMono-VF.ttf</a></p>
-<p><a href="/src/fonts/fontlab/CommitMonoV141-VF.woff2" tabindex="0">Download CommitMono-VF.woff2</a></p>
+<p><a href="/src/fonts/fontlab/CommitMonoV142-VF.ttf" tabindex="0">Download CommitMono-VF.ttf</a></p>
+<p><a href="/src/fonts/fontlab/CommitMonoV142-VF.woff2" tabindex="0">Download CommitMono-VF.woff2</a></p>
 <br />`
        }
    }
--- a/src/txt/ttfautohint.txt
+++ b/src/txt/ttfautohint.txt
@ -3,9 +3,9 @@
 # step 3: run this from the root directory

 rm src/fonts/*.zip
-mkdir src/fonts/CommitMono-1.141
-mv src/fonts/website-export/CommitMono.zip src/fonts/CommitMono-1.141/CommitMono.zip
-cd src/fonts/CommitMono-1.141
+mkdir src/fonts/CommitMono-1.142
+mv src/fonts/website-export/CommitMono.zip src/fonts/CommitMono-1.142/CommitMono.zip
+cd src/fonts/CommitMono-1.142
 unzip CommitMono.zip
 rm CommitMono.zip
 mkdir ttfautohint
@ -22,8 +22,8 @@ rm CommitMono-400-Italic-unhinted.ttf
 rm CommitMono-700-Regular-unhinted.ttf
 rm CommitMono-700-Italic-unhinted.ttf
 cd ..
-zip -vr CommitMono-1.141.zip CommitMono-1.141/ -x "*.DS_Store"
-rm -R CommitMono-1.141
+zip -vr CommitMono-1.142.zip CommitMono-1.142/ -x "*.DS_Store"
+rm -R CommitMono-1.142
 cd ..
 cd ..

--- a/src/txt/woff2_conversion_guide.txt
+++ b/src/txt/woff2_conversion_guide.txt
@ -1,4 +1,4 @@
-#1 Rename variable font to "CommitMonoV141-VF.ttf"
+#1 Rename variable font to "CommitMonoV142-VF.ttf"
 #2 Navigate to /Developer/woff2
 #3
-~/Developer/woff2/woff2_compress ~/Library/CloudStorage/Dropbox/Privat/Eigils\ ting/projects/typography/Font\ Projects/code-mono-font/commit-mono/export/CommitMonoV141/CommitMonoV141-VF.ttf
+~/Developer/woff2/woff2_compress ~/Library/CloudStorage/Dropbox/Privat/Eigils\ ting/projects/typography/Font\ Projects/code-mono-font/commit-mono/export/CommitMonoV142/CommitMonoV142-VF.ttf