bluecloth 2.0.7 → 2.0.9

data/ext/cstring.h

@@ -10,7 +10,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "amalloc.h"
+#ifndef __WITHOUT_AMALLOC
+# include "amalloc.h"
+#endif
 
 /* expandable Pascal-style string.
  */

data/ext/emmatch.c

@@ -0,0 +1,188 @@
+/* markdown: a C implementation of John Gruber's Markdown markup language.
+ *
+ * Copyright (C) 2010 David L Parsons.
+ * The redistribution terms are provided in the COPYRIGHT file that must
+ * be distributed with this source code.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "config.h"
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+/* emmatch: the emphasis mangler that's run after a block
+ *          of html has been generated.
+ *
+ *          It should create MarkdownTest_1.0 (and _1.0.3)
+ *          compatable emphasis for non-pathological cases
+ *          and it should fail in a standards-compliant way
+ *          when someone attempts to feed it junk.
+ *
+ *          Emmatching is done after the input has been 
+ *          processed into a STRING (f->Q) of text and
+ *          emphasis blocks.   After ___mkd_emblock() finishes,
+ *          it truncates f->Q and leaves the rendered paragraph
+ *          if f->out.
+ */
+
+
+/* empair() -- find the NEAREST matching emphasis token (or
+ *             subtoken of a 3+ long emphasis token.
+ */
+static int
+empair(MMIOT *f, int first, int last, int match)
+{
+    
+    int i;
+    block *begin, *p;
+
+    begin = &T(f->Q)[first];
+
+    for (i=first+1; i <= last; i++) {
+	p = &T(f->Q)[i];
+
+	if ( (p->b_type != bTEXT) && (p->b_count <= 0) )
+	    continue; /* break? */
+	
+	if ( p->b_type == begin->b_type ) {
+	    if ( p->b_count == match )	/* exact match */
+		return i;
+
+	    if ( p->b_count > 2 )	/* fuzzy match */
+		return i;
+	}
+    }
+    return 0;
+} /* empair */
+
+
+/* emfill() -- if an emphasis token has leftover stars or underscores,
+ *             convert them back into character and append them to b_text.
+ */
+static void
+emfill(block *p)
+{
+    int j;
+
+    if ( p->b_type == bTEXT )
+	return;
+	
+    for (j=0; j < p->b_count; j++)
+	  EXPAND(p->b_text) = p->b_char;
+    p->b_count = 0;
+} /* emfill */
+
+
+static void
+emclose(MMIOT *f, int first, int last)
+{
+    int j;
+
+    for (j=first+1; j<last-1; j++)
+	emfill(&T(f->Q)[j]);
+}
+
+
+static struct emtags {
+    char open[10];
+    char close[10];
+    int size;
+} emtags[] = {  { "<em>" , "</em>", 5 }, { "<strong>", "</strong>", 9 } };
+
+
+static void emblock(MMIOT*,int,int);
+
+
+/* emmatch() -- match emphasis for a single emphasis token.
+ */
+static void
+emmatch(MMIOT *f, int first, int last)
+{
+    block *start = &T(f->Q)[first];
+    int e, e2, match;
+
+    switch (start->b_count) {
+    case 2: if ( e = empair(f,first,last,match=2) )
+		break;
+    case 1: e = empair(f,first,last,match=1);
+	    break;
+    case 0: return;
+    default:
+	    e = empair(f,first,last,1);
+	    e2= empair(f,first,last,2);
+
+	    if ( e2 >= e ) {
+		e = e2;
+		match = 2;
+	    } 
+	    else
+		match = 1;
+	    break;
+    }
+
+    if ( e ) {
+	/* if we found emphasis to match, match it, recursively call
+	 * emblock to match emphasis inside the new html block, add
+	 * the emphasis markers for the block, then (tail) recursively
+	 * call ourself to match any remaining emphasis on this token.
+	 */
+	block *end = &T(f->Q)[e];
+
+	end->b_count -= match;
+	start->b_count -= match;
+
+	emblock(f, first, e);
+
+	PREFIX(start->b_text, emtags[match-1].open, emtags[match-1].size-1);
+	SUFFIX(end->b_post, emtags[match-1].close, emtags[match-1].size);
+
+	emmatch(f, first, last);
+    }
+} /* emmatch */
+
+
+/* emblock() -- walk a blocklist, attempting to match emphasis
+ */
+static void
+emblock(MMIOT *f, int first, int last)
+{
+    int i;
+    
+    for ( i = first; i <= last; i++ )
+	if ( T(f->Q)[i].b_type != bTEXT )
+	    emmatch(f, i, last);
+    emclose(f, first, last);
+} /* emblock */
+
+
+/* ___mkd_emblock() -- emblock a string of blocks, then concatinate the
+ *                     resulting text onto f->out.
+ */
+void
+___mkd_emblock(MMIOT *f)
+{
+    int i;
+    block *p;
+
+    emblock(f, 0, S(f->Q)-1);
+    
+    for (i=0; i < S(f->Q); i++) {
+	p = &T(f->Q)[i];
+	emfill(p);
+	
+	if ( S(p->b_post) ) { SUFFIX(f->out, T(p->b_post), S(p->b_post));
+			      DELETE(p->b_post); }
+	if ( S(p->b_text) ) { SUFFIX(f->out, T(p->b_text), S(p->b_text));
+			      DELETE(p->b_text); }
+    }
+    
+    S(f->Q) = 0;
+} /* ___mkd_emblock */

