Slight optimization: allow for non-proc predicates for markup writers.

Patches applied:

 * skribilo--devel--1.2  (patch 43)

   - Slight optimization: allow for non-proc predicated for markup writers.

git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-71

3 files changed, 33 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 97098d0..8d1136c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,24 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2006-03-07 22:56:07 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-43
+
+    Summary:
+      Slight optimization: allow for non-proc predicated for markup writers.
+    Revision:
+      skribilo--devel--1.2--patch-43
+
+    * src/guile/skribilo/engine.scm (engine-add-writer!): Allow PRED to be
+      `#f'.
+    
+    * src/guile/skribilo/writer.scm (make-writer-predicate): Likewise.
+      (lookup-markup-writer)[matching-writer]: Likewise.
+
+    modified files:
+     ChangeLog src/guile/skribilo/engine.scm
+     src/guile/skribilo/writer.scm
+
+
 2006-03-07 21:29:32 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-42
 
     Summary:
diff --git a/src/guile/skribilo/engine.scm b/src/guile/skribilo/engine.scm
index 0c3f406..3e05571 100644
--- a/src/guile/skribilo/engine.scm
+++ b/src/guile/skribilo/engine.scm
@@ -333,11 +333,12 @@ otherwise the requested engine is returned."
       (skribe-error ident "Illegal options" opt))
 
   ;; check the correctness of the predicate
-  (check-procedure "predicate" pred 2)
+  (if pred
+      (check-procedure "predicate" pred 2))
 
   ;; check the correctness of the validation proc
   (if valid
-    (check-procedure "validate" valid 2))
+      (check-procedure "validate" valid 2))
 
   ;; check the correctness of the three actions
   (check-output "before" before)
diff --git a/src/guile/skribilo/writer.scm b/src/guile/skribilo/writer.scm
index 62fa8b0..b46cddc 100644
--- a/src/guile/skribilo/writer.scm
+++ b/src/guile/skribilo/writer.scm
@@ -89,13 +89,12 @@
 
 
 (define (make-writer-predicate markup predicate class)
-  (let* ((t1 (if (symbol? markup)
-		 (lambda (n e) (is-markup? n markup))
-		 (lambda (n e) #t)))
-	 (t2 (if class
+  (define (%always-true n e) #t)
+
+  (let* ((t2 (if class
 		 (lambda (n e)
-		   (and (t1 n e) (equal? (markup-class n) class)))
-		 t1)))
+		   (and (equal? (markup-class n) class)))
+		 #f)))
     (if predicate
 	(cond
 	  ((not (procedure? predicate))
@@ -107,8 +106,10 @@
 			   "Illegal predicate arity (2 arguments expected)"
 			   predicate))
 	  (else
-	     (lambda (n e)
-	       (and (t2 n e) (predicate n e)))))
+	   (if (procedure? t2)
+	       (lambda (n e)
+		 (and (t2 n e) (predicate n e)))
+	       predicate)))
 	t2)))
 
 
@@ -167,7 +168,9 @@
   (define (matching-writer writers)
     (find (lambda (w)
 	    (let ((pred (slot-ref w 'pred)))
-	      (pred node e)))
+	      (if (procedure? pred)
+		  (pred node e)
+		  #t)))
 	  writers))
 
   (let* ((writers (slot-ref e 'writers))