aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Court`es2007-03-28 09:25:20 +0000
committerLudovic Court`es2007-03-28 09:25:20 +0000
commit79eecc5bd507411bdff52b17f8c5e086b10c733a (patch)
tree363a73313bcfeda4a768a920030dc9b7ed2f0a9a
parent37af6d73f6adb3af1aea2ccb88a4e35b06ec3cd7 (diff)
parent0be8b41328f05aee4610b190b00b51d459e28395 (diff)
downloadskribilo-79eecc5bd507411bdff52b17f8c5e086b10c733a.tar.gz
skribilo-79eecc5bd507411bdff52b17f8c5e086b10c733a.tar.lz
skribilo-79eecc5bd507411bdff52b17f8c5e086b10c733a.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: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-76
-rw-r--r--ChangeLog19
-rw-r--r--src/guile/skribilo/package/diff.scm6
2 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a80800..84538c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,25 @@
# arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
#
+2007-03-28 09:25:20 GMT Ludovic Court`es <ludovic.courtes@laas.fr> patch-76
+
+ Summary:
+ `diff' package: Use `breakable-space' instead of `~' in `annotated-string-diff'.
+ Revision:
+ skribilo--devo--1.2--patch-76
+
+ * src/guile/skribilo/package/diff.scm: Autoload `(skribilo utils
+ keywords)'.
+ (annotated-string-diff)[space-preserving-substring]: Use
+ `breakable-space' instead of `~'.
+
+ modified files:
+ ChangeLog src/guile/skribilo/package/diff.scm
+
+ new patches:
+ lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-35
+
+
2007-03-28 09:24:33 GMT Ludovic Court`es <ludovic.courtes@laas.fr> patch-75
Summary:
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*))