wirispluginengine 3.62.0.1322 → 7.14.0.1422

data/lib/com/wiris/plugin/impl/ServiceResourceLoaderImpl.rb

@@ -1,52 +1,54 @@
 module WirisPlugin
 include  Wiris
-require('com/wiris/plugin/api/ServiceResourceLoader.rb')
-  class ServiceResourceLoaderImpl
-  extend ServiceResourceLoaderInterface
+    require('com/wiris/plugin/api/ServiceResourceLoader.rb')
+    require('com/wiris/plugin/api/ServiceResourceLoader.rb')
+    class ServiceResourceLoaderImpl
+    extend ServiceResourceLoaderInterface
 
-  include Wiris
+    include Wiris
 
-    def initialize()
-      super()
-    end
-    def getContent(resource)
-      return Storage::newResourceStorage(resource)::read()
-    end
-    def getContentType(name)
-      ext = Std::substr(name,name::lastIndexOf(".")+1)
-      if (ext=="png")
-        return "image/png"
-      else 
-        if (ext=="gif")
-          return "image/gif"
-        else 
-          if (ext=="jpg")||(ext=="jpeg")
-            return "image/jpeg"
-          else 
-            if (ext=="html")||(ext=="htm")
-              return "text/html"
+        def initialize()
+            super()
+        end
+        def getContent(resource)
+            return Storage::newResourceStorage(resource)::read()
+        end
+        def getContentType(name)
+            ext = Std::substr(name,name::lastIndexOf(".") + 1)
+            if (ext == "png")
+                return "image/png"
             else 
-              if (ext=="css")
-                return "text/css"
-              else 
-                if (ext=="js")
-                  return "application/javascript"
+                if (ext == "gif")
+                    return "image/gif"
                 else 
-                  if (ext=="txt")
-                    return "text/plain"
-                  else 
-                    if (ext=="ini")
-                      return "text/plain"
+                    if (ext == "jpg") || (ext == "jpeg")
+                        return "image/jpeg"
                     else 
-                      return "application/octet-stream"
+                        if (ext == "html") || (ext == "htm")
+                            return "text/html"
+                        else 
+                            if (ext == "css")
+                                return "text/css"
+                            else 
+                                if (ext == "js")
+                                    return "application/javascript"
+                                else 
+                                    if (ext == "txt")
+                                        return "text/plain"
+                                    else 
+                                        if (ext == "ini")
+                                            return "text/plain"
+                                        else 
+                                            return "application/octet-stream"
+                                        end
+                                    end
+                                end
+                            end
+                        end
                     end
-                  end
                 end
-              end
             end
-          end
         end
-      end
+
     end
-  end
 end

data/lib/com/wiris/plugin/impl/TestImpl.rb

@@ -1,166 +1,186 @@
 module WirisPlugin
 include  Wiris
-require('com/wiris/plugin/api/ConfigurationKeys.rb')
-require('com/wiris/plugin/impl/HttpImpl.rb')
-require('com/wiris/plugin/api/Test.rb')
-  class TestImpl
-  extend TestInterface
+    require('com/wiris/plugin/api/ConfigurationKeys.rb')
+    require('com/wiris/plugin/impl/HttpImpl.rb')
+    require('com/wiris/plugin/api/Test.rb')
+    require('com/wiris/util/type/UrlUtils.rb')
+    require('com/wiris/util/json/JSon.rb')
+    require('com/wiris/plugin/api/Test.rb')
+    class TestImpl
+    extend TestInterface
 
-  include Wiris
+    include Wiris
 
