about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/guile/skribilo/ast.scm2
-rw-r--r--src/guile/skribilo/debug.scm2
-rw-r--r--src/guile/skribilo/engine/base.scm2
-rw-r--r--src/guile/skribilo/engine/context.scm4
-rw-r--r--src/guile/skribilo/engine/html.scm10
-rw-r--r--src/guile/skribilo/engine/html4.scm2
-rw-r--r--src/guile/skribilo/engine/latex.scm10
-rw-r--r--src/guile/skribilo/package/base.scm72
-rw-r--r--src/guile/skribilo/package/html-navtabs.scm2
-rw-r--r--src/guile/skribilo/package/jfp.scm4
-rw-r--r--src/guile/skribilo/package/lncs.scm2
-rw-r--r--src/guile/skribilo/package/slide/latex.scm2
-rw-r--r--src/guile/skribilo/utils/justify.scm2
-rw-r--r--src/guile/skribilo/utils/keywords.scm8
-rw-r--r--src/guile/skribilo/utils/text-table.scm2
15 files changed, 63 insertions, 63 deletions
diff --git a/src/guile/skribilo/ast.scm b/src/guile/skribilo/ast.scm
index 853d14d..3b30301 100644
--- a/src/guile/skribilo/ast.scm
+++ b/src/guile/skribilo/ast.scm
@@ -434,7 +434,7 @@
 ;;   (let ((e (or engine (use-engine))))
 ;;     (cond
 ;;       ((not (is-a? e <engine>))
-;;           (skribe-error 'markup-writer "illegal engine" e))
+;;           (skribe-error 'markup-writer "invalid engine" e))
 ;;       ((and (not before)
 ;;	    (not action)
 ;;	    (not after))
diff --git a/src/guile/skribilo/debug.scm b/src/guile/skribilo/debug.scm
index 87be812..983dddc 100644
--- a/src/guile/skribilo/debug.scm
+++ b/src/guile/skribilo/debug.scm
@@ -76,7 +76,7 @@
 ;        (set! *debug-port* o)
 ;        o)
 ;       (else
-;        (error 'debug-port "Illegal debug port" (car o)))))
+;        (error 'debug-port "Invalid debug port" (car o)))))
 ;
 
 ;;;
diff --git a/src/guile/skribilo/engine/base.scm b/src/guile/skribilo/engine/base.scm
index 9daf655..96344eb 100644
--- a/src/guile/skribilo/engine/base.scm
+++ b/src/guile/skribilo/engine/base.scm
@@ -398,7 +398,7 @@
 		    (cond
 		       ((not (or bb (is-markup? b 'url-ref)))
 			(skribe-error 'the-index
-				      "Illegal entry"
+				      "Invalid entry"
 				      b))
 		       (note
 			(let ((r (if bb
diff --git a/src/guile/skribilo/engine/context.scm b/src/guile/skribilo/engine/context.scm
index cef0136..b8c431d 100644
--- a/src/guile/skribilo/engine/context.scm
+++ b/src/guile/skribilo/engine/context.scm
@@ -675,7 +675,7 @@
 			       (if (not (number? nb))
 				   (skribe-error
 				    'font
-				    (format #f "Illegal font size ~s" size)
+				    (format #f "Invalid font size ~s" size)
 				    nb)
 				   (+ cs nb))))))
 		     (ne (make-engine (gensym "context")
@@ -949,7 +949,7 @@
 						       efmt
 						       '("jpg"))))))
 	       (if (not (string? img))
-		   (skribe-error 'context "Illegal image" file)
+		   (skribe-error 'context "Invalid image" file)
 		   (begin
 		     (format #t "\\externalfigure[~A][frame=off" (strip-ref-base img))
 		     (if zoom   (format #t ",factor=~a"   (inexact->exact zoom)))
diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm
index 3b06ae1..dc176af 100644
--- a/src/guile/skribilo/engine/html.scm
+++ b/src/guile/skribilo/engine/html.scm
@@ -728,7 +728,7 @@
 	  (id (markup-ident n)))
       (unless (string? id)
 	 (skribe-error '&html-generic-header
-		       (format #f "Illegal identifier '~a'" id)
+		       (format #f "Invalid identifier '~a'" id)
 		       n))
       ;; title
       (output (new markup
@@ -1094,7 +1094,7 @@
 			(f (html-file c e)))
 		    (unless (string? id)
 		       (skribe-error 'toc
-				     (format #f "illegal identifier '~a'" id)
+				     (format #f "invalid identifier '~a'" id)
 				     c))
 		    (display " <tr>")
 		    ;; blank columns
@@ -1127,7 +1127,7 @@
 			     b)))
 		 (if (not (container? bb))
 		     (error 'toc
-			    "Illegal body (container expected)"
+			    "Invalid body (container expected)"
 			    (if (markup? bb)
 				(markup-markup bb)
 				"???"))
@@ -1570,7 +1570,7 @@
 		  (display "width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\"><tr><td align=\"right\">"))
 		 (else
 		  (skribe-error 'flush
-				"Illegal side"
+				"Invalid side"
 				(markup-option n :side)))))
    :after (lambda (n e)
 	     (case (markup-option n :side)
@@ -1830,7 +1830,7 @@
 						     efmt
 						     '("gif" "jpg" "png"))))))
 		 (if (not (string? img))
-		     (skribe-error 'html "Illegal image" file)
+		     (skribe-error 'html "Invalid image" file)
 		     (begin
 			(format #t "<img src=\"~a\" border=\"0\"" img)
 			(html-class n)
diff --git a/src/guile/skribilo/engine/html4.scm b/src/guile/skribilo/engine/html4.scm
index 5a362ad..a9b90de 100644
--- a/src/guile/skribilo/engine/html4.scm
+++ b/src/guile/skribilo/engine/html4.scm
@@ -146,7 +146,7 @@
 			       (else
 				(skribe-error 'font
 					      (format #f
-						      "illegal font size ~s" sz)
+						      "invalid font size ~s" sz)
 					      n))))))
 		 (display "<span ")
 		 (html-class n)
diff --git a/src/guile/skribilo/engine/latex.scm b/src/guile/skribilo/engine/latex.scm
index d7d3432..67d8a4e 100644
--- a/src/guile/skribilo/engine/latex.scm
+++ b/src/guile/skribilo/engine/latex.scm
@@ -906,7 +906,7 @@
 				(if (not (number? nb))
 				    (skribe-error 
 				     'font
-				     (format #f "Illegal font size ~s" size)
+				     (format #f "Invalid font size ~s" size)
 				     nb)
 				    (+ cs nb))))))
 		     (ne (make-engine (gensym "latex")
@@ -1138,7 +1138,7 @@
 	    (luup (cdr cells)
 		  (+ nbcols (markup-option (car cells) :colspan))))
 	   (else
-	    (skribe-type-error 'tr "Illegal tr body, " row "pair")))))
+	    (skribe-type-error 'tr "Invalid tr body, " row "pair")))))
    (let loop ((rows (markup-body t))
 	      (nbcols 0))
       (if (null? rows)
@@ -1171,7 +1171,7 @@
 		 (let ((cols (cond
 				((= nbcols 0)
 				 (skribe-error 'table
-					       "Illegal empty table"
+					       "Invalid empty table"
 					       n))
 				((or (not width) (= nbcols 1))
 				 (make-string nbcols #\c))
@@ -1268,7 +1268,7 @@
    :options '()
    :action (lambda (n e)
               (if (not (is-markup? (ast-parent n) 'table))
-                  (skribe-type-error 'tr "Illegal parent, " (ast-parent n)
+                  (skribe-type-error 'tr "Invalid parent, " (ast-parent n)
                                      "#<table>"))
 
 	      (let* ((parent (ast-parent n))
@@ -1416,7 +1416,7 @@
 						     efmt
 						     '("eps"))))))
 		 (if (not (string? img))
-		     (skribe-error 'latex "Illegal image" file)
+		     (skribe-error 'latex "Invalid image" file)
 		     (begin
 			(format #t "\\epsfig{file=~a" (strip-ref-base img))
 			(if width (format #t ", width=~a" (latex-width width)))
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm
index 3941cd1..a5d8318 100644
--- a/src/guile/skribilo/package/base.scm
+++ b/src/guile/skribilo/package/base.scm
@@ -64,7 +64,7 @@
 ;*---------------------------------------------------------------------*/
 (define-public (include file)
    (if (not (string? file))
-       (skribe-error 'include "Illegal file (string expected)" file)
+       (skribe-error 'include "Invalid file (string expected)" file)
        (include-document file)))
 
 ;*---------------------------------------------------------------------*/
@@ -123,7 +123,7 @@
 		       (photo #f)
 		       (align 'center))
    (if (not (memq align '(center left right)))
-       (skribe-error 'author "Illegal align value" align)
+       (skribe-error 'author "Invalid align value" align)
        (new container
 	  (markup 'author)
 	  (ident (or ident (symbol->string (gensym "author"))))
@@ -143,7 +143,7 @@
    (let ((body (the-body opts)))
       (cond
 	 (section
-	  (error 'handle "Illegal handle 'section' option" section)
+	  (error 'handle "Invalid handle 'section' option" section)
 	  (new unresolved
              (loc  &invocation-location)
 	     (proc (lambda (n e env)
@@ -158,7 +158,7 @@
              (loc &invocation-location)
 	     (ast (car body))))
 	 (else
-	  (skribe-error 'handle "Illegal handle" opts)))))
+	  (skribe-error 'handle "Invalid handle" opts)))))
 
 ;*---------------------------------------------------------------------*/
 ;*    toc ...                                                          */
@@ -192,12 +192,12 @@
 		   (if (handle? (car body))
 		       (car body)
 		       (skribe-error 'toc
-				     "Illegal argument (handle expected)"
+				     "Invalid argument (handle expected)"
 				     (if (markup? (car body))
 					 (markup-markup (car body))
 					 "???"))))
 		  (else
-		   (skribe-error 'toc "Illegal argument" body)))))))
+		   (skribe-error 'toc "Invalid argument" body)))))))
 
 ;*---------------------------------------------------------------------*/
 ;*    section-number ...                                               */
@@ -382,9 +382,9 @@
 	 ((null? num)
 	  ln)
 	 ((not (null? (cdr num)))
-	  (skribe-error 'linebreak "Illegal arguments" num))
+	  (skribe-error 'linebreak "Invalid arguments" num))
 	 ((not (and (integer? (car num)) (positive? (car num))))
-	  (skribe-error 'linebreak "Illegal argument" (car num)))
+	  (skribe-error 'linebreak "Invalid argument" (car num)))
 	 (else
 	  (vector->list (make-vector (car num) ln))))))
 
@@ -484,7 +484,7 @@
 	  (options (the-options opts :ident :class))
 	  (body (the-body opts))))
       (else
-       (skribe-error 'flush "Illegal side" side))))
+       (skribe-error 'flush "Invalid side" side))))
 
 ;*---------------------------------------------------------------------*/
 ;*    center ...                                                       */
@@ -510,7 +510,7 @@
 		     (ident #f) (class "prog")
 		     (line 1) (linedigit #f) (mark ";!"))
    (if (not (or (string? mark) (eq? mark #f)))
-       (skribe-error 'prog "Illegal mark" mark)
+       (skribe-error 'prog "Invalid mark" mark)
        (new container
 	  (markup 'prog)
 	  (ident (or ident (symbol->string (gensym "prog"))))
@@ -553,19 +553,19 @@
 			"definition requires a language specification"
 			definition))
 	 ((and file (not (string? file)))
-	  (skribe-error 'source "Illegal file" file))
+	  (skribe-error 'source "Invalid file" file))
 	 ((and start (not (or (integer? start) (string? start))))
-	  (skribe-error 'source "Illegal start" start))
+	  (skribe-error 'source "Invalid start" start))
 	 ((and stop (not (or (integer? stop) (string? stop))))
-	  (skribe-error 'source "Illegal start" stop))
+	  (skribe-error 'source "Invalid start" stop))
 	 ((and (integer? start) (integer? stop) (> start stop))
 	  (skribe-error 'source
 			"start line > stop line"
 			(format #f "~a/~a" start stop)))
 	 ((and language (not (language? language)))
-	  (skribe-error 'source "illegal language" language))
+	  (skribe-error 'source "invalid language" language))
 	 ((and tab (not (integer? tab)))
-	  (skribe-error 'source "illegal tab" tab))
+	  (skribe-error 'source "invalid tab" tab))
 	 (file
 	  (let ((s (if (not definition)
 		       (source-read-lines file start stop tab)
@@ -586,7 +586,7 @@
 ;*---------------------------------------------------------------------*/
 (define-markup (language :key name (fontifier #f) (extractor #f))
    (if (not (string? name))
-       (skribe-type-error 'language "illegal name" name "string")
+       (skribe-type-error 'language "invalid name" name "string")
        (new language
 	  (name name)
 	  (fontifier fontifier)
@@ -652,7 +652,7 @@
 		 (if (not (is-markup? r markup))
 		     (skribe-warning 2
 				     for
-				     (format #f "illegal '~a' element, '~a' expected"
+				     (format #f "invalid '~a' element, '~a' expected"
 					     (if (markup? r)
 						 (markup-markup r)
 						 (type-name r))
@@ -706,7 +706,7 @@
 			 (number? key)
 			 (markup? key)
 			 (pair? key))))
-       (skribe-type-error 'item "Illegal key:" key "node")
+       (skribe-type-error 'item "Invalid key:" key "node")
        (new container
 	  (markup 'item)
 	  (ident (or ident (symbol->string (gensym "item"))))
@@ -807,9 +807,9 @@
 		     valign)))
       (cond
 	 ((not (integer? colspan))
-	  (skribe-type-error 'tc "Illegal colspan, " colspan "integer"))
+	  (skribe-type-error 'tc "Invalid colspan, " colspan "integer"))
 	 ((not (symbol? align))
-	  (skribe-type-error 'tc "Illegal align, " align "align"))
+	  (skribe-type-error 'tc "Invalid align, " align "align"))
 	 ((not (memq align '(#f center left right)))
 	  (skribe-error
 	   'tc
@@ -924,7 +924,7 @@
       ((and (string? char) (= (string-length char) 1))
        char)
       (else
-       (skribe-error 'char "Illegal char" char))))
+       (skribe-error 'char "Invalid char" char))))
 
 ;*---------------------------------------------------------------------*/
 ;*    symbol ...                                                       */
@@ -937,7 +937,7 @@
 	     symbol)
 	    (else
 	     (skribe-error 'symbol
-			   "Illegal argument (symbol expected)"
+			   "Invalid argument (symbol expected)"
 			   symbol)))))
     (new markup
 	 (markup 'symbol)
@@ -949,7 +949,7 @@
 ;*---------------------------------------------------------------------*/
 (define-markup (! format :rest node)
    (if (not (string? format))
-       (skribe-type-error '! "Illegal format:" format "string")
+       (skribe-type-error '! "Invalid format:" format "string")
        (new command
           (loc &invocation-location)
 	  (fmt format)
@@ -964,7 +964,7 @@
       ((and combinator (not (procedure? combinator)))
        (skribe-error 'processor "Combinator not a procedure" combinator))
       ((and engine (not (engine? engine)))
-       (skribe-error 'processor "Illegal engine" engine))
+       (skribe-error 'processor "Invalid engine" engine))
       ((and procedure
 	    (or (not (procedure? procedure))
 		(not (let ((a (procedure-property procedure 'arity)))
@@ -974,7 +974,7 @@
                                   (rest?      (caddr a)))
                               (or rest?
                                   (>= (+ compulsory optional) 2))))))))
-       (skribe-error 'processor "Illegal procedure" procedure))
+       (skribe-error 'processor "Invalid procedure" procedure))
       (else
        (new processor
           (loc &invocation-location)
@@ -1023,9 +1023,9 @@
 	 ((null? bd)
 	  (skribe-error 'mark "Missing argument" '()))
 	 ((not (string? (car bd)))
-	  (skribe-type-error 'mark "Illegal ident:" (car bd) "string"))
+	  (skribe-type-error 'mark "Invalid ident:" (car bd) "string"))
 	 (ident
-	  (skribe-error 'mark "Illegal 'ident:' option" ident))
+	  (skribe-error 'mark "Invalid 'ident:' option" ident))
 	 (else
 	  (let* ((bs (ast->string bd))
 		 (n (new markup
@@ -1096,7 +1096,7 @@
 	 (body text)))
    (define (do-title-ref title kind)
       (if (not (string? title))
-	  (skribe-type-error 'ref "illegal reference" title "string")
+	  (skribe-type-error 'ref "invalid reference" title "string")
 	  (new unresolved
              (loc  &invocation-location)
 	     (proc (lambda (n e env)
@@ -1122,7 +1122,7 @@
 			     (unref title (or kind 'title)))))))))
    (define (do-ident-ref text kind)
       (if (not (string? text))
-	  (skribe-type-error 'ref "Illegal reference" text "string")
+	  (skribe-type-error 'ref "Invalid reference" text "string")
 	  (new unresolved
              (loc  &invocation-location)
 	     (proc (lambda (n e env)
@@ -1210,7 +1210,7 @@
 	 (bib (bib-ref bib))
 	 (url (url-ref))
 	 (line (line-ref line))
-	 (else (skribe-error 'ref "illegal reference" opts)))))
+	 (else (skribe-error 'ref "invalid reference" opts)))))
 
 
 ;*---------------------------------------------------------------------*/
@@ -1279,7 +1279,7 @@
 		   ((pair? f)
 		    (bib-add! bib-table f))
 		   (else
-		    (skribe-error "bibliography" "Illegal entry" f))))
+		    (skribe-error "bibliography" "Invalid entry" f))))
 	     (the-body files)))
 
 ;*---------------------------------------------------------------------*/
@@ -1360,7 +1360,7 @@
 		    ((not index) (default-index))
 		    ((index? index) index)
 		    (else (skribe-type-error 'index
-					     "Illegal index table, "
+					     "Invalid index table, "
 					     index
 					     "index"))))
 	  (m (mark (symbol->string (gensym "mark"))))
@@ -1406,12 +1406,12 @@
    (let ((bd (the-body opts)))
       (cond
 	 ((not (and (integer? char-offset) (>= char-offset 0)))
-	  (skribe-error 'the-index "Illegal char offset" char-offset))
+	  (skribe-error 'the-index "Invalid char offset" char-offset))
 	 ((not (integer? column))
-	  (skribe-error 'the-index "Illegal column number" column))
+	  (skribe-error 'the-index "Invalid column number" column))
 	 ((not (every index? bd))
 	  (skribe-error 'the-index
-			"Illegal indexes"
+			"Invalid indexes"
 			(filter (lambda (o) (not (index? o))) bd)))
 	 (else
 	  (new unresolved
@@ -1474,7 +1474,7 @@
 			((arabic) the-arabic-number)
 			((alpha) the-alpha-number)
 			(else (skribe-error 'counter
-					    "Illegal numbering"
+					    "Invalid numbering"
 					    numbering)))))
       (let loop ((num 1)
 		 (items items)
diff --git a/src/guile/skribilo/package/html-navtabs.scm b/src/guile/skribilo/package/html-navtabs.scm
index 9d9287c..1a06b4b 100644
--- a/src/guile/skribilo/package/html-navtabs.scm
+++ b/src/guile/skribilo/package/html-navtabs.scm
@@ -243,7 +243,7 @@
 				  (parent (ast-parent n))
 				  (body t))
 			       e)
-		       (skribe-type-error 'tr "Illegal tabs, " t "handle")))
+		       (skribe-type-error 'tr "Invalid tabs, " t "handle")))
 		tabs))
    (display "</div>\n")
    (output (new markup
diff --git a/src/guile/skribilo/package/jfp.scm b/src/guile/skribilo/package/jfp.scm
index 5c831a2..2e305e5 100644
--- a/src/guile/skribilo/package/jfp.scm
+++ b/src/guile/skribilo/package/jfp.scm
@@ -98,7 +98,7 @@
 			(&latex-author-n body))
 		       (else
 			(skribe-error 'author
-				      "Illegal 'jfp' author"
+				      "Invalid 'jfp' author"
 				      body))))))
    ;; title
    (markup-writer '&latex-title le
@@ -185,7 +185,7 @@
 								   "")))
 					 (output s2 e)))))))
 			(skribe-error 'bib-ref
-				      "Illegal bib-ref"
+				      "Invalid bib-ref"
 				      (markup-ident be)))))
       :after ")")
       ;; bib-ref/text
diff --git a/src/guile/skribilo/package/lncs.scm b/src/guile/skribilo/package/lncs.scm
index 97335e0..0289095 100644
--- a/src/guile/skribilo/package/lncs.scm
+++ b/src/guile/skribilo/package/lncs.scm
@@ -146,7 +146,7 @@
 						   (+ 1 j)))))))))
 		       (else
 			(skribe-error 'author
-				      "Illegal 'lncs' author"
+				      "Invalid 'lncs' author"
 				      body))))))
    ;; author
    (let ((old-author (markup-writer-get 'author le)))
diff --git a/src/guile/skribilo/package/slide/latex.scm b/src/guile/skribilo/package/slide/latex.scm
index 1d030c3..7a3a0ce 100644
--- a/src/guile/skribilo/package/slide/latex.scm
+++ b/src/guile/skribilo/package/slide/latex.scm
@@ -55,7 +55,7 @@
     ((prosper)
      (%slide-prosper-setup!))
     (else
-     (skribe-error 'slide "Illegal latex mode" %slide-latex-mode))))
+     (skribe-error 'slide "Invalid latex mode" %slide-latex-mode))))
 
 (define string->integer string->number)
 
diff --git a/src/guile/skribilo/utils/justify.scm b/src/guile/skribilo/utils/justify.scm
index 3ea7d27..e6ad8cb 100644
--- a/src/guile/skribilo/utils/justify.scm
+++ b/src/guile/skribilo/utils/justify.scm
@@ -413,7 +413,7 @@
 		   ((width)
 		    width)
 		   (else
-		    (error "justifier" "Illegal command" cmd))))))))
+		    (error "justifier" "Invalid command" cmd))))))))
 
 ;*---------------------------------------------------------------------*/
 ;*    *justifiers* ...                                                 */
diff --git a/src/guile/skribilo/utils/keywords.scm b/src/guile/skribilo/utils/keywords.scm
index ba5c026..fa13ed1 100644
--- a/src/guile/skribilo/utils/keywords.scm
+++ b/src/guile/skribilo/utils/keywords.scm
@@ -39,10 +39,10 @@
      ((null? opt*)
       (reverse! res))
      ((not (pair? opt*))
-      (error "illegal body" opt*))
+      (error "invalid body" opt*))
      ((keyword? (car opt*))
       (if (null? (cdr opt*))
-          (error "illegal option" (car opt*))
+          (error "invalid option" (car opt*))
           (loop (cddr opt*) res)))
      (else
       (loop (cdr opt*) (cons (car opt*) res))))))
@@ -58,11 +58,11 @@
      ((null? opt*)
       (reverse! res))
      ((not (pair? opt*))
-      (error "illegal options" opt*))
+      (error "invalid options" opt*))
      ((keyword? (car opt*))
       (cond
        ((null? (cdr opt*))
-        (error "illegal option" (car opt*)))
+        (error "invalid option" (car opt*)))
        ((memq (car opt*) out)
         (loop (cdr opt*) res))
        (else
diff --git a/src/guile/skribilo/utils/text-table.scm b/src/guile/skribilo/utils/text-table.scm
index b45a102..dfb2473 100644
--- a/src/guile/skribilo/utils/text-table.scm
+++ b/src/guile/skribilo/utils/text-table.scm
@@ -170,7 +170,7 @@
 					    (if (not align)
 						'left
 						(error "table-cell-format"
-						       "Illegal horizontal alignment"
+						       "Invalid horizontal alignment"
 						       align)))))
 			(lambda () (scribe->ascii body)))))
 	       (if (null? fmt)
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-08-12 16:24:28 +0000