add a new chunk option fig.env to set the figure environment; fixed #364

yihui · Aug 22, 2012 · b1bd23c · b1bd23c
1 parent a2d2d64
commit b1bd23c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/R/defaults.R b/R/defaults.R
@@ -41,7 +41,7 @@ opts_chunk = new_defaults(list(
   fig.keep = 'high', fig.show = 'asis', fig.align = 'default',
   fig.path = 'figure/', fig.ext = NULL, dev = 'pdf', dpi = 72,
   dev.args = NULL, fig.width = 7, fig.height = 7,
-  fig.cap = NULL, fig.scap = NULL, fig.lp = 'fig:', fig.pos = '',
+  fig.env = 'figure', fig.cap = NULL, fig.scap = NULL, fig.lp = 'fig:', fig.pos = '',
   out.width = NULL, out.height = NULL, out.extra = NULL,
   resize.width = NULL, resize.height = NULL,
   external = TRUE, sanitize = FALSE,

diff --git a/R/hooks-latex.R b/R/hooks-latex.R
@@ -71,13 +71,13 @@ hook_plot_tex = function(x, options) {
   }
   if(length(cap) && !is.na(cap)) {
     if (plot1) {
-      fig1 = sprintf('\\begin{figure}[%s]\n', options$fig.pos)
+      fig1 = sprintf('\\begin{%s}[%s]\n', options$fig.env, options$fig.pos)
     }
     if (plot2) {
       lab = str_c(options$fig.lp, options$label, ifelse(mcap, fig.cur, ''))
       if (is.null(scap)) scap = str_split(cap, '\\.|;|:')[[1L]][1L]
       scap = if(is.na(scap)) '' else str_c('[', scap, ']')
-      fig2 = sprintf('\\caption%s{%s\\label{%s}}\n\\end{figure}\n', scap, cap, lab)
+      fig2 = sprintf('\\caption%s{%s\\label{%s}}\n\\end{%s}\n', scap, cap, lab, options$fig.env)
     }
   }