[r-cran-knitr] 05/07: refresh patches
Andreas Tille
tille at debian.org
Mon Oct 23 19:24:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-knitr.
commit 49861161291fe63a8538e39a7a5be7db45ede427
Author: Andreas Tille <tille at debian.org>
Date: Mon Oct 23 21:15:19 2017 +0200
refresh patches
---
R/utils-rd2html.R | 4 +-
debian/patches/privacy_breach_fix.patch | 97 +++++++++++++++------------------
inst/doc/datatables.html | 6 +-
inst/doc/docco-classic.html | 6 +-
inst/doc/docco-linear.html | 2 +-
inst/doc/knit_print.html | 2 +-
inst/doc/knitr-intro.html | 2 +-
inst/doc/knitr-markdown.html | 2 +-
inst/misc/datatables.html | 6 +-
inst/misc/docco-classic.html | 4 +-
inst/misc/docco-template.html | 4 +-
inst/opencpu/apps/index.html | 8 +--
12 files changed, 68 insertions(+), 75 deletions(-)
diff --git a/R/utils-rd2html.R b/R/utils-rd2html.R
index 21d52ad..fbcf4d6 100644
--- a/R/utils-rd2html.R
+++ b/R/utils-rd2html.R
@@ -54,8 +54,8 @@ knit_rd = function(pkg, links = tools::findHTMLlinks(), frame = TRUE) {
txt = c(txt[1:i0], res, txt[i1:length(txt)])
txt = sub('</head>', '
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/languages/r.min.js"></script>
+<script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
+<script src="/usr/lib/nodejs/highlight.js/languages/r.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
</head>', txt)
} else message('no examples found for ', p)
diff --git a/debian/patches/privacy_breach_fix.patch b/debian/patches/privacy_breach_fix.patch
index 065df3c..8daecb3 100644
--- a/debian/patches/privacy_breach_fix.patch
+++ b/debian/patches/privacy_breach_fix.patch
@@ -8,8 +8,8 @@ Description: Replace privacy breach links by packaged copies
<meta name="generator" content="knitr" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/7.3/styles/github.min.css">
<!-- MathJax scripts -->
--<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-+<script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+-<script type="text/javascript" src="https://cdn.bootcss.com/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML">
++<script type="text/javascript" src="file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
<style type="text/css">
@@ -28,45 +28,12 @@ Description: Replace privacy breach links by packaged copies
</div>
- <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+ <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
- <script src="https://yihui.github.io/knitr/js/docco-resize.js"></script>
+ <script src="https://yihui.name/knitr/js/docco-resize.js"></script>
</body>
</html>
---- a/inst/doc/knit_print.html
-+++ b/inst/doc/knit_print.html
-@@ -430,7 +430,7 @@ window.onload = function() {
- (function () {
- var script = document.createElement("script");
- script.type = "text/javascript";
-- script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
-+ script.src = "/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
- document.getElementsByTagName("head")[0].appendChild(script);
- })();
- </script>
---- a/inst/doc/knitr-intro.html
-+++ b/inst/doc/knitr-intro.html
-@@ -166,7 +166,7 @@ window.onload = function() {
- (function () {
- var script = document.createElement("script");
- script.type = "text/javascript";
-- script.src = "https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
-+ script.src = "/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
- document.getElementsByTagName("head")[0].appendChild(script);
- })();
- </script>
---- a/inst/doc/knitr-markdown.html
-+++ b/inst/doc/knitr-markdown.html
-@@ -58,7 +58,7 @@ hljs.initHighlightingOnLoad();
- </script>
-
- <!-- MathJax scripts -->
--<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-+<script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
- </script>
-
-
--- a/R/utils-rd2html.R
+++ b/R/utils-rd2html.R
-@@ -52,8 +52,8 @@ knit_rd = function(pkg, links = tools::f
+@@ -54,8 +54,8 @@ knit_rd = function(pkg, links = tools::f
txt = c(txt[1:i0], res, txt[i1:length(txt)])
txt = sub('</head>', '
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
@@ -93,13 +60,13 @@ Description: Replace privacy breach links by packaged copies
</table><!--table end-->
</div>
- <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-+ <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
- <script src="https://yihui.github.io/knitr/js/docco-resize.js"></script>
++ <script src="file:///usr/share/javascript/jquery/jquery.min.js"></script>
+ <script src="https://yihui.name/knitr/js/docco-resize.js"></script>
</body>
</html>
--- a/inst/misc/docco-template.html
+++ b/inst/misc/docco-template.html
-@@ -13,8 +13,8 @@ img{display:block;margin:auto;}
+@@ -12,8 +12,8 @@ img{display:block;margin:auto;}
.page pre{width:100%;max-width:768px;}
pre, code{font-size:90%;}
</style>
@@ -108,7 +75,7 @@ Description: Replace privacy breach links by packaged copies
+<script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
+<script src="/usr/lib/nodejs/highlight.js/languages/r.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
- <script src="https://yihui.github.io/media/js/center-images.js"></script>
+ <script src="https://yihui.name/js/center-img.js"></script>
#!mathjax#
--- a/inst/opencpu/apps/index.html
+++ b/inst/opencpu/apps/index.html
@@ -163,21 +130,47 @@ Description: Replace privacy breach links by packaged copies
<style type="text/css">
p{clear:both;}
</style>
+--- a/inst/doc/knit_print.html
++++ b/inst/doc/knit_print.html
+@@ -432,7 +432,7 @@ window.onload = function() {
+ (function () {
+ var script = document.createElement("script");
+ script.type = "text/javascript";
+- script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
++ script.src = "file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+ document.getElementsByTagName("head")[0].appendChild(script);
+ })();
+ </script>
+--- a/inst/doc/knitr-intro.html
++++ b/inst/doc/knitr-intro.html
+@@ -166,7 +166,7 @@ window.onload = function() {
+ (function () {
+ var script = document.createElement("script");
+ script.type = "text/javascript";
+- script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
++ script.src = "file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+ document.getElementsByTagName("head")[0].appendChild(script);
+ })();
+ </script>
+--- a/inst/doc/knitr-markdown.html
++++ b/inst/doc/knitr-markdown.html
+@@ -58,7 +58,7 @@ hljs.initHighlightingOnLoad();
+ </script>
+
+ <!-- MathJax scripts -->
+-<script type="text/javascript" src="https://cdn.bootcss.com/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML">
++<script type="text/javascript" src="file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-MML-AM_CHTML">
+ </script>
+
+
--- a/inst/doc/docco-linear.html
+++ b/inst/doc/docco-linear.html
-@@ -13,12 +13,12 @@ img{display:block;margin:auto;}
- .page pre{width:100%;max-width:768px;}
- pre, code{font-size:90%;}
- </style>
--<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
--<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/languages/r.min.js"></script>
-+<script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
-+<script src="/usr/lib/nodejs/highlight.js/languages/r.js"></script>
+@@ -17,7 +17,7 @@ pre, code{font-size:90%;}
<script>hljs.initHighlightingOnLoad();</script>
- <script src="https://yihui.github.io/media/js/center-images.js"></script>
+ <script src="https://yihui.name/js/center-img.js"></script>
<!-- MathJax scripts -->
--<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-+<script type="text/javascript" src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+-<script type="text/javascript" src="https://cdn.bootcss.com/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML">
++<script type="text/javascript" src="file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
diff --git a/inst/doc/datatables.html b/inst/doc/datatables.html
index 22953c0..4fa4372 100644
--- a/inst/doc/datatables.html
+++ b/inst/doc/datatables.html
@@ -196,9 +196,9 @@ hr {
}
</style>
-<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.3/css/jquery.dataTables.css">
-<script type="text/javascript" charset="utf8" src="//code.jquery.com/jquery-2.1.1.min.js"></script>
-<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.3/js/jquery.dataTables.js"></script>
+<link rel="stylesheet" type="text/css" href="/usr/share/javascript/jquery-datatables/css/jquery.dataTables.css">
+<script type="text/javascript" charset="utf8" src="/usr/share/javascript/jquery/jquery.min.js"></script>
+<script type="text/javascript" charset="utf8" src="/usr/share/javascript/jquery-datatables/jquery.dataTables.js"></script>
<style type="text/css">
p{clear:both;}
</style>
diff --git a/inst/doc/docco-classic.html b/inst/doc/docco-classic.html
index 4c3fc36..0692b14 100644
--- a/inst/doc/docco-classic.html
+++ b/inst/doc/docco-classic.html
@@ -6,7 +6,7 @@
<meta name="generator" content="knitr" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/7.3/styles/github.min.css">
<!-- MathJax scripts -->
-<script type="text/javascript" src="https://cdn.bootcss.com/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML">
+<script type="text/javascript" src="file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
<style type="text/css">
@@ -136,7 +136,7 @@ div.handler{
}
</style>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/7.3/highlight.min.js"></script>
+ <script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
<script type="text/javascript">
hljs.LANGUAGES.r=function(a){var b="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[a.HCM,{b:b,l:b,k:{keyword:"function if in break next repeat else for return switch while try tryCatch|10 stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...|10",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b [...]
</script>
@@ -220,7 +220,7 @@ happens.</p>
</td><td class="code"></td></tr>
</table><!--table end-->
</div>
- <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+ <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
<script src="https://yihui.name/knitr/js/docco-resize.js"></script>
</body>
</html>
diff --git a/inst/doc/docco-linear.html b/inst/doc/docco-linear.html
index 4702c23..ed6a41d 100644
--- a/inst/doc/docco-linear.html
+++ b/inst/doc/docco-linear.html
@@ -17,7 +17,7 @@ pre, code{font-size:90%;}
<script>hljs.initHighlightingOnLoad();</script>
<script src="https://yihui.name/js/center-img.js"></script>
<!-- MathJax scripts -->
-<script type="text/javascript" src="https://cdn.bootcss.com/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML">
+<script type="text/javascript" src="file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
diff --git a/inst/doc/knit_print.html b/inst/doc/knit_print.html
index 00a61d0..f3d7aff 100644
--- a/inst/doc/knit_print.html
+++ b/inst/doc/knit_print.html
@@ -432,7 +432,7 @@ window.onload = function() {
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
- script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+ script.src = "file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
diff --git a/inst/doc/knitr-intro.html b/inst/doc/knitr-intro.html
index 55bc853..8870803 100644
--- a/inst/doc/knitr-intro.html
+++ b/inst/doc/knitr-intro.html
@@ -166,7 +166,7 @@ window.onload = function() {
(function () {
var script = document.createElement("script");
script.type = "text/javascript";
- script.src = "https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
+ script.src = "file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
document.getElementsByTagName("head")[0].appendChild(script);
})();
</script>
diff --git a/inst/doc/knitr-markdown.html b/inst/doc/knitr-markdown.html
index 18a90b1..94ccaf4 100644
--- a/inst/doc/knitr-markdown.html
+++ b/inst/doc/knitr-markdown.html
@@ -58,7 +58,7 @@ hljs.initHighlightingOnLoad();
</script>
<!-- MathJax scripts -->
-<script type="text/javascript" src="https://cdn.bootcss.com/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML">
+<script type="text/javascript" src="file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-MML-AM_CHTML">
</script>
diff --git a/inst/misc/datatables.html b/inst/misc/datatables.html
index d298ddc..48e0307 100644
--- a/inst/misc/datatables.html
+++ b/inst/misc/datatables.html
@@ -1,6 +1,6 @@
-<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.3/css/jquery.dataTables.css">
-<script type="text/javascript" charset="utf8" src="//code.jquery.com/jquery-2.1.1.min.js"></script>
-<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.3/js/jquery.dataTables.js"></script>
+<link rel="stylesheet" type="text/css" href="/usr/share/javascript/jquery-datatables/css/jquery.dataTables.css">
+<script type="text/javascript" charset="utf8" src="/usr/share/javascript/jquery/jquery.min.js"></script>
+<script type="text/javascript" charset="utf8" src="/usr/share/javascript/jquery-datatables/jquery.dataTables.js"></script>
<style type="text/css">
p{clear:both;}
</style>
diff --git a/inst/misc/docco-classic.html b/inst/misc/docco-classic.html
index 6b84127..a56762d 100644
--- a/inst/misc/docco-classic.html
+++ b/inst/misc/docco-classic.html
@@ -10,7 +10,7 @@
#!markdown_css#
</style>
#!header#
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/7.3/highlight.min.js"></script>
+ <script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
<script type="text/javascript">
hljs.LANGUAGES.r=function(a){var b="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[a.HCM,{b:b,l:b,k:{keyword:"function if in break next repeat else for return switch while try tryCatch|10 stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...|10",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b [...]
</script>
@@ -23,7 +23,7 @@ hljs.LANGUAGES.r=function(a){var b="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";retur
#!html_output#
</table><!--table end-->
</div>
- <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+ <script src="file:///usr/share/javascript/jquery/jquery.min.js"></script>
<script src="https://yihui.name/knitr/js/docco-resize.js"></script>
</body>
</html>
diff --git a/inst/misc/docco-template.html b/inst/misc/docco-template.html
index 5b74591..36c2583 100644
--- a/inst/misc/docco-template.html
+++ b/inst/misc/docco-template.html
@@ -12,8 +12,8 @@ img{display:block;margin:auto;}
.page pre{width:100%;max-width:768px;}
pre, code{font-size:90%;}
</style>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/languages/r.min.js"></script>
+<script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
+<script src="/usr/lib/nodejs/highlight.js/languages/r.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
<script src="https://yihui.name/js/center-img.js"></script>
#!mathjax#
diff --git a/inst/opencpu/apps/index.html b/inst/opencpu/apps/index.html
index aa4aef4..4a69591 100644
--- a/inst/opencpu/apps/index.html
+++ b/inst/opencpu/apps/index.html
@@ -4,10 +4,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>R Notebook: A knitr app on OpenCPU</title>
- <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+ <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
<!-- Styles for R syntax highlighter -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
- <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/usr/share/javascript/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<style type="text/css">
textarea {
font-size: 12px;
@@ -16,8 +16,8 @@
}
</style>
<!-- R syntax highlighter -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/languages/r.min.js"></script>
+<script src="/usr/share/javascript/highlight.js/highlight.min.js"></script>
+<script src="/usr/lib/nodejs/highlight.js/languages/r.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
</head>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-knitr.git
More information about the debian-science-commits
mailing list