From 874668af3e597d3400864512ad51331ab47ac5ac Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 24 Feb 2016 18:58:11 +0500
Subject: [PATCH] =?UTF-8?q?bash:=20aliases:=20t:=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=20=D0=B1=D0=B5=D0=B7=20=D1=86=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/shell/bash/aliases | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index 3e699aa..277099e 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -513,17 +513,23 @@ noc() {
 
 #- Перевод слов/выражений с сохранением слова в файл
 t() {
-	sdcv --data-dir $SHELLRC/etc/soft/sdcv/dictionaries/ "$*" \
-		| sed 's/[^ ]*\.wav//g' \
-		| sed 's/BrE\|NAmE/\n&/g' \
-		| sed '$!N; /^\(.*\)\n\1$/!P; D' \
-		| clr -fm '\[[^]]*\]' \
-		| clr -fy '=|~|[[:space:]]+[0-9a-zA-Zа-яА-Я]{1,2}\)|^[0-9]\.|^I+[[:space:]]' \
-		| clr -fo 'амер(иканизм|\.)?|\(US [^)]+\)|NAmE' \
-		| clr -fc 'BrE|via|from| f. |Word.Origin:' \
-		| clr -fb 'Syn\.:.[A-Z., ]+' \
-		| clr -bg --\>.* \
-		| sed "s/\&apos;/'/g"
+	sdcvc="sdcv --data-dir $SHELLRC/etc/soft/sdcv/dictionaries/"
+	if [ "$1" == "-p" ]; then
+		shift 1
+		eval $sdcvc \"$*\"
+		return
+	fi
+
+	eval $sdcvc \"$*\"  | sed 's/[^ ]*\.wav//g' \
+			| sed 's/BrE\|NAmE/\n&/g' \
+			| sed '$!N; /^\(.*\)\n\1$/!P; D' \
+			| clr -fm '\[[^]]*\]' \
+			| clr -fy '=|~|[[:space:]]+[0-9a-zA-Zа-яА-Я]{1,2}\)|^[0-9]\.|^I+[[:space:]]' \
+			| clr -fo 'амер(иканизм|\.)?|\(US [^)]+\)|NAmE' \
+			| clr -fc 'BrE|via|from| f. |Word.Origin:' \
+			| clr -fb 'Syn\.:.[A-Z., ]+' \
+			| clr -bg --\>.* \
+			| sed "s/\&apos;/'/g"
 }
 
 #- Vimwiki