aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Court`es2007-03-28 08:07:15 +0000
committerLudovic Court`es2007-03-28 08:07:15 +0000
commit0be8b41328f05aee4610b190b00b51d459e28395 (patch)
tree6959dc6565c78fcf9691d7a3b333cdddb0789d67
parentdca4b35ee0c7746e67cfd43b06191ab8a230adf3 (diff)
downloadskribilo-0be8b41328f05aee4610b190b00b51d459e28395.tar.gz
skribilo-0be8b41328f05aee4610b190b00b51d459e28395.tar.lz
skribilo-0be8b41328f05aee4610b190b00b51d459e28395.zip
`diff' package: Use `breakable-space' instead of `~' in `annotated-string-diff'.
* src/guile/skribilo/package/diff.scm: Autoload `(skribilo utils keywords)'. (annotated-string-diff)[space-preserving-substring]: Use `breakable-space' instead of `~'. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-35
-rw-r--r--src/guile/skribilo/package/diff.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/guile/skribilo/package/diff.scm b/src/guile/skribilo/package/diff.scm
index ef0032f..7e9dc53 100644
--- a/src/guile/skribilo/package/diff.scm
+++ b/src/guile/skribilo/package/diff.scm
@@ -37,6 +37,7 @@
:autoload (skribilo biblio) (*bib-table* make-bib-table)
:use-module (skribilo package base)
:use-module (skribilo utils syntax)
+ :autoload (skribilo utils keywords) (the-options the-body)
:export (make-diff-document
make-diff-document-from-files))
@@ -84,6 +85,7 @@
(ident (gensym "diff:unchanged"))
(body args)))
+
;;;
;;; Helpers for string diffs.
@@ -207,13 +209,13 @@
(let* ((lead (string-ref str start))
(lead* (if (char-set-contains? char-set:whitespace
lead)
- (~)
+ (breakable-space)
(string lead))))
(if (> len 1)
(let* ((trail (string-ref str (- end 1)))
(trail* (if (char-set-contains? char-set:whitespace
trail)
- (~)
+ (breakable-space)
(string trail))))
(list lead* (substring str (+ start 1) (- end 1))
trail*))