implemented colorized output

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 83b5a8740d6c5cda55ffdc4afcdb923b3dadd11f..565fec0a7ea9acf7f588c9a7087ada210ad88e08 100644 (file)
Binary files a/Diff/Mod/Main.odc and b/Diff/Mod/Main.odc differ

diff --git a/Diff/Mod/Sys.odc b/Diff/Mod/Sys.odc
index 13f03ec4c15022cbafe0a73ddb92e070459d33a3..782b57cec8fe2d6b9c8d11514da3f4851b038021 100644 (file)
Binary files a/Diff/Mod/Sys.odc and b/Diff/Mod/Sys.odc differ

diff --git a/Diff/Mod/SysLinux.odc b/Diff/Mod/SysLinux.odc
index ceafa5f6eafc52b604b7e44ecfa6bac8711d2f0e..06fab0be99c73107c700af4cd10f487318020820 100644 (file)
Binary files a/Diff/Mod/SysLinux.odc and b/Diff/Mod/SysLinux.odc differ

diff --git a/Diff/Mod/SysWin32.odc b/Diff/Mod/SysWin32.odc
index 8a632fecf0ed7e4d9c6f89b9f9adccd340228487..283e4381473fd59a23737a5e55e9190ed16426e5 100644 (file)
Binary files a/Diff/Mod/SysWin32.odc and b/Diff/Mod/SysWin32.odc differ

diff --git a/README b/README
index a2a699ccbfc132613ea9ca8d25c9ac73858a2442..a7ec05ec822cc20d7fc6edb89766f9029714f1a8 100644 (file)
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ DiffUtils.Compare (guard TextCmds.FocusGuard)
        You can directly replace DevSearch.Compare with DiffUtils.Compare in Dev/Rsrc/Menus.odc.
 
 
-^Q DiffUtils.CompareThis <oldfile> <newfile> [">" <outfile>]
+^Q DiffUtils.CompareThis <old> <new> [">" <outfile>]
 
        Compare two files and produce patch in unified diff format.
 
@@ -41,7 +41,7 @@ Integration with Git
 2. Create script odctool-gitdiff:
 
        #! /bin/sh
-       odctool diff -p "$1" "$2" "$5"
+       odctool diff -C -p "$1" "$2" "$5"
 
 3. Add to .git/config:
 
@@ -63,10 +63,31 @@ Integration with Git
        *.osf
        odc[0-9][0-9][0-9][0-9][0-9]
 
-
 Now you can see diffs using `git diff' and resolve conflicts from BlackBox.
 
 
+Integration with ranger
+-----------------------
+
+1. To preview documents add to $HOME/.config/ranger/scope.sh:
+
+       handle_extension() {
+               case "${FILE_EXTENSION_LOWER}" in
+
+                       ...
+
+                       # BlackBox Compound Document
+                       odc)
+                               odctool -C cat "${FILE_PATH}" && exit 5
+                               exit 1;;
+               esac
+       }
+
+2. To open/read documents add to $HOME/.config/ranger/rifle.conf:
+
+       ext odc, has odctool, terminal, file = odctool -C cat "$1" | less --tabs=2 -S
+
+
 Current state
 --------------------