mirrors
/
Weave.jl
mirror of https://github.com/mpastell/Weave.jl
1
0
Fork 0
Code Issues Releases Wiki Activity

Added out_height support to tex and pandoc figures

pull/44/head
= 2016-05-03 17:54:56 +03:00
parent 181869a663
commit 0698165193
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/formatters.jl
View File

@ -295,11 +295,17 @@ function formatfigures(chunk, docformat::Tex)
fignames = chunk.figures
caption = chunk.options[:fig_cap]
width = chunk.options[:out_width]
height = chunk.options[:out_height]
f_pos = chunk.options[:fig_pos]
f_env = chunk.options[:fig_env]
result = ""
figstring = ""
#Set size
attribs = ""
width == nothing || (attribs = "width=$width")
(attribs != "" && height != nothing ) && (attribs *= ",")
height == nothing || (attribs *= "height=$height")
if f_env != nothing
@ -308,10 +314,12 @@ function formatfigures(chunk, docformat::Tex)
for fig = fignames
if splitext(fig)[2] == ".tex" #Tikz figures
figstring *= "\\resizebox{$width}{!}{\\input{$fig}}\n"
else
figstring *= "\\includegraphics[width=$width]{$fig}\n"
figstring *= "\\includegraphics[$attribs]{$fig}\n"
end
end
@ -344,8 +352,13 @@ function formatfigures(chunk, docformat::Pandoc)
figstring = ""
attribs = ""
width = chunk.options[:out_width]
width == nothing || (attribs = "{width=$width}")
height = chunk.options[:out_height]
#Build figure attibutes
width == nothing || (attribs = "width=$width")
(attribs ≠ "" && height ≠ nothing ) && (attribs *= " ")
height == nothing || (attribs *= "height=$height")
attribs == "" || (attribs = "{$attribs}")
length(fignames) > 0 || (return "")
if caption != nothing