X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=include%2Fmarkdown.h;h=62d147130295b03d52378a242d74f0763405f516;hb=32639324a5ed0b1678d1066680ed6d2e469ae271;hp=b4812f583b0d89789723f425bb4225efd96b63a8;hpb=6003f2f14d8c40a23336a510b109290dceb2f40b;p=smdp.git

diff --git a/include/markdown.h b/include/markdown.h
index b4812f5..62d1471 100644
--- a/include/markdown.h
+++ b/include/markdown.h
@@ -7,20 +7,15 @@
  */
 
 #include "cstring.h"
-
-#define SET_BIT(var, pos)    ((var) |= (1<<(pos)))
-#define CLEAR_BIT(var, pos)  ((var) &= (~(1<<(pos))))
-#define TOGGLE_BIT(var, pos) ((var) ^= (1<<(pos)))
-#define CHECK_BIT(var, pos)  ((var) &  (1<<(pos)))
+#include "bitops.h"
 
 enum line_bitmask {
-    IS_HEADER,
-    IS_HEADER2,
+    IS_H1,
+    IS_H2,
     IS_QUOTE,
     IS_CODE,
-    IS_LIST,
-    IS_NUMLIST,
-    IS_HR
+    IS_HR,
+    IS_EMPTY
 };
 
 typedef struct _line_t {
@@ -28,49 +23,28 @@ typedef struct _line_t {
     struct _line_t *prev;
     struct _line_t *next;
     int bits;
+    int length;
     int offset;
 } line_t;
 
-typedef struct _page_t {
+typedef struct _slide_t {
     line_t *line;
-    struct _page_t *prev;
-    struct _page_t *next;
-} page_t;
-
-typedef struct _document_t {
-    line_t *title;
-    line_t *author;
-    line_t *date;
-    page_t *page;
-} document_t;
-
-line_t *new_line() {
-    line_t *x = malloc(sizeof(line_t));
-    return x;
-}
-
-line_t *next_line(line_t *prev) {
-    line_t *x = new_line();
-    x->prev = prev;
-    prev->next = x;
-    return x;
-}
-
-page_t *new_page() {
-    page_t *x = malloc(sizeof(page_t));
-    return x;
-}
-
-page_t *next_page(page_t *prev) {
-    page_t *x = new_page();
-    x->prev = prev;
-    prev->next = x;
-    return x;
-}
-
-document_t *new_document() {
-    document_t *x = malloc(sizeof(document_t));
-    return x;
-}
+    struct _slide_t *prev;
+    struct _slide_t *next;
+    int lines;
+} slide_t;
+
+typedef struct _deck_t {
+    line_t *header;
+    slide_t *slide;
+    int slides;
+    int headers;
+} deck_t;
+
+line_t *new_line();
+line_t *next_line(line_t *prev);
+slide_t *new_slide();
+slide_t *next_slide(slide_t *prev);
+deck_t *new_deck();
 
 #endif // !defined( MARKDOWN_H )