make alignment respect pandoc urls, #63

[smdp.git] / src / viewer.c

diff --git a/src/viewer.c b/src/viewer.c
index bd533e2..0e2da58 100644 (file)
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -98,6 +98,9 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
             if (line && line->text && line->text->text)
                 lc += url_count_inline(line->text->text);
 
+            if (line && line->text && line->text->text)
+                line->length -= url_len_inline(line->text->text);
+
             if(line->length > COLS) {
                 i = line->length;
                 offset = 0;
@@ -576,7 +579,7 @@ void add_line(WINDOW *window, int y, int x, line_t *line, int max_cols, int colo
 }
 
 void inline_display(WINDOW *window, const char *c, const int colors) {
-    const static char *special = "\\*_`["; // list of interpreted chars
+    const static char *special = "\\*_`!["; // list of interpreted chars
     const char *i = c; // iterator
     const char *start_link_name, *start_url;
     int length_link_name, url_num;
@@ -637,7 +640,11 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
                    *i == '\\') {
 
                     // url in pandoc style
-                    if (*i == '[' && strchr(i, ']')) {
+                    if ((*i == '[' && strchr(i, ']')) ||
+                        (*i == '!' && *(i + 1) == '[' && strchr(i, ']'))) {
+
+                        if (*i == '!') i++;
+
                         if (strchr(i, ']')[1] == '(') {
                             i++;
 
@@ -666,7 +673,7 @@ void inline_display(WINDOW *window, const char *c, const int colors) {
 
                             url_num = url_add(start_link_name, length_link_name, start_url, i - start_url, 0,0);
 
-                            wprintw(window, "[%d]", url_num);
+                            wprintw(window, " [%d]", url_num);
 
                             // turn highlighting and underlining off
                             wattroff(window, A_UNDERLINE);