close #81: allow , and . in sub/superscripts

Author: yihui

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: litedown
 Type: Package
 Title: A Lightweight Version of R Markdown
-Version: 0.6.4
+Version: 0.6.5
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0003-0645-5666", URL = "https://yihui.org")),
     person("Tim", "Taylor", role = "ctb", comment = c(ORCID = "0000-0002-8587-7113")),

NEWS.md

@@ -2,6 +2,8 @@
 
 - `pkg_manual()` will exclude help pages with the keyword `internal` (thanks, @TimTaylor, #78).
 
+- Allow `,` and `.` in superscripts and subscripts (thanks, @janlisec, #81).
+
 - Fixed a bug that inline code expressions (`` `{lang} expr` ``) cannot be correctly located when the line has leading spaces that are not meaningful.
 
 # CHANGES IN litedown VERSION 0.6

R/mark.R

@@ -158,7 +158,7 @@ mark = function(input, output = NULL, text = NULL, options = NULL, meta = list()
   })
   # superscript and subscript; for now, we allow only characters alnum|*|(|) for
   # script text but can consider changing this rule upon users' request
-  r2 = '(?<!`)\\^([[:alnum:]*()]+?)\\^(?!`)'
+  r2 = '(?<!`)\\^([[:alnum:]*(),.]+?)\\^(?!`)'
   if (has_sup <- test_feature('superscript', r2)) {
     id2 = id_string(text)
     find_prose()
@@ -168,7 +168,7 @@ mark = function(input, output = NULL, text = NULL, options = NULL, meta = list()
       sprintf('!%s!', x)
     })
   }
-  r3 = '(?<![~`[:space:]])~([[:alnum:]*()]+?)~(?!`)'
+  r3 = '(?<![~`[:space:]])~([[:alnum:]*(),.]+?)~(?!`)'
   if (has_sub <- test_feature('subscript', r3)) {
     id3 = id_string(text)
     find_prose()

inst/examples/render-options.R

@@ -60,10 +60,11 @@ mark("~~awesome~~")
 mark("~~awesome~~", options = "-strikethrough")
 
 # superscript and subscript examples
-mark("2^10^")
-mark("2^10^", options = "-superscript")
+mark("2^10.5^")
+mark("2^10.5^", options = "-superscript")
 mark("H~2~O")
 mark("H~2~O", options = "-subscript")
+mark("X~i,j~")
 
 # code blocks
 mark('```r\n1 + 1;\n```')

tests/tests.Rout.save

@@ -140,18 +140,21 @@ b</span></p>
 > mark("~~awesome~~", options = "-strikethrough")
 <p>~~awesome~~</p>
 
-> mark("2^10^")
-<p>2<sup>10</sup></p>
+> mark("2^10.5^")
+<p>2<sup>10.5</sup></p>
 
-> mark("2^10^", options = "-superscript")
-<p>2^10^</p>
+> mark("2^10.5^", options = "-superscript")
+<p>2^10.5^</p>
 
 > mark("H~2~O")
 <p>H<sub>2</sub>O</p>
 
 > mark("H~2~O", options = "-subscript")
 <p>H~2~O</p>
 
+> mark("X~i,j~")
+<p>X<sub>i,j</sub></p>
+
 > mark("```r\n1 + 1;\n```")
 <pre><code class="language-r">1 + 1;
 </code></pre>