Merge pull request #42 from gragusa/master

Changes to pandoc call and to templates
pull/44/head
Matti Pastell 2016-05-03 11:00:33 +03:00
commit 181869a663
3 changed files with 29 additions and 2 deletions

View File

@ -21,7 +21,7 @@ function pandoc2html(formatted::AbstractString, doc::WeaveDoc, outname::Abstract
try
pandoc_out, pandoc_in, proc = readandwrite(`pandoc -R -s --mathjax="" --self-contained --highlight-style=tango
--template $html_template --include-in-header=$css_template
--template $html_template -c $css_template
-V wversion=$wversion -V wtime=$wtime -V wsource=$wsource
-o $outname`)
println(pandoc_in, formatted)

View File

@ -498,6 +498,20 @@ hr {
clear: both; }
pre {
display: block;
padding: 9.5px;
margin: 0 0 10px;
font-size: 13px;
line-height: 1.42857143;
color: #333;
word-break: break-all;
word-wrap: break-word;
background-color: #ffffff;
border: 1px solid #ccc;
border-radius: 4px;
}
pre.sourceCode.julia {
display: block;
padding: 9.5px;
margin: 0 0 10px;
@ -510,6 +524,7 @@ pre {
border: 1px solid #ccc;
border-radius: 4px;
}
code,
kbd,
pre,
@ -520,10 +535,18 @@ code {
padding: 2px 4px;
font-size: 90%;
background-color: #f9f2f4;
background-color: #ffffff;
border-radius: 4px;
}
code.sourceCode.julia {
padding: 2px 4px;
font-size: 90%;
background-color: #f5f5f5;
border-radius: 4px;
}
@media (min-width: 400px) {}
@media (min-width: 550px) {}
@media (min-width: 750px) {}

View File

@ -30,6 +30,10 @@ $highlighting-css$
</style>
$endif$
$for(css)$
<link rel="stylesheet" href="$css$">
$endfor$
</head>
<body>
<div class ="container">