Merge pull request #45 from eigilnikolajsen/feature/regular-400

Feature/regular 400

Author: eigilnikolajsen

404.html

@@ -19,9 +19,9 @@
         <style>
             @font-face {
                 font-family: "CommitMono";
-                src: url("/src/fonts/fontlab/CommitMonoV136-VF.woff2");
+                src: url("/src/fonts/fontlab/CommitMonoV137-VF.woff2");
                 font-style: normal;
-                font-weight: 450;
+                font-weight: 400;
                 font-display: swap;
             }
             body {

index.html

@@ -618,8 +618,8 @@ <h2>Choose download alternate characters</h2>
                                     <p id="custom_settings_feedback"><br /></p>
                                     <br />
                                     <p tabindex="0" data-edit="true">
-                                        Changing the settings above changes the download. Recommended weight: 450 for
-                                        dark mode, 500 for light mode. Alternate characters will be baked and features
+                                        Changing the settings above changes the download. Recommended weight: 400 for
+                                        dark mode, 450 for light mode. Alternate characters will be baked and features
                                         merged, resulting in a single static font file that is compatible in all
                                         environments. For an installation guide, see
                                         <button
@@ -684,13 +684,13 @@ <h2>
                                             <ul>
                                                 <li>
                                                     <p>
-                                                        CommitMono-450-Regular: Base version with settings and weight of
+                                                        CommitMono-400-Regular: Base version with settings and weight of
                                                         your choice.
                                                     </p>
                                                 </li>
                                                 <li>
                                                     <p>
-                                                        CommitMono-450-Italic: Italic version, same weight as regular.
+                                                        CommitMono-400-Italic: Italic version, same weight as regular.
                                                     </p>
                                                 </li>
                                                 <li>
@@ -1197,14 +1197,14 @@ <h2>Programs used</h2>
             <div tabindex="0" id="block_tab_end"></div>
         </div>
         <script>
-            const versionOfCommitMono = "V136"
+            const versionOfCommitMono = "V137"
             let fontsLoaded = false
             const commitMono = new FontFace(
                 "CommitMono",
                 `url(/src/fonts/fontlab/CommitMono${versionOfCommitMono}-VF.woff2)`,
                 {
                     style: "normal",
-                    weight: "450",
+                    weight: "400",
                 }
             )
             // Add to the document.fonts (FontFaceSet)

src/css/loading.css

@@ -2,7 +2,7 @@
     font-family: "CommitMonoLoading";
     src: url("data:font/woff2;charset=url-8;base64,d09GMk9UVE8AAAVoAAoAAAAACRAAAAUgAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAADYcqGhYGYACCcgE2AiQDIgQGBYQhByAbVAgRZJPTIvuRkLnpo1niWFGcZNnEK1FCUU4/x8PT2u/PnZ3dh6g3CJGQRBORpJVGg67f6q9Ns3ed4+/dNQeGD6Q1Nv+/r3HXBE48osgCyvt7NvUTYnINZZJwUNelEzGpqkxUH92fDB0zXaUP82xFMJQsXXOHVdpANttEIhM32xM/y6P+MHZhAh4hJxTKBbrhm89nfEyZeMKSimREp600nifplvNJJ34a/VkBz5F8L+EFZeCFSvKWUsig+NR/R0ZgyZDGIvDSwGSjyt9iLXIEIdUwnqN2Eiag0Go3YpZ2uyOTcHUKJe4KKRInfhZA3BH3KPTa1jUwMjW34E8oZC3tOm14RybSiV8CM8EswZ2BYK7G3WoT1eM4OBCww4CQ/0grvTR5bXZ2cnJ2ztqkpUvXrlvCqo+2rtrF72jXPnwM5x5SebwLrKI9x4/tO2lFSnl5RkqXP9vhF3Ul/HqgT++reCFN7bm85urm6zukd8WH8k80PNbBHMnbfi1Ygsk+Ewyn2MfivKuFiQ361vzVM1du3zn/BDf0iAjL9o2Z7Kaj8lzaxn2+WZ1am9An5uYS0pab2kJMyaNISGuk3cc/AwUa3/jsxbNaA1Zj1eQ+7hzYJknff3H9xQ2X10rviU83nGku0fFVXjj3lKRp3YzUkXqsdcIK7MlRebjPGywHbWdlRmsSq8ar2qD/nYftsKFtQpe269bK+0M6YduD7Q+pd0egDK7T4xblNzXn5TU15i0a6//gheO5RryXpn4MaUzfumjq+JV2jhNSy3PSk4u5wcn0rF1rF8/Uub+bADqw+Nr59fHICkywWC+mvh7ZsjskJtw/ONybOxYRfSpWD8SDuz8zjqTsjuUeteER4r7GX9u189IOPSYHDDabGjkvYx1XZeXVe3auX6lbE7Q5dh+rPn+TZ25+ASst7DVeZPWQegNkD97hJjbwq/CJoeD2h8EGMfUF5N3G9PKkdZlZiUm69/rEZcvXrV+2kBPb+W83Cdj1iIR6GEvzleUvdf2zV4KN6saCJDP1ekAs2yY5sGnDiY364WsyHnLqsB33IgA9hIPie6f1gCbJx/L2Ow0ZC4aw+PcjnpAAOfam9ahZa6dsYk8/GvQnTaw+eot3ukU0PYKqxySUHaWB+QwyMKhka5BhRmuDLakBSj/BFsBwt4SuEx+DCnLUP375st6AVedNNLhy6qPe3VO8n5zHhd5ivMo7ylty1Js/4w3T4gopc6PsthzOKW7fViozCyOr7ihV/Adj6KaLIAu6KMJTL+80vZKGuIJqm/Gc4ARBye4ep2gcIxAk2uHOt6z2oeI+AnMMHrwKfRBX1Yn/XgiqV+jDEvAAaUpQVMbhQqVPiQYFmGITYUPjK626Tk2Kq04ULit/PgOKGsEbWgtt27SjQ6fsHBgRZstv321OjERlQLEZl0IalH5zlJ/leblVov5H/A/7H/o/GFkrVe6Hj7cN3r2/07C4d8BPVfUG4UvYu0B7XoTTKBQvTgILkkKgWl1ZeII95O98bdJy+6Y6fmDlb51Xaocv2hU3QDqOGmDnfJm6PNe1hP6x6pJWSEiBbFwE1Lptypq0/jU2kWUoLNhDkPS4AZUzL5Bt+YHaRHDSBhKjb+N2c7H+U0jpsxD/Imn8NZKvzdrGzuo09DDFCJvgDVwXEcOKxvB0IrnZ0UzDHZbzF5JiEhhaTrOlQlHaWpaS0GVp19ozUcDlJtuojBhThsdj6sLDGy/MoCNODT2409BVrVsWGh9kAA==");
     font-style: normal;
-    font-weight: 450;
+    font-weight: 400;
     font-display: swap;
 }
 *,

