diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 0916164f..fec358f1 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -138,15 +138,4 @@ class AdminController < ApplicationController redirect_to :back end -private - - def is_post - unless (request.post? || Rails.env.test?) - headers['Allow'] = 'POST' - render(:status => 405, :text => 'You must use an HTTP POST', :layout => 'error') - return false - end - return true - end - end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 58b0c054..28576d9d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -190,7 +190,7 @@ class ApplicationController < ActionController::Base response.charset = 'utf-8' if %w(atom_with_content atom_with_headlines).include?(action_name) response.content_type = Mime::ATOM - elsif %w(tex).include?(action_name) + elsif %w(tex tex_list).include?(action_name) response.content_type = Mime::TEXT elsif xhtml_enabled? if request.user_agent =~ /Validator/ or request.env.include?('HTTP_ACCEPT') && @@ -246,6 +246,17 @@ class ApplicationController < ActionController::Base (@web.published? and action_name == 's5') end + def is_post + unless (request.post? || Rails.env.test?) + layout = 'error' + layout = false if %w(tex tex_list).include?(action_name) + headers['Allow'] = 'POST' + render(:status => 405, :text => 'You must use an HTTP POST', :layout => layout) + return false + end + return true + end + end module Mime diff --git a/app/controllers/file_controller.rb b/app/controllers/file_controller.rb index 079b580e..b8510b5b 100644 --- a/app/controllers/file_controller.rb +++ b/app/controllers/file_controller.rb @@ -110,15 +110,6 @@ class FileController < ApplicationController private - def is_post - unless (request.post? || Rails.env.test?) - headers['Allow'] = 'POST' - render(:status => 405, :text => 'You must use an HTTP POST', :layout => 'error') - return false - end - return true - end - def import_from_archive(archive) logger.info "Importing pages from #{archive}" zip = Zip::ZipInputStream.open(archive) diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 50150cd3..3bcb69af 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -184,6 +184,24 @@ EOL def atom_with_headlines render_atom(hide_description = true) end + + def tex_list + return unless is_post + if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) + @tex_content = '' + params.each do |name, p| + if p == 'tex' && @web.has_page?(name) + @tex_content << "\\section*\{#{name}\}\n\n".as_utf8 + @tex_content << Maruku.new(@web.page(name).content).to_latex + end + end + else + @tex_content = 'TeX export only supported with the Markdown text filters.' + end + expire_action :controller => 'wiki', :web => @web.address, :action => 'list', :category => params['category'] + render(:layout => 'tex') + end + def search @query = params['query'].purify @@ -389,6 +407,7 @@ EOL else @tex_content = 'TeX export only supported with the Markdown text filters.' end + render(:layout => 'tex') end def s5 diff --git a/app/views/layouts/tex.rhtml b/app/views/layouts/tex.rhtml index 36ba17d8..8fb892b0 100644 --- a/app/views/layouts/tex.rhtml +++ b/app/views/layouts/tex.rhtml @@ -1 +1,253 @@ +\documentclass[12pt,titlepage]{article} + +\usepackage{amsmath} +\usepackage{amsfonts} +\usepackage{amssymb} +\usepackage{amsthm} +\usepackage{mathtools} +<%- if @tex_content =~ /\\mathbb\{[^}]*[a-z0-9]+[^}]*\}/ -%> +\usepackage{mathbbol} +<% end -%> +\usepackage{graphicx} +\usepackage{color} +\usepackage{ucs} +\usepackage[utf8x]{inputenc} +\usepackage{hyperref} + +%----Macros---------- +% +% Unresolved issues: +% +% \righttoleftarrow +% \lefttorightarrow +% +% \color{} with HTML colorspec +% \bgcolor +% \array with options (without options, it's equivalent to the matrix environment) + +% Of the standard HTML named colors, white, black, red, green, blue and yellow +% are predefined in the color package. Here are the rest. +\definecolor{aqua}{rgb}{0, 1.0, 1.0} +\definecolor{fuschia}{rgb}{1.0, 0, 1.0} +\definecolor{gray}{rgb}{0.502, 0.502, 0.502} +\definecolor{lime}{rgb}{0, 1.0, 0} +\definecolor{maroon}{rgb}{0.502, 0, 0} +\definecolor{navy}{rgb}{0, 0, 0.502} +\definecolor{olive}{rgb}{0.502, 0.502, 0} +\definecolor{purple}{rgb}{0.502, 0, 0.502} +\definecolor{silver}{rgb}{0.753, 0.753, 0.753} +\definecolor{teal}{rgb}{0, 0.502, 0.502} + +% Because of conflicts, \space and \mathop are converted to +% \itexspace and \operatorname during preprocessing. + +% itex: \space{ht}{dp}{wd} +% +% Height and baseline depth measurements are in units of tenths of an ex while +% the width is measured in tenths of an em. +\makeatletter +\newdimen\itex@wd% +\newdimen\itex@dp% +\newdimen\itex@thd% +\def\itexspace#1#2#3{\itex@wd=#3em% +\itex@wd=0.1\itex@wd% +\itex@dp=#2ex% +\itex@dp=0.1\itex@dp% +\itex@thd=#1ex% +\itex@thd=0.1\itex@thd% +\advance\itex@thd\the\itex@dp% +\makebox[\the\itex@wd]{\rule[-\the\itex@dp]{0cm}{\the\itex@thd}}} +\makeatother + +% \tensor and \multiscript +\makeatletter +\newif\if@sup +\newtoks\@sups +\def\append@sup#1{\edef\act{\noexpand\@sups={\the\@sups #1}}\act}% +\def\reset@sup{\@supfalse\@sups={}}% +\def\mk@scripts#1#2{\if #2/ \if@sup ^{\the\@sups}\fi \else% + \ifx #1_ \if@sup ^{\the\@sups}\reset@sup \fi {}_{#2}% + \else \append@sup#2 \@suptrue \fi% + \expandafter\mk@scripts\fi} +\def\tensor#1#2{\reset@sup#1\mk@scripts#2_/} +\def\multiscripts#1#2#3{\reset@sup{}\mk@scripts#1_/#2% + \reset@sup\mk@scripts#3_/} +\makeatother + +% \slash +\makeatletter +\newbox\slashbox \setbox\slashbox=\hbox{$/$} +\def\itex@pslash#1{\setbox\@tempboxa=\hbox{$#1$} + \@tempdima=0.5\wd\slashbox \advance\@tempdima 0.5\wd\@tempboxa + \copy\slashbox \kern-\@tempdima \box\@tempboxa} +\def\slash{\protect\itex@pslash} +\makeatother + +% math-mode versions of \rlap, etc +% from Alexander Perlis, "A complement to \smash, \llap, and lap" +% http://math.arizona.edu/~aprl/publications/mathclap/ +\def\clap#1{\hbox to 0pt{\hss#1\hss}} +\def\mathllap{\mathpalette\mathllapinternal} +\def\mathrlap{\mathpalette\mathrlapinternal} +\def\mathclap{\mathpalette\mathclapinternal} +\def\mathllapinternal#1#2{\llap{$\mathsurround=0pt#1{#2}$}} +\def\mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}} +\def\mathclapinternal#1#2{\clap{$\mathsurround=0pt#1{#2}$}} + +% Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2} +\let\oldroot\root +\def\root#1#2{\oldroot #1 \of{#2}} +\renewcommand{\sqrt}[2][]{\oldroot #1 \of{#2}} + +% Manually declare the txfonts symbolsC font +\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} +\SetSymbolFont{symbolsC}{bold}{U}{txsyc}{bx}{n} +\DeclareFontSubstitution{U}{txsyc}{m}{n} + +% Manually declare the stmaryrd font +\DeclareSymbolFont{stmry}{U}{stmry}{m}{n} +\SetSymbolFont{stmry}{bold}{U}{stmry}{b}{n} + +% Declare specific arrows from txfonts without loading the full package +\makeatletter +\def\re@DeclareMathSymbol#1#2#3#4{% + \let#1=\undefined + \DeclareMathSymbol{#1}{#2}{#3}{#4}} +\re@DeclareMathSymbol{\neArrow}{\mathrel}{symbolsC}{116} +\re@DeclareMathSymbol{\neArr}{\mathrel}{symbolsC}{116} +\re@DeclareMathSymbol{\seArrow}{\mathrel}{symbolsC}{117} +\re@DeclareMathSymbol{\seArr}{\mathrel}{symbolsC}{117} +\re@DeclareMathSymbol{\nwArrow}{\mathrel}{symbolsC}{118} +\re@DeclareMathSymbol{\nwArr}{\mathrel}{symbolsC}{118} +\re@DeclareMathSymbol{\swArrow}{\mathrel}{symbolsC}{119} +\re@DeclareMathSymbol{\swArr}{\mathrel}{symbolsC}{119} +\re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} +\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121} +\re@DeclareMathSymbol{\Vbar}{\mathrel}{symbolsC}{121} +\re@DeclareMathSymbol{\sslash}{\mathrel}{stmry}{12} +\re@DeclareMathSymbol{\invamp}{\mathrel}{symbolsC}{77} +\re@DeclareMathSymbol{\parr}{\mathrel}{symbolsC}{77} +\makeatother + +% Widecheck +\makeatletter +\DeclareRobustCommand\widecheck[1]{{\mathpalette\@widecheck{#1}}} +\def\@widecheck#1#2{% + \setbox\z@\hbox{\m@th$#1#2$}% + \setbox\tw@\hbox{\m@th$#1% + \widehat{% + \vrule\@width\z@\@height\ht\z@ + \vrule\@height\z@\@width\wd\z@}$}% + \dp\tw@-\ht\z@ + \@tempdima\ht\z@ \advance\@tempdima2\ht\tw@ \divide\@tempdima\thr@@ + \setbox\tw@\hbox{% + \raise\@tempdima\hbox{\scalebox{1}[-1]{\lower\@tempdima\box +\tw@}}}% + {\ooalign{\box\tw@ \cr \box\z@}}} +\makeatother + +% udots (taken from yhmath) +\makeatletter +\def\udots{\mathinner{\mkern2mu\raise\p@\hbox{.} +\mkern2mu\raise4\p@\hbox{.}\mkern1mu +\raise7\p@\vbox{\kern7\p@\hbox{.}}\mkern1mu}} +\makeatother + +%% Fix array +\newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}} + +%% Renaming existing commands +\newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}} +\newcommand{\widevec}{\overrightarrow} +\newcommand{\darr}{\downarrow} +\newcommand{\nearr}{\nearrow} +\newcommand{\nwarr}{\nwarrow} +\newcommand{\searr}{\searrow} +\newcommand{\swarr}{\swarrow} +\newcommand{\curvearrowbotright}{\curvearrowright} +\newcommand{\uparr}{\uparrow} +\newcommand{\downuparrow}{\updownarrow} +\newcommand{\duparr}{\updownarrow} +\newcommand{\updarr}{\updownarrow} +\newcommand{\gt}{>} +\newcommand{\lt}{<} +\newcommand{\map}{\mapsto} +\newcommand{\embedsin}{\hookrightarrow} +\newcommand{\Alpha}{A} +\newcommand{\Beta}{B} +\newcommand{\Zeta}{Z} +\newcommand{\Eta}{H} +\newcommand{\Iota}{I} +\newcommand{\Kappa}{K} +\newcommand{\Mu}{M} +\newcommand{\Nu}{N} +\newcommand{\Rho}{P} +\newcommand{\Tau}{T} +\newcommand{\Upsi}{\Upsilon} +\newcommand{\omicron}{o} +\newcommand{\lang}{\langle} +\newcommand{\rang}{\rangle} +\newcommand{\Union}{\bigcup} +\newcommand{\Intersection}{\bigcap} +\newcommand{\Oplus}{\bigoplus} +\newcommand{\Otimes}{\bigotimes} +\newcommand{\Wedge}{\bigwedge} +\newcommand{\Vee}{\bigvee} +\newcommand{\coproduct}{\coprod} +\newcommand{\product}{\prod} +\newcommand{\closure}{\overline} +\newcommand{\integral}{\int} +\newcommand{\doubleintegral}{\iint} +\newcommand{\tripleintegral}{\iiint} +\newcommand{\quadrupleintegral}{\iiiint} +\newcommand{\conint}{\oint} +\newcommand{\contourintegral}{\oint} +\newcommand{\infinity}{\infty} +\newcommand{\bottom}{\bot} +\newcommand{\minusb}{\boxminus} +\newcommand{\plusb}{\boxplus} +\newcommand{\timesb}{\boxtimes} +\newcommand{\intersection}{\cap} +\newcommand{\union}{\cup} +\newcommand{\Del}{\nabla} +\newcommand{\odash}{\circleddash} +\newcommand{\negspace}{\!} +\newcommand{\widebar}{\overline} +\newcommand{\textsize}{\normalsize} +\renewcommand{\scriptsize}{\scriptstyle} +\newcommand{\scriptscriptsize}{\scriptscriptstyle} +\newcommand{\mathfr}{\mathfrak} +\newcommand{\statusline}[2]{#2} +\newcommand{\tooltip}[2]{#2} +\newcommand{\toggle}[2]{#2} + +% Theorem Environments +\theoremstyle{plain} +\newtheorem{theorem}{Theorem} +\newtheorem{lemma}{Lemma} +\newtheorem{prop}{Proposition} +\newtheorem{cor}{Corollary} +\newtheorem*{utheorem}{Theorem} +\newtheorem*{ulemma}{Lemma} +\newtheorem*{uprop}{Proposition} +\newtheorem*{ucor}{Corollary} +\theoremstyle{definition} +\newtheorem{defn}{Definition} +\newtheorem{example}{Example} +\newtheorem*{udefn}{Definition} +\newtheorem*{uexample}{Example} +\theoremstyle{remark} +\newtheorem{remark}{Remark} +\newtheorem{note}{Note} +\newtheorem*{uremark}{Remark} +\newtheorem*{unote}{Note} + +%------------------------------------------------------------------- + +\begin{document} + +%------------------------------------------------------------------- + <%= @content_for_layout %> + +\end{document} diff --git a/app/views/wiki/list.rhtml b/app/views/wiki/list.rhtml index b5876fb3..e146b407 100644 --- a/app/views/wiki/list.rhtml +++ b/app/views/wiki/list.rhtml @@ -10,6 +10,28 @@ <%- end -%> +<% if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) -%> +<% form_tag({ :controller => 'wiki', :action => 'tex_list', :web => @web.address }, + {'method' => 'post', 'accept-charset' => 'utf-8' }) do +%> +
+<% if params['category'] -%> + +<%- end -%> + +

Export selected pages to a LaTeX file. +<%= submit_tag("Export") %> +

+
+<%- end -%> +<%- else -%> +<%- end -%> <%- if @web.count_pages? -%> <% total_chars = @pages_in_category.characters %> diff --git a/app/views/wiki/tex.rhtml b/app/views/wiki/tex.rhtml index ac8f827d..e5faa508 100644 --- a/app/views/wiki/tex.rhtml +++ b/app/views/wiki/tex.rhtml @@ -1,255 +1,3 @@ -\documentclass[12pt,titlepage]{article} - -\usepackage{amsmath} -\usepackage{amsfonts} -\usepackage{amssymb} -\usepackage{amsthm} -\usepackage{mathtools} -<%- if @tex_content =~ /\\mathbb\{[^}]*[a-z0-9]+[^}]*\}/ -%> -\usepackage{mathbbol} -<% end -%> -\usepackage{graphicx} -\usepackage{color} -\usepackage{ucs} -\usepackage[utf8x]{inputenc} -\usepackage{hyperref} - -%----Macros---------- -% -% Unresolved issues: -% -% \righttoleftarrow -% \lefttorightarrow -% -% \color{} with HTML colorspec -% \bgcolor -% \array with options (without options, it's equivalent to the matrix environment) - -% Of the standard HTML named colors, white, black, red, green, blue and yellow -% are predefined in the color package. Here are the rest. -\definecolor{aqua}{rgb}{0, 1.0, 1.0} -\definecolor{fuschia}{rgb}{1.0, 0, 1.0} -\definecolor{gray}{rgb}{0.502, 0.502, 0.502} -\definecolor{lime}{rgb}{0, 1.0, 0} -\definecolor{maroon}{rgb}{0.502, 0, 0} -\definecolor{navy}{rgb}{0, 0, 0.502} -\definecolor{olive}{rgb}{0.502, 0.502, 0} -\definecolor{purple}{rgb}{0.502, 0, 0.502} -\definecolor{silver}{rgb}{0.753, 0.753, 0.753} -\definecolor{teal}{rgb}{0, 0.502, 0.502} - -% Because of conflicts, \space and \mathop are converted to -% \itexspace and \operatorname during preprocessing. - -% itex: \space{ht}{dp}{wd} -% -% Height and baseline depth measurements are in units of tenths of an ex while -% the width is measured in tenths of an em. -\makeatletter -\newdimen\itex@wd% -\newdimen\itex@dp% -\newdimen\itex@thd% -\def\itexspace#1#2#3{\itex@wd=#3em% -\itex@wd=0.1\itex@wd% -\itex@dp=#2ex% -\itex@dp=0.1\itex@dp% -\itex@thd=#1ex% -\itex@thd=0.1\itex@thd% -\advance\itex@thd\the\itex@dp% -\makebox[\the\itex@wd]{\rule[-\the\itex@dp]{0cm}{\the\itex@thd}}} -\makeatother - -% \tensor and \multiscript -\makeatletter -\newif\if@sup -\newtoks\@sups -\def\append@sup#1{\edef\act{\noexpand\@sups={\the\@sups #1}}\act}% -\def\reset@sup{\@supfalse\@sups={}}% -\def\mk@scripts#1#2{\if #2/ \if@sup ^{\the\@sups}\fi \else% - \ifx #1_ \if@sup ^{\the\@sups}\reset@sup \fi {}_{#2}% - \else \append@sup#2 \@suptrue \fi% - \expandafter\mk@scripts\fi} -\def\tensor#1#2{\reset@sup#1\mk@scripts#2_/} -\def\multiscripts#1#2#3{\reset@sup{}\mk@scripts#1_/#2% - \reset@sup\mk@scripts#3_/} -\makeatother - -% \slash -\makeatletter -\newbox\slashbox \setbox\slashbox=\hbox{$/$} -\def\itex@pslash#1{\setbox\@tempboxa=\hbox{$#1$} - \@tempdima=0.5\wd\slashbox \advance\@tempdima 0.5\wd\@tempboxa - \copy\slashbox \kern-\@tempdima \box\@tempboxa} -\def\slash{\protect\itex@pslash} -\makeatother - -% math-mode versions of \rlap, etc -% from Alexander Perlis, "A complement to \smash, \llap, and lap" -% http://math.arizona.edu/~aprl/publications/mathclap/ -\def\clap#1{\hbox to 0pt{\hss#1\hss}} -\def\mathllap{\mathpalette\mathllapinternal} -\def\mathrlap{\mathpalette\mathrlapinternal} -\def\mathclap{\mathpalette\mathclapinternal} -\def\mathllapinternal#1#2{\llap{$\mathsurround=0pt#1{#2}$}} -\def\mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}} -\def\mathclapinternal#1#2{\clap{$\mathsurround=0pt#1{#2}$}} - -% Renames \sqrt as \oldsqrt and redefine root to result in \sqrt[#1]{#2} -\let\oldroot\root -\def\root#1#2{\oldroot #1 \of{#2}} -\renewcommand{\sqrt}[2][]{\oldroot #1 \of{#2}} - -% Manually declare the txfonts symbolsC font -\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} -\SetSymbolFont{symbolsC}{bold}{U}{txsyc}{bx}{n} -\DeclareFontSubstitution{U}{txsyc}{m}{n} - -% Manually declare the stmaryrd font -\DeclareSymbolFont{stmry}{U}{stmry}{m}{n} -\SetSymbolFont{stmry}{bold}{U}{stmry}{b}{n} - -% Declare specific arrows from txfonts without loading the full package -\makeatletter -\def\re@DeclareMathSymbol#1#2#3#4{% - \let#1=\undefined - \DeclareMathSymbol{#1}{#2}{#3}{#4}} -\re@DeclareMathSymbol{\neArrow}{\mathrel}{symbolsC}{116} -\re@DeclareMathSymbol{\neArr}{\mathrel}{symbolsC}{116} -\re@DeclareMathSymbol{\seArrow}{\mathrel}{symbolsC}{117} -\re@DeclareMathSymbol{\seArr}{\mathrel}{symbolsC}{117} -\re@DeclareMathSymbol{\nwArrow}{\mathrel}{symbolsC}{118} -\re@DeclareMathSymbol{\nwArr}{\mathrel}{symbolsC}{118} -\re@DeclareMathSymbol{\swArrow}{\mathrel}{symbolsC}{119} -\re@DeclareMathSymbol{\swArr}{\mathrel}{symbolsC}{119} -\re@DeclareMathSymbol{\nequiv}{\mathrel}{symbolsC}{46} -\re@DeclareMathSymbol{\Perp}{\mathrel}{symbolsC}{121} -\re@DeclareMathSymbol{\Vbar}{\mathrel}{symbolsC}{121} -\re@DeclareMathSymbol{\sslash}{\mathrel}{stmry}{12} -\re@DeclareMathSymbol{\invamp}{\mathrel}{symbolsC}{77} -\re@DeclareMathSymbol{\parr}{\mathrel}{symbolsC}{77} -\makeatother - -% Widecheck -\makeatletter -\DeclareRobustCommand\widecheck[1]{{\mathpalette\@widecheck{#1}}} -\def\@widecheck#1#2{% - \setbox\z@\hbox{\m@th$#1#2$}% - \setbox\tw@\hbox{\m@th$#1% - \widehat{% - \vrule\@width\z@\@height\ht\z@ - \vrule\@height\z@\@width\wd\z@}$}% - \dp\tw@-\ht\z@ - \@tempdima\ht\z@ \advance\@tempdima2\ht\tw@ \divide\@tempdima\thr@@ - \setbox\tw@\hbox{% - \raise\@tempdima\hbox{\scalebox{1}[-1]{\lower\@tempdima\box -\tw@}}}% - {\ooalign{\box\tw@ \cr \box\z@}}} -\makeatother - -% udots (taken from yhmath) -\makeatletter -\def\udots{\mathinner{\mkern2mu\raise\p@\hbox{.} -\mkern2mu\raise4\p@\hbox{.}\mkern1mu -\raise7\p@\vbox{\kern7\p@\hbox{.}}\mkern1mu}} -\makeatother - -%% Fix array -\newcommand{\itexarray}[1]{\begin{matrix}#1\end{matrix}} - -%% Renaming existing commands -\newcommand{\underoverset}[3]{\underset{#1}{\overset{#2}{#3}}} -\newcommand{\widevec}{\overrightarrow} -\newcommand{\darr}{\downarrow} -\newcommand{\nearr}{\nearrow} -\newcommand{\nwarr}{\nwarrow} -\newcommand{\searr}{\searrow} -\newcommand{\swarr}{\swarrow} -\newcommand{\curvearrowbotright}{\curvearrowright} -\newcommand{\uparr}{\uparrow} -\newcommand{\downuparrow}{\updownarrow} -\newcommand{\duparr}{\updownarrow} -\newcommand{\updarr}{\updownarrow} -\newcommand{\gt}{>} -\newcommand{\lt}{<} -\newcommand{\map}{\mapsto} -\newcommand{\embedsin}{\hookrightarrow} -\newcommand{\Alpha}{A} -\newcommand{\Beta}{B} -\newcommand{\Zeta}{Z} -\newcommand{\Eta}{H} -\newcommand{\Iota}{I} -\newcommand{\Kappa}{K} -\newcommand{\Mu}{M} -\newcommand{\Nu}{N} -\newcommand{\Rho}{P} -\newcommand{\Tau}{T} -\newcommand{\Upsi}{\Upsilon} -\newcommand{\omicron}{o} -\newcommand{\lang}{\langle} -\newcommand{\rang}{\rangle} -\newcommand{\Union}{\bigcup} -\newcommand{\Intersection}{\bigcap} -\newcommand{\Oplus}{\bigoplus} -\newcommand{\Otimes}{\bigotimes} -\newcommand{\Wedge}{\bigwedge} -\newcommand{\Vee}{\bigvee} -\newcommand{\coproduct}{\coprod} -\newcommand{\product}{\prod} -\newcommand{\closure}{\overline} -\newcommand{\integral}{\int} -\newcommand{\doubleintegral}{\iint} -\newcommand{\tripleintegral}{\iiint} -\newcommand{\quadrupleintegral}{\iiiint} -\newcommand{\conint}{\oint} -\newcommand{\contourintegral}{\oint} -\newcommand{\infinity}{\infty} -\newcommand{\bottom}{\bot} -\newcommand{\minusb}{\boxminus} -\newcommand{\plusb}{\boxplus} -\newcommand{\timesb}{\boxtimes} -\newcommand{\intersection}{\cap} -\newcommand{\union}{\cup} -\newcommand{\Del}{\nabla} -\newcommand{\odash}{\circleddash} -\newcommand{\negspace}{\!} -\newcommand{\widebar}{\overline} -\newcommand{\textsize}{\normalsize} -\renewcommand{\scriptsize}{\scriptstyle} -\newcommand{\scriptscriptsize}{\scriptscriptstyle} -\newcommand{\mathfr}{\mathfrak} -\newcommand{\statusline}[2]{#2} -\newcommand{\tooltip}[2]{#2} -\newcommand{\toggle}[2]{#2} - -% Theorem Environments -\theoremstyle{plain} -\newtheorem{theorem}{Theorem} -\newtheorem{lemma}{Lemma} -\newtheorem{prop}{Proposition} -\newtheorem{cor}{Corollary} -\newtheorem*{utheorem}{Theorem} -\newtheorem*{ulemma}{Lemma} -\newtheorem*{uprop}{Proposition} -\newtheorem*{ucor}{Corollary} -\theoremstyle{definition} -\newtheorem{defn}{Definition} -\newtheorem{example}{Example} -\newtheorem*{udefn}{Definition} -\newtheorem*{uexample}{Example} -\theoremstyle{remark} -\newtheorem{remark}{Remark} -\newtheorem{note}{Note} -\newtheorem*{uremark}{Remark} -\newtheorem*{unote}{Note} - -%------------------------------------------------------------------- - -\begin{document} - -%------------------------------------------------------------------- - \section*{<%= @page.name %>} -<%= @tex_content.html_safe %> - -\end{document} +<%= @tex_content.html_safe %> \ No newline at end of file diff --git a/app/views/wiki/tex_list.html.erb b/app/views/wiki/tex_list.html.erb new file mode 100644 index 00000000..9b3ac3f5 --- /dev/null +++ b/app/views/wiki/tex_list.html.erb @@ -0,0 +1 @@ +<%= @tex_content.html_safe %> diff --git a/vendor/plugins/form_spam_protection/lib/form_spam_protection.rb b/vendor/plugins/form_spam_protection/lib/form_spam_protection.rb index 9d90cf04..44ade73a 100644 --- a/vendor/plugins/form_spam_protection/lib/form_spam_protection.rb +++ b/vendor/plugins/form_spam_protection/lib/form_spam_protection.rb @@ -18,13 +18,13 @@ module FormSpamProtection if session[:form_keys].keys.include?(key) session[:form_keys][key][1] += 1 if session[:form_keys][key][1] >= 4 - render :text => "You cannot resubmit this form again.", :layout => 'error', :status => 403 - return false + flash[:error] = "You cannot resubmit this form again." + redirect_to :back end end else - render :text => "You must have Javascript on, and cookies enabled, to submit this form.", :layout => 'error', :status => 403 - return false + flash[:error] = "You must have Javascript on, and cookies enabled, to submit this form." + redirect_to :back end end end