From ddb67cea5e0691259e3e74be5caa6e03e6b3daf8 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Tue, 12 Aug 2014 13:58:56 +0600
Subject: [PATCH] =?UTF-8?q?bash:=20sdcv,=20clr:=20=D0=BF=D0=BE=D0=B4=D1=81?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=BA=D0=B0=20=D1=81=D0=B8=D0=BD=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BA=D1=81=D0=B8=D1=81=D0=B0,=20=D1=83=D0=BA=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/shell/bash/aliases | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index df44f71..00c0abd 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -391,11 +391,29 @@ calc() { echo "$*" | bc -l; }
 ################################################################################
 
 #- Подсветка выражений
-clr() { sed -e "s/$1/`echo -e "\033"`[7;31m&`echo -e "\033"`[1;0m/g"; }
+clr() {
+	case "$1" in
+		-bb) sed -r -e "s/$2/`echo -e "\033"`[7;34m&`echo -e "\033"`[1;0m/g";;
+		-bc) sed -r -e "s/$2/`echo -e "\033"`[7;36m&`echo -e "\033"`[1;0m/g";;
+		-bg) sed -r -e "s/$2/`echo -e "\033"`[7;32m&`echo -e "\033"`[1;0m/g";;
+		-br) sed -r -e "s/$2/`echo -e "\033"`[7;31m&`echo -e "\033"`[1;0m/g";;
+		-by) sed -r -e "s/$2/`echo -e "\033"`[7;33m&`echo -e "\033"`[1;0m/g";;
+		-fb) sed -r -e "s/$2/`echo -e "\033"`[1;34m&`echo -e "\033"`[1;0m/g";;
+		-fc) sed -r -e "s/$2/`echo -e "\033"`[1;36m&`echo -e "\033"`[1;0m/g";;
+		-fg) sed -r -e "s/$2/`echo -e "\033"`[1;32m&`echo -e "\033"`[1;0m/g";;
+		-fr) sed -r -e "s/$2/`echo -e "\033"`[1;31m&`echo -e "\033"`[1;0m/g";;
+		-fy) sed -r -e "s/$2/`echo -e "\033"`[1;33m&`echo -e "\033"`[1;0m/g";;
+		* ) sed -e "s/$1/`echo -e "\033"`[7;31m&`echo -e "\033"`[1;0m/g";;
+	esac
+}
 
 #- Перевод слов/выражений с сохранением слова в файл
 t() {
-	sdcv --data-dir $SHELLRC/etc/soft/sdcv/dictionaries/ "$*"
+	sdcv --data-dir $SHELLRC/etc/soft/sdcv/dictionaries/ "$*" \
+		| clr -bg --.* \
+		| clr -fg '\[.*\]' \
+		| clr -fy '=|~|[[:space:]]+[0-9a-zA-Zа-яА-Я]{1,2}\)|^[0-9]\.|^I+[[:space:]]' \
+		| clr -fc "'"
 }
 
 #- Vimwiki