From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Mon, 11 Mar 2019 21:53:27 +0000 (+0300)
Subject: implemented colorized output
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=4dcb80cd11534f62778c713df546406329385aaf;p=bbdiff.git

implemented colorized output
---

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 83b5a87..565fec0 100644
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 13f03ec..782b57c 100644
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 ceafa5f..06fab0b 100644
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 8a632fe..283e438 100644
Binary files a/Diff/Mod/SysWin32.odc and b/Diff/Mod/SysWin32.odc differ
diff --git a/README b/README
index a2a699c..a7ec05e 100644
--- 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
 --------------------