-    attr_accessor :plugin
-    def initialize(plugin)
-      super()
-      @plugin = plugin
-    end
-    def getTestPage()
-      random = ""+(Math::random()*9999).to_s
-      mml = ("<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow><msqrt><mn>"+random)+"</mn></msqrt></mrow></math>"
-      output = ""
-      output+="<html><head>\r\n"
-      output+="<title>WIRIS plugin test page</title><meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\" /><style type=\"text/css\">/*<!--*/html {font-family: sans-serif;}h2 {margin-left: 1em;}h3 {margin-left: 2em;}p {margin-left: 3em;}p.concrete {margin-left: 4em;}.ok {font-weight: bold;color: #0c0;}.error {font-weight: bold;color: #f00;}/*-->*/</style><style type=\"text/css\">body{font-family: Arial;}span{font-weight: bold;}span.ok {color: #009900;}span.error {color: #dd0000;}table, th, td, tr {border: solid 1px #000000;border-collapse:collapse;padding: 5px;}th{background-color: #eeeeee;}img{border:none;}</style>\r\n"
-      output+="<script src=\"../core/WIRISplugins.js?viewer=image\" ></script>\r\n"
-      output+="</head><body><h1>WIRIS plugin test page</h1>\r\n"
-      output+="<table><tr><th>Test</th><th>Report</th><th>Status</th></tr>\r\n"
-      testName = "WIRIS plugin version"
-      begin
-      s = Storage::newResourceStorage("VERSION")::read()
-      reportText = ("<b>"+s)+"</b>"
-      solutionLink = ""
-      condition = true
-      end
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      testName = "Creating and storing data"
-      solutionLink = ""
-      param = PropertiesTools::newProperties()
-      outp = PropertiesTools::newProperties()
-      provider = @plugin::newGenericParamsProvider(param)
-      imageUrl = plugin::newRender()::createImage(mml,provider,outp)
-      reportText = ((("<a href=\""+imageUrl)+"\" />")+imageUrl)+"</a>"
-      condition = true
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      testName = "Retrieving data"
-      solutionLink = ""
-      reportText = ("<img src=\""+imageUrl)+"\" />"
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      testName = "JavaScript MathML filter"
-      solutionLink = ""
-      reportText = mml
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      testName = "Host platform"
-      solutionLink = ""
-      platform = plugin::getConfiguration()::getProperty(ConfigurationKeys::HOST_PLATFORM,"failed")
-      reportText = platform
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      testName = "Filter test"
-      solutionLink = ""
-      condition = true
-      p = PropertiesTools::newProperties()
-      PropertiesTools::setProperty(p,"savemode","safeXml")
-      s2 = StringTools::replace(mml,"<",Std::fromCharCode(171))
-      s2 = StringTools::replace(s2,">",Std::fromCharCode(187))
-      s2 = StringTools::replace(s2,"\"",Std::fromCharCode(168))
-      reportText = plugin::newTextService()::filter("square root: "+s2,p)
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      testName = "Connecting to www.wiris.net"
-      solutionLink = ""
-      condition = true
-      begin
-      h = HttpImpl.new("http://www.wiris.net",nil)
-      h::request(true)
-      end
-      reportText = "Checking if WIRIS server is reachable"
-      output+=createTableRow(testName,reportText,solutionLink,condition)
-      if Type::resolveClass("com.wiris.editor.services.PublicServices")!=nil
-        condition = true
-        testName = "Testing integrated services"
-        reportText = "WIRIS Services installed"
-        solutionLink = ""
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        isLicensed = plugin::isEditorLicensed()
-        condition = false
-        testName = "WIRIS editor license"
-        reportText = "Checking WIRIS editor valid license"
-        output+=createTableRow(testName,reportText,solutionLink,isLicensed)
-      else 
-        reportText = "WIRIS Services not installed"
-      end
-      debug = (plugin::getConfiguration()::getProperty(ConfigurationKeys::DEBUG,"false")=="true")
-      if debug
-        testName = "Font family"
-        solutionLink = ""
-        condition = true
-        reportText = plugin::getConfiguration()::getProperty(ConfigurationKeys::FONT_FAMILY,"")
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "Configuration file"
-        solutionLink = ""
-        condition = true
-        reportText = plugin::getConfiguration()::getProperty(ConfigurationKeys::CONFIGURATION_PATH,"")+"\\configuration.ini"
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "Cache path"
-        solutionLink = ""
-        condition = true
-        reportText = plugin::getConfiguration()::getProperty(ConfigurationKeys::CACHE_FOLDER,"")
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "Formula path"
-        solutionLink = ""
-        condition = true
-        reportText = plugin::getConfiguration()::getProperty(ConfigurationKeys::FORMULA_FOLDER,"")
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "Integration path"
-        solutionLink = ""
-        condition = true
-        reportText = plugin::getConfiguration()::getProperty(ConfigurationKeys::INTEGRATION_PATH,"")
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "Context path"
-        solutionLink = ""
-        condition = true
-        reportText = plugin::getConfiguration()::getProperty(ConfigurationKeys::CONTEXT_PATH,"")
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "default-configuration.ini load"
-        solutionLink = ""
-        defaultConfiguration = Storage::newResourceStorage("default-configuration.ini")::read()
-        condition = (defaultConfiguration!=nil)&&(defaultConfiguration::length()>0)
-        if condition
-          reportText = "Length: "+defaultConfiguration::length().to_s
-        else 
-          reportText = "Not found!"
+        attr_accessor :plugin
+        attr_accessor :conf
+        def initialize(plugin)
+            super()
+            self.plugin = plugin
         end
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-        testName = "cas.png load"
-        solutionLink = ""
-        casPng = Storage::newResourceStorage("cas.png")::readBinary()
-        casPngLength = 0
-        if casPng!=nil
-          casPngLength = Bytes::ofData(casPng)::length()
-          condition = casPngLength>0
-        else 
-          condition = false
+        def getTestPage()
+            random = "" + (Math::random()*9999).to_s
+            mml = ("<math xmlns=\"http://www.w3.org/1998/Math/MathML\"><mrow><msqrt><mn>" + random) + "</mn></msqrt></mrow></math>"
+            self.conf = self.plugin::getConfiguration()
+            output = ""
+            output += "<html><head>\r\n"
+            output += "<title>MathType integration test page</title><meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\" /><style type=\"text/css\">/*<!--*/html {font-family: sans-serif;}h2 {margin-left: 1em;}h3 {margin-left: 2em;}p {margin-left: 3em;}p.concrete {margin-left: 4em;}.ok {font-weight: bold;color: #0c0;}.error {font-weight: bold;color: #f00;}/*-->*/</style><style type=\"text/css\">body{font-family: Arial;}span{font-weight: bold;}span.ok {color: #009900;}span.error {color: #dd0000;}table, th, td, tr {border: solid 1px #000000;border-collapse:collapse;padding: 5px;}th{background-color: #eeeeee;}img{border:none;}</style>\r\n"
+            output += "<script src=\"../core/WIRISplugins.js?viewer=image\" ></script>\r\n"
+            output += "</head><body><h1>MathType integration test page</h1>\r\n"
+            output += "<table><tr><th>Test</th><th>Report</th><th>Status</th></tr>\r\n"
+            testName = "MathType integration version"
+            begin
+            s = Storage::newResourceStorage("VERSION")::read()
+            reportText = ("<b>" + s) + "</b>"
+            solutionLink = ""
+            condition = true
+            end
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            testName = "Creating and storing data"
+            solutionLink = ""
+            param = PropertiesTools::newProperties()
+            outp = PropertiesTools::newProperties()
+            provider = @plugin::newGenericParamsProvider(param)
+            imageUrl = self.plugin::newRender()::createImage(mml,provider,outp)
+            reportText = ((("<a href=\"" + imageUrl) + "\" />") + imageUrl) + "</a>"
+            condition = true
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            testName = "Retrieving data"
+            solutionLink = ""
+            if (self.conf::getProperty("wirispluginperformance","false") == "true")
+                self.plugin::newRender()::showImage(nil,mml,provider)
+                digest = self.plugin::newRender()::computeDigest(mml,provider::getRenderParameters(self.plugin::getConfiguration()))
+                imageUrlJson = self.plugin::newRender()::showImageJson(digest,"en")
+                imageJson = (JSon::decode(imageUrlJson))
+                result = (imageJson::get("result"))
+                content = (result::get("content"))
+                if (self.conf::getProperty("wirisimageformat","svg") == "svg")
+                    reportText = (("<img src=\"" + "data:image/svg+xml;charset=utf8,") + UrlUtils::urlComponentEncode(content)) + "\" />"
+                else 
+                    reportText = (("<img src=\'" + "data:image/png;base64,") + content) + "\' />"
+                end
+            else 
+                reportText = ("<img src=\'" + imageUrl) + "\' />"
+            end
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            testName = "JavaScript MathML filter"
+            solutionLink = ""
+            reportText = mml
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            testName = "Host platform"
+            solutionLink = ""
+            platform = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::HOST_PLATFORM,"failed")
+            reportText = platform
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            testName = "Filter test"
+            solutionLink = ""
+            condition = true
+            p = PropertiesTools::newProperties()
+            PropertiesTools::setProperty(p,"savemode","safeXml")
+            s2 = StringTools::replace(mml,"<",Std::fromCharCode(171))
+            s2 = StringTools::replace(s2,">",Std::fromCharCode(187))
+            s2 = StringTools::replace(s2,"\"",Std::fromCharCode(168))
+            reportText = self.plugin::newTextService()::filter("square root: " + s2,p)
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            testName = "Connecting to www.wiris.net"
+            solutionLink = ""
+            condition = true
+            begin
+            h = HttpImpl.new("http://www.wiris.net",nil)
+            h::request(true)
+            end
+            reportText = "Checking if server is reachable"
+            output += createTableRow(testName,reportText,solutionLink,condition)
+            if Type::resolveClass("com.wiris.editor.services.PublicServices") != nil
+                condition = true
+                testName = "Testing integrated services"
+                reportText = "WIRIS Services installed"
+                solutionLink = ""
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                isLicensed = self.plugin::isEditorLicensed()
+                condition = false
+                testName = "MathType license"
+                reportText = "Checking MathType valid license"
+                output += createTableRow(testName,reportText,solutionLink,isLicensed)
+            else 
+                reportText = "MathType services not installed"
+            end
+            debug = (self.plugin::getConfiguration()::getProperty(ConfigurationKeys::DEBUG,"false") == "true")
+            if debug
+                testName = "Font family"
+                solutionLink = ""
+                condition = true
+                reportText = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::FONT_FAMILY,"")
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "Configuration file"
+                solutionLink = ""
+                condition = true
+                reportText = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::CONFIGURATION_PATH,"") + "\\configuration.ini"
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "Cache path"
+                solutionLink = ""
+                condition = true
+                reportText = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::CACHE_FOLDER,"")
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "Formula path"
+                solutionLink = ""
+                condition = true
+                reportText = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::FORMULA_FOLDER,"")
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "Integration path"
+                solutionLink = ""
+                condition = true
+                reportText = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::INTEGRATION_PATH,"")
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "Context path"
+                solutionLink = ""
+                condition = true
+                reportText = self.plugin::getConfiguration()::getProperty(ConfigurationKeys::CONTEXT_PATH,"")
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "default-configuration.ini load"
+                solutionLink = ""
+                defaultConfiguration = Storage::newResourceStorage("default-configuration.ini")::read()
+                condition = (defaultConfiguration != nil) && (defaultConfiguration::length() > 0)
+                if condition
+                    reportText = "Length: " + defaultConfiguration::length().to_s
+                else 
+                    reportText = "Not found!"
+                end
+                output += createTableRow(testName,reportText,solutionLink,condition)
+                testName = "cas.png load"
+                solutionLink = ""
+                casPng = Storage::newResourceStorage("cas.png")::readBinary()
+                casPngLength = 0
+                if casPng != nil
+                    casPngLength = Bytes::ofData(casPng)::length()
+                    condition = casPngLength > 0
+                else 
+                    condition = false
+                end
+                if condition
+                    reportText = "Length: " + casPngLength.to_s
+                else 
+                    reportText = "Not found!"
+                end
+                output += createTableRow(testName,reportText,solutionLink,condition)
+            end
+            output += "<div id=\"haxe:trace\"></div>"
+            return output
         end