data/ext/generate.c

@@ -18,11 +18,9 @@
 #include "amalloc.h"
 
 typedef int (*stfu)(const void*,const void*);
-
+typedef void (*spanhandler)(MMIOT*,int);
 
 /* forward declarations */
-static int iscodeblock(MMIOT*);
-static void code(int, MMIOT*);
 static void text(MMIOT *f);
 static Paragraph *display(Paragraph*, MMIOT*);
 
@@ -182,118 +180,6 @@ Qem(MMIOT *f, char c, int count)
 }
 
 
-/* empair()
- */
-static int
-empair(MMIOT *f, int go, int level)
-{
-    
-    int i;
-    block *begin, *p;
-
-    begin = &T(f->Q)[go];
-    for (i=go+1; i < S(f->Q); i++) {
-	p = &T(f->Q)[i];
-
-	if ( (p->b_type != bTEXT) && (p->b_count <= 0) )
-	    break;
-	
-	if ( p->b_type == begin->b_type ) {
-	    if ( p->b_count == level )	/* exact match */
-		return i-go;
-
-	    if ( p->b_count > 2 )	/* fuzzy match */
-		return i-go;
-	}
-    }
-    return EOF;
-}
-
-
-
-static struct emtags {
-    char open[10];
-    char close[10];
-    int size;
-} emtags[] = {  { "<em>" , "</em>", 5 }, { "<strong>", "</strong>", 9 } };
-
-
-static void
-emclose(Cstring *s, int level)
-{
-    PREFIX(*s, emtags[level-1].close, emtags[level-1].size);
-}
-
-
-static void
-emopen(Cstring *s, int level)
-{
-    SUFFIX(*s, emtags[level-1].open, emtags[level-1].size-1);
-}
-
-
-/* emmatch()
- */
-static void
-emmatch(MMIOT *f, int go)
-{
-    block *start = &T(f->Q)[go], *end;
-    int e, e2, i, match;
-
-    while ( start->b_count ) {
-	switch (start->b_count) {
-	case 2: e = empair(f,go,match=2);
-		if ( e != EOF ) break;
-	case 1: e = empair(f,go,match=1); break;
-	default:
-	    e = empair(f,go,1);
-	    e2= empair(f,go,2);
-
-	    if ( e == EOF || ((e2 != EOF) && (e2 >= e)) ) {
-		e = e2;
-		match = 2;
-	    } 
-	    else
-		match = 1;
-	}
-	if ( e != EOF ) {
-	    end = &T(f->Q)[go+e];
-	    emclose(&end->b_post, match);
-	    emopen(&start->b_text, match);
-	    end->b_count -= match;
-	}
-	else {
-	    for (i=0; i < match; i++)
-		EXPAND(start->b_text) = start->b_char;
-	}
-	
-	start->b_count -= match;
-    }
-}
-
-
-/* ___mkd_emblock()
- */
-void
-___mkd_emblock(MMIOT *f)
-{
-    int i;
-    block *p;
-
-    for (i=0; i < S(f->Q); i++) {
-	p = &T(f->Q)[i];
-	
-	if ( p->b_type != bTEXT ) emmatch(f, i);
-
-	if ( S(p->b_post) ) { SUFFIX(f->out, T(p->b_post), S(p->b_post));
-			      DELETE(p->b_post); }
-	if ( S(p->b_text) ) { SUFFIX(f->out, T(p->b_text), S(p->b_text));
-			      DELETE(p->b_text); }
-    }
-    S(f->Q) = 0;
-}
-
-
 /* generate html from a markup fragment
  */
 void
