Merge pull request #49 from bobbybee/bugfix/italics-bold

Nested bold+italics; closes #43
alyssarosenzweig · Jun 7, 2015 · 92afc53 · 92afc53
2 parents fc3db25 + 98d8646
commit 92afc53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/test/test.up b/test/test.up
@@ -19,8 +19,8 @@ Some links..
 # Etymology
 
 ~ Likely comes from _Latin_
-~ Might also come from _Greek_
-~ Some even believe it originates from **German**
+~ Might also come from _**Greek**_
+~ Some even believe it originates from **_German_**
 
 ------------------
 # Purpose

diff --git a/uPresent.ne b/uPresent.ne
@@ -49,11 +49,15 @@ ln -> nophrase linecharacter:+ {%
 lphrase -> ln {% id %}
 	|  nphrase {% id %}
 
+lophrase -> ln {% id %}
+          | nphrase {% id %}
+          | _ {% function(d) { return "" } %}
+
 nophrase -> nphrase {% id %} | _ {% function() { return "" } %}
 
 nphrase -> lphrase [#] {% function(d) { return d[0]+d[1] } %}
-		| lphrase italics {% function(d) { return d[0]+d[1] } %}
-		| lphrase bold {% function(d) { return d[0]+d[1] } %}
+		| lophrase italics {% function(d) { return d[0]+d[1] } %}
+		| lophrase bold {% function(d) { return d[0]+d[1] } %}
 		| lphrase image {% function(d) { return d[0]+d[1] } %}
 		| lphrase [\-] {% function(d) { return d[0]+d[1] } %}
 		| lphrase [!] [^\[] {% function(d) { return d[0]+d[1]+d[2] } %}