-        if condition
-          reportText = "Length: "+casPngLength.to_s
-        else 
-          reportText = "Not found!"
+        def createTableRow(testName, reportText, solutionLink, condition)
+            output = ""
+            output += "<tr>"
+            output += ("<td>" + testName) + "</td>"
+            output += ("<td>" + reportText) + "</td>"
+            output += "<td>"
+            if condition
+                output += "<span class=\"ok\">OK</span><br/>"
+            else 
+                output += "<span class=\"error\">ERROR</span><br/>"
+            end
+            output += "</td>"
+            output += "</tr>\r\n"
+            return output
         end
-        output+=createTableRow(testName,reportText,solutionLink,condition)
-      end
-      output+="<div id=\"haxe:trace\"></div>"
-      return output
-    end
-    def createTableRow(testName,reportText,solutionLink,condition)
-      output = ""
-      output+="<tr>"
-      output+=("<td>"+testName)+"</td>"
-      output+=("<td>"+reportText)+"</td>"
-      output+="<td>"
-      if condition
-        output+="<span class=\"ok\">OK</span><br/>"
-      else 
-        output+="<span class=\"error\">ERROR</span><br/>"
-      end
-      output+="</td>"
-      output+="</tr>\r\n"
-      return output
+
     end
-  end
 end

