Merge pull request #349 from cmmp/master

Work on inline latex numeric input using different decimal separators; closes #348
yihui · Jul 24, 2012 · ceaa141 · ceaa141
2 parents 68e8345 + 7723b22
commit ceaa141
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/R/header.R b/R/header.R
@@ -13,6 +13,7 @@ insert_header = function(doc) {
 make_header_latex = function() {
   h = paste(c(
     '\\usepackage{graphicx, color}', .header.maxwidth, opts_knit$get('header'),
+    if(getOption('OutDec') != '.') '\\usepackage{amsmath}',
     if (out_format('latex')) {
       if (opts_knit$get('use.highlight')) highlight_fun('boxes_latex')() else '\\usepackage{alltt}'
     }

diff --git a/R/hooks-latex.R b/R/hooks-latex.R
@@ -129,7 +129,13 @@ hook_plot_tex = function(x, options) {
 
 ## inline hook for tex
 .inline.hook.tex = function(x) {
-  if (is.numeric(x)) x = format_sci(x, 'latex')
+  if(is.numeric(x)) {
+    if(getOption('OutDec') != '.') {
+      if(!inherits(x, 'AsIs')) x = sprintf('\\text{%s}', format_sci(x, 'latex'))
+    } else {
+      x = format_sci(x, 'latex')
+    }
+  }
   .inline.hook(x)
 }
 # an example of a chunk hook