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

lib/stringsupport.rb

@@ -530,7 +530,7 @@ class String
 	'bowtie' => '⋈',
 	'bsim' => '∽',
 	'bsime' => '⋍',
-	'bsolhsub' => '\⊂',
+	'bsolhsub' => '⟈',
 	'bump' => '≎',
 	'bumpE' => '⪮',
 	'bumpe' => '≏',
@@ -675,7 +675,7 @@ class String
 	'supdsub' => '⫘',
 	'supE' => '⫆',
 	'supedot' => '⫄',
-	'suphsol' => '⊃/',
+	'suphsol' => '⟉',
 	'suphsub' => '⫗',
 	'suplarr' => '⥻',
 	'supmult' => '⫂',
@@ -706,7 +706,7 @@ class String
 	'Delta' => 'Δ',
 	'delta' => 'δ',
 	'epsi' => 'ϵ',
-	'epsiv' => 'ε',
+	'epsiv' => 'ϵ',
 	'eta' => 'η',
 	'Gamma' => 'Γ',
 	'gamma' => 'γ',
@@ -725,7 +725,7 @@ class String
 	'Phi' => 'Φ',
 	'phi' => 'φ',
 	'phis' => 'ϕ',
-	'phiv' => 'φ',
+	'phiv' => 'ϕ',
 	'Pi' => 'Π',
 	'pi' => 'π',
 	'piv' => 'ϖ',
@@ -1593,7 +1593,7 @@ class String
 	'NotSquareSuperset' => '⊐̸',
 	'NotSucceedsTilde' => '≿̸',
 	'oopf' => '𝕠',
-	'OverBar' => '¯',
+	'OverBar' => '‾',
 	'OverBrace' => '⏞',
 	'OverBracket' => '⎴',
 	'OverParenthesis' => '⏜',
@@ -1615,9 +1615,9 @@ class String
 	'RuleDelayed' => '⧴',
 	'sopf' => '𝕤',
 	'Tab' => '	',
-	'ThickSpace' => '   ',
+	'ThickSpace' => '  ',
 	'topf' => '𝕥',
-	'UnderBar' => '̲',
+	'UnderBar' => '_',
 	'UnderBrace' => '⏟',
 	'UnderBracket' => '⎵',
 	'UnderParenthesis' => '⏝',
@@ -2153,10 +2153,10 @@ class String
 	'UpTeeArrow' => '↥',
 	'upuparrows' => '⇈',
 	'urcorner' => '⌝',
-	'varepsilon' => 'ε',
+	'varepsilon' => 'ϵ',
 	'varkappa' => 'ϰ',
 	'varnothing' => '∅',
-	'varphi' => 'φ',
+	'varphi' => 'ϕ',
 	'varpi' => 'ϖ',
 	'varpropto' => '∝',
 	'varrho' => 'ϱ',

test/unit/page_renderer_test.rb

@@ -212,6 +212,13 @@ END_THM
   
   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'><mi>\316\265</mi><mo>\342\211\240</mo>} +
+        %{<mi>\317\265</mi></math></p>},
+        "equation $\\varepsilon\\neq\\epsilon$")
+
       assert_markup_parsed_as(
         %{<p>equation <math class='maruku-mathml' displa} +
         %{y='inline' xmlns='http://www.w3.org/1998/Math/} +
@@ -244,7 +251,7 @@ END_THM
     assert_markup_parsed_as(
         %{<p>equation <math class='maruku-mathml' displa} +
         %{y='inline' xmlns='http://www.w3.org/1998/Math/} +
-        %{MathML'><munder><mi>A</mi><mo>\314\262</mo></m} +
+        %{MathML'><munder><mi>A</mi><mo>_</mo></m} +
         %{under></math></p>},
         "equation $\\underline{A}$")