Merge branch 'main' of https://github.com/Bubobubobubobubo/Topos

Bubobubobubobubo · Oct 25, 2023 · 140d451 · 140d451
2 parents 4fd9f01 + 4f27d1e
commit 140d451
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 1 deletion.
diff --git a/fonts/index.css b/fonts/index.css
@@ -32,4 +32,81 @@
   font-weight: 700;
   font-style: italic;
   font-display: swap;
-}
+}
+
+@font-face {
+  font-family: "Comic Mono";
+  font-weight: normal;
+  src: url(./woff/ComicMono.woff) format("woff"),
+       url(./woff2/ComicMono.woff2) format("wooff2");
+}
+
+@font-face {
+  font-family: "Comic Mono";
+  font-weight: bold;
+  src: url(./woff/ComicMono-Bold.woff) format("woff"),
+       url(./woff/ComicMono-Bold.woff2) format("woff2"),
+}
+
+
+@font-face {
+    font-family: 'jgs7';
+    src: url('./woff2/jgs7.woff2') format('woff2'),
+         url('./woff/jgs7.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'jgs5';
+    src: url('./woff2/jgs5.woff2') format('woff2'),
+         url('./woff/jgs5.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'jgs9';
+    src: url('./woff2/jgs9.woff2') format('woff2'),
+         url('./woff/jgs9.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+
+@font-face {
+    font-family: 'Steps Mono';
+    src: url('./woff2/Steps-Mono.woff2') format('woff2');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'Steps Mono Thin';
+    src: url('./woff2/Steps-Mono-Thin.woff2') format('woff2');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+
+@font-face {
+    font-family: 'Jet Brains';
+    src: url('./woff2/JetBrainsMono-Regular.woff2') format('woff2');
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+
+@font-face {
+    font-family: 'Jet Brains';
+    src: url('./woff2/JetBrainsMono-Bold.woff2') format('woff2');
+    font-weight: 700;
+    font-style: normal;
+    font-display: swap;
+}
diff --git a/fonts/woff/ComicMono-Bold.woff b/fonts/woff/ComicMono-Bold.woff
diff --git a/fonts/woff/ComicMono.woff b/fonts/woff/ComicMono.woff
diff --git a/fonts/woff/jgs5.woff b/fonts/woff/jgs5.woff
diff --git a/fonts/woff/jgs7.woff b/fonts/woff/jgs7.woff
diff --git a/fonts/woff/jgs9.woff b/fonts/woff/jgs9.woff
diff --git a/fonts/woff2/ComicMono-Bold.woff2 b/fonts/woff2/ComicMono-Bold.woff2
diff --git a/fonts/woff2/ComicMono.woff2 b/fonts/woff2/ComicMono.woff2
diff --git a/fonts/woff2/JetBrainsMono-Bold.woff2 b/fonts/woff2/JetBrainsMono-Bold.woff2
diff --git a/fonts/woff2/JetBrainsMono-Regular.woff2 b/fonts/woff2/JetBrainsMono-Regular.woff2
diff --git a/fonts/woff2/Steps-Mono-Thin.woff2 b/fonts/woff2/Steps-Mono-Thin.woff2
diff --git a/fonts/woff2/Steps-Mono.woff2 b/fonts/woff2/Steps-Mono.woff2
diff --git a/fonts/woff2/jgs5.woff2 b/fonts/woff2/jgs5.woff2
diff --git a/fonts/woff2/jgs7.woff2 b/fonts/woff2/jgs7.woff2
diff --git a/fonts/woff2/jgs9.woff2 b/fonts/woff2/jgs9.woff2
diff --git a/index.html b/index.html
@@ -229,7 +229,14 @@ <h2 class="font-semibold lg:text-xl text-gray-400">More</h2>
                   <select id="font-family" class="bg-gray-50 ml-4 border border-gray-300 mb-2
                   text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block  p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white">
                     <option value="IBM Plex Mono">IBM Plex Mono</option>
+                    <option value="Jet Brains">Jet Brains</option>
                     <option value="Courier">Courier</option>
+                    <option value="Comic Mono">Comic Mono</option>
+                    <option value="jgs5">JGS 5</option>
+                    <option value="jgs7">JGS 7</option>
+                    <option value="jgs9">JGS 9</option>
+                    <option value="Steps Mono">Steps Mono</option>
+                    <option value="Steps Mono Thin">Steps Mono Thin</option>
                   </select>
               </div>
               <!-- Editor mode selection -->

diff --git a/src/API.ts b/src/API.ts
@@ -1,3 +1,4 @@
+import { EditorView } from '@codemirror/view';
 import { getAllScaleNotes, seededRandom } from "zifferjs";
 import {
   MidiCCEvent,
@@ -2031,4 +2032,25 @@ export class UserAPI {
       ...config,
     };
   };
+
+  // =============================================================
+  // Ralt144mi section
+  // =============================================================
+
+  raltfont = (mainFont: string, commentFont: string): void => {
+    this.app.view.dispatch({
+      effects: this.app.fontSize.reconfigure(
+        EditorView.theme({
+          "&": { fontFamily: mainFont },
+          ".cm-gutters": { fontFamily: mainFont, },
+          ".cm-content": {
+            fontFamily: mainFont,
+          },
+          ".cm-comment": {
+            fontFamily: commentFont,
+          },
+        })
+      ),
+    });
+  }
 }
diff --git a/src/documentation/about.ts b/src/documentation/about.ts
@@ -20,6 +20,8 @@ Topos is a free and open-source software distributed under [GPL-3.0](https://git
 - Frank Force for the [ZzFX](https://github.com/KilledByAPixel/ZzFX) synthesizer.
 - Kristoffer Ekstrand for the [AKWF](https://www.adventurekid.se/akrt/waveforms/adventure-kid-waveforms/) waveforms.
 - Ryan Kirkbride for some of the audio samples in the [Dough-Fox](https://github.com/Bubobubobubobubo/Dough-Fox) sample pack, taken from [here](https://github.com/Qirky/FoxDot/tree/master/FoxDot/snd).
+- Adel Faure for the [JGS](https://adelfaure.net/https://adelfaure.net/) font.
+- Raphaël Bastide for the [Steps Mono](https://github.com/raphaelbastide/steps-mono/) font.
 
 - All the [Topos](https//github.com/Bubobubobubobubo/Topos) contributors!