math_ml 0.10 → 0.11

data/Rakefile

@@ -1,6 +1,6 @@
 load "Rakefile.utirake"
 
-VER = "0.10"
+VER = "0.11"
 
 UtiRake.setup do
 	external("https://hg.hinet.mydns.jp", %w[eim_xml])
@@ -8,7 +8,7 @@ UtiRake.setup do
 	rdoc do |t|
 		t.title = "MathML Library"
 		t.main = "README"
-		t.rdoc_files << FileList["lib/**/*.rb", "README"]
+		t.rdoc_files.include(FileList["lib/**/*.rb", "README"])
 	end
 
 	publish("mathml", "hiraku") do
@@ -28,9 +28,9 @@ UtiRake.setup do
 
 	rcov_spec do |s|
 		s.ruby_opts = %w[-rubygems]
-		s.pattern ||= %w[spec/util.rb spec/*_spec.rb]
+		s.pattern ||= %w[spec/util.rb spec/**/*_spec.rb]
 		s.pattern = [s.pattern] unless s.pattern.is_a?(Array)
-		s.pattern << "symbols/**/*_spec.rb"
+#		s.pattern << "symbols/**/*_spec.rb"
 	end
 
 	spec do |s|

data/Rakefile.utirake

@@ -5,11 +5,13 @@
 
 require "rake/clean"
 require "rake/testtask"
-require "rake/rdoctask"
+require "rdoc/task"
 require "rake/contrib/rubyforgepublisher"
 require "rubygems/package_task"
 
 class UtiRake
+	include Rake::DSL
+
 	def self.setup(opt={}, &proc)
 		ur = new
 		ur.setup(opt, &proc)
@@ -196,7 +198,7 @@ class UtiRake
 
 	def publish(project_name, user_id)
 		task :publish => "rdoc" do
-			yield if block_given
+			yield if block_given?
 			Rake::RubyForgePublisher.new(project_name, user_id).upload
 		end
 	end
@@ -253,7 +255,7 @@ class UtiRake
 				end
 			end
 
-			`grep -sRn '#[[:space:]]*here\\([[:space:]]\\|$\\)' spec`.split(/\n/).map{|l|
+			`grep -sRn '#[[:space:]]*here\\([[:space:]]\\|$\\)' --include='*.rb' spec`.split(/\n/).map{|l|
 				next nil unless l=~/\A(.*?):(\d+):/
 				[$1, $2.to_i]
 			}.compact.sort{|a, b| FILE_SORT.call(a[0], b[0])}.reverse.each do |file, line|

data/lib/math_ml/latex.rb

@@ -564,7 +564,9 @@ EOS
 				raise ParseError.new("Double superscript.", @scanner[0]) if e.sup
 				if /'+/=~@scanner[0]
 					prime = Operator.new
-					prime << MathML.pcstring('&prime;'*@scanner[0].size, true)
+					@scanner[0].size.times do
+						prime << symbol_table.convert("prime")
+					end
 					unless @scanner.scan(/\^/)
 						e.sup = prime
 						return e

data/lib/math_ml/symbol/utf8.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module MathML
 	module Symbol
 		MAP = {} unless const_defined?(:MAP)

data/spec/math_ml/latex/parser_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "eim_xml/parser"
 require "eim_xml/dsl"
 require "math_ml"
@@ -102,17 +103,31 @@ describe MathML::LaTeX::Parser do
 			check_hash("mo", {'\backslash'=>'\\', '\%'=>'%', '\{'=>'{', '\}'=>'}', '\$'=>'$', '\#'=>'#'})
 		end
 
-		it "should process prime" do
-			smml("a'").should == "<msup><mi>a</mi><mo>&prime;</mo></msup>"
-			smml("a''").should == "<msup><mi>a</mi><mo>&prime;&prime;</mo></msup>"
-			smml("a'''").should == "<msup><mi>a</mi><mo>&prime;&prime;&prime;</mo></msup>"
-			smml("'").should == "<msup><none /><mo>&prime;</mo></msup>"
+		describe "should process prime" do
+			it "entity reference" do
+				smml("a'").should == "<msup><mi>a</mi><mo>&prime;</mo></msup>"
+				smml("a''").should == "<msup><mi>a</mi><mo>&prime;&prime;</mo></msup>"
+				smml("a'''").should == "<msup><mi>a</mi><mo>&prime;&prime;&prime;</mo></msup>"
+				smml("'").should == "<msup><none /><mo>&prime;</mo></msup>"
 
-			lambda{smml("a^b'")}.should raise_parse_error("Double superscript.", "a^b", "'")
+				lambda{smml("a^b'")}.should raise_parse_error("Double superscript.", "a^b", "'")
 
-			smml("a'^b").should == "<msup><mi>a</mi><mrow><mo>&prime;</mo><mi>b</mi></mrow></msup>"
-			smml("a'''^b").should == "<msup><mi>a</mi><mrow><mo>&prime;&prime;&prime;</mo><mi>b</mi></mrow></msup>"
-			smml("a'b").should == "<msup><mi>a</mi><mo>&prime;</mo></msup><mi>b</mi>"
+				smml("a'^b").should == "<msup><mi>a</mi><mrow><mo>&prime;</mo><mi>b</mi></mrow></msup>"
+				smml("a'''^b").should == "<msup><mi>a</mi><mrow><mo>&prime;&prime;&prime;</mo><mi>b</mi></mrow></msup>"
+				smml("a'b").should == "<msup><mi>a</mi><mo>&prime;</mo></msup><mi>b</mi>"
+			end
+
+			it "utf8" do
+				@parser = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::UTF8)
+				smml("a'").should == "<msup><mi>a</mi><mo>′</mo></msup>"
+				smml("a'''").should == "<msup><mi>a</mi><mo>′′′</mo></msup>"
+			end
+
+			it "character reference" do
+				@parser = MathML::LaTeX::Parser.new(:symbol=>MathML::Symbol::CharacterReference)
+				smml("a'").should == "<msup><mi>a</mi><mo>&#x2032;</mo></msup>"
+				smml("a'''").should == "<msup><mi>a</mi><mo>&#x2032;&#x2032;&#x2032;</mo></msup>"
+			end
 		end
 
 		it "should process sqrt" do

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: math_ml
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
-  - 10
-  version: "0.10"
+  - 11
+  version: "0.11"
 platform: ruby
 authors: 
 - KURODA Hiraku
@@ -14,8 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 +09:00
-default_executable: 
+date: 2011-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eim_xml
@@ -40,27 +39,26 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- Rakefile
 - Rakefile.utirake
-- lib/math_ml/element.rb
+- Rakefile
+- lib/math_ml.rb
 - lib/math_ml/string.rb
 - lib/math_ml/util.rb
-- lib/math_ml/latex.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
+- lib/math_ml/symbol/character_reference.rb
+- lib/math_ml/latex/builtin/symbol.rb
+- lib/math_ml/latex/builtin.rb
+- lib/math_ml/latex.rb
+- lib/math_ml/element.rb
+- spec/util.rb
 - spec/math_ml_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
+- spec/math_ml/latex/macro_spec.rb
+- spec/math_ml/util_spec.rb
 homepage: http://mathml.rubyforge.org/
 licenses: []
 
@@ -92,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mathml
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: MathML Library