data/lib/com/wiris/plugin/impl/TextFilter.rb

@@ -1,211 +1,227 @@
 module WirisPlugin
 include  Wiris
-require('com/wiris/plugin/api/ConfigurationKeys.rb')
-require('com/wiris/plugin/impl/TextFilterTags.rb')
-require('com/wiris/util/json/JSon.rb')
-  class TextFilter
-  include Wiris
+    require('com/wiris/plugin/api/ConfigurationKeys.rb')
+    require('com/wiris/plugin/impl/TextFilterTags.rb')
+    require('com/wiris/util/type/UrlUtils.rb')
+    require('com/wiris/util/json/JSon.rb')
+    class TextFilter
+    include Wiris
 
-    attr_accessor :plugin
-    attr_accessor :render
-    attr_accessor :service
-    attr_accessor :fixUrl
-  NBSP = Std::fromCharCode(160)
-    def initialize(plugin)
-      super()
-      @plugin = plugin
-      @render = plugin::newRender()
-      @service = plugin::newTextService()
-      @fixUrl = nil
-    end
-    def filter(str,prop)
-      saveMode = nil
-      if prop!=nil
-        saveMode = PropertiesTools::getProperty(prop,"savemode")
-      end
-      if saveMode==nil
-        saveMode = @plugin::getConfiguration()::getProperty(ConfigurationKeys::SAVE_MODE,"xml")
-      end
-      b = (saveMode=="safeXml")
-      if b
-        tags = TextFilterTags::newSafeXml()
-      else 
-        tags = TextFilterTags::newXml()
-      end
-      str = filterMath(tags,str,prop,b)
-      str = filterApplet(tags,str,prop,b)
-      return str
-    end
-    def filterMath(tags,text,prop,safeXML)
-      output = StringBuf.new()
-      n0 = 0
-      n1 = text::indexOf(tags::in_mathopen,n0)
-      tag = @plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_MATHML_ATTRIBUTE,"data-mathml")
-      dataMathml = text::indexOf(tag,0)
-      while n1>=0
-        m0 = n0
-        output::add(Std::substr(text,n0,n1-n0))
-        n0 = n1
-        n1 = text::indexOf(tags::in_mathclose,n0)
-        if n1>=0
-          n1 = n1+tags::in_mathclose::length()
-          sub = Std::substr(text,n0,n1-n0)
-          if safeXML
-            if dataMathml!=-1
-              m1 = text::indexOf("/>",n1)
-              if (m1>=0)&&((text::indexOf("<img",n1)==-1)||(text::indexOf("<img",n1)>m1))
-                m0 = Std::substr(text,m0,n0-m0)::lastIndexOf("<img")
-                if m0>=0
-                  if (text::indexOf(tag,m0)>0)&&(text::indexOf(tag,m0)<n1)
+        attr_accessor :plugin
+        attr_accessor :render
+        attr_accessor :service
+        attr_accessor :fixUrl
+    NBSP = Std::fromCharCode(160)
+        def initialize(plugin)
+            super()
+            self.plugin = plugin
+            self.render = plugin::newRender()
+            self.service = plugin::newTextService()
+            self.fixUrl = nil
+        end
+        def filter(str, prop)
+            saveMode = nil
+            if prop != nil
+                saveMode = PropertiesTools::getProperty(prop,"savemode")
+            end
+            if saveMode == nil
+                saveMode = @plugin::getConfiguration()::getProperty(ConfigurationKeys::SAVE_MODE,"xml")
+            end
+            b = (saveMode == "safeXml")
+            mathNamespace = nil
+            namespaceIndex = str::indexOf(":math")
+            if namespaceIndex >= 0
+                mathNamespace = Std::substr(str,str::lastIndexOf("<",namespaceIndex) + 1,namespaceIndex - (str::lastIndexOf("<",namespaceIndex) + 1))
+            end
+            if b
+                tags = TextFilterTags::newSafeXml()
+            else 
+                tags = TextFilterTags::newXml(mathNamespace)
+            end
+            str = filterMath(tags,str,prop,b)
+            str = filterApplet(tags,str,prop,b)
+            return str
+        end
+        def filterMath(tags, text, prop, safeXML)
+            output = StringBuf.new()
+            n0 = 0
+            n1 = text::indexOf(tags::in_mathopen,n0)
+            tag = @plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_MATHML_ATTRIBUTE,"data-mathml")
+            dataMathml = text::indexOf(tag,0)
+            while n1 >= 0
+                m0 = n0
+                output::add(Std::substr(text,n0,n1 - n0))
+                n0 = n1
+                n1 = text::indexOf(tags::in_mathclose,n0)
+                if n1 >= 0
+                    n1 = n1 + tags::in_mathclose::length()
+                    sub = Std::substr(text,n0,n1 - n0)
+                    if safeXML
+                        if dataMathml != -1
+                            m1 = text::indexOf("/>",n1)
+                            if m1 == -1
+                                m1 = text::indexOf(">",n1)
+                            end
+                            if (m1 >= 0) && ((text::indexOf("<img",n1) == -1) || (text::indexOf("<img",n1) > m1))
+                                m0 = Std::substr(text,m0,n0 - m0)::lastIndexOf("<img")
+                                if m0 >= 0
+                                    if (text::indexOf(tag,m0) > 0) && (text::indexOf(tag,m0) < n1)
+                                        n0 = n1
+                                        output::add(sub)
+                                        n1 = text::indexOf(tags::in_mathopen,n0)
+                                        m0 = m1
+                                            next
+                                    end
+                                end
+                            end
+                        end
+                        if @fixUrl == nil
+                            @fixUrl = EReg.new("<a href=\"[^\"]*\"[^>]*>([^<]*)<\\/a>|<a href=\"[^\"]*\">","")
+                        end
+                        sub = @fixUrl::replace(sub,"$1")
+                        sub = html_entity_decode(sub)
+                        sub = StringTools::replace(sub,tags::in_double_quote,tags::out_double_quote)
+                        sub = StringTools::replace(sub,tags::in_open,tags::out_open)
+                        sub = StringTools::replace(sub,tags::in_close,tags::out_close)
+                        sub = StringTools::replace(sub,tags::in_entity,tags::out_entity)
+                        sub = StringTools::replace(sub,tags::in_quote,tags::out_quote)
+                    end
+                    begin
+                    subtext = math2Img(sub,prop)
+                    end
+                    sub = subtext
                     n0 = n1
                     output::add(sub)
                     n1 = text::indexOf(tags::in_mathopen,n0)
