aboutsummaryrefslogtreecommitdiff
path: root/src/guile/skribilo/source.scm
diff options
context:
space:
mode:
authorLudovic Courtès2010-03-08 00:27:57 +0100
committerLudovic Courtès2010-03-08 00:27:57 +0100
commit86de6d9453a9d747bddadd20fce67e58c4dbe8c7 (patch)
tree44ad52bc21763d13adf5de74d3c50ab92a75fae4 /src/guile/skribilo/source.scm
parentcb2c1a2e6bef653cf9b7aa003d8fcfe09fc4eca0 (diff)
downloadskribilo-86de6d9453a9d747bddadd20fce67e58c4dbe8c7.tar.gz
skribilo-86de6d9453a9d747bddadd20fce67e58c4dbe8c7.tar.lz
skribilo-86de6d9453a9d747bddadd20fce67e58c4dbe8c7.zip
Factorize encoding twiddling in `set-correct-file-encoding!'.
* doc/modules/skribilo/documentation/api.scm (api-search-definition): Call `set-correct-file-encoding!'. * doc/user/src/outline.txt (Author): Remove accent from last name, as a temporary hack. * doc/user/syntax.skb: Call `set-correct-file-encoding!' in the `outline' syntax example. * doc/user/user.skb: Use `(skribilo utils syntax)'. * src/guile/skribilo.scm (skribilo): Replace encoding twiddling with `set-correct-file-encoding!' call. * src/guile/skribilo/evaluator.scm (load-document, include-document): Likewise. * src/guile/skribilo/source.scm (source-read-lines): Call `set-correct-file-encoding!'. (source-read-definition): Likewise. * src/guile/skribilo/utils/syntax.scm (set-correct-file-encoding!): New macro.
Diffstat (limited to 'src/guile/skribilo/source.scm')
-rw-r--r--src/guile/skribilo/source.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/guile/skribilo/source.scm b/src/guile/skribilo/source.scm
index b0a2a7f..3d2c858 100644
--- a/src/guile/skribilo/source.scm
+++ b/src/guile/skribilo/source.scm
@@ -1,7 +1,7 @@
;;; source.scm -- Highlighting source files.
;;; -*- coding: iso-8859-1 -*-
;;;
-;;; Copyright 2005, 2008, 2009 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2005, 2008, 2009, 2010 Ludovic Courtès <ludo@gnu.org>
;;; Copyright 2003, 2004 Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr>
;;;
;;;
@@ -110,6 +110,7 @@
(path (*source-path*)))))
(with-input-from-file p
(lambda ()
+ (set-correct-file-encoding!)
(if (> (*verbose*) 0)
(format (current-error-port) " [source file: ~S]\n" p))
(let ((startl (if (string? start) (string-length start) -1))
@@ -194,6 +195,7 @@
(else
(let ((ip (open-input-file p)))
+ (set-correct-file-encoding! ip)
(if (> (*verbose*) 0)
(format (current-error-port) " [source file: ~S]\n" p))
(if (not (input-port? ip))