math_ml 0.13 → 0.14

data/Rakefile

@@ -1,6 +1,6 @@
 load "Rakefile.utirake"
 
-VER = "0.13"
+VER = "0.14"
 
 UtiRake.setup do
 	external("https://hg.hinet.mydns.jp", %w[eim_xml])

data/lib/math_ml/latex.rb

@@ -530,7 +530,7 @@ EOS
 
 			def parse_operator
 				o = @scanner.matched
-				Operator.new << o
+				Operator.new.tap{|op| op[:stretchy]="false"} << o
 			end
 
 			def parse_block
@@ -614,6 +614,7 @@ EOS
 					el.extend(Variant).variant = Variant::NORMAL unless s.is_a?(String)&&s.length>1
 				when :o
 					el = Operator.new
+					el[:stretchy] = "false"
 				when :n
 					el = Number.new
 				else

data/spec/math_ml/latex/parser_spec.rb

@@ -11,13 +11,15 @@ describe MathML::LaTeX::Parser do
 
 	def check_chr(tag, src)
 		src.scan(/./) do |c|
-			smml(c).should == "<#{tag}>#{c}</#{tag}>"
+			tag_re = Regexp.escape(tag)
+			smml(c).should =~ /\A<#{tag_re}(\s+[^>]+)?>#{Regexp.escape(c)}<\/#{tag_re}>\z/
 		end
 	end
 
 	def check_hash(tag, hash)
 		hash.each do |k, v|
-			smml(k).should == "<#{tag}>#{v}</#{tag}>"
+			tag_re = Regexp.escape(tag)
+			smml(k).should =~ /\A<#{tag_re}(\s+[^>]+)?>#{Regexp.escape(v)}<\/#{tag_re}>\z/
 		end
 	end
 
@@ -72,7 +74,7 @@ describe MathML::LaTeX::Parser do
 		it "should process numerics" do
 			smml('1234567890').should == "<mn>1234567890</mn>"
 			smml('1.2').should == "<mn>1.2</mn>"
-			smml('1.').should == "<mn>1</mn><mo>.</mo>"
+			smml('1.').should == "<mn>1</mn><mo stretchy='false'>.</mo>"
 			smml('.2').should == "<mn>.2</mn>"
 			smml('1.2.3').should == "<mn>1.2</mn><mn>.3</mn>"
 		end
@@ -83,7 +85,7 @@ describe MathML::LaTeX::Parser do
 		end
 
 		it "should process non alphabet command" do
-			smml('\|').should == "<mo>&DoubleVerticalBar;</mo>"
+			smml('\|').should == "<mo stretchy='false'>&DoubleVerticalBar;</mo>"
 		end
 
 		it "should process space commands" do
@@ -150,12 +152,12 @@ describe MathML::LaTeX::Parser do
 		end
 
 		it "should process underover" do
-			smml('\sum_a^b', true).should == "<munderover><mo>&sum;</mo><mi>a</mi><mi>b</mi></munderover>"
-			smml('\sum_a^b').should == "<msubsup><mo>&sum;</mo><mi>a</mi><mi>b</mi></msubsup>"
-			smml('\sum_a', true).should == "<munder><mo>&sum;</mo><mi>a</mi></munder>"
-			smml('\sum^a', true).should == "<mover><mo>&sum;</mo><mi>a</mi></mover>"
-			smml('\sum_a').should == "<msub><mo>&sum;</mo><mi>a</mi></msub>"
-			smml('\sum^a').should == "<msup><mo>&sum;</mo><mi>a</mi></msup>"
+			smml('\sum_a^b', true).should == "<munderover><mo stretchy='false'>&sum;</mo><mi>a</mi><mi>b</mi></munderover>"
+			smml('\sum_a^b').should == "<msubsup><mo stretchy='false'>&sum;</mo><mi>a</mi><mi>b</mi></msubsup>"
+			smml('\sum_a', true).should == "<munder><mo stretchy='false'>&sum;</mo><mi>a</mi></munder>"
+			smml('\sum^a', true).should == "<mover><mo stretchy='false'>&sum;</mo><mi>a</mi></mover>"
+			smml('\sum_a').should == "<msub><mo stretchy='false'>&sum;</mo><mi>a</mi></msub>"
+			smml('\sum^a').should == "<msup><mo stretchy='false'>&sum;</mo><mi>a</mi></msup>"
 
 			lambda{smml('\sum_b_c')}.should raise_parse_error("Double subscript.", '\sum_b', "_c")
 			lambda{smml('\sum^b^c')}.should raise_parse_error("Double superscript.", '\sum^b', "^c")
