diff --git a/README.md b/README.md
index 4ac8c85..d27c02a 100644
--- a/README.md
+++ b/README.md
@@ -113,18 +113,18 @@ var1 doesn't exist, so ncdg moves on to var2, which does exist, and skips var3.
```
@\
-#include
+#include
@
```
Result:
```
-
-#include <stdio.h%gt;
+#include <stdio.h>
-Note that text inside of escaped sections are not minified.
+Note that text inside of escaped sections is not minified. Also note taht the
+first character after the code is swallowed.
### Excluding minification
diff --git a/src/' b/src/'
deleted file mode 100644
index 925b556..0000000
--- a/src/'
+++ /dev/null
@@ -1,297 +0,0 @@
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include
-
-struct var {
- struct string *var;
- struct string *value;
-};
-
-struct expandfile {
- struct string *data;
- struct vector *vars;
- /* This is a vector of struct var */
-};
-
-struct minstate {
- int ignore;
- /* If this is set, then ignore the current whitespace group */
- int isspace;
- /* If this is set, then we've seen whitespace on the previous char. */
-};
-
-static int expandfile(struct expandfile *ret, char *filename, int level);
-static int writefile(struct expandfile *file, FILE *out);
-static struct string *getstring(FILE *file, char end);
-static void initminstate(struct minstate *state);
-static void mputs(struct minstate *state, char *s, FILE *file);
-static void mputc(struct minstate *state, char c, FILE *file);
-static int putvar(int i, const struct string *file, const struct vector *vars);
-
-int parsefile(char *template, FILE *out) {
- struct expandfile expanded;
- int ret;
- expanded.data = newstring();
- if (expanded.data == NULL) {
- ret = 1;
- goto error1;
- }
- expanded.vars = newvector(struct var);
- if (expanded.vars == NULL) {
- ret = 1;
- goto error2;
- }
- if (expandfile(&expanded, template, 0)) {
- ret = 1;
- goto error3;
- }
- ret = writefile(&expanded, out);
-error3:
- {
- int i;
- for (i = 0; i < expanded.vars->len; ++i) {
- struct var var;
- var = getvector(expanded.vars, struct var, i);
- freestring(var.var);
- freestring(var.value);
- }
- }
- freevector(expanded.vars);
-error2:
- freestring(expanded.data);
-error1:
- return ret;
-}
-
-static int writefile(struct expandfile *file, FILE *out) {
- long i;
- struct minstate s;
- initminstate(&s);
- for (i = 0; i < file->data->len; ++i) {
- if (file->data->data[i] == ESCAPE_CHAR) {
- const struct string *data = file->data;
- const struct vector *vars = file->vars;
- switch (data->data[++i]) {
- case ESCAPE_CHAR:
- mputc(&s, ESCAPE_CHAR, out);
- break;
- case VAR_CHAR: {
- i = putvar(i, data, vars);
- if (i < 0)
- goto error;
- long start;
- int j;
- char *varname;
- start = ++i;
- while (data->data[i] != ESCAPE_CHAR &&
- i < data->len)
- ++i;
- data->data[i] = '\0';
- varname = data->data + start;
- vars = file->vars;
- for (j = 0; j < vars->len; ++j) {
- struct var var;
- var = getvector(vars,
- struct var, j);
- if (strcmp(var.var->data,
- varname) == 0) {
- mputs(&s, var.value->data,
- out);
- }
- }
- break;
- }
- case AUTOESCAPE_CHAR:
- for (++i; i < data->len; ++i) {
- switch (data->data[i]) {
- case '&':
- fputs("&", out);
- break;
- case ';':
- fputs(";", out);
- case '<':
- fputs("<", out);
- break;
- case '>':
- fputs(">", out);
- break;
- case ESCAPE_CHAR:
- if (data->data[i + 1] != ESCAPE_CHAR)
- goto autoescapeend;
- ++i;
- /* fallthrough */
- default:
- fputc(data->data[i], out);
- break;
- }
- }
-autoescapeend:
- break;
- case NOMINIFY_CHAR:
- for (++i; data->data[i] != ESCAPE_CHAR &&
- i < data->len; ++i) {
- if (data->data[i] == ESCAPE_CHAR) {
- if (data->data[i + 1] != ESCAPE_CHAR)
- break;
- ++i;
- }
- fputc(data->data[i], out);
- }
- break;
- }
- }
- else
- mputc(&s, file->data->data[i], out);
- }
- return 0;
-}
-
-static int expandfile(struct expandfile *ret, char *filename, int level) {
- FILE *file;
- int c, linenum;
- file = fopen(filename, "r");
- if (file == NULL) {
- fprintf(stderr, "Failed to open file %s\n", filename);
- return 1;
- }
- linenum = 1;
- if (level >= MAX_INCLUDE_DEPTH) {
-
- fprintf(stderr, "The include depth has reached %d, quitting\n",
- level);
- fclose(file);
- return 1;
- }
- for (;;) {
- c = fgetc(file);
- switch (c) {
- case ESCAPE_CHAR:
- c = fgetc(file);
- switch (c) {
- case ESCAPE_CHAR:
- if (appendchar(ret->data, ESCAPE_CHAR))
- goto error;
- if (appendchar(ret->data, ESCAPE_CHAR))
- goto error;
- break;
- case VAR_CHAR: case AUTOESCAPE_CHAR: case NOMINIFY_CHAR:
- if (appendchar(ret->data, ESCAPE_CHAR))
- goto error;
- for (;;) {
- if (c == EOF)
- goto error;
- if (appendchar(ret->data, c))
- goto error;
- if (c == '\n')
- ++linenum;
- if (c == ESCAPE_CHAR) {
- c = fgetc(file);
- if (c == ESCAPE_CHAR) {
- if (appendchar(
- ret->data, c))
- goto error;
- if (appendchar(
- ret->data, c))
- goto error;
- }
- else {
- ungetc(c, file);
- break;
- }
- }
- c = fgetc(file);
- }
- break;
- case SET_CHAR: {
- struct var var;
- var.var = getstring(file, ' ');
- var.value = getstring(file, ESCAPE_CHAR);
- addvector(ret->vars, &var);
- break;
- }
- case INCLUDE_CHAR: {
- struct string *inclname;
- inclname = getstring(file, ESCAPE_CHAR);
- if (inclname == NULL)
- goto error;
- if (expandfile(ret, inclname->data,
- level + 1))
- return 1;
- freestring(inclname);
- break;
- }
- default:
- fprintf(stderr, "Line %d: Invalid escape %c\n",
- linenum, c);
- goto error;
- }
- break;
- case '\n':
- ++linenum;
- goto casedefault;
- case EOF:
- goto end;
- default: casedefault:
- if (appendchar(ret->data, c))
- goto error;
- break;
- }
- }
-end:
- fclose(file);
- return 0;
-error:
- fclose(file);
- return 1;
-}
-
-static struct string *getstring(FILE *file, char end) {
- struct string *ret;
- int c;
- ret = newstring();
- if (ret == NULL)
- return NULL;
- for (;;) {
- c = fgetc(file);
- if (c == EOF)
- goto error;
- if (c == end) {
- if (appendchar(ret, '\0'))
- goto error;
- return ret;
- }
- if (appendchar(ret, c))
- goto error;
- }
-error:
- freestring(ret);
- return NULL;
-}
-
-static void initminstate(struct minstate *state) {
- memset(state, 0, sizeof *state);
-}
-
-static void mputs(struct minstate *state, char *s, FILE *file) {
- int i;
- for (i = 0; s[i] != '\0'; ++i)
- mputc(state, s[i], file);
-}
-
-static void mputc(struct minstate *state, char c, FILE *file) {
- if (isspace(c))
- state->isspace = 1;
- else {
- if (!state->ignore && state->isspace && c != '>')
- fputc(' ', file);
- fputc(c, file);
- state->ignore = c == '<';
- state->isspace = 0;
- }
-}
diff --git a/src/parse.c b/src/parse.c
index 4149440..b93935e 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -88,6 +88,8 @@ static int writefile(struct expandfile *file, FILE *out) {
return 1;
break;
case AUTOESCAPE_CHAR:
+ if (data->data[++i] != '\n')
+ --i;
for (++i; i < data->len; ++i) {
switch (data->data[i]) {
case '&':
@@ -114,6 +116,8 @@ static int writefile(struct expandfile *file, FILE *out) {
autoescapeend:
break;
case NOMINIFY_CHAR:
+ if (data->data[++i] != '\n')
+ --i;
for (++i; data->data[i] != ESCAPE_CHAR &&
i < data->len; ++i) {
if (data->data[i] == ESCAPE_CHAR) {