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 2011-07-07 10:32:49 -05:00
parent dfad5a3a37 2967b207b2
commit 8d7f33f99b
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,6 +1,6 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3-ruby", :require => "sqlite3" gem "sqlite3-ruby", :require => "sqlite3"
gem "itextomml", ">=1.4.5" gem "itextomml", ">=1.4.6"
gem "rack", ">=1.1.0" gem "rack", ">=1.1.0"
gem "mongrel", ">=1.2.0.pre2" gem "mongrel", ">=1.2.0.pre2"
gem "rubyzip" gem "rubyzip"

2
app/views/layouts/tex.rhtml
View file

@ -155,6 +155,8 @@
%% Fix array %% Fix array
\newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}} \newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}}
%% \itexnum is a noop
\newcommand{\itexnum}[1]{#1}
%% Renaming existing commands %% Renaming existing commands
\newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}} \newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}}

2
test/functional/wiki_controller_test.rb
View file

@ -1201,6 +1201,8 @@ class WikiControllerTest < ActionController::TestCase
%% Fix array %% Fix array
\newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}} \newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}}
%% \itexnum is a noop
\newcommand{\itexnum}[1]{#1}
%% Renaming existing commands %% Renaming existing commands
\newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}} \newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}}

10
test/unit/page_renderer_test.rb
View file

@ -269,6 +269,16 @@ END_THM
def test_have_latest_itex2mml def test_have_latest_itex2mml
assert_markup_parsed_as(
%{<p>equation <math class='maruku-mathml' displa} +
%{y='inline' xmlns='http://www.w3.org/1998/Math/} +
%{MathML'><mrow href='http://ex.com' xlink:href=} +
%{'http://ex.com' xlink:type='simple' xmlns:xlin} +
%{k='http://www.w3.org/1999/xlink'><mn>47.3</mn>} +
%{</mrow><mn>47</mn><mo>,</mo><mn>3</mn><mn>47,3} +
%{</mn></math></p>},
"equation $\\href{http://ex.com}{47.3} 47,3 \\itexnum{47,3}$")
assert_markup_parsed_as( assert_markup_parsed_as(
%{<p>equation <math class='maruku-mathml' displa} + %{<p>equation <math class='maruku-mathml' displa} +
%{y='inline' xmlns='http://www.w3.org/1998/Math/} + %{y='inline' xmlns='http://www.w3.org/1998/Math/} +