added file conversion support

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index e7eab5d74885b3f2105e74cd33ea29fd320ef5e4..33bfec8ef3ef54b81bdb42b728cac2042ebc6545 100644 (file)
Binary files a/Diff/Mod/Main.odc and b/Diff/Mod/Main.odc differ

diff --git a/Diff/Script/build-linux.sh b/Diff/Script/build-linux.sh
index 6b3cf7504de8429e0e83019df1ffca538570164f..3da5fc88758e0c099766ed2a18ff0f9eca003dc5 100755 (executable)
--- a/Diff/Script/build-linux.sh
+++ b/Diff/Script/build-linux.sh
@@ -8,6 +8,6 @@ cd "$DIR/../.."
 
 DevCompiler.CompileThis DiffBase DiffSys DiffSysLinuxLibc DiffSysLinux DiffMain
 
-Dev2Linker1.LinkElf Linux odctool := Kernel$+ Files HostFiles HostConsole Log Math Strings Dialog Meta Stores Sequencers Models Converters Fonts Ports Services Views Printers Dates Printing Controllers Mechanisms Properties Containers Documents Windows Console StdInterpreter StdDialog StdApi StdCmds StdCFrames Controls HostFonts HostWindows HostDialog TextModels TextRulers TextSetters TextViews TextControllers TextMappers StdStamps StdClocks StdFolds StdETHConv StdLinks HostTextConv StdLog DevCommanders DiffBase DiffSys DiffSysLinux DiffMain
+Dev2Linker1.LinkElf Linux odctool := Kernel$+ Files HostFiles HostConsole Log Math Strings Dialog Meta Stores Sequencers Models Converters Fonts Ports Services Views Printers Dates Printing Controllers Mechanisms Properties Containers Documents Windows Console StdInterpreter StdDialog StdApi StdCmds StdCFrames Controls HostFonts HostWindows HostDialog TextModels TextRulers TextSetters TextViews TextControllers TextMappers StdStamps StdClocks StdFolds StdETHConv StdLinks HostTextConv XhtmlWriters XhtmlEntitySets XhtmlStdFileWriters XhtmlTextTableMarkers XhtmlExporter StdLog DevCommanders DiffBase DiffSys DiffSysLinux DiffMain
 
 DATA

diff --git a/README b/README
index bbee7baaa06e76f9ac553f47241e2d4e1568829f..c5b7788ac793c95fe4f4dfc17e3286905b7655d9 100644 (file)
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ Integration with git
 2. Create script odctool-gitdiff:
 
        #! /bin/sh
-       odctool diff -C -p "$1" "$2" "$5"
+       odctool diff -x -X -C -p "$1" "$2" "$5"
 
 3. Add to .git/config:
 
@@ -79,14 +79,14 @@ Integration with ranger
 
                        # BlackBox Compound Document
                        odc)
-                               odctool -C cat "${FILE_PATH}" && exit 5
+                               odctool -C -X 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
+       ext odc, has odctool, terminal, file = odctool -C -X cat "$1" | less --tabs=2 -S
 
 
 Current state