-                    m0 = m1
-                      next
-                  end
                 end
-              end
             end
-            if @fixUrl==nil
-              @fixUrl = EReg.new("<a href=\"[^\"]*\"[^>]*>([^<]*)<\\/a>|<a href=\"[^\"]*\">","")
+            output::add(Std::substr(text,n0))
+            return output::toString()
+        end
+        def filterApplet(tags, text, prop, safeXML)
+            output = StringBuf.new()
+            n0 = 0
+            n1 = text::toUpperCase()::indexOf(tags::in_appletopen,n0)
+            while n1 >= 0
+                output::add(Std::substr(text,n0,n1 - n0))
+                n0 = n1
+                n1 = text::toUpperCase()::indexOf(tags::in_appletclose,n0)
+                if n1 >= 0
+                    n1 = n1 + tags::in_appletclose::length()
+                    sub = Std::substr(text,n0,n1 - n0)
+                    if safeXML
+                        if @fixUrl == nil
+                            @fixUrl = EReg.new("<a href=\"[^\"]*\"[^>]*>([^<]*)<\\/a>|<a href=\"[^\"]*\">","")
+                        end
+                        sub = @fixUrl::replace(sub,"$1")
+                        sub = html_entity_decode(sub)
+                        sub = StringTools::replace(sub,tags::in_double_quote,tags::out_double_quote)
+                        sub = StringTools::replace(sub,tags::in_open,tags::out_open)
+                        sub = StringTools::replace(sub,tags::in_close,tags::out_close)
+                        sub = StringTools::replace(sub,tags::in_entity,tags::out_entity)
+                        sub = StringTools::replace(sub,tags::in_quote,tags::out_quote)
+                    end
+                    n0 = n1
+                    output::add(sub)
+                    n1 = text::toUpperCase()::indexOf(tags::in_appletopen,n0)
+                end
             end
