Merge pull request #40 from FreeBirdLjj/issue#16

Add sublime Text 3 project settings.
Replace ((void*)0) with NULL.
Add inline_display().
Update for inline markdown support of unordered list.
Support for inline markdown in unordered list.
Use for loop to iterate.
Remove unused block.

diff --git a/Makefile b/Makefile
index 4e8d489..1231bde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,4 +65,3 @@ uninstall:
        $(RM) $(PREFIX)$(DESTDIR)/$(TARGET)
 
 .PHONY: all clean install src uninstall
-

diff --git a/include/viewer.h b/include/viewer.h
index 7a80eaa..07475fd 100644 (file)
--- a/include/viewer.h
+++ b/include/viewer.h
@@ -51,6 +51,7 @@
 
 int ncurses_display(deck_t *deck, int notrans, int nofade, int invert);
 void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors);
+void inline_display(WINDOW *window, const char *c, const int colors);
 void fade_out(WINDOW *window, int trans, int colors, int invert);
 void fade_in(WINDOW *window, int trans, int colors, int invert);
 int int_length (int val);

diff --git a/mdp.sublime-project b/mdp.sublime-project
new file mode 100644 (file)
index 0000000..e20eca6
--- /dev/null
+++ b/mdp.sublime-project
@@ -0,0 +1,16 @@
+{
+    "settings":
+    {
+        "tab_size": 4,
+        "translate_tabs_to_spaces": true,
+        "use_tab_stops": false
+    }
+    ,"folders":
+    [
+    {
+        "follow_symlinks": true,
+        "path": ".",
+        "file_exclude_patterns": [".*", "mdp", "mdp.sublime-project"]
+    }
+    ]
+}
\ No newline at end of file

diff --git a/sample.md b/sample.md
index 57abf3d..11d36e0 100644 (file)
--- a/sample.md
+++ b/sample.md
@@ -140,7 +140,7 @@ Leading *\** or *-* indicate lists.
 TODO list
 \* major 1
 \    \- minor 1.1
-\        \- detail 1.1.1
+\        \- detail 1.1.1 \*IMPORTANT\*
 \        \- detail 1.1.2
 \    \- minor 1.2
 
@@ -149,7 +149,7 @@ becomes
 TODO list
 * major 1
     - minor 1.1
-        - detail 1.1.1
+        - detail 1.1.1 *IMPORTANT*
         - detail 1.1.2
     - minor 1.2
 

diff --git a/src/cstack.c b/src/cstack.c
index aafb95f..a5ecc06 100644 (file)
--- a/src/cstack.c
+++ b/src/cstack.c
@@ -25,7 +25,7 @@
 
 cstack_t *cstack_init() {
     cstack_t *stack = malloc(sizeof(cstack_t));
-    stack->content = (void*)0;
+    stack->content = NULL;
     stack->alloc = stack->size = 0;
     stack->head = -1;
     stack->push = cstack_push;
@@ -56,12 +56,11 @@ int cstack_top(cstack_t *self, char c) {
     return 0;
 }
 
-int cstack_empty(cstack_t *self)  {
-   return self->head == -1;
+int cstack_empty(cstack_t *self) {
+    return self->head == -1;
 }
 
 void cstack_delete(cstack_t *self) {
     free(self->content);
     free(self);
 }
-

diff --git a/src/cstring.c b/src/cstring.c
index 1939572..6d16d2b 100644 (file)
--- a/src/cstring.c
+++ b/src/cstring.c
@@ -26,7 +26,7 @@
 
 cstring_t *cstring_init() {
     cstring_t *x = malloc(sizeof(cstring_t));
-    x->text = (void*)0;
+    x->text = NULL;
     x->size = x->alloc = 0;
     x->expand = cstring_expand;
     x->expand_arr = cstring_expand_arr;
@@ -57,7 +57,7 @@ void cstring_expand_arr(cstring_t *self, char *x) {
 
 void cstring_reset(cstring_t *self) {
     free(self->text);
-    self->text = (void*)0;
+    self->text = NULL;
     self->size = self->alloc = 0;
 }
 
@@ -65,4 +65,3 @@ void cstring_delete(cstring_t *self) {
     free(self->text);
     free(self);
 }
-

diff --git a/src/main.c b/src/main.c
index c94330a..ef86cdb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -125,4 +125,3 @@ int main(int argc, char *argv[]) {
 
     return(EXIT_SUCCESS);
 }
-

diff --git a/src/markdown.c b/src/markdown.c
index 6e7d15f..2648dc1 100644 (file)
--- a/src/markdown.c
+++ b/src/markdown.c
@@ -61,4 +61,3 @@ deck_t *new_deck() {
     x->slides = x->headers = 0;
     return x;
 }
-

diff --git a/src/parser.c b/src/parser.c
index c8120cd..7a54986 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -266,7 +266,7 @@ deck_t *markdown_load(FILE *input) {
                     }
                     tmp = tmp->next;
                 }
-                
+
                 for(tmp = line; tmp != list_last_level_1; tmp = tmp->next) {
                     SET_BIT(tmp->bits, IS_UNORDERED_LIST_1);
                 }
@@ -337,12 +337,12 @@ int markdown_analyse(cstring_t *text) {
                     case 3: SET_BIT(bits, IS_UNORDERED_LIST_3); break;
                     default: break;
                 }
-                
+
                 break;
             }
         }
     }
