Index: library/lib/pp.tcl
===================================================================
diff -u -ra13fd7c36e88fae335636d8f9216036efb38e790 -r81dccb2818007e6a1ed9f2c17eb58e1b7ce07a5c
--- library/lib/pp.tcl	(.../pp.tcl)	(revision a13fd7c36e88fae335636d8f9216036efb38e790)
+++ library/lib/pp.tcl	(.../pp.tcl)	(revision 81dccb2818007e6a1ed9f2c17eb58e1b7ce07a5c)
@@ -107,12 +107,14 @@
       Object
     } \\M|\\m]\\M)
 
-    set :re(placeholder) {([/?][-a-zA-Z0-9:]+[/?])}
+    set :re(placeholder1) {([/][a-zA-Z0-9:]+?[/])}
+    set :re(placeholder2) {([?][^ ][-a-zA-Z0-9: .]+?[?])}
 
     :public method flush {} {
       set html [string map [list & {&amp;} < {&lt;} > {&gt;}] ${:text}]
       regsub -all [set :re(keyword)] $html {<span class='nx-keyword'>\1</span>} html
-      regsub -all [set :re(placeholder)] $html {<span class='nx-placeholder'>\1</span>} html
+      regsub -all [set :re(placeholder1)] $html {<span class='nx-placeholder'>\1</span>} html
+      regsub -all [set :re(placeholder2)] $html {<span class='nx-placeholder'>\1</span>} html
       nx::pp puts -nonewline [:cssWrap $html]
       set :text ""
     }