-            sub = @fixUrl::replace(sub,"$1")
-            sub = html_entity_decode(sub)
-            sub = StringTools::replace(sub,tags::in_double_quote,tags::out_double_quote)
-            sub = StringTools::replace(sub,tags::in_open,tags::out_open)
-            sub = StringTools::replace(sub,tags::in_close,tags::out_close)
-            sub = StringTools::replace(sub,tags::in_entity,tags::out_entity)
-            sub = StringTools::replace(sub,tags::in_quote,tags::out_quote)
-          end
-          sub = math2Img(sub,prop)
-          n0 = n1
-          output::add(sub)
-          n1 = text::indexOf(tags::in_mathopen,n0)
+            output::add(Std::substr(text,n0))
+            return output::toString()
         end
-      end
-      output::add(Std::substr(text,n0))
-      return output::toString()
-    end
-    def filterApplet(tags,text,prop,safeXML)
-      output = StringBuf.new()
-      n0 = 0
-      n1 = text::toUpperCase()::indexOf(tags::in_appletopen,n0)
-      while n1>=0
-        output::add(Std::substr(text,n0,n1-n0))
-        n0 = n1
-        n1 = text::toUpperCase()::indexOf(tags::in_appletclose,n0)
-        if n1>=0
-          n1 = n1+tags::in_appletclose::length()
-          sub = Std::substr(text,n0,n1-n0)
-          if safeXML
-            if @fixUrl==nil
-              @fixUrl = EReg.new("<a href=\"[^\"]*\"[^>]*>([^<]*)<\\/a>|<a href=\"[^\"]*\">","")
+        def math2Img(str, prop)
+            img = "<img"
+            output = PropertiesTools::newProperties()
+            PropertiesTools::setProperty(prop,"centerbaseline","false")
+            PropertiesTools::setProperty(prop,"accessible","true")
+            PropertiesTools::setProperty(prop,"metrics","true")
+            provider = @plugin::newGenericParamsProvider(prop)
+            if (@plugin::getConfiguration()::getProperty("wirispluginperformance","false") == "false")
+                src = @render::createImage(str,provider,output)
+                img += (" src=\"" + src) + "\""
+                alt = PropertiesTools::getProperty(output,"alt")
+                width = PropertiesTools::getProperty(output,"width")
+                height = PropertiesTools::getProperty(output,"height")
+                baseline = PropertiesTools::getProperty(output,"baseline")
+                role = PropertiesTools::getProperty(output,"role")
+            else 
+                digest = @render::computeDigest(str,prop)
+                hashImage = @render::showImageHash(digest,PropertiesTools::getProperty(prop,"lang"))
+                if hashImage == nil
+                    @render::showImage(nil,str,provider)
+                    hashImage = @render::showImageHash(digest,PropertiesTools::getProperty(prop,"lang"))
+                end
+                content = (hashImage::get("content"))
+                if (@plugin::getConfiguration()::getProperty("wirisimageformat","png") == "png")
+                    img += (" src=\"data:image/png;base64," + content) + "\""
+                else 
+                    img += (" src=\"data:image/svg+xml;charset=utf8," + UrlUtils::urlComponentEncode(content)) + "\""
+                end
+                if hashImage::exists("alt")
+                    alt = (hashImage::get("alt"))
+                else 
+                    alt = @service::mathml2accessible(str,nil,prop)
+                end
+                width = (hashImage::get("width"))
+                height = (hashImage::get("height"))
+                baseline = (hashImage::get("baseline"))
+                role = (hashImage::get("role"))
+            end
+            dpi = Std::parseFloat(@plugin::getConfiguration()::getProperty(ConfigurationKeys::WIRIS_DPI,"96"))
+            if @plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_PARAMS,nil) != nil
+                json = JSon::decode(@plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_PARAMS,nil))
+                decodedHash = (json)
+                if decodedHash::exists("dpi")
+                    dpi = Std::parseFloat((decodedHash::get("dpi")))
+                end
             end
