X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=markdown.c;h=d0e18d6deffcbc85d98ad55238de8ce49bb7ca76;hb=5e77cd8cc9723829ce6fcd09e4a52207d6112d70;hp=62aca6f9b3a881e5613060b3ab484c3ba97a3b7a;hpb=ab8e567cda085c6cc575082d175790617a3f9fa6;p=smdp.git

diff --git a/markdown.c b/markdown.c
index 62aca6f..d0e18d6 100644
--- a/markdown.c
+++ b/markdown.c
@@ -1,132 +1,64 @@
-// needed by tmp.c to process markdown
+/*
+ * An implementation of markdown objects.
+ * Copyright (C) 2014 Michael Goehler
+ *
+ * This file is part of mpd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "include/markdown.h"
 
-document_t * markdown_load(FILE *input) {
-
-    int c, i, bits;
-
-    document_t *doc;
-    page_t *page;
-    line_t *line;
-    cstring_t *text;
-
-    doc = new_document();
-    page = new_page();
-    doc->page = page;
-    text = cstring_init();
-
-    while ((c = fgetc(input)) != EOF) {
-        if(c == '\n') {
-
-            // markdown analyse
-            bits = markdown_analyse(text);
-
-            // if text is markdown hr
-            if(CHECK_BIT(bits, IS_HR)) {
-
-                // clear text
-                (text->reset)(text);
-                // create next page
-                page = next_page(page);
-
-            } else {
-
-                // if page ! has line
-                if(!page->line) {
-
-                    // create new line
-                    line = new_line();
-                    page->line = line;
-
-                } else {
-
-                    // create next line
-                    line = next_line(line);
-
-                }
-
-                // add text to line
-                line->text = text;
-
-                // add bits to line
-                line->bits = bits;
-
-                // calc offset
-                line->offset = next_nonblank(text, 0);
-            }
-
-        } else if('\t') {
-
-            // expand tab to spaces
-            for (i = 0;  i <= 4;  i++)
-                (text->expand)(text, ' ');
-
-        } else if(isprint(c) || isspace(c) || is_utf8(c)) {
-
-            // add char to line
-            (text->expand)(text, c);
-        }
-    }
-
-    //TODO detect header
-
-    return doc;
+line_t *new_line() {
+    line_t *x = malloc(sizeof(line_t));
+    x->text = (void*)0;
+    x->prev = x->next = (void*)0;
+    x->bits = x->length = x->offset = 0;
+    return x;
 }
 
-int markdown_analyse(cstring_t *text) {
-    int c, i, bits,
-        offset, eol,
-        equals, hashes, stars, minus, plus,
-        spaces, other;
-
-    // count leading spaces
-    offset = next_nonblank(text, 0);
-
-    // IS_CODE
-    if(offset >= 4) {
-        SET_BIT(bits, IS_CODE);
-        return bits;
-    }
-
-    // strip trailing spaces
-    for(eol = text->size; eol > offset && isspace(text->text[eol - 1]); eol--);
-
-    for(i = offset; i < eol; i++) {
-
-        switch(text->text[i]) {
-            case '=': equals++; break;
-            case '#': hashes++; break;
-            case '*': stars++; break;
-            case '-': minus++; break;
-            case '+': plus++; break;
-            case ' ': spaces++; break;
-            default: other++; break;
-        }
-    }
-
-    // IS_HR
-    if((minus >= 3 && equals + hashes + stars + plus == 0) ||
-       (stars >= 3 && equals + hashes + minus + plus == 0)) {
-
-        SET_BIT(bits, IS_HR);
-        return bits;
-    }
-
-    //TODO all the other markdown tags
+line_t *next_line(line_t *prev) {
+    line_t *x = new_line();
+    x->prev = prev;
+    prev->next = x;
+    return x;
+}
 
-    return bits;
+slide_t *new_slide() {
+    slide_t *x = malloc(sizeof(slide_t));
+    x->line = (void*)0;
+    x->prev = x->next = (void*)0;
+    x->lines = 0;
+    return x;
 }
 
-int is_utf8(char ch) {
-    return (ch & 0x80);
+slide_t *next_slide(slide_t *prev) {
+    slide_t *x = new_slide();
+    x->prev = prev;
+    prev->next = x;
+    return x;
 }
 
-int next_nonblank(cstring_t *text, int i) {
-    while ((i < text->size) && isspace((text->text)[i]))
-        ++i;
-    return i;
-};
+deck_t *new_deck() {
+    deck_t *x = malloc(sizeof(deck_t));
+    x->header = (void*)0;
+    x->slide = (void*)0;
+    x->slides = x->headers = 0;
+    return x;
+}