math_ml 0.9 → 0.10

data/lib/math_ml.rb

@@ -14,12 +14,12 @@ module MathML
 	end
 
 	def self.pcstring(s, encoded=false)
-		EimXML::PCString.new(s, encoded)
+		s.is_a?(EimXML::PCString) ? s : EimXML::PCString.new(s, encoded)
 	end
 
 	class Error < StandardError; end
 end
 
 require "math_ml/element"
+require "math_ml/symbol/entity_reference"
 require "math_ml/latex"
-require "math_ml/latex/builtin_commands"

data/spec/{math_ml_latex_parser_spec.rb → math_ml/latex/parser_spec.rb}

@@ -2,6 +2,8 @@ require "eim_xml/parser"
 require "eim_xml/dsl"
 require "math_ml"
 require "spec/util"
+require "math_ml/symbol/character_reference"
+require "math_ml/symbol/utf8"
 
 describe MathML::LaTeX::Parser do
 	include MathML::Spec::Util
@@ -473,7 +475,89 @@ EOS
 		end
 
 		it "should parse symbols" do
-			smml('\precneqq').should == "<mo><mfrac linethickness='0' mathsize='1%'><mo>&prec;</mo><mo>&ne;</mo></mfrac></mo>"
+			smml('\precneqq').should == "<mo>&#x2ab5;</mo>"
+		end
+	end
+
+	context ".new should accept symbol table" do
+		it "character reference" do
+			@parser = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
+			smml('\alpha').should == "<mi>&#x3b1;</mi>"
+			smml('\mathbb{abcABC}').should == "<mrow><mrow><mi>&#x1d552;</mi><mi>&#x1d553;</mi><mi>&#x1d554;</mi><mi>&#x1d538;</mi><mi>&#x1d539;</mi><mi>&#x2102;</mi></mrow></mrow>"
+			smml('\mathscr{abcABC}').should == "<mrow><mrow><mi>&#x1d4b6;</mi><mi>&#x1d4b7;</mi><mi>&#x1d4b8;</mi><mi>&#x1d49c;</mi><mi>&#x212c;</mi><mi>&#x1d49e;</mi></mrow></mrow>"
+			smml('\mathfrak{abcABC}').should == "<mrow><mrow><mi>&#x1d51e;</mi><mi>&#x1d51f;</mi><mi>&#x1d520;</mi><mi>&#x1d504;</mi><mi>&#x1d505;</mi><mi>&#x212d;</mi></mrow></mrow>"
+		end
+
+		it "utf8" do
+			@parser = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::UTF8)
+			smml('\alpha').should == "<mi>α</mi>"
+			smml('\mathbb{abcABC}').should == "<mrow><mrow><mi>𝕒</mi><mi>𝕓</mi><mi>𝕔</mi><mi>𝔸</mi><mi>𝔹</mi><mi>ℂ</mi></mrow></mrow>"
+			smml('\mathscr{abcABC}').should == "<mrow><mrow><mi>𝒶</mi><mi>𝒷</mi><mi>𝒸</mi><mi>𝒜</mi><mi>ℬ</mi><mi>𝒞</mi></mrow></mrow>"
+			smml('\mathfrak{abcABC}').should == "<mrow><mrow><mi>𝔞</mi><mi>𝔟</mi><mi>𝔠</mi><mi>𝔄</mi><mi>𝔅</mi><mi>ℭ</mi></mrow></mrow>"
+		end
+	end
+
+	context "#symbol_table" do
+		it "should return when .new was given name of symbol-module" do
+			ps = MathML::LaTeX::Parser
+			symbol = MathML::Symbol
+
+			ps.new(:symbol=>symbol::UTF8).symbol_table.should == symbol::UTF8
+			ps.new(:symbol=>symbol::EntityReference).symbol_table.should == symbol::EntityReference
+			ps.new(:symbol=>symbol::CharacterReference).symbol_table.should == symbol::CharacterReference
+
+			ps.new(:symbol=>:utf8).symbol_table.should == symbol::UTF8
+			ps.new(:symbol=>:entity).symbol_table.should == symbol::EntityReference
+			ps.new(:symbol=>:character).symbol_table.should == symbol::CharacterReference
+
+			ps.new.symbol_table.should == symbol::EntityReference
+			ps.new(:symbol=>nil).symbol_table.should == symbol::EntityReference
+		end
+
+		context "should return default symbol module" do
+			before do
+				@loaded_features = $LOADED_FEATURES.dup
+				$LOADED_FEATURES.delete_if{|i| i=~/math_ml/}
+				if ::Object.const_defined?(:MathML)
+					@MathML = ::Object.const_get(:MathML)
+					::Object.module_eval{remove_const(:MathML)}
+				end
+			end
+
+			after do
+				$LOADED_FEATURES.clear
+				$LOADED_FEATURES.push(@loaded_features.shift) until @loaded_features.empty?
+				if @MathML
+					::Object.module_eval{remove_const(:MathML)}
+					::Object.const_set(:MathML, @MathML)
+				end
+			end
+
+			it "character entity reference version by default" do
+				require("math_ml").should be_true
+				MathML::LaTeX::Parser.new.symbol_table.should == MathML::Symbol::EntityReference
+			end
+
+			describe "character entity reference version when set by requiring" do
+				it do
+					require("math_ml/symbol/entity_reference").should be_true
+					MathML::LaTeX::Parser.new.symbol_table.should == MathML::Symbol::EntityReference
+				end
+			end
+
+			describe "utf8 version when set by requiring" do
+				it do
+					require("math_ml/symbol/utf8").should be_true
+					MathML::LaTeX::Parser.new.symbol_table.should == MathML::Symbol::UTF8
+				end
+			end
+
+			describe "numeric character reference version when set by requiring" do
+				it do
+					require("math_ml/symbol/character_reference").should be_true
+					MathML::LaTeX::Parser.new.symbol_table.should == MathML::Symbol::CharacterReference
+				end
+			end
 		end
 	end
 end

