Permalink
Browse files

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

  • Loading branch information...
2 parents 1a66a38 + b8a040a commit d243c56166b95837e1885be93c5e66ca8643ee16 @distler distler committed Nov 16, 2016
@@ -1,7 +1,7 @@
# Controller responsible for serving files and pictures.
require 'zip/zip'
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
class FileController < ApplicationController
@@ -2,7 +2,7 @@
require 'maruku'
require 'maruku/ext/math'
require 'zip/zip'
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
require 'resolv'
class WikiController < ApplicationController
@@ -1,6 +1,6 @@
# The methods added to this helper will be available to all templates in the application.
module ApplicationHelper
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
# Accepts a container (hash, array, enumerable, your type) and returns a string of option tags. Given a container
# where the elements respond to first and last (such as a two-element array), the "lasts" serve as option values and
View
@@ -1,7 +1,7 @@
# Allow the metal piece to run in isolation
require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
class Itex
def self.call(env)
View
@@ -1,4 +1,4 @@
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
require 'file_signature'
class Web < ActiveRecord::Base
@@ -1,5 +1,5 @@
require 'chunks/chunk'
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
# The category chunk looks for "category: news" on a line by
# itself and parses the terms after the ':' as categories.
@@ -1,7 +1,7 @@
$: << File.dirname(__FILE__) + "../../lib"
require_dependency 'chunks/chunk'
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
require 'maruku'
require 'maruku/ext/math'
require_dependency 'rdocsupport'
@@ -64,6 +64,7 @@ def mask
if @content.options[:mode] == :s5
my_content = Maruku.new(text,
{:math_enabled => true,
+ :html_math_generate_ids => false,
:math_numbered => ['\\[','\\begin{equation}'],
:content_only => true,
:author => @content.options[:engine_opts][:author],
@@ -74,6 +75,7 @@ def mask
(t = Time.now; nil)
html = Maruku.new(text,
{:math_enabled => true,
+ :html_math_generate_ids => false,
:math_numbered => ['\\[','\\begin{equation}']}).to_html
(ApplicationController.logger.info("Maruku took " + (Time.now-t).to_s + " seconds."); nil)
html.gsub(/\A<div class="maruku_wrapper_div">\n?(.*?)\n?<\/div>\Z/m, '\1')
View
@@ -1,5 +1,5 @@
require 'chunks/chunk'
-require 'instiki_stringsupport'
+require 'itex_stringsupport'
# Contains all the methods for finding and replacing wiki related links.
module WikiChunk
Oops, something went wrong.

0 comments on commit d243c56

Please sign in to comment.