From 4dcb80cd11534f62778c713df546406329385aaf Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Tue, 12 Mar 2019 00:53:27 +0300 Subject: [PATCH] implemented colorized output --- Diff/Mod/Main.odc | Bin 13470 -> 13915 bytes Diff/Mod/Sys.odc | Bin 2196 -> 3542 bytes Diff/Mod/SysLinux.odc | Bin 2310 -> 4225 bytes Diff/Mod/SysWin32.odc | Bin 2467 -> 2792 bytes README | 27 ++++++++++++++++++++++++--- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc index 83b5a8740d6c5cda55ffdc4afcdb923b3dadd11f..565fec0a7ea9acf7f588c9a7087ada210ad88e08 100644 GIT binary patch delta 940 zcmah|&ui0Q7*66=`?c%J*3H$`ZLby9rW;u;j$-QuHO+KT(y>(Z;vwylHIO!tX3D0c z$n-Q3x9_H)e}NZ+ARgSsgSd-$5Z|r*D2R$kp){>?xumH)nVSx-PdD&Nj59wjlFm%Jz zwv+-~u2w5TNwhzr4vhyxV7I~>bgZnYsrNS3L!*YU4`!;?K6zl#{YZ5IZg z_TkB)06rLs&G1RK2sOE01TQO{RN8W#RG}JXOSUXRG}jZyhr>Jn6#5y9`{Z~#*7#qH z9UXajBDTB)ZMmhuIY=gaV`&8#GUO~IG<%5NrXJGumB#@D_w29X~E(G7{^EMKWgLgcRrI7{$V))ZCV&@JBi R4y--FHT&p@{UCRm`3>)!7rp=h delta 587 zcmcbeGcR*OJ(IM_#Ku^zOk)NHP6h^sMB|AsT$s3xC+jiVafuo-Fz^Efc?~C*F;0>f zV_{%m;Oc`OUT|7V*8%Qj5vO1GG(?9mf0Ze^Nm)SQzVA{vT=sS5n>n;uj=ls0l z{G8Oy5p1s+H^*|cGfozglin=C70Sp72b(jvr!fjZRqBNoWtOA{mlRDFc=~Ij)WnTHSgr}5(+G?elEO|ze;Frww64?Snr&XSfrqloMENl z?BN)sY0b;&=^8-kes35?*`=5C>R(;0M$T(0^&iCRt+O#L-Pnt1r05Q zvdq+S1uad8Vi$D9K6xNDIhlE>3Pq_UrA2uVrF=kxEfH!bzmtArK(Ny+NzyZQj# zf@yhj2FN;)hd_h^IM_k1n*3VId$Nz$r2V4OVd_=EVs z@uIM4MLWq$#|Z}_w{)7X`(D%^c}@^E?~R;87Dg)f{4fQXIcbs6za9RfsasKf_GpWuP`Fq9Vnl5+%6&bT*zRpG2(7UFfF4VZbXq6zj%skNgh7;VRq6P}Lby3+VS z&7y=vUHtVU5#lGBZUC=zGUlWT(NMxgN+{1t*HG#uxMwm=WZ@{%ME;+Y8ww0FGlNN{ z9OWq51WZ|p@PWo>54J(8 zI`SxMU#AqsaRueRMIKSaBM&}D9#I+Z2zeCw5>WrH_d1(vhU|=Xcdg^FRjHI$);D^l zEmxhub6jNTy{=_f%H?XkF8gV%$$Gs8%u&>LM}xY&Ewz@6y&WfT;dJBsY)ghvnEQ?& zNBBP1lH0z!gXGQGR;5gca^Smu5K6+@cKd^Ug3@>_x8&h)6cL=JEz(#9)$(589Dl-+ ziyB@aiM-i4W*Qn^ia9sWOkKk()t}dx{h5ZBlKoW4-qP?Q*}x&6*`vip7IZvTMz1tf z-ge{EO%x^79cQ;6yOEADlKgBE7o^qR+AtuLbaAC?8%u`CnP~@m^kqe@jUFzU((cK& zX|}gyZ&B*YZIr|$F8e+uEiZQ0vdy+`OViMMW=B?eGn*({lSa40s`uI^=nsLpAaRMg z)w(>0!$=HuQL?AI>p1Swl^5P^=1!Ta5MN@!{SPC8v4&j@Iy=itOnrS95Rrn5}vE+Ti+Ve|kdb5mI^^{e9 zJ!|v%h4(^cCn1x-3(9=LpTYvZm=BcdR3FM;#htQ>O#M%}PivXspoW9Iapo48hZ8cb zi8YUlh{9U)CQvVMj;1iE(D+O?_&BP-)Y61`<7k9m*a5V;+2=54P<`INiANC$DKJ!n zBaLT6{k}IV+&N;G9Qdw_Z8)@}dK9Sk8N1Q^Vn&~7uZxxv%!#$Mxu&iO+79YsU{<5V zUYT*?5K(LqJyHu9cTDXZX#Wm3HaL$NiTmsf$HK4P8Jvtersjxs1-5F~Md3K*(0L6u ziwf}(65LY*q5Z)i*P@d6#pi`&@#5Vw_t}YstIveM`->+J#Fb~_PX4dgWUk*xl+;We dDAJVlN2{Tb*B^@?{<%!|d%dCfwf;zm{{S@3KQ90P delta 551 zcmca6Jw%krpv>fUjtBxO{&7Ue;Wa~V@Qg2cbVKL9E@^-uvb?_+oEI1vX{a^8D0^XC2L>wUy9?MT7z z@n2>%m>l|HnpE6$PYz5!87KwTG~I~8v=@YaoK&^~{~;HqUSa&)O{3T+rPweDT8_Tg z@%Q&Ttox*}#74B|kGZOX{sNVClS+XimaxYDA)9#eD$}YcZB(yf-{i}XnVx@~a)@YV zjyfl2w37=$3pE7x&$k)j3DY4^pppU*(sByk$!lzyqP)1MC9z3F|v)@oZFn@#racP*4`M$rS5>)Nf3XF1^6;8=$3n4k${6_U`w z>X@Xsq;54FY)43}1F?wOi-&_ckcM^35rm_9QE9_*8u!6ollUu*c*tsuqz9AOO&^W@ zI=Gf62u3uH;(8{|hQunVUB@;obJMXv8*vCaw89`QL&v&DB8U)zG8~j)?1x2IcdYeR z2L(`0L&!(cy%oX_A3;s0>1e0T2ru!0Ju1KxighI2-NSCACv3iAcy)wbe1S1D(1eV2lzF z1qmhk!<Ha5Pr==O!aQiwIg|tQ{gUU+GVPH(S&}T7t`RXa z2A7bfLV+eX4n~-IJ2lp?Zli!I!i|V9&|XAgr*J3ulfnM4AxKy{37eB?la0}g!TFZV zf@O?)7!}G4X}p9k*vKookmS$T$Sne`)d37ZA=q*OzWwKA2D!Utw{TQ|n=gC_)oroK zN>rS~f;DFY<$1_ldp_89i2Nywu~M{ZW4mZG6Pmwuy0~@XEr{|uJ04*$=VZ*&stm(2 z^ve+B9+-uIF4Ssww(-1K+^H_=E2_2xM`^8Eg(bwLw$}I(=oh&o?)m$@$v9<)FnCRi z4pB8`nMYs%?=rA_{RSGVs>7UYwzh~o#qLkDZ(P5Aby@(yAObChTk!E(QwQ4tZCD)i z<$!?TrNd}*_hfgYNL&Hg5FHC|gs#3`$-1FlxK32}ra}8k;f*DZLXs}9x2R>ai&j$3V zP;?$3iq|%}R;RE#Y`Pu_wos5`W~-gD#H7V|p>-%gIP% z@zSG*Q<0hXPrU@^v82u!UiJ=rj~*cS(Oaf0gnCoE|`%`*y>Iu!2-y7KZObn&~o%I%!6E9PTKmV{({h2FyH(gM^i#S6v&wRv* z`Lpjxxx&R4ibB8DA9j?tUMRPV|0S69^(8q;v}6|hnA4x$O%%BDO!?~No9y?#JyO13 Ida5Y@0#U$Nb^rhX delta 548 zcmZovY!jML&(zE@u`!nGB0B>ECj$e+N%n~^T$qa4C+jiV3D>eRFz^EfOMx^5%%5D( z=+D~D#K6EfS&>O{@_&B8$$uHSMf-u$jBFq^Zj3Ni+~jN~YqsFZVg)PP$xE5kym&c7 zA_H7`IXPW2i&B$I@{1}JY!w3hJ^eylgA_vi6@pxy{exT-G=N(4;7T-s>NyjO(vz(e zKnmSmgRFTuCwno=c!HEU7NwWwrskCZ6}kGk0A)CNIl~--fOJY`k(C166o^bfkiWC5 zOK6a*f<_9G_jeWaiPGzU2dKxP2Fu27Izl3}H=S(%N4(ZJyR;z#Ku^z&72GjK*X?`bK(mZrclnwdW?2l@$3u?{6N8Q_Q_?85sddI zpJ%jG$Yf+-U}OV|GV}p4ge3|WTg*6FgUL|9IX|yBKPOd3Av`nBu^>}taypYfi${Kb z_T>3YVuCK2X=%Zg#d;tCO1w&111(4`u z6P7R*Fr%AA7sA-dGMOEwIf7M#F=KKgt1?_<1FJX-$X%0Qc delta 456 zcmY*VJx{_=6n(AGv_#Z^#>jLNj42Uo3X6h}AblY$EqQ!7sEJY_9jvBS5+>r};-KXH z1b>37adL3uPdM;1yoH3o@a}y%=YE`Xr#m0<_mK$7`1va0%7iF{ke)oA8se7BHK7K9-K7PhmVjea7R2&8;;lQ z`1jrr3Q)7EW`ikra^u>*&or}AKPJ=79x{u(;M_!Z*oD_yOyits3$ zOfJJIsC0dl1*)5az(s|!R1Wx0_+)psqmzaVPDhE1Hk!=DHF0Twb#zfm@Js1{zevAl w=d@Baql!t}DtZcJIi6N^9X}sjPpfx*bUCAmiN@&StdFiM%KN1KF;8r2qf` 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 [">" ] +^Q DiffUtils.CompareThis [">" ] 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 -------------------- -- 2.29.2