diff options
| -rw-r--r-- | module/main.scm | 31 | ||||
| -rw-r--r-- | module/output/html.scm | 6 | ||||
| -rw-r--r-- | module/vcomponent/parse.scm | 1 |
3 files changed, 6 insertions, 32 deletions
diff --git a/module/main.scm b/module/main.scm index 24561f72..dc69ac0c 100644 --- a/module/main.scm +++ b/module/main.scm @@ -185,33 +185,8 @@ 'flat (string->symbol stprof))))) - -(define logport (make-parameter (open-file "/tmp/calp.xml" "a"))) - (define (main args) - - (when (zero? (stat:size (stat (logport)))) - (format (logport) "<?xml version=\"1.0\" encoding=\"UTF-8\"?>~%")) - - (format (logport) "<run><start>~a</start>~%" - ((@ (datetime) datetime->string) - ((@ (datetime) current-datetime)))) (report-time! "Program start") - ;; ((@ (util config) print-configuration-documentation)) - (let ((stack #f)) - (catch #t - (lambda () (dynamic-wind (lambda () 'noop) - (lambda () (catch 'return (lambda () (wrapped-main args)) values)) - (lambda () (run-hook shutdown-hook)) - )) - (case-lambda - ((err raiser fmt . args) - (format #t "Calp has crashed with [~a], -~?~%See ~a for full backtrace~%" - err fmt args (port-filename (logport))) - (format (logport) "<trace>~%<![CDATA[~%") - (display-backtrace stack (logport)) - (format (logport) "]]></trace></run>~%")) - ((err . args) - (format #t "Calp has crashed with [~a]~%~a~%" err args))) - (lambda _ (set! stack (make-stack #t)))))) + (dynamic-wind (lambda () 'noop) + (lambda () (catch 'return (lambda () (wrapped-main args)) values)) + (lambda () (run-hook shutdown-hook)))) diff --git a/module/output/html.scm b/module/output/html.scm index a17a19fd..5b06fe01 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -640,10 +640,10 @@ ,(include-alt-css "/static/dark.css" '(title "Dark")) ,(include-alt-css "/static/light.css" '(title "Light")) - (script (@ (src "/static/jquery-3.1.1.min.js")) "") - (script (@ (src "/static/tipped-4.7.0/dist/js/tipped.min.js")) "") + (script (@ (defer) (src "/static/jquery-3.1.1.min.js")) "") + (script (@ (defer) (src "/static/tipped-4.7.0/dist/js/tipped.min.js")) "") - (script (@ (src "/static/script.js")) "") + (script (@ (defer) (src "/static/script.js")) "") (style ,(format #f "~:{.CAL_~a { background-color: ~a; color: ~a }~%.CAL_bg_~a { border-color: ~a }~%~}" (map (lambda (c) (let* ((name (html-attr (prop c 'NAME))) diff --git a/module/vcomponent/parse.scm b/module/vcomponent/parse.scm index 0b5f5529..0caa65e7 100644 --- a/module/vcomponent/parse.scm +++ b/module/vcomponent/parse.scm @@ -5,7 +5,6 @@ ;;; Code: (define-module (vcomponent parse) - :use-module (rnrs bytevectors) :use-module (srfi srfi-1) :use-module ((ice-9 hash-table) :select (alist->hash-table)) |