[PATCH 1/2] contrib: Add diff viewing capability for Microsoft Word documents

@@ -0,0 +1,2 @@
+winworddiff
+winworddiff.dot

@@ -0,0 +1,39 @@
+prefix = $(HOME)
+bindir = $(prefix)/bin
+datadir = $(prefix)/share/winworddiff
+
+WINWORDEXE = C:/Program Files/Microsoft Office/Office/WINWORD.EXE
+INSTALL = install
+
+all: winworddiff winworddiff.dot
+
+winworddiff: winworddiff.sh
+	sed	-e 's|@@WINWORDEXE@@|$(WINWORDEXE)|' \
+		-e 's|@@PREFIX@@|$(prefix)|' \
+		< $@.sh > $@
+
+winworddiff.dot: winworddiff.bas
+	@echo
+	@echo '****  ATTENTION  ***'
+	@echo '* $@ must be created from $<'
+	@echo '* This cannot be done automatically, so your help is needed:'
+	@echo '* 1. Start Microsoft Word; create a new document *template*'
+	@echo '* 2. Open the Tools->Macro->Visual Basic Editor'
+	@echo '* 3. In the Project browser, locate and open:'
+	@echo '*        TemplateProject (Template1)'
+	@echo '*           Microsoft Word Objects'
+	@echo '*              ThisDocument'
+	@echo '* 4. Double-click "ThisDocument"'
+	@echo '* 5. Choose Insert->File... and select this file:'
+	@echo; echo "`pwd`/$<"; echo
+	@echo '* 6. Close the Visual Basic Editor'
+	@echo '* 7. Save the template as this file (overwrite if necessary):'
+	@echo; echo "`pwd`/$@"; echo
+	@echo '* 8. Run make again'
+	@exit 1
+
+-include ../../../config.mak
+
+install: all
+	$(INSTALL) winworddiff $(bindir)
+	$(INSTALL) winworddiff.dot $(datadir)

@@ -0,0 +1,34 @@
+This directory contains facilities that allow to highlight changes
+between two revisions of WinWord documents.
+
+1.	Installation:
+	a.	Set the variable WINWORDEXE in ../../../config.mak to point
+		to your installed WinWord.exe
+	b.	Run 'make'. This will fail with instructions to
+		create a document template. (It boils down to import
+		a macro file into the template.) Once you have completed
+		the instructions, 'make' will no longer fail.
+	c.	Run 'make install'
+
+2.	Activate diff in your repository
+	a.	Define a custom diff driver:
+
+			$ git config diff.docdiff.command winworddiff
+
+	b.	Use the custom driver for your Word documents, i.e. put
+		a line like this in your .git/info/attributes:
+
+			*.doc	diff=docdiff
+
+3.	Enjoy the diffs:
+
+		$ git diff HEAD~1.. -- UserManual.doc
+
+4.	Caveats:
+
+	-	Macros must be enabled.
+
+	-	A new WinWord instance is started *for*each*document* that
+		is covered by the 'git diff' invocation; therefore, to be
+		on the safe side, always specify a path limiter. Use git-gui
+		and gitk to inspect diffs without path limiters.

@@ -0,0 +1,13 @@
+Sub Document_Open()
+    ' pick the last 2 documents, present changes from second-last to last
+    ' (the third document is this one)
+    Dim olddoc As Document, newdoc As Document
+    With Application.Documents
+        If .Count < 3 Then Exit Sub
+        Set newdoc = .Item(.Count)
+        Set olddoc = .Item(.Count - 1)
+    End With
+    newdoc.Activate
+    newdoc.Compare Name:=olddoc.FullName
+    newdoc.ShowRevisions = True
+End Sub

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+word="@@WINWORDEXE@@"
+difftempl="@@PREFIX@@/share/winworddiff/winworddiff.dot"
+
+test $# = 7 || {
+	echo >&2 "$0: expected 7 arguments:"
+	echo >&2 "	path old oldsha1 oldmode new newsha1 newmode"
+	exit 1;
+}
+
+of="$2"
+nf="$5"
+
+"$word" -w "$nf" "$of" "$difftempl"

@@ -1,3 +1,4 @@
+# You can override any of these from ../../../config.mak
 prefix = $(HOME)
 bindir = $(prefix)/bin
 datadir = $(prefix)/share/winworddiff

@@ -8,6 +9,9 @@ INSTALL = install
 all: winworddiff winworddiff.dot
 
 winworddiff: winworddiff.sh
+ifndef FORCE
+	exec < "$(WINWORDEXE)"	# check existence; override with 'make FORCE=1'
+endif
 	sed	-e 's|@@WINWORDEXE@@|$(WINWORDEXE)|' \
 		-e 's|@@PREFIX@@|$(prefix)|' \
 		< $@.sh > $@