pymations 0.1.0 → 0.2.0

package/engine/manifest.json

@@ -0,0 +1 @@
+{"files":["anim.js","opentype.min.js","katex.min.js","katex.min.css","fonts/KaTeX_AMS-Regular.ttf","fonts/KaTeX_AMS-Regular.woff2","fonts/KaTeX_Caligraphic-Bold.ttf","fonts/KaTeX_Caligraphic-Bold.woff2","fonts/KaTeX_Caligraphic-Regular.ttf","fonts/KaTeX_Caligraphic-Regular.woff2","fonts/KaTeX_Fraktur-Bold.ttf","fonts/KaTeX_Fraktur-Bold.woff2","fonts/KaTeX_Fraktur-Regular.ttf","fonts/KaTeX_Fraktur-Regular.woff2","fonts/KaTeX_Main-Bold.ttf","fonts/KaTeX_Main-Bold.woff2","fonts/KaTeX_Main-BoldItalic.ttf","fonts/KaTeX_Main-BoldItalic.woff2","fonts/KaTeX_Main-Italic.ttf","fonts/KaTeX_Main-Italic.woff2","fonts/KaTeX_Main-Regular.ttf","fonts/KaTeX_Main-Regular.woff2","fonts/KaTeX_Math-BoldItalic.ttf","fonts/KaTeX_Math-BoldItalic.woff2","fonts/KaTeX_Math-Italic.ttf","fonts/KaTeX_Math-Italic.woff2","fonts/KaTeX_SansSerif-Bold.ttf","fonts/KaTeX_SansSerif-Bold.woff2","fonts/KaTeX_SansSerif-Italic.ttf","fonts/KaTeX_SansSerif-Italic.woff2","fonts/KaTeX_SansSerif-Regular.ttf","fonts/KaTeX_SansSerif-Regular.woff2","fonts/KaTeX_Script-Regular.ttf","fonts/KaTeX_Script-Regular.woff2","fonts/KaTeX_Size1-Regular.ttf","fonts/KaTeX_Size1-Regular.woff2","fonts/KaTeX_Size2-Regular.ttf","fonts/KaTeX_Size2-Regular.woff2","fonts/KaTeX_Size3-Regular.ttf","fonts/KaTeX_Size3-Regular.woff2","fonts/KaTeX_Size4-Regular.ttf","fonts/KaTeX_Size4-Regular.woff2","fonts/KaTeX_Typewriter-Regular.ttf","fonts/KaTeX_Typewriter-Regular.woff2","fonts/LiberationSans-Bold.ttf","fonts/LiberationSans-BoldItalic.ttf","fonts/LiberationSans-Italic.ttf","fonts/LiberationSans-Regular.ttf"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pymations",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Maths animations from Python on any web page: the browser half of Pymations, with its animation engine. Runs Manim Community scripts. Python runs in the browser with Pyodide.",
   "type": "module",
   "main": "./pymations.js",

package/pyctures.py

@@ -1,9 +1,9 @@
-# GENERATED by circuitry/scripts/sync-pymations-lib.mjs from src/lib/python-canvas/canvas-runtime-py.ts (version 12).
+# GENERATED by circuitry/scripts/sync-pymations-lib.mjs from src/lib/python-canvas/canvas-runtime-py.ts (version 13).
 # Do not edit here: change it in Circuitry, then run the script.
 # Pymations is MIT licensed; see LICENSE.
 import sys, io, json, time, math, traceback, threading, types
 
-VERSION = "12"
+VERSION = "13"
 USER_FILE = "main.py"
 
 # Fixed handles the frame defines before anything runs.
@@ -31,6 +31,7 @@ class _State:
         self.sections = {}       # name -> ms this frame (measure mode)
         self.vt = None           # virtual seconds while recording, else None
         self.live = False        # frame code has run (draw(), await frame(), an event)
+        self.source = ""         # the user's file, for modules that map lines (Pymations)
 
 
 # WHICH RUN A THREAD IS WORKING FOR. On the device every frame is its own
@@ -776,6 +777,7 @@ def start(source, info_json):
     S.thread = threading.get_ident()
     S.busy = True
     S.started = time.monotonic()
+    S.source = source
     info = json.loads(info_json)
     S.measuring = bool(info.get("measure"))
     # Recording: virtual time from frame 0, and the same random numbers each take.

package/pymations.js

@@ -68,13 +68,14 @@ function prop(obj, name) {
 
 // ---------------------------------------------------------------- images by relative path
 
-/** A relative path to an image or a sound: no scheme, not absolute, a known extension (pages.IMAGE_PATH). */
-const IMAGE_PATH = /^(?![a-z][a-z0-9+.-]*:|\/)(?:\.\/)?[^\s"'<>?#]+\.(png|jpe?g|gif|webp|svg|bmp|avif|mp3|wav|ogg|m4a|aac|flac)$/i
+/** A relative path to a picture, a sound or a font file: no scheme, not absolute, a known extension (pages.IMAGE_PATH). */
+const IMAGE_PATH = /^(?![a-z][a-z0-9+.-]*:|\/)(?:\.\/)?[^\s"'<>?#]+\.(png|jpe?g|gif|webp|svg|bmp|avif|mp3|wav|ogg|m4a|aac|flac|ttf|otf|woff2?)$/i
 export function isRelativeImagePath(s) { return typeof s === 'string' && s.length < 300 && IMAGE_PATH.test(s) }
 export const IMAGE_TYPES = {
   png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif',
   webp: 'image/webp', svg: 'image/svg+xml', bmp: 'image/bmp', avif: 'image/avif',
   mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', m4a: 'audio/mp4', aac: 'audio/aac', flac: 'audio/flac',
+  ttf: 'font/ttf', otf: 'font/otf', woff: 'font/woff', woff2: 'font/woff2',
 }
 /** The key an image is packed under: as written, without a leading "./". */
 const packedKey = (s) => s.replace(/^(\.\/)+/, '')
@@ -438,7 +439,7 @@ function unpackEngine(eng) {
   window.fetch = (input, init) => {
     const url = typeof input === 'string' ? input : (input && input.url) || String(input)
     if (url.startsWith(prefix)) {
-      const b64 = fonts[decodeURIComponent(url.slice(prefix.length))]
+      const b64 = fonts[decodeURIComponent(url.slice(prefix.length).split(/[?#]/)[0])]
       if (b64 != null) return Promise.resolve(new Response(fromBase64(b64), { headers: { 'Content-Type': 'font/ttf' } }))
     }
     return pageFetch(input, init)
@@ -1006,6 +1007,9 @@ class Player {
     if (scene.opt.controls !== false) this.makeBar()
     this.onKey = (e) => this.key(e)
     window.addEventListener('keydown', this.onKey)
+    // The engine's notices (a font or an equation still loading after a
+    // while) and errors from work it finishes later, collected once a second.
+    this.poll = setInterval(() => this.takeErrors(), 1000)
   }
 
   /** A new run. Python's first command resets the engine itself. */
@@ -1045,6 +1049,7 @@ class Player {
   }
 
   destroy() {
+    clearInterval(this.poll)
     this.halt()
     this.observer.disconnect()
     window.removeEventListener('keydown', this.onKey)
@@ -1064,7 +1069,15 @@ class Player {
   }
 
   takeErrors() {
-    for (const msg of this.engine.takeErrors ? this.engine.takeErrors() : []) this.report(msg)
+    const e = this.engine
+    if (typeof e.takeNotices === 'function') {
+      for (const n of e.takeNotices()) this.scene.log('info', 'animation: ' + ((n && n.message) || String(n)))
+    }
+    // Strings, or {message, line} with the Python line that made the command.
+    for (const x of e.takeErrors ? e.takeErrors() : []) {
+      if (x && typeof x === 'object') this.report((x.line ? 'line ' + x.line + ': ' : '') + (x.message || String(x)))
+      else this.report(String(x))
+    }
   }
 
   report(msg) {