From 8de02e8e7565ebf0dd67802843cc35af7df7af6f Mon Sep 17 00:00:00 2001
From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Tue, 19 Mar 2019 19:15:42 +0300
Subject: [PATCH] added file conversion support

---
 Diff/Mod/Main.odc          | Bin 15703 -> 18215 bytes
 Diff/Script/build-linux.sh |   2 +-
 README                     |   6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index e7eab5d74885b3f2105e74cd33ea29fd320ef5e4..33bfec8ef3ef54b81bdb42b728cac2042ebc6545 100644
GIT binary patch
delta 2864
zcmb_e-EZ4e6t|PKowI&TUAwedyIXH#&Sz7x4c2rWZR)PsN;;+42M<G-*2$tJcICKR
zGd?nS7%vEQx@b=fA%ryXzySFH2{DOh1QHKu>;=Tf!w?T3#vcIZT-!<d0YiY>*w^>|
z&hMP_^Euc4`pT`>__dnnotf(|o%cVGIZog>?q~V>Pt%^)Wg6!vcD|Y7xGtEy0ayE|
z`sh{uJb!_H%ZJ<F3ve9YiVGeu9r7eR_q_C!XQ~^gye~iKuuZtb01nbS9)GPDXFlLz
zwFgH}!Oz#g9l|*{hU^P)<6zP#Dkbi_SJ@4>#x7Z0I0Zi+x@u`qoWun<wx$^78Kup^
zA~*+FuNO`&@1oiF))$_`JU>o-zA^F)Otdzr4Fte3U|+aD=$fy$6(!@c^q6ljHVC6u
zKi=c1wG&6jal~}k1tY#2=P-jdy5d{px6x0=2k7s<{rpwh-||N5G-Rq5EUV>+r*>Mq
zsOgurba|N^CE|*GM~dZT-7r-{Om+x@1CdwPLDbbINLst3lz_v*xaLIBmWT@^nr@QH
zvbtEz7u6-koYscHPF^+9x4LSoTBWFK>w(t&wzv6hz!*g)dVPBzpQP7>o7O)6LEb|o
z`r$x;&in6KC)*P||2TcV<8z;IW-?2E9oTKnbiUO>2fDY@`JT?hSuzeZ6J#8C*x8&A
zLrIcTo=uVk(<o{MNi@_#u>y&cMP0k3q6BnD_f9mA=WWAHCMy+{xMq!P>t?3y^>54!
zb*U~m-O&{kQuCQJayBPt>FusSE$f8T09D42ZBE07gK?6vqa@|VTZxw-16(>go1T+d
zB4jVgr02-=Jj@E|88#OOEnr?0Np4oo;DW%EXqE%XYX}S>U&AzCEUCHbvbw>3Gl3|D
z;~1+WFY?7*<HocYYUCpba%LKx!G$@kxfwEJ4XOlIokbWmhb!7rp`LEh{dcKq7&Fjq
z$aPDt5chveRYRfwp;rG&Dl}r1zO`00clBX)wMh~2z{W?<D#<Md@c`KbVEU~GOh2@G
z7>nHv^>)}$EY^=bC%uoR+)Rm-&X8q8UmPR$UKqCvH0ku=7@3-%pOYsuA>41;unwIa
zrPd)#$;Z>!FRs{i)<)++i$SWegVuY??nQ~&ux1RAM+m!h`VgZDL5JG?3Js0WIF>tc
zI{_P)-t~8CL^cemY2%I%5&j}9qY%QeL*^D_xHy}@mX7VBeyC&mrGIC-*`*B4u%%18
zW3zJZbT-4{@4!YS$5pegQPLXR#d~mXrbGSXolFl%7SsZf=|pgtR{OhniQWtjSvUHB
z;k^)~^-Ay{&kNSI!S~yHrEr*}nYJSk2TB|chv<$-fSw4a=>Axcc1L^Yi_t^0Epmw7
zj?B_Xte4G=M^5yCA`JqfYo)4V9-(`q5h}$32yL5HSH&n1>2Kja?~-ED;n>;TFR;dT
z2prc<1Oa+0_Jmgo6Z&biclWe<Y0A(qS5zZz2fI)$&%mZxXVoitVBIsg37FEC)MjK@
zU(AEmbKstYL*O3%K`q?!VM|ZqM(2*{{n%IiL`g)6GKz(r&o5Lf@kyhwQdTw7`Z)d(
zPd^)J=ks)8BrxQVG(Q|kF$(*lB$quc(>o*myota)j)yIPGm}tc44Fk_O-W!VK*Bce
z4AgFtfKuurT$RzkT!W18r6ehdr|~;LWUZl$x;OZGV&&KLk-@5*c>zOk$gn~CRo1}D
ztELO2Yq7qtl7Q@#Q8<Y?2<}W#y<Cao83eXdN0~7ktB^P*6wh5S%cZkM5xxQ{gx$!R
zSv0E)s_EP>m`nJu)?ttu_QI0-q+(obSUR6e9Rk?Q=>-B$KBbq-@P!257|F*Z`oodC
K);D8UJbwb7AR8M1

delta 616
zcmZ49$9TPJLOs(Jn~9CFTuL?!44e!M3{o}|U$`(Gv7W5QXeV;cl7WFAD0mD=L%?k2
z$qkILj75|0F=~lTXJKGq<N`@(Gs0L!e3M0(3|JQdrI;r7GD%EMWKtJ61(arP`os%0
z!~&>WS^y}<Fabm`goB9bn`4>H7#Z^>PhqiQ+&!6-RaP<tD9p$Kl4Jt0*g-6i2A0Xe
ztjUb5lY88xCckA7nEa4clyT|g@2qn+&t@}c+FZ^#mvOQg_bf)O%@?>$7@4&cG$y}O
zkk~B8%fZBGHd&qj%w|!6d90h|r97B7+sJ=loa~`!Gr5<See!HYb-u97)N+lS{A3-4
zyu{qp%?}mdF*5sk`fR?WY{F>B%NY>l@9gRl8sw@FUX)pq3Q`?XS&*urQD&t8;uPzF
zNKI>APR=mLAce^bRpln@Yl=<|Ru`QdtH}wZMJCs2vVr+;HQ0q+{ajE@vgX~)uDYIQ
za-gZ$<R^wsQqK8#WvN9asYS(lnYjh|MJ0|oIkjN(C-)g^PYyB4nyhE+HQCZcbn+i#
z;mP}qJXnEtYiLcLXdKL{r3qw1)tNF^<mOD)H<1Uc3o$aC{KkY2sLxjfn-!BE8cR>!
zW#TaTu<4b}8_l*cZWgpM<(xdnS(b^HbMh|d&&r88Ir-%ZCHV@;8Hsu6sS3$(hbkmh
PDgeb&iZ`!zsbK;DR%fxj

diff --git a/Diff/Script/build-linux.sh b/Diff/Script/build-linux.sh
index 6b3cf75..3da5fc8 100755
--- 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 bbee7ba..c5b7788 100644
--- 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
-- 
2.29.2