Merge branch 'master' into punani_files

5 files changed, 97 insertions, 9 deletions

diff --git a/util/bin/anonbox.net b/util/bin/anonbox.net
index d038cd0a..3b648afb 100755
--- a/util/bin/anonbox.net
+++ b/util/bin/anonbox.net
@@ -13,12 +13,12 @@ GET() {
 
 ## retrieve data
 eval "$(${GET-GET} |
-  sed -rn '
-s^<dd><p>([[:alnum:]@.]+)</p></dd>$\
+  sed -n '
+s^<dd><p>\([[:alnum:]@.]\+\)</p></dd>$\
       email="\1" ; p
-s^<dd><p><a href="([^"\\]+)">.*</a></p></dd>$\
+s^<dd><p><a href="\([^"\\]\+\)">.*</a></p></dd>$\
       uri="\1/" ; p
-s^<dd><p>([0-9]+)/([0-9]+)/([0-9]+) ([0-9]+):([0-9]+) ([ap]).m.</p></dd>$\
+s^<dd><p>\([0-9]\+\)/\([0-9]\+\)/\([0-9]\+\) \([0-9]\+\):\([0-9]\+\) \([ap]\).m.</p></dd>$\
       Y=20\3 ; \
       m=\1 ; \
       d=\2 ; \
diff --git a/util/bin/dict.leo.org b/util/bin/dict.leo.org
new file mode 100755
index 00000000..03f16b96
--- /dev/null
+++ b/util/bin/dict.leo.org
@@ -0,0 +1,87 @@
+#! /bin/sh
+#### dict.leo.org version 2.0 beta 1
+set -euf
+
+cache_dir=/tmp/dict.leo.org/
+file="$cache_dir$*"
+
+url="http://dict.leo.org/?$*"
+
+# TODO check sanity of filename
+
+if test -d "$cache_dir" ; then
+  test -e "$file" || { curl --silent "$url" | tee "$file" ; }
+else
+  curl --silent "$url"
+fi |
+sed 's/>\( *.\)/>\n\1/g' | sed -n '
+  s/[[:space:]]/ /g
+  /<!-- # Werbung # -->/,/<\/td>/b
+  /<!-- ============================================== -->/,/^<\/td>/b
+  /<!-- # Trailer # -->/,/^ <\/table>/b
+  /<table id="subnavigation" class="border">/,/<\/table>/b
+  /<div id="divMoreInfo" class="popup">/,/^ <\/table>/b
+
+  ## show link in rendered version
+  s/^<a href="\(.*searchLocRelinked.*\)">$/&mehr: \1/
+  s/^mehr &gt;&gt;//
+
+  s/<[Bb][Rr] *\/>/,/g
+
+  p
+  b
+  :c;# comment
+  s/-->/\\-\\-\\>/g
+  s/<!--/\\<\\!\\-\\-/g
+  s/.*/<!--(&)-->/
+  p
+' \
+| w3m -cols 1024 -T text/html -dump | sed '
+  s/[[:space:]]\+/ /g
+  s/ ,/,/g
+  s/^ //;s/ $//
+  s/[┌┬┐└┴┘├┼┤─]//g
+  s/ *│ */|/g
+  s/\[ \]//
+  s/\[Speichern\] der ausgewa:hlten Wo:rter im Trainer//
+  s/^||//;s/|| \?$//
+' | sed -n '
+  /^\[EN-> DE\]/,$b
+  s/^mehr: /+ /
+  s/^ENGLISCH||DEUTSCH \?/= Englisch -> Deutsch/
+  s/^|\([0-9]\+\) \(Treffer\)|$/= \1 \2/
+  s/^\([^|]\+\)||\([^|]\+\)$/- \1|\2/
+
+  s/^[^=+#-][^|]\+$/## &/
+
+  p
+' | sed -n '
+  /^$/b
+  s/ \([?!]\)/\1/g
+  s/\([[(]\) /\1/g;s/ \([]\)]\)/\1/g
+
+  s/ ([0-9]\+ of [0-9]\+) \?//;# TODO
+
+  #s/^##.*Grundform.*/\n#&/
+  /^## .*Grundform.*/,/^##\( .*\)\?/{
+    /##/{/Grundform/!p}
+    b
+  }
+
+  /^## Informationen /,$b;# TODO
+  #/^## Beispiele/,$b;# TODO
+  #/^## Wendungen/,$b;# TODO
+  /^+/b;# TODO
+  #/^=/b;# TODO
+
+  p
+' | sed '
+  ##
+  s/|\(.*\)/\n  \1/g
+  s/^#.*/\n&/
+
+  s/##.*Treffer $/\n#&/
+' | less -R
+echo
+
+#### end of file.
diff --git a/util/bin/my-global-ipv4-addr b/util/bin/my-global-ipv4-addr
index 305d3f80..71608a8a 100755
--- a/util/bin/my-global-ipv4-addr
+++ b/util/bin/my-global-ipv4-addr
@@ -8,7 +8,8 @@
 if test $# = 1; then
   has() { type "$1" 1>/dev/null 2>/dev/null; }
   parse() {
-    sed -rn 's/.*((1?[0-9][0-9]|2[0-5][0-9])\.(1?[0-9][0-9]|2[0-5][0-9])\.(1?[0-9][0-9]|2[0-5][0-9])\.(1?[0-9][0-9]|2[0-5][0-9])).*/\1/p' | grep .
+    sed -n 's/.*\(\(1\?[0-9][0-9]\|2[0-5][0-9]\)\.\(1\?[0-9][0-9]\|2[0-5][0-9]\)\.\(1\?[0-9][0-9]\|2[0-5][0-9]\)\.\(1\?[0-9][0-9]\|2[0-5][0-9]\)\).*/\1/p' |
+      grep .
   }
   get () {
     # TODO get random valid user agent
diff --git a/util/bin/naturalvoices.att b/util/bin/naturalvoices.att
index 9a944d8b..07fb6e17 100755
--- a/util/bin/naturalvoices.att
+++ b/util/bin/naturalvoices.att
@@ -24,8 +24,8 @@ done
 (cd "$pwd/../.." && git submodule update --init)
 
 {
-  for arg; do echo "$arg"; done | sed -rn '
-    s/^--(.*=.*)/\1/p;t
+  for arg; do echo "$arg"; done | sed -n '
+    s/^--\(.*=.*\)/\1/p;t
     s/.*/text="${text+$text }&"/p;t
   '
   cat<<EOF
diff --git a/util/bin/translate.google b/util/bin/translate.google
index 1a1be6b6..45da6463 100755
--- a/util/bin/translate.google
+++ b/util/bin/translate.google
@@ -19,8 +19,8 @@ done
 (cd "$pwd/../.." && git submodule update --init)
 
 {
-  for arg; do echo "$arg"; done | sed -rn '
-    s/^--(.*=.*)/\1/p;t
+  for arg; do echo "$arg"; done | sed -n '
+    s/^--\(.*=.*\)/\1/p;t
     s/.*/text="${text+$text }&"/p;t
   '
   cat<<EOF