Physikerwelt has submitted this change and it was merged.
Change subject: Add install script
......................................................................
Add install script
Temporary remove texvc check option.
Change-Id: I663f9ad141ab0694fcea23092b50b0ab97a315e0
---
M bin/MediawikiTex2Svg
M bin/latexmlmediawiki
M lib/LaTeXML/Util/Texvc.pm
A mw_install
4 files changed, 26 insertions(+), 10 deletions(-)
Approvals:
Physikerwelt: Verified; Looks good to me, approved
diff --git a/bin/MediawikiTex2Svg b/bin/MediawikiTex2Svg
index 12f87c7..71a9508 100755
--- a/bin/MediawikiTex2Svg
+++ b/bin/MediawikiTex2Svg
@@ -5,7 +5,7 @@
echo "<!--The input-TeXFile:->>">&2
cat input.tex 1>&2
echo "<!--pdflatex-->">&2
-time pdflatex input.tex -interaction=batchmode
+time pdflatex input.tex -interaction=batchmode >&2
echo "<!--pdfcrop-->">&2
time pdfcrop input.pdf crop.pdf 1>&2
echo "<!--pdf2svg-->">&2
diff --git a/bin/latexmlmediawiki b/bin/latexmlmediawiki
index a2ab55a..b02c470 100755
--- a/bin/latexmlmediawiki
+++ b/bin/latexmlmediawiki
@@ -70,7 +70,6 @@
log => $texvlog,'texvc_error'=>$outtex});
} else {
$source = $outtex;
- print "HEOADF".$outtex;
my $svgIN = $latexheader ."\n\$\$\n".$source."\n\$\$\n\\end{document}";
my ($svg,$png,$image_log) = LaTeXML::Util::Svg->createSVG($svgIN);
#print $svg;
@@ -93,7 +92,7 @@
# If there are no protocols, use literal: as default:
if ((! defined $source) || (length($source)<1)) {
print encode_json({result => '', status => "Fatal:input:empty No TeX
provided on input", status_code=>3,
- log => "Status:conversion:3\nFatal:input:empty No
TeX provided on input"});
+ log =>
$texvlog."Status:conversion:3\nFatal:input:empty No TeX provided on input"});
} else {
#$source = "literal:".$source unless (pathname_is_url($source));
#Send a request:
diff --git a/lib/LaTeXML/Util/Texvc.pm b/lib/LaTeXML/Util/Texvc.pm
index 910c982..98cb36d 100644
--- a/lib/LaTeXML/Util/Texvc.pm
+++ b/lib/LaTeXML/Util/Texvc.pm
@@ -13,7 +13,7 @@
my $outtex;
#Hack to avoid wrong encoded output
- #$intex =~ s/\\/\\\\/g;
+ $intex =~ s/\\\\/\\/g;
#$intex =~ s/\n/\\n/g;
my @args = ("timeout",'5','texvc', $intex);
@@ -22,13 +22,13 @@
my($stdout, $sdterr, $success, $exit_code) = capture_exec( @args );
my $duration = time() - $start;
#print "\nin: $intex ->$stdout \n";
- if(substr($stdout,0,1) eq '+'){
+ my $status = substr($stdout,0,1);
+ if( $status eq '+'){
$passed = 1;
- $outtex = substr($stdout,1,-1);
- } else {
- $outtex = $stdout;
- }
- return ($passed,$outtex, "\n\nTexvc-time:$duration\n\n");
+ $stdout =~ s/.(.+)/$1/;
+ }
+ return (1,$intex,"\n\nTexvc-time:$duration\n.Fix texvc input not to
much encoding");
+ return ($passed,$stdout, "\n\nTexvc-time:$duration\n$intex -($status)>
$stdout \n");
}
1;
__END__
\ No newline at end of file
diff --git a/mw_install b/mw_install
new file mode 100755
index 0000000..52ee68d
--- /dev/null
+++ b/mw_install
@@ -0,0 +1,17 @@
+#/bin/sh
+sudo apt-get -y install ocaml \
+texlive libclone-perl libdata-compare-perl libio-prompt-perl \
+perlmagick libparse-recdescent-perl libxml-libxml-perl \
+libxml-libxslt-perl libarchive-zip-perl libio-string-perl apache2 \
+libapache2-mod-perl2 libplack-perl libfile-which-perl libjson-xs-perl \
+pdf2svg texlive-latex-extra \
+liblist-moreutils-perl libio-captureoutput-perl \
+librsvg2-bin texlive-latex-extra texlive-lang-greek \
+libstring-shellquote-perl
+cd texvc
+make
+#make install
+cd ..
+perl Makefile.PL
+make
+#sudo make install
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/86164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I663f9ad141ab0694fcea23092b50b0ab97a315e0
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/latexml
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt <w...@physikerwelt.de>
Gerrit-Reviewer: Physikerwelt <w...@physikerwelt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
