Added syntax highlighting.

diff --git a/highlight b/highlight
index cfcc452fb2862375aa073c4c5f2052514957f49d..8273a3b6ca7be074efc9cbdc6f298ba5b7185042 100755 (executable)
--- a/highlight
+++ b/highlight
@@ -5,7 +5,7 @@ from pygments import highlight
 from pygments.formatters import HtmlFormatter
 from pygments.lexers import guess_lexer, guess_lexer_for_filename
 
-from sys import stdin
+from sys import stdin, stderr
 
 filename = stdin.readline().strip()
 contents = stdin.read()
@@ -25,9 +25,15 @@ if lexer is None:
     lexer = TextLexer
 
 FORMAT = HtmlFormatter(
-    lineos='table',
+    style='murphy',
+    cssclass='highlight',
+    linenos='table',
     lineanchors='loc',
     anchorlinenos=True)
 
 print(highlight(contents, lexer, FORMAT))
+print('<style>')
+print(FORMAT.get_style_defs('.highlight'))
+print('</style>')
 
+print("Lexer: {}.".format(lexer), file=stderr)

diff --git a/stagit.c b/stagit.c
index 9a8ccd0245b1e55af35fad1dd86f3477ec779e22..bb64869c5ac99adcbd444805d8672adfe1fdbd28 100644 (file)
--- a/stagit.c
+++ b/stagit.c
@@ -397,12 +397,14 @@ writefooter(FILE *fp)
 int
 syntax_highlight(const char *filename, FILE *fp, const char *s, size_t len)
 {
+       // Flush HTML-file
+       fflush(fp);
        // Copy STDOUT
        int stdout_copy = dup(1);
        // Redirect STDOUT
        dup2(fileno(fp), 1);
 
-       // Ruby script for syntax highlighting.
+       // Python Pygments script for syntax highlighting.
        FILE *child = popen("./highlight", "w");
        if (child == NULL) {
                printf("child is null: %s", strerror(errno));
@@ -419,6 +421,7 @@ syntax_highlight(const char *filename, FILE *fp, const char *s, size_t len)
        }
 
        pclose(child);
+       fflush(stdout);
        // Give back STDOUT.
        dup2(stdout_copy, 1);
        return lc;