From a33de8d1dff2f61e0d34f6200ea9c7b6a1421004 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 26 Apr 2023 17:04:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D1=8B?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B8=D0=BD=D0=B0=D1=80=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- attributes | 11 ++++++----- config | 11 ++++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/attributes b/attributes index e0b214c..4eff6df 100644 --- a/attributes +++ b/attributes @@ -4,11 +4,12 @@ *.tar.bz2 diff=tar-bz2 *.zip diff=zip -*.odt diff=pandoc -*.doc diff=pandoc -*.docx diff=pandoc -*.ods diff=localc +*.doc diff=doc +*.docx diff=docx +*.odt diff=odt + *.xls diff=localc *.xlsx diff=localc -*.odg diff=odf +*.ods diff=localc +*.odg diff=odf diff --git a/config b/config index 244a8e2..bd79295 100644 --- a/config +++ b/config @@ -36,7 +36,16 @@ prompt = false binary = true cachetextconv = true -[diff "pandoc"] + +[diff "doc"] + textconv=lowriter --cat + prompt = false + binary = true +[diff "docx"] + textconv=pandoc --to=markdown -f docx+styles + prompt = false + binary = true +[diff "odt"] textconv=pandoc --to=markdown prompt = false binary = true