-            sub = @fixUrl::replace(sub,"$1")
-            sub = html_entity_decode(sub)
-            sub = StringTools::replace(sub,tags::in_double_quote,tags::out_double_quote)
-            sub = StringTools::replace(sub,tags::in_open,tags::out_open)
-            sub = StringTools::replace(sub,tags::in_close,tags::out_close)
-            sub = StringTools::replace(sub,tags::in_entity,tags::out_entity)
-            sub = StringTools::replace(sub,tags::in_quote,tags::out_quote)
-          end
-          n0 = n1
-          output::add(sub)
-          n1 = text::toUpperCase()::indexOf(tags::in_appletopen,n0)
+            mml = (@plugin::getConfiguration()::getProperty(ConfigurationKeys::FILTER_OUTPUT_MATHML,"false") == "true")
+            f = 96/dpi
+            imageFormatController = @plugin::getImageFormatController()
+            metricsHash = Hash.new()
+            metricsHash::set("width",Std::parseInt(width))
+            metricsHash::set("height",Std::parseInt(height))
+            metricsHash::set("baseline",Std::parseInt(baseline))
+            imageFormatController::scalateMetrics(dpi,metricsHash)
+            alt = html_entity_encode(alt)
+            img += " class=\"Wirisformula\""
+            img += (" alt=\"" + alt) + "\""
+            img += (" width=\"" + (metricsHash::get("width")).to_s) + "\""
+            img += (" height=\"" + (metricsHash::get("height")).to_s) + "\""
+            verticalAlign = (metricsHash::get("baseline") - metricsHash::get("height"))
+            img += (" style=\"vertical-align:" + verticalAlign.to_s) + "px\""
+            img += (" role=\"" + role) + "\""
+            if mml
+                tag = @plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_MATHML_ATTRIBUTE,"data-mathml")
+                img += (((" " + tag) + "=\'") + save_xml_encode(str)) + "\'"
+            end
+            img += "/>"
+            return img
         end
-      end
-      output::add(Std::substr(text,n0))
-      return output::toString()
-    end
-    def math2Img(str,prop)
-      img = "<img"
-      output = PropertiesTools::newProperties()
-      PropertiesTools::setProperty(prop,"centerbaseline","false")
-      PropertiesTools::setProperty(prop,"accessible","true")
-      PropertiesTools::setProperty(prop,"metrics","true")
-      provider = @plugin::newGenericParamsProvider(prop)
-      if (@plugin::getConfiguration()::getProperty("wirispluginperformance","false")=="false")
-        src = @render::createImage(str,provider,output)
-        img+=(" src=\""+src)+"\""
-        alt = PropertiesTools::getProperty(output,"alt")
-        width = PropertiesTools::getProperty(output,"width")
-        height = PropertiesTools::getProperty(output,"height")
-        baseline = PropertiesTools::getProperty(output,"baseline")
-      else 
-        digest = @render::computeDigest(str,prop)
-        json = JSon::decode(@render::showImageJson(digest,PropertiesTools::getProperty(prop,"alt")))
-        hashImage = (json)
-        if (hashImage::get("status")=="warning")
-          @render::showImage(nil,str,provider)
+        def html_entity_decode(str)
+            str = StringTools::replace(str,"&lt;","<")
+            str = StringTools::replace(str,"&gt;",">")
+            str = StringTools::replace(str,"&quot;","\"")
+            str = StringTools::replace(str,"&nbsp;",NBSP)
+            str = StringTools::replace(str,"&amp;","&")
+            return str
         end
