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

Remove compat macros

pull/66/head
Matti Pastell 2016-11-03 10:41:29 +02:00
parent afb9fabef3
commit 56e92c648c
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Weave.jl
View File

@ -1,5 +1,5 @@
module Weave
using Compat
#using Compat
"""

2
src/config.jl
View File

@ -2,7 +2,7 @@
#Default options
const defaultParams =
@compat Dict{Symbol,Any}(:plotlib => nothing,
Dict{Symbol,Any}(:plotlib => nothing,
:plotlib_set => false,
:storeresults => false,
:doc_number => 0,

20
src/formatters.jl
View File

@ -142,7 +142,7 @@ type Tex
end
const tex = Tex("Latex with custom code environments",
@compat Dict{Symbol,Any}(:codestart => "\\begin{juliacode}",
Dict{Symbol,Any}(:codestart => "\\begin{juliacode}",
:codeend => "\\end{juliacode}",
:outputstart => "\\begin{juliaout}",
:outputend => "\\end{juliaout}",
@ -158,7 +158,7 @@ const tex = Tex("Latex with custom code environments",
))
const texminted = Tex("Latex using minted for highlighting",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "\\begin{minted}[mathescape, fontsize=\\small, xleftmargin=0.5em]{julia}",
:codeend => "\\end{minted}",
:outputstart => "\\begin{minted}[fontsize=\\small, xleftmargin=0.5em, mathescape, frame = leftline]{text}",
@ -181,7 +181,7 @@ end
const pandoc = Pandoc("Pandoc markdown",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "~~~~{.julia}",
:codeend=>"~~~~~~~~~~~~~\n\n",
:outputstart=>"~~~~",
@ -196,7 +196,7 @@ const pandoc = Pandoc("Pandoc markdown",
const md2html = Pandoc("Markdown to HTML (requires Pandoc)",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "````julia",
:codeend=> "````\n\n",
:outputstart=> "````",
@ -208,7 +208,7 @@ const md2html = Pandoc("Markdown to HTML (requires Pandoc)",
:doctype=> "md2html"))
const md2pdf = Pandoc("Markdown to pdf (requires Pandoc and xelatex)",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "````julia",
:codeend=> "````\n\n",
:outputstart=> "````",
@ -227,7 +227,7 @@ type Markdown
end
const github = Markdown("Github markdown",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "````julia",
:codeend=> "````\n\n",
:outputstart=> "````",
@ -243,7 +243,7 @@ type MultiMarkdown
end
const multimarkdown = MultiMarkdown("MultiMarkdown",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "````julia",
:codeend=> "````\n\n",
:outputstart=> "````",
@ -260,7 +260,7 @@ type Rest
end
const rst = Rest("reStructuredText and Sphinx",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => ".. code-block:: julia\n",
:codeend => "\n\n",
:outputstart => "::\n",
@ -279,7 +279,7 @@ end
#asciidoc -b html5 -a source-highlighter=pygments ...
const adoc = AsciiDoc("AsciiDoc",
@compat Dict{Symbol,Any}(
Dict{Symbol,Any}(
:codestart => "[source,julia]\n--------------------------------------",
:codeend => "--------------------------------------\n\n",
:outputstart => "--------------------------------------",
@ -476,7 +476,7 @@ end
#Add new supported formats here
const formats = @compat Dict{AbstractString, Any}("tex" => tex,
const formats = Dict{AbstractString, Any}("tex" => tex,
"texminted" => texminted,
"pandoc" => pandoc,
"md2html" => md2html,

8
src/readers.jl
View File

@ -39,7 +39,7 @@ end
"""Read and parse input document"""
function read_doc(source::AbstractString, format=:auto)
format == :auto && (format = detect_informat(source))
document = @compat readstring(source)
document = readstring(source)
parsed = parse_doc(document, format)
doc = WeaveDoc(source, parsed)
end
@ -85,7 +85,7 @@ function parse_doc(document::AbstractString, format::MarkupInput)
#options = merge(rcParams[:chunk_defaults], options)
#@show options
chunk = DocChunk(content, docno, start_line)
#chunk = @compat Dict{Symbol,Any}(:type => "doc", :content => content,
#chunk = Dict{Symbol,Any}(:type => "doc", :content => content,
# :number => docno,:start_line => start_line)
docno += 1
start_line = lineno
@ -96,7 +96,7 @@ function parse_doc(document::AbstractString, format::MarkupInput)
if ismatch(codeend, line) && state=="code"
chunk = CodeChunk(content, codeno, start_line, optionString, options)
#chunk = @compat Dict{Symbol,Any}(:type => "code", :content => content,
#chunk = Dict{Symbol,Any}(:type => "code", :content => content,
# :number => codeno, :options => options,
# :optionAbstractString => optionAbstractString,
# :start_line => start_line)
@ -119,7 +119,7 @@ function parse_doc(document::AbstractString, format::MarkupInput)
#Remember the last chunk
if strip(content) != ""
chunk = DocChunk(content, docno, start_line)
#chunk = @compat Dict{Symbol,Any}(:type => "doc", :content => content,
#chunk = Dict{Symbol,Any}(:type => "doc", :content => content,
# :number => docno, :start_line => start_line)
push!(parsed, chunk)
end