improved syntax translation

diff --git a/moinimport.sh b/moinimport.sh
index b747843310f5fc6dc48669094909a39a5b0d3a0e..1815a8379daf3dfec35a888730258d69da776f85 100755 (executable)
--- a/moinimport.sh
+++ b/moinimport.sh
@@ -26,11 +26,11 @@ reformat() {
 
     s;^----+$;\n&;
 
-    s;\{\{attachment:(.*)\|(.*)\|(.*)\}\};![\2](\1 "\3");g
-    s;\{\{attachment:(.*)\|(.*)\}\};![\2](\1);g
-    s;\{\{attachment:(.*)\}\};![](\1);g
-    s;\[\[(.*)\|(.*)\|(.*)\]\];[\2](\1);g
-    s;\[\[(.*)\|(.*)\]\];[\2](\1);g
+    s;\{\{attachment:([^}|]*)\|([^}|]*)\|([^}|]*)\}\};![\2](\1 "\3");g
+    s;\{\{attachment:([^}|]*)\|([^}|]*)\}\};![\2](\1);g
+    s;\{\{attachment:([^}|]*)\}\};![](\1);g
+    s;\[\[([^]|]*)\|([^]|]*)\|([^]|]*)\]\];[\2](\1);g
+    s;\[\[([^]|]*)\|([^]|]*)\]\];[\2](\1);g
 
     /\{\{\{+#!wiki/{
       s;\{;:;g;
@@ -40,7 +40,7 @@ reformat() {
     /^\}\}\}+$/s;\};:;g;
 
     :MACRO
-    s;<<([^\(>]+)\(([^,)]+)([^)]*)\)>>;<<\1 "\2"(\3)>>;g;
+    s;<<([^\(>]+)\(([^,)]+),?([^)]*)\)>>;<<\1 "\2"(\3)>>;g;
     tMACRO
     s;<<([^\(>]+)\(\)>>;<<\1>>;g;
   '