Merge branch 'master' of orc@gw:Src/discount

Makefile.in

@@ -75,8 +75,8 @@ $(MKDLIB): $(OBJS)
 	$(AR) crv $(MKDLIB) $(OBJS)
 	$(RANLIB) $(MKDLIB)
 
-verify: tools/checkbits.sh
-	@tools/checkbits.sh && echo "headers are ok!"
+verify: echo tools/checkbits.sh
+	@./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"
 
 test:	$(PGMS) echo cols verify
 	@for x in tests/*.t; do \

VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

generate.c

@@ -641,7 +641,10 @@ linkylinky(int image, MMIOT *f)
 	else {
 	    int goodlink, implicit_mark = mmiottell(f);
 
-	    if ( eatspace(f) == '[' ) {
+	    if ( isspace(peek(f,1)) )
+		pull(f);
+	    
+	    if ( peek(f,1) == '[' ) {
 		pull(f);	/* consume leading '[' */
 		goodlink = linkylabel(f, &key.tag);
 	    }
@@ -1242,6 +1245,14 @@ text(MMIOT *f)
 				break;
 		    case '<':   Qstring("&lt;", f);
 				break;
+		    case '^':   if ( f->flags & (MKD_STRICT|MKD_NOSUPERSCRIPT) ) {
+				    Qchar('\\', f);
+				    shift(f,-1);
+				    break;
+				}
+				Qchar(c, f);
+				break;
+				
 		    case '>': case '#': case '.': case '-':
 		    case '+': case '{': case '}': case ']':
 		    case '!': case '[': case '*': case '_':

tests/linkylinky.t

@@ -106,5 +106,17 @@ try '[text] (text) not a link' \
 '[test] (me)' \
 '<p>[test] (me)</p>'
 
+try '[test] [this] w/ one space between' \
+'[test] [this]
+[test]: yay!
+[this]: nay!' \
+'<p><a href="nay!">test</a></p>'
+
+try '[test] [this] w/ two spaces between' \
+'[test]  [this]
+[test]: yay!
+[this]: nay!' \
+'<p><a href="yay!">test</a>  <a href="nay!">this</a></p>'
+
 summary $0
 exit $rc