@@ -304,7 +190,7 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
     ___mkd_initmmiot(&sub, f->footnotes);
     
     sub.flags = f->flags | flags;
-    sub.base = f->base;
+    sub.cb = f->cb;
 
     push(bfr, size, &sub);
     EXPAND(sub.in) = 0;
@@ -345,6 +231,8 @@ puturl(char *s, int size, MMIOT *f, int display)
 	    Qstring("%22", f);
 	else if ( isalnum(c) || ispunct(c) || (display && isspace(c)) )
 	    Qchar(c, f);
+	else if ( c == 003 )	/* untokenize ^C */
+	    Qstring("  ", f);
 	else
 	    Qprintf(f, "%%%02X", c);
     }
@@ -374,12 +262,12 @@ parenthetical(int in, int out, MMIOT *f)
     for ( indent=1,size=0; indent; size++ ) {
 	if ( (c = pull(f)) == EOF )
 	    return EOF;
-	else if ( c == in )
-	    ++indent;
-	else if ( (c == '\\') && (peek(f,1) == out) ) {
+	else if ( (c == '\\') && (peek(f,1) == out || peek(f,1) == in) ) {
 	    ++size;
 	    pull(f);
 	}
+	else if ( c == in )
+	    ++indent;
 	else if ( c == out )
 	    --indent;
     }
@@ -512,27 +400,28 @@ linkyurl(MMIOT *f, int image, Footnote *p)
 
 /* prefixes for <automatic links>
  */
-static struct {
+static struct _protocol {
     char *name;
     int   nlen;
 } protocol[] = { 
 #define _aprotocol(x)	{ x, (sizeof x)-1 }
-    _aprotocol( "http://" ), 
     _aprotocol( "https://" ), 
-    _aprotocol( "ftp://" ), 
+    _aprotocol( "http://" ), 
     _aprotocol( "news://" ),
+    _aprotocol( "ftp://" ), 
 #undef _aprotocol
 };
 #define NRPROTOCOLS	(sizeof protocol / sizeof protocol[0])
 
 
 static int
-isautoprefix(char *text)
+isautoprefix(char *text, int size)
 {
     int i;
+    struct _protocol *p;
 
-    for (i=0; i < NRPROTOCOLS; i++)
-	if ( strncasecmp(text, protocol[i].name, protocol[i].nlen) == 0 )
+    for (i=0, p=protocol; i < NRPROTOCOLS; i++, p++)
+	if ( (size >= p->nlen) && strncasecmp(text, p->name, p->nlen) == 0 )
 	    return 1;
     return 0;
 }
@@ -569,9 +458,10 @@ static linkytype linkt  = { 0, 0, "<a href=\"", "\"",
  */
 static linkytype specials[] = {
     { "id:", 3, "<a id=\"", "\"", 0, ">", "</a>", 0, IS_URL },
-    { "class:", 6, "<span class=\"", "\"", 0, ">", "</span>", 0, 0 },
     { "raw:", 4, 0, 0, 0, 0, 0, DENY_HTML, 0 },
+    { "lang:", 5, "<span lang=\"", "\"", 0, ">", "</span>", 0, 0 },
     { "abbr:", 5, "<abbr title=\"", "\"", 0, ">", "</abbr>", 0, 0 },
+    { "class:", 6, "<span class=\"", "\"", 0, ">", "</span>", 0, 0 },
 } ;
 
 #define NR(x)	(sizeof x / sizeof x[0])
@@ -584,8 +474,7 @@ pseudo(Cstring t)
     int i;
     linkytype *r;
 
-    for ( i=0; i < NR(specials); i++ ) {
-	r = &specials[i];
+    for ( i=0, r=specials; i < NR(specials); i++,r++ ) {
 	if ( (S(t) > r->szpat) && (strncasecmp(T(t), r->pat, r->szpat) == 0) )
 	    return r;
     }
@@ -593,6 +482,36 @@ pseudo(Cstring t)
 }
 
 
+/* print out the start of an `img' or `a' tag, applying callbacks as needed.
+ */
+static void
+printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
+{
+    char *edit;
+    
+    Qstring(tag->link_pfx, f);
+	
+    if ( tag->kind & IS_URL ) {
+	if ( f->cb->e_url && (edit = (*f->cb->e_url)(link, size, f->cb->e_data)) ) {
+	    puturl(edit, strlen(edit), f, 0);
+	    if ( f->cb->e_free ) (*f->cb->e_free)(edit, f->cb->e_data);
+	}
+	else
+	    puturl(link + tag->szpat, size - tag->szpat, f, 0);
+    }
+    else
+	___mkd_reparse(link + tag->szpat, size - tag->szpat, INSIDE_TAG, f);
+
+    Qstring(tag->link_sfx, f);
+
+    if ( f->cb->e_flags && (edit = (*f->cb->e_flags)(link, size, f->cb->e_data)) ) {
+	Qchar(' ', f);
+	Qstring(edit, f);
+	if ( f->cb->e_free ) (*f->cb->e_free)(edit, f->cb->e_data);
+    }
+} /* printlinkyref */
+
+
 /* print out a linky (or fail if it's Not Allowed)
  */
 static int
@@ -608,11 +527,11 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
     }
     else if ( (f->flags & SAFELINK) && T(ref->link)
 				    && (T(ref->link)[0] != '/')
-				    && !isautoprefix(T(ref->link)) )
+				    && !isautoprefix(T(ref->link), S(ref->link)) )
 	/* if SAFELINK, only accept links that are local or
 	 * a well-known protocol
 	 */
-	    return 0;
+	return 0;
     else
 	tag = &linkt;
 
@@ -620,21 +539,11 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
 	return 0;
 
     if ( tag->link_pfx ) {
-	Qstring(tag->link_pfx, f);
-	
-	if ( tag->kind & IS_URL ) {
-	    if ( f->base && T(ref->link) && (T(ref->link)[tag->szpat] == '/') )
-		puturl(f->base, strlen(f->base), f, 0);
-	    puturl(T(ref->link) + tag->szpat, S(ref->link) - tag->szpat, f, 0);
-	}
-	else
-	    ___mkd_reparse(T(ref->link) + tag->szpat, S(ref->link) - tag->szpat, INSIDE_TAG, f);
-	
-	Qstring(tag->link_sfx, f);
+	printlinkyref(f, tag, T(ref->link), S(ref->link));
 
-	if ( tag->WxH) {
-	    if ( ref->height) Qprintf(f," height=\"%d\"", ref->height);
-	    if ( ref->width) Qprintf(f, " width=\"%d\"", ref->width);
+	if ( tag->WxH ) {
+	    if ( ref->height ) Qprintf(f," height=\"%d\"", ref->height);
+	    if ( ref->width ) Qprintf(f, " width=\"%d\"", ref->width);
 	}
 
 	if ( S(ref->title) ) {
@@ -677,7 +586,7 @@ linkylinky(int image, MMIOT *f)
 	}
 	else {
 	    int goodlink, implicit_mark = mmiottell(f);
-	
+
 	    if ( eatspace(f) == '[' ) {
 		pull(f);	/* consume leading '[' */
 		goodlink = linkylabel(f, &key.tag);
@@ -742,6 +651,98 @@ mangle(char *s, int len, MMIOT *f)
 }
 
 
+/* nrticks() -- count up a row of tick marks
+ */
+static int
+nrticks(int offset, int tickchar, MMIOT *f)
+{
+    int  tick = 0;
+
+    while ( peek(f, offset+tick) == tickchar ) tick++;
+
+    return tick;
+} /* nrticks */
+
+
+/* matchticks() -- match a certain # of ticks, and if that fails
+ *                 match the largest subset of those ticks.
+ *
+ *                 if a subset was matched, return the # of ticks
+ *		   that were matched.
+ */
+static int
+matchticks(MMIOT *f, int tickchar, int ticks, int *endticks)
+{
+    int size, count, c;
+    int subsize=0, subtick=0;
+    
+    *endticks = ticks;
+    for (size = 0; (c=peek(f,size+ticks)) != EOF; size ++) {
+	if ( (c == tickchar) && ( count = nrticks(size+ticks,tickchar,f)) ) {
+	    if ( count == ticks )
+		return size;
+	    else if ( count ) {
+		if ( (count > subtick) && (count < ticks) ) {
+		    subsize = size;
+		    subtick = count;
+		}
+		size += count;
+	    }
+	}
+    }
+    if ( subsize ) {
+	*endticks = subtick;
+	return subsize;
+    }
+    return 0;
+} /* matchticks */
+
+
+/* code() -- write a string out as code. The only characters that have
+ *           special meaning in a code block are * `<' and `&' , which
+ *           are /always/ expanded to &lt; and &amp;
+ */
+static void
+code(MMIOT *f, char *s, int length)
+{
+    int i,c;
+
+    for ( i=0; i < length; i++ )
+	if ( (c = s[i]) == 003)  /* ^C: expand back to 2 spaces */
+	    Qstring("  ", f);
+	else
+	    cputc(c, f);
+} /* code */
+
+
+/*  delspan() -- write out a chunk of text, blocking with <del>...</del>
+ */
+static void
+delspan(MMIOT *f, int size)
+{
+    Qstring("<del>", f);
+    ___mkd_reparse(cursor(f)-1, size, 0, f);
+    Qstring("</del>", f);
+}
+
+
+/*  codespan() -- write out a chunk of text as code, trimming one
+ *                space off the front and/or back as appropriate.
+ */
+static void
+codespan(MMIOT *f, int size)
+{
+    int i=0;
+
+    if ( size > 1 && peek(f, size-1) == ' ' ) --size;
+    if ( peek(f,i) == ' ' ) ++i, --size;
+    
+    Qstring("<code>", f);
+    code(f, cursor(f)+(i-1), size);
+    Qstring("</code>", f);
+} /* codespan */
+
+
 /* before letting a tag through, validate against
  * DENY_A and DENY_IMG
  */
@@ -826,10 +827,9 @@ process_possible_link(MMIOT *f, int size)
 	Qstring("</a>", f);
 	return 1;
     }
-    else if ( isautoprefix(text) ) {
-	Qstring("<a href=\"", f);
-	puturl(text,size,f, 0);
-	Qstring("\">", f);
+    else if ( isautoprefix(text, size) ) {
+	printlinkyref(f, &linkt, text, size);
+	Qchar('>', f);
 	puturl(text,size,f, 1);
 	Qstring("</a>", f);
 	return 1;
@@ -879,7 +879,10 @@ maybe_tag_or_link(MMIOT *f)
 		else
 		    size++;
 	    
-	    Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
+	    if ( forbidden_tag(f) )
+		return 0;
+
+	    Qchar('<', f);
 	    while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
 		Qchar(pull(f), f);
 	    return 1;
@@ -981,6 +984,11 @@ static struct smarties {
 } smarties[] = {
     { '\'', "'s>",      "rsquo",  0 },
     { '\'', "'t>",      "rsquo",  0 },
+    { '\'', "'re>",     "rsquo",  0 },
+    { '\'', "'ll>",     "rsquo",  0 },
+    { '\'', "'ve>",     "rsquo",  0 },
+    { '\'', "'m>",      "rsquo",  0 },
+    { '\'', "'d>",      "rsquo",  0 },
     { '-',  "--",       "mdash",  1 },
     { '-',  "<->",      "ndash",  0 },
     { '.',  "...",      "hellip", 2 },
@@ -1049,6 +1057,30 @@ smartypants(int c, int *flags, MMIOT *f)
 } /* smartypants */
 
 
+/* process a body of text encased in some sort of tick marks.   If it
+ * works, generate the output and return 1, otherwise just return 0 and
+ * let the caller figure it out.
+ */
+static int
+tickhandler(MMIOT *f, int tickchar, int minticks, spanhandler spanner)
+{
+    int endticks, size;
+    int tick = nrticks(0, tickchar, f);
+
+    if ( (tick >= minticks) && (size = matchticks(f,tickchar,tick,&endticks)) ) {
+	if ( endticks < tick ) {
+	    size += (tick - endticks);
+	    tick = endticks;
+	}
+
+	shift(f, tick);
+	(*spanner)(f,size);
+	shift(f, size+tick-1);
+	return 1;
+    }
+    return 0;
+}
+
 #define tag_text(f)	(f->flags & INSIDE_TAG)
 
 
@@ -1060,7 +1092,7 @@ text(MMIOT *f)
     int smartyflags = 0;
 
     while (1) {
-        if ( (f->flags & AUTOLINK) && isalpha(peek(f,1)) )
+        if ( (f->flags & AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) )
 	    maybe_autolink(f);
 
         c = pull(f);
@@ -1073,7 +1105,7 @@ text(MMIOT *f)
 	switch (c) {
 	case 0:     break;
 
-	case 3:     Qstring("<br/>", f);
+	case 3:     Qstring(tag_text(f) ? "  " : "<br/>", f);
 		    break;
 
 	case '>':   if ( tag_text(f) )
@@ -1126,16 +1158,13 @@ text(MMIOT *f)
 		    }
 #endif
 	case '*':
-#if RELAXED_EMPHASIS
 	/* Underscores & stars don't count if they're out in the middle
 	 * of whitespace */
-		    if ( !(f->flags & STRICT) && isthisspace(f,-1)
-					      && isthisspace(f,1) ) {
+		    if ( isthisspace(f,-1) && isthisspace(f,1) ) {
 			Qchar(c, f);
 			break;
 		    }
 		    /* else fall into the regular old emphasis case */
-#endif
 		    if ( tag_text(f) )
 			Qchar(c, f);
 		    else {
@@ -1145,18 +1174,12 @@ text(MMIOT *f)
 		    }
 		    break;
 	
-	case '`':   if ( tag_text(f) || !iscodeblock(f) )
+	case '~':   if ( (f->flags & (NOSTRIKETHROUGH|INSIDE_TAG|STRICT)) || !tickhandler(f,c,2,delspan) )
+			Qchar(c, f);
+		    break;
+
+	case '`':   if ( tag_text(f) || !tickhandler(f,c,1,codespan) )
 			Qchar(c, f);
-		    else {
-			Qstring("<code>", f);
-			if ( peek(f, 1) == '`' ) {
-			    pull(f);
-			    code(2, f);
-			}
-			else
-			    code(1, f);
-			Qstring("</code>", f);
-		    }
 		    break;
 
 	case '\\':  switch ( c = pull(f) ) {
@@ -1164,11 +1187,10 @@ text(MMIOT *f)
 				break;
 		    case '<':   Qstring("&lt;", f);
 				break;
-		    case '\\':
 		    case '>': case '#': case '.': case '-':
 		    case '+': case '{': case '}': case ']':
-		    case '(': case ')': case '"': case '\'':
 		    case '!': case '[': case '*': case '_':
+		    case '\\':case '(': case ')':
 		    case '`':	Qchar(c, f);
 				break;
 		    default:
@@ -1202,74 +1224,6 @@ text(MMIOT *f)
 } /* text */
 
 
-static int
-iscodeblock(MMIOT *f)
-{
-    int i=1, single = 1, c;
-    
-    if ( peek(f,i) == '`' ) {
-	single=0;
-	i++;
-    }
-    while ( (c=peek(f,i)) != EOF ) {
-	if ( (c == '`') && (single || peek(f,i+1) == '`') )
-	    return 1;
-	else if ( c == '\\' )
-	    i++;
-	i++;
-    }
-    return 0;
-    
-}
-
-static int
-endofcode(int escape, int offset, MMIOT *f)
-{
-    switch (escape) {
-    case 2: if ( peek(f, offset+1) == '`' ) {
-		shift(f,1);
-    case 1:     shift(f,offset);
-		return 1;
-	    }
-    default:return 0;
-    }
-}
-
-
-/* the only characters that have special meaning in a code block are
- * `<' and `&' , which are /always/ expanded to &lt; and &amp;
- */
-static void
-code(int escape, MMIOT *f)
-{
-    int c;
-
-    if ( escape && (peek(f,1) == ' ') )
-	shift(f,1);
-
-    while ( (c = pull(f)) != EOF ) {
-	switch (c) {
-	case ' ':   if ( peek(f,1) == '`' && endofcode(escape, 1, f) )
-			return;
-		    Qchar(c, f);
-		    break;
-
-	case '`':   if ( endofcode(escape, 0, f) )
-			return;
-		    Qchar(c, f);
-		    break;
-
-	case '\\':  cputc(c, f);
-		    if ( peek(f,1) == '>' || (c = pull(f)) == EOF )
-			break;
-	
-	default:    cputc(c, f);
-		    break;
-	}
-    }
-} /* code */
-
-
 /* print a header block
  */
 static void
@@ -1328,6 +1282,7 @@ splat(Line *p, char *block, Istring align, int force, MMIOT *f)
     return colno;
 }
 
+
 static int
 printtable(Paragraph *pp, MMIOT *f)
 {
@@ -1392,13 +1347,14 @@ static int
 printblock(Paragraph *pp, MMIOT *f)
 {
     Line *t = pp->text;
-    static char *Begin[] = { "", "<p>", "<center>"  };
-    static char *End[]   = { "", "</p>","</center>" };
+    static char *Begin[] = { "", "<p>", "<p style=\"text-align:center;\">"  };
+    static char *End[]   = { "", "</p>","</p>" };
 
     while (t) {
 	if ( S(t->text) ) {
-	    if ( S(t->text) > 2 && T(t->text)[S(t->text)-2] == ' '
-				&& T(t->text)[S(t->text)-1] == ' ') {
+	    if ( t->next && S(t->text) > 2
+			 && T(t->text)[S(t->text)-2] == ' '
+			 && T(t->text)[S(t->text)-1] == ' ' ) {
 		push(T(t->text), S(t->text)-2, f);
 		push("\003\n", 2, f);
 	    }
@@ -1423,19 +1379,18 @@ printcode(Line *t, MMIOT *f)
 {
     int blanks;
 
-    for ( blanks = 0; t ; t = t->next )
+    Qstring("<pre><code>", f);
+    for ( blanks = 0; t ; t = t->next ) {
 	if ( S(t->text) > t->dle ) {
 	    while ( blanks ) {
-		push("\n", 1, f);
+		Qchar('\n', f);
 		--blanks;
 	    }
-	    push(T(t->text), S(t->text), f);
-	    push("\n", 1, f);
+	    code(f, T(t->text), S(t->text));
+	    Qchar('\n', f);
 	}
 	else blanks++;
-
-    Qstring("<pre><code>", f);
-    code(0, f);
+    }
     Qstring("</code></pre>", f);
 }