Merge branch 'master' of https://github.com/mpastell/Weave.jl into HEAD

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.5
+julia 0.6
 ArgParse
 JLD
 JSON

appveyor.yml

@@ -1,6 +1,6 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
 
 branches:
   only:
@@ -14,9 +14,10 @@ notifications:
     on_build_status_changed: false
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

src/writers.jl

@@ -65,8 +65,8 @@ function convert_doc(doc::WeaveDoc, format::NotebookOutput)
 
   kernelspec = Dict()
   kernelspec["language"] =  "julia"
-  kernelspec["name"] =  "julia-0.5"
-  kernelspec["display_name"] = "Julia 0.5.0"
+  kernelspec["name"] =  "julia-$(VERSION.major).$(VERSION.minor)"
+  kernelspec["display_name"] = "Julia $(VERSION.major).$(VERSION.minor).$(VERSION.patch)"
   metadata["kernelspec"] = kernelspec
 
 
@@ -74,7 +74,7 @@ function convert_doc(doc::WeaveDoc, format::NotebookOutput)
   language_info["file_extension"] = ".jl"
   language_info["mimetype"] = "application/julia"
   language_info["name"]=  "julia"
-  language_info["version"] = "0.5.0"
+  language_info["version"] = "$(VERSION.major).$(VERSION.minor).$(VERSION.patch)"
   metadata["language_info"] = language_info
 
   cells = []

templates/julia_tex.tpl

@@ -3,7 +3,7 @@
 \usepackage[a4paper,text={16.5cm,25.2cm},centering]{geometry}
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
-\usepackage{graphics}
+\usepackage{graphicx}
 \usepackage{microtype}
 \usepackage{hyperref}
 \setlength{\parindent}{0pt}