tenno/scq
1
0
Fork 0
Code Issues Releases 2 Activity

Added doparagraph parser.

Browse source 
Removed ERRMALLOC constant.
changed "<hr />" from "---" to "- - -"
linebreak is now markdown compatible
This commit is contained in:
gottox@rootkit.lan 2007-12-11 18:38:57 +01:00
parent 7e1d539235
commit 857be7fb4d
1 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cmarkdown.c
View file

@ -10,7 +10,6 @@
#include <string.h> #include <string.h>
#define BUFFERSIZE 1024 #define BUFFERSIZE 1024
#define ERRMALLOC eprint("malloc failed\n");
#define LENGTH(x) sizeof(x)/sizeof(x[0]) #define LENGTH(x) sizeof(x)/sizeof(x[0])
typedef unsigned int (*Parser)(const char *, const char *); typedef unsigned int (*Parser)(const char *, const char *);
@ -28,6 +27,8 @@ unsigned int dolink(const char *begin, const char *end);
/* Parser for links and images */ /* Parser for links and images */
unsigned int dolist(const char *begin, const char *end); unsigned int dolist(const char *begin, const char *end);
/* Parser for lists */ /* Parser for lists */
unsigned int doparagraph(const char *begin, const char *end);
/* Parser for paragraphs */
unsigned int doreplace(const char *begin, const char *end); unsigned int doreplace(const char *begin, const char *end);
/* Parser for simple replaces */ /* Parser for simple replaces */
unsigned int doshortlink(const char *begin, const char *end); unsigned int doshortlink(const char *begin, const char *end);
@ -38,8 +39,8 @@ unsigned int dounderline(const char *begin, const char *end);
/* Parser for underline tags */ /* Parser for underline tags */
void process(const char *begin, const char *end); /* Processes range between begin and end. */ void process(const char *begin, const char *end); /* Processes range between begin and end. */
Parser parsers[] = { dounderline, dolineprefix, dolist, dosurround, Parser parsers[] = { dounderline, dolineprefix, dolist, doparagraph,
dolink, doshortlink, doreplace }; /* list of parsers */ dosurround, dolink, doshortlink, doreplace }; /* list of parsers */
FILE *source; FILE *source;
unsigned int bsize = 0, nohtml = 0; unsigned int bsize = 0, nohtml = 0;
struct Tag lineprefix[] = { struct Tag lineprefix[] = {
@ -67,7 +68,8 @@ struct Tag surround[] = {
{ "_", 1, "em" }, { "_", 1, "em" },
}; };
char * replace[][2] = { char * replace[][2] = {
{ "\n---\n", "\n<hr />\n" }, { "\n- - -\n", "\n<hr />\n" },
{ "\n- - - \n", "\n<hr />\n" },
{ " #######\n", "\n" }, { " #######\n", "\n" },
{ " ######\n", "\n" }, { " ######\n", "\n" },
{ " #####\n", "\n" }, { " #####\n", "\n" },
@ -77,7 +79,7 @@ char * replace[][2] = {
{ " #\n", "\n" }, { " #\n", "\n" },
}; };
char * insert[][2] = { char * insert[][2] = {
{ "\n\n", "<br /><br />" }, { " \n", "<br />" },
}; };
void void
@ -109,7 +111,7 @@ dolineprefix(const char *begin, const char *end) {
char *buffer; char *buffer;
const char *p; const char *p;
if(*begin != '\n' && *begin != '\0') if(*begin != '\n')
return 0; return 0;
for(i = 0; i < LENGTH(lineprefix); i++) { for(i = 0; i < LENGTH(lineprefix); i++) {
l = strlen(lineprefix[i].search); l = strlen(lineprefix[i].search);
@ -118,7 +120,7 @@ dolineprefix(const char *begin, const char *end) {
if(strncmp(lineprefix[i].search,begin+1,l)) if(strncmp(lineprefix[i].search,begin+1,l))
continue; continue;
if(!(buffer = malloc(end - begin+1))) if(!(buffer = malloc(end - begin+1)))
ERRMALLOC; eprint("Malloc failed.");
printf("<%s>",lineprefix[i].tag); printf("<%s>",lineprefix[i].tag);
for(p = begin, j = 0; p != end; p++, j++) { for(p = begin, j = 0; p != end; p++, j++) {
buffer[j] = *p; buffer[j] = *p;
@ -202,7 +204,7 @@ dolist(const char *begin, const char *end) {
indent = p - begin - 1; indent = p - begin - 1;
if(!(buffer = malloc(end - begin+1))) if(!(buffer = malloc(end - begin+1)))
ERRMALLOC; eprint("Malloc failed.");
puts(ul ? "<ul>" : "<ol>"); puts(ul ? "<ul>" : "<ol>");
run = 1; run = 1;
@ -234,6 +236,24 @@ dolist(const char *begin, const char *end) {
return p - begin; return p - begin;
} }
unsigned int
doparagraph(const char *begin, const char *end) {
const char *p;
if(strncmp(begin,"\n\n",2))
return 0;
if(!(p = strstr(begin+2,"\n\n")))
p = end;
if(p > end)
return 0;
if(p - begin - 2 <= 0)
return 0;
fputs("\n<p>",stdout);
process(begin+2,p);
fputs("</p>\n",stdout);
return p - begin;
}
unsigned int unsigned int
doreplace(const char *begin, const char *end) { doreplace(const char *begin, const char *end) {
unsigned int i, l; unsigned int i, l;
@ -344,7 +364,7 @@ dounderline(const char *begin, const char *end) {
process(begin+1, begin + l + 1); process(begin+1, begin + l + 1);
else else
hprint(begin+1, begin + l + 1); hprint(begin+1, begin + l + 1);
printf("</%s>",underline[i].tag); printf("</%s>\n",underline[i].tag);
return j + l + 2; return j + l + 2;
} }
} }
@ -388,7 +408,7 @@ main(int argc, char *argv[]) {
if(argc > 1 + nohtml && strcmp("-", argv[1 + nohtml]) != 0 && !(source = fopen(argv[1 + nohtml],"r"))) if(argc > 1 + nohtml && strcmp("-", argv[1 + nohtml]) != 0 && !(source = fopen(argv[1 + nohtml],"r")))
eprint("Cannot open file `%s`\n",argv[1 + nohtml]); eprint("Cannot open file `%s`\n",argv[1 + nohtml]);
if(!(buffer = malloc(BUFFERSIZE))) if(!(buffer = malloc(BUFFERSIZE)))
ERRMALLOC; eprint("Malloc failed.");
bsize = BUFFERSIZE; bsize = BUFFERSIZE;
/* needed to properly process first line */ /* needed to properly process first line */
strcpy(buffer,"\n"); strcpy(buffer,"\n");
@ -400,7 +420,7 @@ main(int argc, char *argv[]) {
if(BUFFERSIZE + strlen(buffer) > bsize) { if(BUFFERSIZE + strlen(buffer) > bsize) {
bsize += BUFFERSIZE; bsize += BUFFERSIZE;
if(!(buffer = realloc(buffer, bsize))) if(!(buffer = realloc(buffer, bsize)))
ERRMALLOC; eprint("Malloc failed.");
} }
} }