Import Debian changes 3a1-4.2debian/3a1-4.2

slib (3a1-4.2) unstable; urgency=low

  * Non-maintainer upload.
  * Add guile.init.local for use within the build dir, since otherwise we
    have an (earlier unnoticed) circular build-dep due to a difference
    between scm and guile.

slib (3a1-4.1) unstable; urgency=low

  * Non-maintainer upload.
  * Build-depend on guile-1.6 instead of scm, since the new version of
    scm is wedged in unstable (closes: #281809).

slib (3a1-4) unstable; urgency=low

  * Also check for expected creation on slibcat. (Closes: #240096)

slib (3a1-3) unstable; urgency=low

  * Also check for /usr/share/guile/1.6/slib before installing for guile
    1.6. (Closes: #239267)

slib (3a1-2) unstable; urgency=low

  * Add format.scm back into slib until gnucash stops using it.
  * Call guile-1.6 new-catalog (Closes: #238231)

slib (3a1-1) unstable; urgency=low

  * New upstream release
  * Remove Info section from doc-base file (Closes: #186950)
  * Remove period from end of description (linda, lintian)
  * html gen fixed upstream (Closes: #111778)

slib (2d4-2) unstable; urgency=low

  * Fix url for upstream source (Closes: #144981)
  * Fix typo in slib.texi (enquque->enqueue) (Closes: #147475)
  * Add build depends.

slib (2d4-1) unstable; urgency=low

  * New upstream.

slib (2d3-1) unstable; urgency=low

  * New upstream.
  * Remove texi2html call in debian/rules.  Now done upstream.  Add make
    html instead.
  * Changes to rules and doc-base to conform to upstream html gen
  * Clean up upstream makefile to make sure it cleans up after itself.

1 files changed, 17 insertions, 5 deletions

diff --git a/format.scm b/format.scm
index 709acf7..c9e1d12 100644
--- a/format.scm
+++ b/format.scm
@@ -31,6 +31,13 @@
 (define format:expch #\E)
 ;; The character prefixing the exponent value in ~e printing.
 
+(define format:iteration-bounded #t)
+;; If #t, "~{...~}" iterates no more than format:max-iterations times;
+;; if #f, there is no bound.
+
+(define format:max-iterations 100)
+;; Compatible with previous versions.
+
 (define format:floats (provided? 'inexact))
 ;; Detects if the scheme system implements flonums (see at eof).
 
@@ -605,7 +612,8 @@
 		 ((colon)
 		  (if (not max-iterations) (set! max-iterations 1)))
 		 ((colon-at at) (format:error "illegal modifier"))
-		 (else (if (not max-iterations) (set! max-iterations 100))))
+		 (else (if (not max-iterations)
+			   (set! max-iterations format:max-iterations))))
 	       (if (not (null? params))
 		   (format:error "no parameters allowed in ~~}"))
 	       (if (zero? iteration-nest)
@@ -627,7 +635,8 @@
 					    (list-tail args arg-pos))))
 			     (i 0 (+ i 1)))
 			    ((or (>= arg-pos args-len)
-				 (>= i max-iterations))))))
+				 (and format:iteration-bounded
+				      (>= i max-iterations)))))))
 		     ((sublists)
 		      (let ((args (next-arg))
 			    (args-len 0))
@@ -636,7 +645,8 @@
 			(set! args-len (length args))
 			(do ((arg-pos 0 (+ arg-pos 1)))
 			    ((or (>= arg-pos args-len)
-				 (>= arg-pos max-iterations)))
+				 (and format:iteration-bounded
+				      (>= arg-pos max-iterations))))
 			  (let ((sublist (list-ref args arg-pos)))
 			    (if (not (list? sublist))
 				(format:error
@@ -653,7 +663,8 @@
 						   args arg-pos))))
 				   (i 0 (+ i 1)))
 				  ((or (>= arg-pos args-len)
-				       (>= i max-iterations))
+				       (and format:iteration-bounded
+					    (>= i max-iterations)))
 				   arg-pos))))
 			(add-arg-pos usedup-args)))
 		     ((rest-sublists)
@@ -662,7 +673,8 @@
 			     (usedup-args
 			      (do ((arg-pos 0 (+ arg-pos 1)))
 				  ((or (>= arg-pos args-len)
-				       (>= arg-pos max-iterations))
+				       (and format:iteration-bounded
+					    (>= arg-pos max-iterations)))
 				   arg-pos)
 				(let ((sublist (list-ref args arg-pos)))
 				  (if (not (list? sublist))