diff options
| author | Ludovic Court`es | 2007-03-16 17:10:38 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2007-03-16 17:10:38 +0000 |
| commit | 20e07303a9da769e56feb90c252ee0a66369b52d (patch) | |
| tree | fbd15acee4edaf01d480eba2fb68c85f72c41bbc | |
| parent | 1ebc6400a3b1ba3e6111745ae95fcd858749f258 (diff) | |
| parent | b594657ce02d1d79a1eec77178637436d5703462 (diff) | |
| download | skribilo-20e07303a9da769e56feb90c252ee0a66369b52d.tar.gz skribilo-20e07303a9da769e56feb90c252ee0a66369b52d.tar.lz skribilo-20e07303a9da769e56feb90c252ee0a66369b52d.zip | |
`diff' package: Various fixes.
* src/guile/skribilo/package/diff.scm (%undiffable-markups): Added
`numref' and `eq'.
(make-diff-document)[undiffable?]: New.
For containers, check whether they are undiffable.
For lists, iterate until AST2 is empty, not until the smallest is
empty.
Added an `(equal? ast1 ast2)' cond clause.
git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-66
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | src/guile/skribilo/package/diff.scm | 39 |
2 files changed, 52 insertions, 9 deletions
@@ -2,6 +2,28 @@ # arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2 # +2007-03-16 17:10:38 GMT Ludovic Court`es <ludovic.courtes@laas.fr> patch-66 + + Summary: + `diff' package: Various fixes. + Revision: + skribilo--devo--1.2--patch-66 + + * src/guile/skribilo/package/diff.scm (%undiffable-markups): Added + `numref' and `eq'. + (make-diff-document)[undiffable?]: New. + For containers, check whether they are undiffable. + For lists, iterate until AST2 is empty, not until the smallest is + empty. + Added an `(equal? ast1 ast2)' cond clause. + + modified files: + ChangeLog src/guile/skribilo/package/diff.scm + + new patches: + lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-25 + + 2007-03-16 17:09:41 GMT Ludovic Court`es <ludovic.courtes@laas.fr> patch-65 Summary: diff --git a/src/guile/skribilo/package/diff.scm b/src/guile/skribilo/package/diff.scm index 6e8c60b..116a6bd 100644 --- a/src/guile/skribilo/package/diff.scm +++ b/src/guile/skribilo/package/diff.scm @@ -166,7 +166,8 @@ (define %undiffable-markups ;; List of markups to not diff. - '(ref url-ref bib-ref bib-ref+ line-ref unref + '(ref url-ref bib-ref bib-ref+ line-ref unref numref + eq ;; XXX: not supported because of the `eq-evaluate' thing figref ;; non-standard mark image symbol lout-illustration @@ -197,7 +198,12 @@ (define (make-diff-document ast1 ast2) ;; Return a document based on AST2 that highlights differences between AST1 - ;; and AST2, enclosing unchanged parts in `unchanged' markups, etc. + ;; and AST2, enclosing unchanged parts in `unchanged' markups, etc. AST2 + ;; is used as the "reference" tree, thus changes from AST1 to AST2 are + ;; shown in the resulting document. + (define (undiffable? kind) + (memq kind %undiffable-markups)) + (let loop ((ast1 ast1) (ast2 ast2)) ;;(format (current-error-port) "diff: ~a ~a~%" ast1 ast2) @@ -240,10 +246,13 @@ (ident ident) (class class) (options opts) - (body (loop (if (markup? ast1) - (markup-body ast1) - ast1) - body))))) + (body (if (undiffable? kind) + body + (loop (if (and (container? ast1) + (is-markup? ast1 kind)) + (markup-body ast1) + ast1) + body)))))) ((markup? ast2) (let ((kind (markup-markup ast2)) @@ -256,20 +265,32 @@ (ident ident) (class class) (options opts) - (body (if (memq kind %undiffable-markups) + (body (if (undiffable? kind) body - (loop (if (markup? ast1) + (loop (if (is-markup? ast1 kind) (markup-body ast1) ast1) body)))))) ((list? ast2) (if (list? ast1) - (map loop ast1 ast2) + (let liip ((ast1 ast1) + (ast2 ast2) + (result '())) + (if (null? ast2) + (reverse! result) + (liip (if (null? ast1) ast1 (cdr ast1)) + (cdr ast2) + (cons (loop (if (null? ast1) #f (car ast1)) + (car ast2)) + result)))) (map (lambda (x) (loop ast1 x)) ast2))) + ((equal? ast1 ast2) + (unchanged ast1)) + (else (insertion ast2))))) |