deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-10-01 18:56:31 -05:00
parent b6653749ac 105c1d79e7
commit 1290dfc9ae
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/wiki/tex.rhtml
View file

@ -97,6 +97,7 @@
% Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2} % Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2}
\let\oldroot\root \let\oldroot\root
\def\root#1#2{\oldroot #1 \of{#2}} \def\root#1#2{\oldroot #1 \of{#2}}
\renewcommand{\sqrt}[2][]{\oldroot #1 \of{#2}}
% Manually declare the txfonts symbolsC font % Manually declare the txfonts symbolsC font
\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} \DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n}

2
test/functional/wiki_controller_test.rb
View file

@ -142,6 +142,7 @@ class WikiControllerTest < ActionController::TestCase
# Tempfile doesn't know how to open files with binary flag, hence the two-step process # Tempfile doesn't know how to open files with binary flag, hence the two-step process
Tempfile.open('instiki_export_file') { |f| @tempfile_path = f.path } Tempfile.open('instiki_export_file') { |f| @tempfile_path = f.path }
@tempfile_path.to_s
begin begin
File.open(@tempfile_path, 'wb') { |f| f.write(r.body); @exported_file = f.path } File.open(@tempfile_path, 'wb') { |f| f.write(r.body); @exported_file = f.path }
Zip::ZipFile.open(@exported_file) do |zip| Zip::ZipFile.open(@exported_file) do |zip|
@ -1141,6 +1142,7 @@ class WikiControllerTest < ActionController::TestCase
% Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2} % Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2}
\let\oldroot\root \let\oldroot\root
\def\root#1#2{\oldroot #1 \of{#2}} \def\root#1#2{\oldroot #1 \of{#2}}
\renewcommand{\sqrt}[2][]{\oldroot #1 \of{#2}}
% Manually declare the txfonts symbolsC font % Manually declare the txfonts symbolsC font
\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} \DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n}