Merge branch 'dev-v0.3.0'

Conflicts:
	README.md

Author: vDorst

README.md

@@ -1,7 +1,14 @@
-Redmine LaTeX MathJax Plugin
-============================
+Redmine LaTeX MathJax Macro Plugin
+==================================
+
 This is a simple little plugin which allows mathematical notation to be used within Redmine.
 
+Requirements
+------------
+
+Redmine 3.0.x or 3.1.x.
+Other version are not tested but may work.
+
 Installation
 ------------
 1. Download archive and extract to /your/path/to/redmine/plugins/
@@ -13,12 +20,20 @@ Login to Redmine and go to Administration->Plugins. You should now see 'Redmine
 
 Usage
 ------------
-Anywhere on a wiki page write for inline formulas:
+Anywhere on a wiki or issue page write for formulas:
 
 {{mj(\sum_i x_i$)}}
 
-Hit 'Preview' or 'Save' to make the notation show up.
+or a multiline MathJax Syntax:
+
+{{mj
+P_{POWER} =
+\cfrac
+{U_{POWER}}
+{I_{POWER}}
+}}
 
+Hit 'Preview' or 'Save' to let them show up.
 
 FAQ
 ------------

init.rb

@@ -8,12 +8,15 @@
   description 'Employ MathJax in all settings: wiki, issues, or every page.'
   url 'https://github.com/vDorst/redmine_latex_mathjax'
   author_url 'https://github.com/vDorst'
-  version '0.2.0'
+  version '0.3.0'
 
   Redmine::WikiFormatting::Macros.register do
-    desc = "MathJax Macro: Usage: {{mj( MathJax Syntax )}}"
-    macro :mj, :parse_args => false do |obj, args|
-      out = MathJaxEmbedMacro.mj_macro(obj, args)
+    desc "MathJax Macro:\n\n" +
+	    "Usage:\n"+ 
+	    "{{mj( single line MathJax Syntax )}}\n\n" +
+	    "{{mj\nMulti line\nMathJax Syntax\n}}"
+    macro :mj, :parse_args => false do |obj, args, text|
+      out = MathJaxEmbedMacro.mj_macro(obj, args, text)
     end
   end
 end
@@ -23,15 +26,36 @@ class MathJaxEmbedMacro
   @@delimiter = '~~~'
   # Modify URL to MathJax.
   @@url = 'https://cdn.mathjax.org/mathjax/latest/MathJax.js'
-  def self.mj_macro(obj, arg)
-    raise "Usage: {{mj( MathJax Syntax )}}" unless arg.length >= 1
-    out = "#@@delimiter #{arg} #@@delimiter".html_safe
+  def self.mj_error(text)
+	return "<span id=\"errorExplanation\"><strong>MathJaxMacro:</strong> #{text}</span>".html_safe
+  end
+  def self.mj_macro(obj, arg, text)
+    ## Check any argument is given
+    if ((text == nil) && (arg.length == 0))
+	return "<div id=\"errorExplanation\"><strong>MathJaxMacro:</strong> Usage:<ul><li><stong>Argument only</strong>: only single line MathJax Syntax</li>{{mj( MathJax Syntax )}}<li>Blocktext only: Multiline MathJax Syntax</li>{{mj<br/>Multi-<br/>line<br/>}}</ul></div>".html_safe
+    end
+    ## Check if both argument are given
+    if ((text != nil) && (arg.length > 0))
+	return self.mj_error("Usage: Don\'t mix argument and blocktext!")
+    end
+    # Use text is arg == nil
+    if (text != nil)
+	arg = text
+    end
+    # Check argument length in Argument Mode
+    if (arg != nil) && (arg.length < 1)
+	return self.mj_error("Input must be atlease 1 characet long.")
+    end
+    # Check for illegal charaters.
+    if arg =~ /[<>]/
+	return self.mj_error("Illegal characters found! Don\'t using < or >")
+    end
+    return "#@@delimiter #{arg} #@@delimiter".html_safe
   end
   def self.delimiter()
 	  return @@delimiter
   end
   def self.URLToMathJax()
 	  return @@url
   end
-end
-
+end