Changeset 61

Timestamp:

03/09/08 05:20:20 (10 months ago)

Author:

scott

Message:

Full support for VIM/Hilight and non-gvim-coprocesses settings

• Finally got the kinks worked out.

Files:

• trunk/awkbot/src/awkpaste.awk (modified) (3 diffs)

trunk/awkbot/src/awkpaste.awk

@@ -46 +46 @@
         }
     }
+#define TEMPLATE_FILE               \
+    workfile = tempfile("paste");   \
+    template = workfile ".html";    \
+                                    \
+    print content > workfile;       \
+    close(workfile)
 
+#ifdef VIM
+    TEMPLATE_FILE
+
+    system("vim -i NONE -c \"syn on\" -c \"set syntax=awk\" -c \"set nu\"" \
+            " -c TOhtml -c wq -c q " workfile " &> /dev/null")
+
+    while (getline content < template) {
+#else
 #ifdef GAWK
-    hilight = "highlight -I -l -S awk"
+    hilight = "highlight -I -l -k monospace -S awk"
     print content |& hilight
     close(hilight, "to")
@@ -54 +68 @@
     while (hilight |& getline content) {
 #else
-    workfile = tempfile("paste")
-    template = workfile ".html"
+    TEMPLATE_FILE
 
-    print content > workfile
-    close(workfile)
+    system("highlight -I -l -k monospace -S awk -o " template " " workfile)
 
-#ifdef VIM
-    system("vim -i NONE -c \"syn on\" -c \"set syntax=awk\" -c \"set nu\"" \
-            " -c TOhtml -c wq -c q " workfile " &> /dev/null")
-#else
-    system("highlight -I -l -S awk -o " template " " workfile)
+    while (getline content < template) {
 #endif
-    while (getline content < template) {
 #endif
         if (content ~ /<\/body>/) {
@@ -84 +91 @@
         }
     }
+#define CLEANUP_FILE        \
+    system("rm " workfile); \
+    system("rm " template)
+
+#ifdef VIM
+    CLEANUP_FILE
+#else
+#ifndef GAWK
+    CLEANUP_FILE
+#else
     close(hilight, "from")
-
-#ifndef GAWK
-    system("rm " workfile)
-    system("rm " template)
+#endif
 #endif
 }