diff options
Diffstat (limited to 'doc/modules')
| -rw-r--r-- | doc/modules/skribilo/documentation/api.scm | 11 | ||||
| -rw-r--r-- | doc/modules/skribilo/documentation/env.scm | 3 | ||||
| -rw-r--r-- | doc/modules/skribilo/documentation/extension.scm | 2 | ||||
| -rw-r--r-- | doc/modules/skribilo/documentation/manual.scm | 34 |
4 files changed, 25 insertions, 25 deletions
diff --git a/doc/modules/skribilo/documentation/api.scm b/doc/modules/skribilo/documentation/api.scm index 84108c9..d369b1a 100644 --- a/doc/modules/skribilo/documentation/api.scm +++ b/doc/modules/skribilo/documentation/api.scm @@ -27,7 +27,6 @@ :use-module (skribilo output) :use-module (skribilo lib) ;; `define-markup' :use-module (skribilo utils keywords) - :use-module (skribilo utils compat) :use-module (skribilo utils syntax) ;; `%skribilo-module-reader' :use-module (skribilo package base) @@ -44,7 +43,7 @@ ;*---------------------------------------------------------------------*/ ;* Html configuration */ ;*---------------------------------------------------------------------*/ -(let* ((he (find-engine 'html)) +(let* ((he (lookup-engine-class 'html)) (tro (markup-writer-get 'tr he))) (markup-writer 'tr he :class 'api-table-header @@ -71,7 +70,7 @@ ;*---------------------------------------------------------------------*/ ;* LaTeX configuration */ ;*---------------------------------------------------------------------*/ -(let* ((le (find-engine 'latex)) +(let* ((le (lookup-engine-class 'latex)) (tro (markup-writer-get 'tr le))) (markup-writer 'tr le :class 'api-table-prototype @@ -93,8 +92,8 @@ (define* (api-search-definition id file pred :optional (skribe-source? #t)) ;; If SKRIBE-SOURCE? is true, then assume Skribe syntax. Otherwise, use ;; the ``Skribilo module syntax''. - (let* ((path (append %load-path (skribe-path))) - (f (find-file/path file path)) + (let* ((path %load-path) + (f (search-path path file)) (read (if skribe-source? (make-reader 'skribe) %skribilo-module-reader))) (if (not (string? f)) @@ -371,7 +370,7 @@ (define (opt-engine-support opt) ;; find the engines providing a writer for id (map (lambda (e) - (let* ((id (engine-ident e)) + (let* ((id (engine-class-ident e)) (s (symbol->string id))) (if (engine-format? "latex") (list s " ") diff --git a/doc/modules/skribilo/documentation/env.scm b/doc/modules/skribilo/documentation/env.scm index 569f194..0510796 100644 --- a/doc/modules/skribilo/documentation/env.scm +++ b/doc/modules/skribilo/documentation/env.scm @@ -44,4 +44,5 @@ (define-public *disp-color* "#ccffcc") (define-public *header-color* "#cccccc") -(define-public *api-engines* (map find-engine '(html latex xml))) +(define-public *api-engines* (map lookup-engine-class + '(html lout latex xml))) diff --git a/doc/modules/skribilo/documentation/extension.scm b/doc/modules/skribilo/documentation/extension.scm index e012cb2..a7e5c20 100644 --- a/doc/modules/skribilo/documentation/extension.scm +++ b/doc/modules/skribilo/documentation/extension.scm @@ -29,7 +29,7 @@ ;* extension */ ;*---------------------------------------------------------------------*/ (define-markup (extension #!rest opt - #!key (ident (symbol->string (gensym 'extension))) + #!key (ident (symbol->string (gensym "extension"))) (class "extension") title html-title ending author description (env '())) diff --git a/doc/modules/skribilo/documentation/manual.scm b/doc/modules/skribilo/documentation/manual.scm index f2a6cdd..97501d8 100644 --- a/doc/modules/skribilo/documentation/manual.scm +++ b/doc/modules/skribilo/documentation/manual.scm @@ -26,8 +26,8 @@ :use-module (skribilo lib) ;; `define-markup' :use-module (skribilo resolve) :use-module (skribilo output) + :use-module (skribilo evaluator) :use-module (skribilo utils keywords) - :use-module (skribilo utils compat) :use-module (skribilo utils syntax) ;; `when' :use-module (skribilo documentation env) @@ -52,20 +52,20 @@ ;*---------------------------------------------------------------------*/ ;* Base configuration */ ;*---------------------------------------------------------------------*/ -(let ((be (find-engine 'base))) +(let ((be (lookup-engine-class 'base))) (markup-writer 'example be :options '(:legend :number) :action (lambda (n e) (let ((ident (markup-ident n)) (number (markup-option n :number)) (legend (markup-option n :legend))) - (skribe-eval (mark ident) e) - (skribe-eval (center - (markup-body n) - (if number - (bold (format #f "Ex. ~a: " number))) - legend) - e))))) + (evaluate-document (mark ident) e) + (evaluate-document + (center (markup-body n) + (if number + (bold (format #f "Ex. ~a: " number))) + legend) + e))))) ;*---------------------------------------------------------------------*/ ;* html-browsing-extra ... */ @@ -95,7 +95,7 @@ ;*---------------------------------------------------------------------*/ ;* Html configuration */ ;*---------------------------------------------------------------------*/ -(let* ((he (find-engine 'html)) +(let* ((he (lookup-engine-class 'html)) (bd (markup-writer-get 'bold he))) (markup-writer 'bold he :class 'api-proto-ident @@ -108,7 +108,7 @@ ;*---------------------------------------------------------------------*/ ;* LaTeX */ ;*---------------------------------------------------------------------*/ -(let* ((le (find-engine 'latex)) +(let* ((le (lookup-engine-class 'latex)) (opckg (engine-custom le 'usepackage)) (lpckg "\\usepackage{fullpage}\n\\usepackage{eurosym}\n") (npckg (if (string? opckg) @@ -190,7 +190,7 @@ (define-markup (example #!rest opts #!key legend class) (new container (markup 'example) - (ident (symbol->string (gensym 'example))) + (ident (symbol->string (gensym "example"))) (class class) (required-options '(:legend :number)) (options `((:number @@ -290,19 +290,19 @@ (pref (eq? (engine-custom e 'index-page-ref) #t)) (loc (ast-loc n)) ;; FIXME: Since we don't support - ;; `:&skribe-eval-location', we could set up a - ;; `parameterize' thing around `skribe-eval' to provide + ;; `:&evaluate-document-location', we could set up a + ;; `parameterize' thing around `evaluate-document' to provide ;; it with the right location information. (t (cond ((null? ie) "") ((or (not (integer? nc)) (= nc 1)) - (table :width 100. ;;:&skribe-eval-location loc + (table :width 100. ;;:&evaluate-document-location loc (make-column ie pref))) (else - (table :width 100. ;;:&skribe-eval-location loc + (table :width 100. ;;:&evaluate-document-location loc (make-sub-tables ie nc pref)))))) - (output (skribe-eval t e) e)))) + (evaluate-document t e)))) ;*---------------------------------------------------------------------*/ ;* compiler-command ... */ |