forked from nuxeo-archives/daisydiff
-
Notifications
You must be signed in to change notification settings - Fork 0
/
README.txt
81 lines (59 loc) · 3.42 KB
/
README.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
=====================================================================================
This is the Nuxeo maintenance branch of daisydiff, forked from tag v1.2.
The initial commit is a checkout of http://daisydiff.googlecode.com/svn/tags/v1.2/
Original README content below.
=====================================================================================
Daisy Diff 1.2
This is Daisy Diff, the open source HTML diffing library!
Website - http://code.google.com/p/daisydiff/
+---------------------------------------------------------------+
| STAND-ALONE |
+---------------------------------------------------------------+
Java:
=====
java -jar daisydiff.jar [oldHTML] [newHTML] [optional arguments]
Optional Arguments:
===================
--file=[filename] - Write output to the specified file.
--type=[html/tag] - Use the html (default) diff algorithm or the tag diff.
--css=[cssfile1;cssfile2;cssfile3] - Add external CSS files.
--output=[html/xml] - Write html (default) or xml output.
--q - Generate less console output.
Example:
========
java -jar daisydiff.jar http://web.archive.org/web/20070107145418/http://news.bbc.co.uk/ http://web.archive.org/web/20070107182640/http://news.bbc.co.uk/ --css=http://web.archive.org/web/20070107145418/http://news.bbc.co.uk/nol/shared/css/news_r5.css
java -jar daisydiff.jar http://cocoondev.org/wiki/291-cd/version/15/part/SimpleDocumentContent/data http://cocoondev.org/wiki/291-cd/version/17/part/SimpleDocumentContent/data --css=http://cocoondev.org/resources/skins/daisysite/css/daisy.css --output=xml --file=daisysite.htm
Requirements:
=============
Java 1.5 or 6
+---------------------------------------------------------------+
| EMBEDDED |
+---------------------------------------------------------------+
Java:
=====
org.outerj.daisy.diff.DaisyDiff{
/**
* Diffs two html files, outputting the result to the specified consumer.
*/
public static void diffHTML(InputSource oldSource, InputSource newSource, ContentHandler consumer, String prefix, Locale locale) throws SAXException, IOException;
/**
* Diffs two html files word for word as source, outputting the result to
* the specified consumer.
*/
public static void diffTag(String oldText, String newText, ContentHandler consumer) throws Exception;
}
Requirements:
=============
Java 1.5 or 6
To run Daisy Diff embedded in your application, you don't need the entire Jar file. A much smaller Jar file without Xerces and NekoHtml will suffice.
+---------------------------------------------------------------+
| PHP |
+---------------------------------------------------------------+
The DaisyDiff algorithm has been integrated in MediaWiki. The version with DaisyDiff support isn't released yet.
More info on: http://www.mediawiki.org/wiki/Visual_Diff
The PHP code is released under the GPLv2. It can also be used as an embedded HTML differ in a PHP application.
+---------------------------------------------------------------+
| Acknowledgements |
+---------------------------------------------------------------+
Guy Van den Broeck <[email protected]>
Daniel Dickison