src/css/style.css

@@ -150,7 +150,7 @@ a:focus,
 
 i {
     font-style: normal;
-    font-variation-settings: "wght" 450, "ital" 1;
+    font-variation-settings: "wght" 400, "ital" 1;
 }
 
 h1 {

src/fonts/CommitMono-1.137.zip

@@ -54,7 +54,7 @@ async function updateCodeFont() {
         })
         .catch((err) => console.log(err))
     // opentype
-    //     .load("src/fonts/fontlab/CommitMonoV136-500Regular.otf")
+    //     .load("src/fonts/fontlab/CommitMonoV137-500Regular.otf")
     //     .then((font) => {
     //         console.log(font)
     //         console.log(font.toTables())

src/fonts/CommitMono.zip

@@ -1,13 +1,13 @@
 const downloadSettingsCustom = {
-    weight: 450,
+    weight: 400,
     italic: false,
     alternates: {},
     features: {},
     letterSpacing: 0,
     lineHeight: 1,
 }
 const downloadSettingsDefault = {
-    weight: 450,
+    weight: 400,
     italic: false,
     alternates: {},
     features: {},
@@ -72,7 +72,7 @@ async function downloadFont(kindOfDownload, button) {
                 }
             }
             if (kindOfDownload === "design") {
-                for (let weight = 300; weight <= 700; weight += 25) {
+                for (let weight = 200; weight <= 700; weight += 25) {
                     allSettings[weight + "Regular"] = {
                         ...downloadSettingsCustom,
                         style: weight + "Regular",
@@ -118,7 +118,7 @@ function makeCustomFont(settings) {
     const fontWeight = settings.weight
     const fontItalic = settings.italic ? "Italic" : "Regular"
     const fontFilePath = `${fontBaseURL}${fontName}-${fontWeight}${fontItalic}.otf`
-    // "/src/fonts/fontlab/CommitMonoV132-450Italic.otf"
+    // "/src/fonts/fontlab/CommitMonoV132-400Italic.otf"
 
     return opentype
         .load(fontFilePath)

src/fonts/export/CommitMono-450-Italic.otf

@@ -68,7 +68,7 @@ function buildExample() {
                 input.classList.add("example_weight")
                 input.value = weight
                 input.dataset.forform = "weight_form"
-                if (index == 6) {
+                if (weight == 400) {
                     input.setAttribute("checked", "true")
                 }
                 const label = document.createElement("label")
@@ -193,7 +193,7 @@ function updateFont(event, form) {
         input.classList.add("loading_font")
         const outputFont = new FontFace(output, `url(/src/fonts/other/${output}.woff2)`, {
             style: "normal",
-            weight: "450",
+            weight: "400",
         })
         document.fonts.add(outputFont)
         outputFont.load()

src/fonts/export/CommitMono-450-Regular.otf

@@ -163,12 +163,12 @@ function keyDown(e) {
 
         if (e.key == "b" || e.key == "l") {
             if (e.key == "b") websiteData.weight = websiteData.weight == 700 ? 700 : websiteData.weight + 25
-            if (e.key == "l") websiteData.weight = websiteData.weight == 300 ? 300 : websiteData.weight - 25
+            if (e.key == "l") websiteData.weight = websiteData.weight == 200 ? 200 : websiteData.weight - 25
             updateCodeFont()
             document.querySelector("body").style.fontVariationSettings = `"wght" ${websiteData.weight}, "ital" ${
                 websiteData.italic ? "1" : "0"
             }`
-            showHideChangeSettings(`Weight: ${websiteData.weight}. Def: 450, Min: 300, Max: 700.`)
+            showHideChangeSettings(`Weight: ${websiteData.weight}. Def: 400, Min: 200, Max: 700.`)
             document.forms["weight_form"][`weight_${websiteData.weight}`].checked = true
             updateWeight(null, weightForm)
         }
@@ -345,8 +345,8 @@ function pushPage(key) {
         document.querySelector("#canvas").style.transform = "scale(1)"
         rem = 16
         document.documentElement.style.fontSize = "16px"
-        websiteData.weight = 450
-        document.querySelector("body").style.fontVariationSettings = `"wght" 450`
+        websiteData.weight = 400
+        document.querySelector("body").style.fontVariationSettings = `"wght" 400`
         document.forms["weight_form"][`weight_${websiteData.weight}`].checked = true
         codeExample.style.fontFamily = "CommitMono"
         document.querySelector("#font_name").value = ""
@@ -472,8 +472,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/CommitMonoV136-VF.ttf" tabindex="0">Download CommitMono-VF.ttf</a></p>
-<p><a href="/src/fonts/fontlab/CommitMonoV136-VF.woff2" tabindex="0">Download CommitMono-VF.woff2</a></p>
+<p><a href="/src/fonts/fontlab/CommitMonoV137-VF.ttf" tabindex="0">Download CommitMono-VF.ttf</a></p>
+<p><a href="/src/fonts/fontlab/CommitMonoV137-VF.woff2" tabindex="0">Download CommitMono-VF.woff2</a></p>
 <br />`
         }
     }

src/fonts/export/CommitMono-700-Italic.otf

@@ -8,7 +8,7 @@
             @font-face {
                 font-family: "CommitMono";
                 src: url("/fonts/CommitMono.woff2");
-                font-weight: 450;
+                font-weight: 400;
             }
             :root {
                 --grey: #aaa;