@@ -349,7 +351,7 @@ describe MathML::LaTeX::Parser do
 		end
 
 		it "should parse stackrel" do
-			smml('\stackrel\to=').should == "<mover><mo>=</mo><mo>&rightarrow;</mo></mover>"
+			smml('\stackrel\to=').should == "<mover><mo stretchy='false'>=</mo><mo stretchy='false'>&rightarrow;</mo></mover>"
 			smml('\stackrel12').should == "<mover><mn>2</mn><mn>1</mn></mover>"
 		end
 
@@ -490,7 +492,7 @@ EOS
 		end
 
 		it "should parse symbols" do
-			smml('\precneqq').should == "<mo>&#x2ab5;</mo>"
+			smml('\precneqq').should == "<mo stretchy='false'>&#x2ab5;</mo>"
 		end
 	end
 

data/spec/math_ml/util_spec.rb

@@ -143,9 +143,9 @@ describe MathML::Util::SimpleLaTeX do
 			"a\n<math display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>b</mi></math>\nc<math display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mi>d</mi></math>e")
 
 		assert_data('$\\$$',
-			["<mo>$</mo>"],
+			["<mo stretchy='false'>$</mo>"],
 			['$\$$'], [], [], [], [], "\001m0\001",
-			"<math display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mo>$</mo></math>")
+			"<math display='inline' xmlns='http://www.w3.org/1998/Math/MathML'><mo stretchy='false'>$</mo></math>")
 	end
 
 	it "should parse dmath environment" do
@@ -633,7 +633,7 @@ EOT
 			end
 		end
 		encoded.should == "test\n\001u0\001\nend\n"
-		simplify_math(s.decode(encoded, data)).should == simplify_math("test\n<math display='block' xmlns='http://www.w3.org/1998/Math/MathML'><mtable><mtr><mtd><mi>a</mi></mtd><mtd><mo>=</mo></mtd><mtd><mi>b</mi></mtd></mtr><mtr><mtd><mi>c</mi></mtd><mtd><mo>=</mo></mtd><mtd><mi>d</mi></mtd></mtr></mtable></math>\nend\n")
+		simplify_math(s.decode(encoded, data)).should == simplify_math("test\n<math display='block' xmlns='http://www.w3.org/1998/Math/MathML'><mtable><mtr><mtd><mi>a</mi></mtd><mtd><mo stretchy='false'>=</mo></mtd><mtd><mi>b</mi></mtd></mtr><mtr><mtd><mi>c</mi></mtd><mtd><mo stretchy='false'>=</mo></mtd><mtd><mi>d</mi></mtd></mtr></mtable></math>\nend\n")
 
 		encoded, data = s.encode('\begin{eqnarray}a\end{eqnarray}', MathML::Util::EQNARRAY_RE) do |scanner|
 			s.parse_eqnarray(scanner[1]) if scanner.scan(MathML::Util::EQNARRAY_RE)

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: math_ml
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 13
-  version: "0.13"
+  - 14
+  version: "0.14"
 platform: ruby
 authors: 
 - KURODA Hiraku
@@ -14,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-01 00:00:00 Z
+date: 2012-11-11 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eim_xml
@@ -59,6 +60,7 @@ files:
 - spec/math_ml/string_spec.rb
 - spec/math_ml/util_spec.rb
 - spec/math_ml/element_spec.rb
+has_rdoc: true
 homepage: http://mathml.rubyforge.org/
 licenses: []
 
@@ -90,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mathml
-rubygems_version: 1.8.18
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: MathML Library