1.1 --- a/src/highlighter.c Wed Aug 31 14:47:01 2016 +0200
1.2 +++ b/src/highlighter.c Wed Aug 31 16:20:58 2016 +0200
1.3 @@ -73,9 +73,12 @@
1.4
1.5 /* Plaintext Highlighter */
1.6
1.7 -void c2html_plain_highlighter(char *src, UcxBuffer *dest, c2html_highlighter_data *hd) {
1.8 +void c2html_plain_highlighter(char *src, UcxBuffer *dest,
1.9 + c2html_highlighter_data *hd) {
1.10 while (*src && *src != '\n') {
1.11 - put_htmlescaped(dest, *src);
1.12 + if (*src != '\r') {
1.13 + put_htmlescaped(dest, *src);
1.14 + }
1.15 src++;
1.16 }
1.17 ucx_buffer_putc(dest, '\n');
1.18 @@ -91,7 +94,8 @@
1.19 "while", NULL
1.20 };
1.21
1.22 -void c2html_c_highlighter(char *src, UcxBuffer *dest, c2html_highlighter_data *hd) {
1.23 +void c2html_c_highlighter(char *src, UcxBuffer *dest,
1.24 + c2html_highlighter_data *hd) {
1.25 /* reset buffers without clearing them */
1.26 hd->primary_buffer->size = hd->primary_buffer->pos = 0;
1.27 hd->secondary_buffer->size = hd->secondary_buffer->pos = 0;
1.28 @@ -115,6 +119,7 @@
1.29 char c;
1.30 do {
1.31 c = src[++sp];
1.32 + if (c == '\r') continue;
1.33
1.34 /* comments */
1.35 if (!isstring && c == '/') {
1.36 @@ -234,7 +239,8 @@
1.37 "volatile", "const", "float", "native", "super", "while", NULL
1.38 };
1.39
1.40 -void c2html_java_highlighter(char *src, UcxBuffer *dest, c2html_highlighter_data *hd) {
1.41 +void c2html_java_highlighter(char *src, UcxBuffer *dest,
1.42 + c2html_highlighter_data *hd) {
1.43 /* reset buffers without clearing them */
1.44 hd->primary_buffer->size = hd->primary_buffer->pos = 0;
1.45 hd->secondary_buffer->size = hd->secondary_buffer->pos = 0;
1.46 @@ -256,6 +262,7 @@
1.47 char c;
1.48 do {
1.49 c = src[++sp];
1.50 + if (c == '\r') continue;
1.51
1.52 /* comments */
1.53 if (!isstring && c == '/') {
