X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=parser.c;h=dc2677d1d33e59ce63d5ad7edfd54aa8b152bd56;hb=d4843ea375360f37e965709e73c0fbd68e302dca;hp=9931b02e5ef15b94f7f33b3680843da96a9f443d;hpb=32639324a5ed0b1678d1066680ed6d2e469ae271;p=smdp.git

diff --git a/parser.c b/parser.c
index 9931b02..dc2677d 100644
--- a/parser.c
+++ b/parser.c
@@ -1,3 +1,27 @@
+/*
+ * Functions necessary to parse a file and transform its content into
+ * a deck of slides containing lines. All based on markdown formating
+ * rules.
+ * Copyright (C) 2014 Michael Goehler
+ *
+ * This file is part of mdp.
+ *
+ * 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 <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -80,7 +104,7 @@ deck_t *markdown_load(FILE *input) {
         } else if(c == '\t') {
 
             // expand tab to spaces
-            for (i = 0;  i <= EXPAND_TABS;  i++) {
+            for (i = 0;  i < EXPAND_TABS;  i++) {
                 (text->expand)(text, ' ');
                 l++;
             }
@@ -171,7 +195,8 @@ deck_t *markdown_load(FILE *input) {
 
                 // remove line from linked list
                 line->prev->next = line->next;
-                line->next->prev = line->prev;
+                if(line->next)
+                    line->next->prev = line->prev;
 
                 // set bits on revious line
                 if(CHECK_BIT(line->bits, IS_H1)) {
@@ -359,12 +384,16 @@ int next_nonblank(cstring_t *text, int i) {
         ++i;
 
     return i;
-};
+}
 
 int next_blank(cstring_t *text, int i) {
     while ((i < text->size) && !isspace((text->text)[i]))
         ++i;
 
     return i;
-};
+}
+
+int next_word(cstring_t *text, int i) {
+    return next_nonblank(text, next_blank(text, i));
+}