Remove 'cond-expand' clauses for Guile 1.8.

This is a followup to d183aa487d99baea3746f79759c17cf36c55dfbf.

* src/guile/skribilo/debug.scm (with-debug): Remove 'cond-expand' and
keep only 'guile-2' version.
* src/guile/skribilo/engine/html.scm (&html-generic-document)[set-output-encoding]:
Likewise.
* src/guile/skribilo/engine/info.scm (document): Likewise.
* src/guile/skribilo/engine/latex.scm (document): Likewise.
* src/guile/skribilo/engine/lout.scm (document): Likewise.
* src/guile/skribilo/evaluator.scm (%evaluate): Likewise.
* src/guile/skribilo/location.scm <top level>: Likewise.
* src/guile/skribilo/module.scm (maybe-set-module-name!): Likewise.
* src/guile/skribilo/package/base.scm <top level>: Likewise.
* src/guile/skribilo/utils/syntax.scm (unless, when): Remove.
(set-correct-file-encoding!, default-to-utf-8): Keep only 'guile-2' variant.
* tests/location.test <top level>: Likewise.
* tests/readers/rss-2.test <top level>: Likewise.

4 files changed, 23 insertions, 35 deletions

diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm
index 9055486..5120631 100644
--- a/src/guile/skribilo/engine/html.scm
+++ b/src/guile/skribilo/engine/html.scm
@@ -1161,14 +1161,11 @@
 ;*---------------------------------------------------------------------*/
 (define (&html-generic-document n title e)
   (define (set-output-encoding)
-    (cond-expand
-     (guile-2
-      ;; Make sure the output is suitably encoded.
-      (and=> (engine-custom e 'charset)
-             (lambda (charset)
-               (set-port-encoding! (current-output-port) charset)
-               (set-port-conversion-strategy! (current-output-port) 'error))))
-     (else #t)))
+    ;; Make sure the output is suitably encoded.
+    (and=> (engine-custom e 'charset)
+           (lambda (charset)
+             (set-port-encoding! (current-output-port) charset)
+             (set-port-conversion-strategy! (current-output-port) 'error))))
 
    (let* ((id (markup-ident n))
 	  (header (new markup
diff --git a/src/guile/skribilo/engine/info.scm b/src/guile/skribilo/engine/info.scm
index 81b4071..a66acde 100644
--- a/src/guile/skribilo/engine/info.scm
+++ b/src/guile/skribilo/engine/info.scm
@@ -189,10 +189,7 @@
   :options '(:title :author :ending)
   :action (lambda (doc e)
             (check-node-title-conflicts doc e)
-
-            (cond-expand
-             (guile-2 (set-port-encoding! (current-output-port) "UTF-8"))
-             (else #t))
+            (set-port-encoding! (current-output-port) "UTF-8")
 
             (let ((title     (markup-option doc :title))
                   (authors   (markup-option doc :author))
diff --git a/src/guile/skribilo/engine/latex.scm b/src/guile/skribilo/engine/latex.scm
index 6cd98e9..5f5b300 100644
--- a/src/guile/skribilo/engine/latex.scm
+++ b/src/guile/skribilo/engine/latex.scm
@@ -1,7 +1,7 @@
 ;;; latex.scm  --  LaTeX engine.
 ;;; -*- coding: iso-8859-1 -*-
 ;;;
-;;; Copyright 2007, 2009, 2012, 2015  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2007, 2009, 2012, 2015, 2020  Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright 2003, 2004  Manuel Serrano
 ;;;
 ;;;
@@ -519,14 +519,11 @@
 		     (begin (display dc) (newline))
 		     (display "\\documentclass{article}\n")))
 
-              (cond-expand
-               (guile-2
-                (let ((encoding (engine-custom e 'encoding)))
-                  (set-port-encoding! (current-output-port) encoding)
-                  (set-port-conversion-strategy! (current-output-port) 'error)
-                  (if (string-ci=? encoding "UTF-8") ; FIXME: other encodings?
-                      (display "\\usepackage[utf8]{inputenc}\n"))))
-               (else #t))
+              (let ((encoding (engine-custom e 'encoding)))
+                (set-port-encoding! (current-output-port) encoding)
+                (set-port-conversion-strategy! (current-output-port) 'error)
+                (when (string-ci=? encoding "UTF-8") ; FIXME: other encodings?
+                  (display "\\usepackage[utf8]{inputenc}\n")))
 
 	      (if (latex-color? e)
 		  (display (engine-custom e 'color-usepackage)))
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index bfc60dc..8fbcfc9 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -1101,20 +1101,17 @@
 (markup-writer 'document
    :options '(:title :author :ending :keywords :env)
    :before (lambda (n e) ;; `e' is the engine
-             (cond-expand
-              (guile-2
-               ;; Make sure the output is suitably encoded.
-               (let ((encoding (engine-custom e 'encoding)))
-                 (set-port-encoding! (current-output-port) encoding)
-                 (set-port-conversion-strategy! (current-output-port) 'error)
-                 (cond ((string-ci=? encoding "ISO-8859-2")
-                        (display "@SysInclude { latin2 }\n"))
-                       ((not (string-ci=? encoding "ISO-8859-1"))
-                        (raise (condition
-                                (&invalid-argument-error
-                                 (proc-name 'lout)
-                                 (argument encoding))))))))
-              (else #t))
+             ;; Make sure the output is suitably encoded.
+             (let ((encoding (engine-custom e 'encoding)))
+               (set-port-encoding! (current-output-port) encoding)
+               (set-port-conversion-strategy! (current-output-port) 'error)
+               (cond ((string-ci=? encoding "ISO-8859-2")
+                      (display "@SysInclude { latin2 }\n"))
+                     ((not (string-ci=? encoding "ISO-8859-1"))
+                      (raise (condition
+                              (&invalid-argument-error
+                               (proc-name 'lout)
+                               (argument encoding)))))))
 
 	     (let* ((doc-type (let ((d (engine-custom e 'document-type)))
 				(if (string? d)