-        json = JSon::decode(@render::showImageJson(digest,"en"))
-        hashImage = (json)
-        if (hashImage::get("status")=="ok")
-          result = (hashImage::get("result"))
-          base64 = (result::get("base64"))
-          img+=(" src=\"data:image/png;base64,"+base64)+"\""
-          if result::exists("alt")
-            alt = (result::get("alt"))
-          else 
-            alt = @service::mathml2accessible(str,nil,prop)
-          end
-          width = (result::get("width"))
-          height = (result::get("height"))
-          baseline = (result::get("baseline"))
-        else 
-          raise Exception,"Image can\'t be rendererd"
+        def html_entity_encode(str)
+            str = StringTools::replace(str,"<","&lt;")
+            str = StringTools::replace(str,">","&gt;")
+            str = StringTools::replace(str,"\"","&quot;")
+            str = StringTools::replace(str,"&","&amp;")
+            return str
         end
-      end
-      dpi = Std::parseFloat(@plugin::getConfiguration()::getProperty(ConfigurationKeys::WIRIS_DPI,"96"))
-      if @plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_PARAMS,nil)!=nil
-        json = JSon::decode(@plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_PARAMS,nil))
-        decodedHash = (json)
-        if decodedHash::exists("dpi")
-          dpi = Std::parseFloat((decodedHash::get("dpi")))
+        def save_xml_encode(str)
+            tags = TextFilterTags::newSafeXml()
+            str = StringTools::replace(str,tags::out_double_quote,tags::in_double_quote)
+            str = StringTools::replace(str,tags::out_open,tags::in_open)
+            str = StringTools::replace(str,tags::out_close,tags::in_close)
+            str = StringTools::replace(str,tags::out_entity,tags::in_entity)
+            str = StringTools::replace(str,tags::out_quote,tags::in_quote)
+            return str
         end
-      end
-      mml = (@plugin::getConfiguration()::getProperty(ConfigurationKeys::FILTER_OUTPUT_MATHML,"false")=="true")
-      f = 96/dpi
-      dwidth = f*Std::parseFloat(width)
-      dheight = f*Std::parseFloat(height)
-      dbaseline = f*Std::parseFloat(baseline)
-      alt = html_entity_encode(alt)
-      img+=" class=\"Wirisformula\""
-      img+=(" alt=\""+alt)+"\""
-      img+=(" width=\""+(dwidth).to_s)+"\""
-      img+=(" height=\""+(dheight).to_s)+"\""
-      d = ((dbaseline-dheight))
-      img+=(" style=\"vertical-align:"+d.to_s)+"px\""
-      if mml
-        tag = @plugin::getConfiguration()::getProperty(ConfigurationKeys::EDITOR_MATHML_ATTRIBUTE,"data-mathml")
-        img+=(((" "+tag)+"=\"")+save_xml_encode(str))+"\""
-      end
-      img+="/>"
-      return img
-    end
-    def html_entity_decode(str)
-      str = StringTools::replace(str,"&lt;","<")
-      str = StringTools::replace(str,"&gt;",">")
-      str = StringTools::replace(str,"&quot;","\"")
-      str = StringTools::replace(str,"&nbsp;",NBSP)
-      str = StringTools::replace(str,"&amp;","&")
-      return str
-    end
-    def html_entity_encode(str)
-      str = StringTools::replace(str,"<","&lt;")
-      str = StringTools::replace(str,">","&gt;")
-      str = StringTools::replace(str,"\"","&quot;")
-      str = StringTools::replace(str,"&","&amp;")
-      return str
-    end
-    def save_xml_encode(str)
-      tags = TextFilterTags::newSafeXml()
-      str = StringTools::replace(str,tags::out_double_quote,tags::in_double_quote)
-      str = StringTools::replace(str,tags::out_open,tags::in_open)
-      str = StringTools::replace(str,tags::out_close,tags::in_close)
-      str = StringTools::replace(str,tags::out_entity,tags::in_entity)
-      str = StringTools::replace(str,tags::out_quote,tags::in_quote)
-      return str
+
     end
-  end
 end