Initial import from old project at Google Code. Removed obsolete links. Updated redirected links.

peter-lyons-kehl · peter-lyons-kehl · commit 51743824cbd4 · 2016-07-28T10:08:03.000+10:00
diff --git a/CustomizingHtmlOutput.md b/CustomizingHtmlOutput.md
@@ -0,0 +1,51 @@
+---
+layout: default
+---
+
+# Html Presentation
+
+By default Daisy Diff is using the [Dojo Toolkit](http://www.dojotoolkit.org/) for presentation of the html output. This offers annotation tooltips on the result that allow the user to move back and forth between differences.
+
+Default Values are
+
+  * Added text is shown in green background
+  * Removed text is shown in red background
+  * Formatted text is shown with a blue underline and tooltip
+  * Special styles for images that show coloured layers
+
+Here is an example (HTML mode):
+
+![HTML mode](images/daisyDiffHtmlMode.png)
+
+# Changing the default styles
+
+You can change the default presentation by updating (or replacing) the CSS used by the resulting file. Open the `diff.css` file to look at the present values.
+
+Inside the file you will see several CSS declarations such as
+
+  1.  span.diff-html-removed (removed text in html mode)
+  2.  span.diff-html-added (added text in html mode)
+  3.  span.diff-html-changed (formatted text in html mode)
+
+Override/Change this values are you are free to customize the presentation!
+
+# Simple Example
+
+Let's assume that instead of the default values you want to have the following
+
+  1.  blue text for additions
+  2.  red strike-through text for removals
+  3.  dotted underlines for formatting changes
+  4.  default values for the images
+
+You modify the css file as below
+
+```
+span.diff-html-removed { color: red; text-decoration: line-through; cursor: default; }
+span.diff-html-added { color: blue; cursor: default; }
+span.diff-html-changed { color: black; border-bottom: dotted 2px red; cursor: default; text-decoration: none; }
+```
+
+and now you have the requested result!
+
+![Alternative CSS](images/AlternativeCSS.png)
diff --git a/Examples.md b/Examples.md
@@ -0,0 +1,23 @@
+---
+layout: default
+---
+
+BBC News example
+
+This example uses the BBC news archive site to compare the news page at different times on a given day. The page can load slowly due to the slow servers at archive.org. The page layout is somewhat shifted in the example because the page is not hosted on the BBC servers.
+Result
+
+[old HTML](http://web.archive.org/web/20070107145418/http://news.bbc.co.uk/) - [new HTML](http://web.archive.org/web/20070107182640/http://news.bbc.co.uk/)
+
+Command
+
+```
+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
+Diffing local HTML files
+```
+
+Command
+
+```
+java -jar daisydiff.jar file:///c:/sites/old.html file:///c:/sites/new.html 
+```
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,5 @@
+#gem 'jekyll', '3.0.0.pre.beta4'
+#gem 'jekyll', '3.0.1'
+source 'https://rubygems.org'
+gem 'github-pages'
+gem 'jekyll-sitemap'
diff --git a/Papers.md b/Papers.md
@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+ *   [http://pages.cs.wisc.edu/~yuanwang/papers/xdiff.pdf](http://pages.cs.wisc.edu/~yuanwang/papers/xdiff.pdf)
+ *   [https://sourceforge.net/projects/diffxml/files/documentation/1.0/dissertation.ps/download](https://sourceforge.net/projects/diffxml/files/documentation/1.0/dissertation.ps/download)
+ *   [http://conferences.idealliance.org/extreme/html/2005/Schaffert01/EML2005Schaffert01.html](http://conferences.idealliance.org/extreme/html/2005/Schaffert01/EML2005Schaffert01.html)
+ *   [http://citeseer.ist.psu.edu/rd/69327360%2C650653%2C1%2C0.25%2CDownload/http%3AqSqqSqwww.dlsi.ua.esqSq%7EcarrascoqSqxmldocsqSq0282.pdf](http://citeseer.ist.psu.edu/rd/69327360%2C650653%2C1%2C0.25%2CDownload/http%3AqSqqSqwww.dlsi.ua.esqSq%7EcarrascoqSqxmldocsqSq0282.pdf)
+
+
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1,20 @@
+gems:
+  - jekyll-sitemap
+markdown: kramdown
+highlighter: rouge
+kramdown:
+  input: GFM
+  auto_ids:       true
+  footnote_nr:    1
+  entity_output:  as_char
+  toc_levels:     1..6
+  smart_quotes:   lsquo,rsquo,ldquo,rdquo
+  enable_coderay: false
+
+  coderay:
+    coderay_wrap:              div
+    coderay_line_numbers:      inline
+    coderay_line_number_start: 1
+    coderay_tab_width:         4
+    coderay_bold_every:        10
+    coderay_css:               style
diff --git a/_layouts/default.md b/_layouts/default.md
@@ -0,0 +1 @@
+{{ content }}
diff --git a/images/AlternativeCSS.png b/images/AlternativeCSS.png
diff --git a/images/daisyDiffHtmlMode.png b/images/daisyDiffHtmlMode.png
diff --git a/images/daisyDiffTagMode.png b/images/daisyDiffTagMode.png
diff --git a/index.md b/index.md
@@ -0,0 +1,15 @@
+---
+layout: default
+---
+
+# What Daisy Diff offers
+
+One of the most important features of Daisy Diff is the fact that it "understands" HTML tags and will actually look into the text to decide if a node is same for not.
+
+For example assume that a user has changed a single word in a big paragraph. Most XML libraries would just mark the whole paragraph as different. Daisy Diff however will look into the inline text (the contents of the p tag node) and understand that only one word is different. Therefore it will present to the user *only* this word as changed.
+
+DaisyDiff is also used in production (Daisy CMS) and also comes with a business friendly licence.
+
+ * [CustomizingHtmlOutput](CustomizingHtmlOutput)
+ * [Examples](Examples)
+ * [Papers](Papers)