-    
+
     if(!CHECK_BIT(bits, IS_UNORDERED_LIST_1) &&
        !CHECK_BIT(bits, IS_UNORDERED_LIST_2) &&
        !CHECK_BIT(bits, IS_UNORDERED_LIST_3)) {
@@ -518,4 +518,3 @@ int next_blank(cstring_t *text, int i) {
 int next_word(cstring_t *text, int i) {
     return next_nonblank(text, next_blank(text, i));
 }
-

diff --git a/src/viewer.c b/src/viewer.c
index a09fd1f..747329c 100644 (file)
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -399,218 +399,217 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
 }
 
 void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colors) {
-    int i = 0; // increment
-    char *c; // char pointer for iteration
-    char *special = "\\*_`"; // list of interpreted chars
-    cstack_t *stack = cstack_init();
 
-    if(line->text->text) {
-        int offset = 0; // text offset
-
-        // IS_UNORDERED_LIST_3
-        if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) {
-            offset = next_nonblank(line->text, 0);
-            char format_s[15];
-            strcpy(&format_s[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " |  " : "    ");
-            strcpy(&format_s[4], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? " |  " : "    ");
-            strcpy(&format_s[8], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? " +- %s" : " `- %s");
-            mvwprintw(window,
-                      y, x,
-                      format_s,
-                      &line->text->text[offset + 2]);
-
-        // IS_UNORDERED_LIST_2
-        } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) {
-            offset = next_nonblank(line->text, 0);
-            char format_s[11];
-            strcpy(&format_s[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? " |  " : "    ");
-            strcpy(&format_s[4], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? " +- %s" : " `- %s");
-            mvwprintw(window,
-                      y, x,
-                      format_s,
-                      &line->text->text[offset + 2]);
-
-        // IS_UNORDERED_LIST_1
-        } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) {
-            offset = next_nonblank(line->text, 0);
-            char format_s[7];
-            strcpy(&format_s[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? " +- %s" : " `- %s");
-            mvwprintw(window,
-                      y, x,
-                      format_s,
-                      &line->text->text[offset + 2]);
-
-        // IS_CODE
-        } else if(CHECK_BIT(line->bits, IS_CODE)) {
-
-            // set static offset for code
-            offset = CODE_INDENT;
-
-            // reverse color for code blocks
-            if(colors)
-                wattron(window, COLOR_PAIR(CP_BLACK));
-
-            // print whole lines
-            mvwprintw(window,
-                      y, x,
-                      "%s", &line->text->text[offset]);
+    if(!line->text->text) {
+        return;
+    }
 
-        } else {
+    int i; // increment
+    int offset = 0; // text offset
+
+    // move the cursor in position
+    wmove(window, y, x);
+
+    // IS_UNORDERED_LIST_3
+    if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_3)) {
+        offset = next_nonblank(line->text, 0);
+        char prompt[10];
+        strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? "|  " : "   ");
+        strcpy(&prompt[3], CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)? "|  " : "   ");
+        strcpy(&prompt[6], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_3)? "+- " : "`- ");
+        wprintw(window,
+                "%s", prompt);
+
+        inline_display(window, &line->text->text[offset + 2], colors);
+
+    // IS_UNORDERED_LIST_2
+    } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_2)) {
+        offset = next_nonblank(line->text, 0);
+        char prompt[7];
+        strcpy(&prompt[0], CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)? "|  " : "   ");
+        strcpy(&prompt[3], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_2)? "+- " : "`- ");
+        wprintw(window,
+                "%s", prompt);
+
+        inline_display(window, &line->text->text[offset + 2], colors);
+
+    // IS_UNORDERED_LIST_1
+    } else if(CHECK_BIT(line->bits, IS_UNORDERED_LIST_1)) {
+        offset = next_nonblank(line->text, 0);
+        char prompt[4];
+        strcpy(&prompt[0], line->next && CHECK_BIT(line->next->bits, IS_UNORDERED_LIST_1)? "+- " : "`- ");
+        wprintw(window,
+                "%s", prompt);
+
+        inline_display(window, &line->text->text[offset + 2], colors);
+
+    // IS_CODE
+    } else if(CHECK_BIT(line->bits, IS_CODE)) {
+
+        // set static offset for code
+        offset = CODE_INDENT;
+
+        // reverse color for code blocks
+        if(colors)
+            wattron(window, COLOR_PAIR(CP_BLACK));
 
-            // IS_H1 || IS_H2
-            if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) {
+        // print whole lines
+        wprintw(window,
+                "%s", &line->text->text[offset]);
 
-                // set headline color
-                if(colors)
-                    wattron(window, COLOR_PAIR(CP_BLUE));
+    // IS_H1 || IS_H2
+    } else if(CHECK_BIT(line->bits, IS_H1) || CHECK_BIT(line->bits, IS_H2)) {
 
-                // enable underline for H1
-                if(CHECK_BIT(line->bits, IS_H1))
-                    wattron(window, A_UNDERLINE);
+        // set headline color
+        if(colors)
+            wattron(window, COLOR_PAIR(CP_BLUE));
 
-                // skip hashes
-                while(line->text->text[offset] == '#')
-                    offset = next_word(line->text, offset);
+        // enable underline for H1
+        if(CHECK_BIT(line->bits, IS_H1))
+            wattron(window, A_UNDERLINE);
 
-                // print whole lines
-                mvwprintw(window,
-                      y, x,
-                      "%s", &line->text->text[offset]);
+        // skip hashes
+        while(line->text->text[offset] == '#')
+            offset = next_word(line->text, offset);
 
-                wattroff(window, A_UNDERLINE);
+        // print whole lines
+        wprintw(window,
+                "%s", &line->text->text[offset]);
 
-            } else {
-                // move the cursor in position
-                wmove(window, y, x);
-
-                // IS_QUOTE
-                if(CHECK_BIT(line->bits, IS_QUOTE)) {
-                    while(line->text->text[offset] == '>') {
-                        // print a reverse color block
-                        if(colors) {
-                            wattron(window, COLOR_PAIR(CP_BLACK));
-                            wprintw(window, "%s", " ");
-                            wattron(window, COLOR_PAIR(CP_WHITE));
-                            wprintw(window, "%s", " ");
-                        } else {
-                            wprintw(window, "%s", ">");
-                        }
+        wattroff(window, A_UNDERLINE);
 
-                        // find next quote or break
-                        offset++;
-                        if(line->text->text[offset] == ' ')
-                            offset = next_word(line->text, offset);
-                    }
+    } else {
+
+        // IS_QUOTE
+        if(CHECK_BIT(line->bits, IS_QUOTE)) {
+            while(line->text->text[offset] == '>') {
+                // print a reverse color block
+                if(colors) {
+                    wattron(window, COLOR_PAIR(CP_BLACK));
+                    wprintw(window, "%s", " ");
+                    wattron(window, COLOR_PAIR(CP_WHITE));
+                    wprintw(window, "%s", " ");
+                } else {
+                    wprintw(window, "%s", ">");
                 }
 
-                // for each char in line
-                c = &line->text->text[offset];
-                while(*c) {
-
-                    // if char is in special char list
-                    if(strchr(special, *c)) {
-
-                        // closing special char (or second backslash)
-                        if((stack->top)(stack, *c)) {
-
-                            switch(*c) {
-                                // print escaped backslash
-                                case '\\':
-                                    wprintw(window, "%c", *c);
-                                    break;
-                                // disable highlight
-                                case '*':
-                                    if(colors)
-                                        wattron(window, COLOR_PAIR(CP_WHITE));
-                                    break;
-                                // disable underline
-                                case '_':
-                                    wattroff(window, A_UNDERLINE);
-                                    break;
-                                // disable inline code
-                                case '`':
-                                    if(colors)
-                                        wattron(window, COLOR_PAIR(CP_WHITE));
-                                    break;
-                            }
+                // find next quote or break
+                offset++;
+                if(line->text->text[offset] == ' ')
+                    offset = next_word(line->text, offset);
+            }
+        }
 
-                            // remove top special char from stack
-                            (stack->pop)(stack);
+        inline_display(window, &line->text->text[offset], colors);
+    }
 
-                        // treat special as regular char
-                        } else if((stack->top)(stack, '\\')) {
-                            wprintw(window, "%c", *c);
+    // fill rest off line with spaces
+    for(i = getcurx(window) - x; i < max_cols; i++)
+        wprintw(window, "%s", " ");
 
-                            // remove backslash from stack
-                            (stack->pop)(stack);
+    // reset to default color
+    if(colors)
+        wattron(window, COLOR_PAIR(CP_WHITE));
+    wattroff(window, A_UNDERLINE);
+}
 
-                        // opening special char
-                        } else {
-                            switch(*c) {
-                                // enable highlight
-                                case '*':
-                                    if(colors)
-                                        wattron(window, COLOR_PAIR(CP_RED));
-                                    break;
-                                // enable underline
-                                case '_':
-                                    wattron(window, A_UNDERLINE);
-                                    break;
-                                // enable inline code
-                                case '`':
-                                    if(colors)
-                                        wattron(window, COLOR_PAIR(CP_BLACK));
-                                    break;
-                                // do nothing for backslashes
-                            }
+void inline_display(WINDOW *window, const char *c, const int colors) {
+    const static char *special = "\\*_`"; // list of interpreted chars
+    cstack_t *stack = cstack_init();
 
-                            // push special char to stack
-                            (stack->push)(stack, *c);
-                        }
+    // for each char in line
+    for(; *c; c++) {
 
-                    } else {
-                        // remove backslash from stack
-                        if((stack->top)(stack, '\\'))
-                            (stack->pop)(stack);
+        // if char is in special char list
+        if(strchr(special, *c)) {
 
-                        // print regular char
-                        wprintw(window, "%c", *c);
-                    }
+            // closing special char (or second backslash)
+            if((stack->top)(stack, *c)) {
 
-                    c++;
+                switch(*c) {
+                    // print escaped backslash
+                    case '\\':
+                        wprintw(window, "%c", *c);
+                        break;
+                    // disable highlight
+                    case '*':
+                        if(colors)
+                            wattron(window, COLOR_PAIR(CP_WHITE));
+                        break;
+                    // disable underline
+                    case '_':
+                        wattroff(window, A_UNDERLINE);
+                        break;
+                    // disable inline code
+                    case '`':
+                        if(colors)
+                            wattron(window, COLOR_PAIR(CP_WHITE));
+                        break;
                 }
 
-                // pop stack until empty to prevent formated trailing spaces
-                while(!(stack->empty)(stack)) {
-                    switch((stack->pop)(stack)) {
-                        // disable highlight
-                        case '*':
-                            if(colors)
-                                wattron(window, COLOR_PAIR(CP_WHITE));
-                            break;
-                        // disable underline
-                        case '_':
-                            wattroff(window, A_UNDERLINE);
-                            break;
-                        // disable inline code
-                        case '`':
-                            if(colors)
-                                wattron(window, COLOR_PAIR(CP_WHITE));
-                            break;
-                        // do nothing for backslashes
-                    }
+                // remove top special char from stack
+                (stack->pop)(stack);
+
+            // treat special as regular char
+            } else if((stack->top)(stack, '\\')) {
+                wprintw(window, "%c", *c);
+
+                // remove backslash from stack
+                (stack->pop)(stack);
+
+            // opening special char
+            } else {
+                switch(*c) {
+                    // enable highlight
+                    case '*':
+                        if(colors)
+                            wattron(window, COLOR_PAIR(CP_RED));
+                        break;
+                    // enable underline
+                    case '_':
+                        wattron(window, A_UNDERLINE);
+                        break;
+                    // enable inline code
+                    case '`':
+                        if(colors)
+                            wattron(window, COLOR_PAIR(CP_BLACK));
+                        break;
+                    // do nothing for backslashes
                 }
+
+                // push special char to stack
+                (stack->push)(stack, *c);
             }
-        }
 
-        // fill rest off line with spaces
-        for(i = getcurx(window) - x; i < max_cols; i++)
-            wprintw(window, "%s", " ");
+        } else {
+            // remove backslash from stack
+            if((stack->top)(stack, '\\'))
+                (stack->pop)(stack);
 
-        // reset to default color
-        if(colors)
-            wattron(window, COLOR_PAIR(CP_WHITE));
-        wattroff(window, A_UNDERLINE);
+            // print regular char
+            wprintw(window, "%c", *c);
+        }
+    }
+
+    // pop stack until empty to prevent formated trailing spaces
+    while(!(stack->empty)(stack)) {
+        switch((stack->pop)(stack)) {
+            // disable highlight
+            case '*':
+                if(colors)
+                    wattron(window, COLOR_PAIR(CP_WHITE));
+                break;
+            // disable underline
+            case '_':
+                wattroff(window, A_UNDERLINE);
+                break;
+            // disable inline code
+            case '`':
+                if(colors)
+                    wattron(window, COLOR_PAIR(CP_WHITE));
+                break;
+            // do nothing for backslashes
+        }
     }
 
     (stack->delete)(stack);