data/spec/util.rb

@@ -1,13 +1,19 @@
+require "rspec"
 module MathML
 	module Spec
 		module Util
 			def raise_parse_error(message, done, rest)
-				simple_matcher("parse_error") do |given|
-					given.should raise_error(MathML::LaTeX::ParseError){ |e|
-						e.message.should == message
-						e.done.should == done
-						e.rest.should == rest
-					}
+				RSpec::Matchers::Matcher.new(:raise_parse_error) do
+					match do |given|
+						begin
+							given.call
+							@error = nil
+						rescue Exception
+							@error = $!
+						end
+						@error.is_a?(MathML::LaTeX::ParseError) &&
+							[@error.message, @error.done, @error.rest] == [message, done, rest]
+					end
 				end
 			end
 
@@ -16,7 +22,7 @@ module MathML
 			end
 
 			def math_ml(src, display_style=false, parser=nil)
-				parser ||= new_parser
+				parser ||= @parser || new_parser
 				parser.parse(src, display_style)
 			end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: math_ml
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 9
-  version: "0.9"
+  - 10
+  version: "0.10"
 platform: ruby
 authors: 
 - KURODA Hiraku
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +09:00
+date: 2010-12-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,22 +40,26 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Rakefile.utirake
 - Rakefile
-- lib/math_ml.rb
-- lib/math_ml/latex/builtin_commands.rb
+- Rakefile.utirake
+- lib/math_ml/element.rb
+- lib/math_ml/string.rb
 - lib/math_ml/util.rb
 - lib/math_ml/latex.rb
-- lib/math_ml/string.rb
-- lib/math_ml/element.rb
-- spec/math_ml_latex_scanner_spec.rb
-- spec/math_ml_element_spec.rb
-- spec/math_ml_latex_parser_spec.rb
-- spec/util.rb
-- spec/math_ml_latex_macro_spec.rb
-- spec/math_ml_util_spec.rb
+- lib/math_ml/latex/builtin.rb
+- lib/math_ml/latex/builtin/symbol.rb
+- lib/math_ml/symbol/character_reference.rb
+- lib/math_ml/symbol/entity_reference.rb
+- lib/math_ml/symbol/utf8.rb
+- lib/math_ml.rb
 - spec/math_ml_spec.rb
-- spec/math_ml_string_spec.rb
+- spec/math_ml/element_spec.rb
+- spec/math_ml/util_spec.rb
+- spec/math_ml/string_spec.rb
+- spec/math_ml/latex/macro_spec.rb
+- spec/math_ml/latex/scanner_spec.rb
+- spec/math_ml/latex/parser_spec.rb
+- spec/util.rb
 has_rdoc: true
 homepage: http://mathml.rubyforge.org/
 licenses: []