pinosaur
/
smdp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename objects to deck / slide
[smdp.git]
/
parser.c
diff --git
a/parser.c
b/parser.c
index
254c084
..
552a453
100644
(file)
--- a/
parser.c
+++ b/
parser.c
@@
-3,18
+3,18
@@
#include "include/parser.h"
#include "include/parser.h"
-d
ocument
_t *markdown_load(FILE *input) {
+d
eck
_t *markdown_load(FILE *input) {
int c = 0, i = 0, l = 0, bits = 0;
int c = 0, i = 0, l = 0, bits = 0;
- d
ocument_t *doc
;
-
page_t *pag
e;
+ d
eck_t *deck
;
+
slide_t *slid
e;
line_t *line;
cstring_t *text;
line_t *line;
cstring_t *text;
- d
oc = new_document
();
-
page = new_pag
e();
- d
oc->page = pag
e;
+ d
eck = new_deck
();
+
slide = new_slid
e();
+ d
eck->slide = slid
e;
text = cstring_init();
while ((c = fgetc(input)) != EOF) {
text = cstring_init();
while ((c = fgetc(input)) != EOF) {
@@
-33,17
+33,17
@@
document_t *markdown_load(FILE *input) {
// reset line length
l = 0;
// reset line length
l = 0;
- // create next
pag
e
-
page = next_page(pag
e);
+ // create next
slid
e
+
slide = next_slide(slid
e);
} else {
} else {
- // if
pag
e ! has line
- if(!
pag
e->line) {
+ // if
slid
e ! has line
+ if(!
slid
e->line) {
// create new line
line = new_line();
// create new line
line = new_line();
-
pag
e->line = line;
+
slid
e->line = line;
} else {
} else {
@@
-104,11
+104,11
@@
document_t *markdown_load(FILE *input) {
}
// detect header
}
// detect header
- line = d
oc->pag
e->line;
+ line = d
eck->slid
e->line;
if(line && line->text->size > 0 && line->text->text[0] == '%') {
if(line && line->text->size > 0 && line->text->text[0] == '%') {
- // assign header to d
ocument
- d
oc
->header = line;
+ // assign header to d
eck
+ d
eck
->header = line;
// find first non-header line
while(line->text->size > 0 && line->text->text[0] == '%') {
// find first non-header line
while(line->text->size > 0 && line->text->text[0] == '%') {
@@
-119,14
+119,14
@@
document_t *markdown_load(FILE *input) {
line->prev->next = (void*)0;
line->prev = (void*)0;
line->prev->next = (void*)0;
line->prev = (void*)0;
- // remove header lines from
pag
e
- d
oc->pag
e->line = line;
+ // remove header lines from
slid
e
+ d
eck->slid
e->line = line;
}
// combine underlined H1/H2 in single line
}
// combine underlined H1/H2 in single line
-
page = doc->pag
e;
- while(
pag
e) {
- line =
pag
e->line;
+
slide = deck->slid
e;
+ while(
slid
e) {
+ line =
slid
e->line;
while(line) {
if((CHECK_BIT(line->bits, IS_H1) ||
CHECK_BIT(line->bits, IS_H2)) &&
while(line) {
if((CHECK_BIT(line->bits, IS_H1) ||
CHECK_BIT(line->bits, IS_H2)) &&
@@
-151,10
+151,10
@@
document_t *markdown_load(FILE *input) {
}
line = line->next;
}
}
line = line->next;
}
-
page = pag
e->next;
+
slide = slid
e->next;
}
}
- return d
oc
;
+ return d
eck
;
}
int markdown_analyse(cstring_t *text) {
}
int markdown_analyse(cstring_t *text) {
@@
-232,13
+232,13
@@
int markdown_analyse(cstring_t *text) {
return bits;
}
return bits;
}
-void markdown_debug(d
ocument_t *doc
, int debug) {
+void markdown_debug(d
eck_t *deck
, int debug) {
// print header to STDERR
int offset;
line_t *header;
// print header to STDERR
int offset;
line_t *header;
- if(d
oc
->header) {
- header = d
oc
->header;
+ if(d
eck
->header) {
+ header = d
eck
->header;
while(header &&
header->length > 0 &&
header->text->text[0] == '%') {
while(header &&
header->length > 0 &&
header->text->text[0] == '%') {
@@
-249,16
+249,16
@@
void markdown_debug(document_t *doc, int debug) {
}
}
}
}
- // print
pag
e/line count to STDERR
- int c
p
= 0, cl = 0;
-
page_t *page = doc->pag
e;
+ // print
slid
e/line count to STDERR
+ int c
s
= 0, cl = 0;
+
slide_t *slide = deck->slid
e;
line_t *line;
line_t *line;
- while(
pag
e) {
- c
p
++;
+ while(
slid
e) {
+ c
s
++;
if(debug > 1) {
if(debug > 1) {
- fprintf(stderr, "
page %i:\n", cp
);
+ fprintf(stderr, "
slide %i:\n", cs
);
}
}
- line =
pag
e->line;
+ line =
slid
e->line;
cl = 0;
while(line) {
cl++;
cl = 0;
while(line) {
cl++;
@@
-268,9
+268,9
@@
void markdown_debug(document_t *doc, int debug) {
line = line->next;
}
if(debug == 1) {
line = line->next;
}
if(debug == 1) {
- fprintf(stderr, "
page %i: %i lines\n", cp
, cl);
+ fprintf(stderr, "
slide %i: %i lines\n", cs
, cl);
}
}
-
page = pag
e->next;
+
slide = slid
e->next;
}
}
}
}