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

Revert Pkg.dir

pull/55/head
Matti Pastell 2016-10-30 21:16:12 +02:00
parent b7908bc2ea
commit d50770abe1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pandoc.jl
View File

@ -6,8 +6,8 @@
Convert output from pandoc markdown to html using Weave.jl template
"""
function pandoc2html(formatted::AbstractString, doc::WeaveDoc, outname::AbstractString)
html_template = joinpath(dirname(@__FILE__), "../templates/pandoc_skeleton.html")
css_template = joinpath(dirname(@__FILE__), "../templates/pandoc_skeleton.css")
html_template = joinpath(Pkg.dir("Weave"), "templates/pandoc_skeleton.html")
css_template = joinpath(Pkg.dir("Weave"), "templates/pandoc_skeleton.css")
path, wsource = splitdir(abspath(doc.source))
wversion = string(Pkg.installed("Weave"))
@ -43,7 +43,7 @@ Convert output from pandoc markdown to pdf using Weave.jl template
"""
function pandoc2pdf(formatted::AbstractString, doc::WeaveDoc, outname::AbstractString)
header_template = joinpath(dirname(@__FILE__), "../templates/pandoc_header.txt")
header_template = joinpath(Pkg.dir("Weave"), "templates/pandoc_header.txt")
path, wsource = splitdir(abspath(doc.source))
wversion = string(Pkg.installed("Weave"))

8
src/run.jl
View File

@ -279,16 +279,16 @@ function init_plotting(plotlib)
l_plotlib = lowercase(plotlib)
rcParams[:chunk_defaults][:fig] = true
if l_plotlib == "winston"
include("winston.jl")
eval(parse("""include(Pkg.dir("Weave","src","winston.jl"))"""))
rcParams[:plotlib] = "Winston"
elseif l_plotlib == "pyplot"
include("pyplot.jl")
eval(parse("""include(Pkg.dir("Weave","src","pyplot.jl"))"""))
rcParams[:plotlib] = "PyPlot"
elseif l_plotlib == "plots"
include("plots.jl")
eval(parse("""include(Pkg.dir("Weave","src","plots.jl"))"""))
rcParams[:plotlib] = "Plots"
elseif l_plotlib == "gadfly"
include("gadfly.jl")
eval(parse("""include(Pkg.dir("Weave","src","gadfly.jl"))"""))
rcParams[:plotlib] = "Gadfly"
end
end