[bring markup closer to wikicreole draft spec
raph.levien@gmail.com**20061228005139] {
hunk ./barghest.py 275
-def userlink(ctx, uname):
+def userlink(ctx, uname, body = None):
hunk ./barghest.py 281
-	return '<a class="user" href="' + ctx.urlbase + 'user/' + uname + '">' + htmlquote(realname) + '</a>'
+	if body == None:
+	    body = realname
+	return '<a class="user" href="' + ctx.urlbase + 'user/' + uname + '">' + htmlquote(body) + '</a>'
hunk ./barghest.py 321
-def wikihref(ctx, page):
+# Determine URL for given wiki resource
+def wikiurl(ctx, page):
hunk ./barghest.py 330
-    url_re = re.compile(r'^([a-z\+]*://\S+)(\s(.+))?')
-    m = url_re.match(str)
-    if m:
-	if m.group(3):
-	    text = m.group(3)
-	else:
-	    text = m.group(1)
-	return '<a href="' + m.group(1) + '">' + htmlquote(text) + '</a>'
-    if re.match('user/', str):
-	return userlink(ctx, str[5:])
-    if exists or (exists == None and wikiexists(ctx, str)):
-	pref = '<a class="wiki" '
+    linkl = str.split('|', 1)
+    if len(linkl) == 2:
+	link, body = linkl
hunk ./barghest.py 334
-	pref = '<a class="new" '
-    if str == '':
-	textstr = 'wiki home page'
+	link, = linkl
+	body = None
+    aclass = ''
+    if re.match(r'[a-z\+]*://', link):
+	url = link
+    elif re.match('user/', str):
+	return userlink(ctx, str[5:], body)
hunk ./barghest.py 342
-	textstr = htmlquote(str)
-    return pref + 'href="' + wikihref(ctx, str) + '">' + textstr + '</a>'
+	if exists or (exists == None and wikiexists(ctx, str)):
+	    aclass = 'class="wiki" '
+	else:
+	    aclass = 'class="new" '
+	if str == '' and body == None:
+	    body = 'wiki home page'
+	url = wikiurl(ctx, link)
+    if body == None:
+	body = link
+    return '<a ' + aclass + 'href="' + url + '">' + htmlquote(body) + '</a>'
hunk ./barghest.py 371
-    head_re = re.compile(r'\s*(=+)\s*')
-    special_re = re.compile(r'[<>&\\]|--|(?<!\S)([#_\*]|\[\[?)(?=\S)')
+    head_re = re.compile(r'(={2,6})\s*')
+    special_re = re.compile(r'[<>&\\]|--|(?<!:)//|\*\*|(?<!\S)([#_\*]|\[\[?)(?=\S)')
hunk ./barghest.py 374
-    emphs = {'_': 'i', '*' : 'b'}
+    emphs = {'_': 'i', '*' : 'b', '//': 'em', '**': 'strong'}
hunk ./barghest.py 405
+	    if bullet_m:
+		m = bullet_re.match(line, pos)
+		if m:
+		    rpar.append('</li><li>')
+		    pos = m.end()
hunk ./barghest.py 440
-			if mend < len(line) and line[mend] in '\\_#[]*':
+			if mend < len(line) and line[mend] in '\\_#[]*-/':
hunk ./barghest.py 481
-    ctx.write(['<form id="theform" method="POST" action="' + wikihref(ctx, page) +
+    ctx.write(['<form id="theform" method="POST" action="' + wikiurl(ctx, page) +
hunk ./barghest.py 541
-	items.append('<a href="' + wikihref(ctx, page) + '?a=edit">Edit</a>')
+	items.append('<a href="' + wikiurl(ctx, page) + '?a=edit">Edit</a>')
}