Merge pull request andras-simonyi#123 from andras-simonyi/Allow_forma…

…tting_in_locators

Allow formatting in locators

citeproc-context.el

@@ -86,7 +86,7 @@ optional FORM can be nil, `short' or `long'."
 		  (sep (or (citeproc-term-text-from-terms "page-range-delimiter"
 							  (citeproc-context-terms context))
 			   "–")))
-	      (citeproc-prange-render var-val prange-format sep))
+	      (citeproc-rt-from-str (citeproc-prange-render var-val prange-format sep)))
 	  var-val)))))
 
 (defun citeproc-locator-label (context)

citeproc-name.el

@@ -409,7 +409,7 @@ contents."
 (defun citeproc--var-plural-p (var context)
   "Return whether the content of variable VAR is plural.
 VAR is a symbol."
-  (let ((content (citeproc-var-value var context)))
+  (let ((content (citeproc-rt-to-plain (citeproc-var-value var context))))
     (if (or (string= var "number-of-pages")
 	    (string= var "number-of-volumes"))
 	(> (string-to-number content) 1)

citeproc-rt.el

@@ -276,7 +276,8 @@ on any dominated branch for which PRED holds."
     ((sc . nil) . (font-variant . "small-caps"))
     ((sup . nil) . (vertical-align . "sup"))
     ((sub . nil) . (vertical-align . "sub"))
-    ((span . ((class . "nocase"))) . (nocase . t)))
+    ((span . ((class . "nocase"))) . (nocase . t))
+    ((span . ((class . "underline"))) . (text-decoration . "underline")))
   "A mapping from html tags and attrs to rich text attrs.")
 
 (defun citeproc-rt-from-html (h)