mathml 0.8.0 → 0.8.1

data/Rakefile

@@ -54,7 +54,7 @@ namespace :test do
 	end
 	FileList["test/*_test.rb"].sort{|a,b| File.mtime(a)<=>File.mtime(b)}.reverse.each do |i|
 		Rake::TestTask.new(:apart) do |t|
-			t.test_files = i
+			t.test_files = [i]
 			add_libs_for_test(t)
 		end
 	end
@@ -80,7 +80,7 @@ def build_gem(unstable=false)
 	spec = Gem::Specification.new do |spec|
 		spec.name = "mathml"
 		spec.rubyforge_project = "mathml"
-		spec.version = "0.8.0"
+		spec.version = ENV["VER"] or raise "Need VER=x.y.z(.?)"
 		spec.summary = "MathML Library"
 		spec.author = "KURODA Hiraku"
 		spec.email = "hiraku@hinet.mydns.jp"

data/lib/math_ml.rb

@@ -153,16 +153,9 @@ module MathML
 			update_name
 		end
 
-		if Module.constants.include?("REXML") && self < REXML::Element
-			def write(writer=$stdout, indent=-1, transitive=false, ie_hack=true)
-				update_contents
-				super
-			end
-		elsif Module.constants.include?("EimXML") && self < EimXML::Element
-			def write(dst=String.new, level=0, is_head=true)
-				update_contents
-				super
-			end
+		def to_xml_with_indent(dst=String.new, level=0, is_head=true)
+			update_contents
+			super
 		end
 	end
 
@@ -270,7 +263,7 @@ module MathML
 		module RE
 			SPACE = /(?:\s|%.*$)/
 			NUMERICS = /(?:\.\d+)|(?:\d+(\.\d+)?)/
-			OPERATORS = /[,\.\+\-\*=\/\(\)\[\]<>"'|;:!]/
+			OPERATORS = /[,\.\+\-\*=\/\(\)\[\]<>"|;:!]/
 			ALPHABETS = /[a-zA-Z]/
 			BLOCK = /\A\{(.*?)\}\z/m
 			OPTION = /\A\[(.*)\]\z/m
@@ -746,7 +739,7 @@ EOS
 						parse_block
 					when @scanner.scan(/_/)
 						parse_sub
-					when @scanner.scan(/\^/)
+					when @scanner.scan(/'+|\^/)
 						parse_sup
 					when @scanner.scan_command
 						parse_command
@@ -815,8 +808,27 @@ EOS
 				e = @container.pop
 				e = None.new unless e
 				e = SubSup.new(@ds && e.display_style, e) unless e.is_a?(SubSup)
-				raise ParseError.new("Double superscript.", "^") if e.sup
-				e.sup = parse_any("Superscript not exist.")
+				raise ParseError.new("Double superscript.", @scanner[0]) if e.sup
+				if /'+/=~@scanner[0]
+					prime = Operator.new
+					prime << MathML.pcstring('&prime;'*@scanner[0].size, true)
+					unless @scanner.scan(/\^/)
+						e.sup = prime
+						return e
+					end
+				end
+				sup = parse_any("Superscript not exist.")
+
+				if prime
+					unless sup.is_a?(Row)
+						r = Row.new
+						r << sup
+						sup = r
+					end
+					sup.contents.insert(0, prime)
+				end
+
+				e.sup = sup
 				e
 			end
 

data/test/math_ml_test.rb

@@ -459,10 +459,24 @@ class TC_MathML_LaTeX_Parser < Test::Unit::TestCase
 
 	def test_operators
 		check_chr("<mo>", "</mo>", ",.+-*=/()[]|;:!")
-		check_entity("<mo>", "</mo>", {"<"=>"lt", ">"=>"gt", '"'=>"quot", "'"=>"apos"})
+		check_entity("<mo>", "</mo>", {"<"=>"lt", ">"=>"gt", '"'=>"quot"})
 		check_hash("<mo>", "</mo>", {'\backslash'=>'\\', '\%'=>'%', '\{'=>'{', '\}'=>'}', '\$'=>'$', '\#'=>'#'})
 	end
 
+	def test_prime
+		assert_equal("<msup><mi>a</mi><mo>&prime;</mo></msup>", smml("a'"))
+		assert_equal("<msup><mi>a</mi><mo>&prime;&prime;</mo></msup>", smml("a''"))
+		assert_equal("<msup><mi>a</mi><mo>&prime;&prime;&prime;</mo></msup>", smml("a'''"))
+		assert_equal("<msup><none /><mo>&prime;</mo></msup>", smml("'"))
+
+		e = assert_raises(ParseError){smml("a^b'")}
+		assert_equal(["Double superscript.", "a^b", "'"], parse_error(e))
+
+		assert_equal("<msup><mi>a</mi><mrow><mo>&prime;</mo><mi>b</mi></mrow></msup>", smml("a'^b"))
+		assert_equal("<msup><mi>a</mi><mrow><mo>&prime;&prime;&prime;</mo><mi>b</mi></mrow></msup>", smml("a'''^b"))
+		assert_equal("<msup><mi>a</mi><mo>&prime;</mo></msup><mi>b</mi>", smml("a'b"))
+	end
+
 	def test_sqrt
 		assert_equal("<msqrt><mi>a</mi></msqrt>", smml('\sqrt a'))
 		assert_equal("<mroot><mn>3</mn><mn>2</mn></mroot>", smml('\sqrt[2]3'))

metadata

@@ -1,57 +1,55 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: mathml
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-10-23 00:00:00 +09:00
-summary: MathML Library
-require_paths: 
-- lib
-email: hiraku@hinet.mydns.jp
-homepage: http://mathml.rubyforge.org/
-rubyforge_project: mathml
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.8.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - KURODA Hiraku
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-03-24 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eimxml
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: 
+email: hiraku@hinet.mydns.jp
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - lib
-- test
-- Rakefile
-- README
-- symbols
-- lib/math_ml
 - lib/math_ml.rb
+- lib/math_ml
 - lib/math_ml/string.rb
 - lib/math_ml/util.rb
-- test/math_ml_test_util.rb
-- test/util_test.rb
-- test/string_test.rb
-- test/math_ml_test_util_test.rb
-- test/math_ml_test.rb
-- symbols/list.txt
+- README
+- symbols
 - symbols/fetch_symbol_test.rb
+- symbols/list.txt
 - symbols/fetch_symbol.rb
-test_files: 
-- test/math_ml_test_util.rb
+- Rakefile
+- test
 - test/util_test.rb
-- test/string_test.rb
 - test/math_ml_test_util_test.rb
 - test/math_ml_test.rb
+- test/math_ml_test_util.rb
+- test/string_test.rb
+has_rdoc: true
+homepage: http://mathml.rubyforge.org/
+post_install_message: 
 rdoc_options: 
 - -S
 - -w
@@ -60,21 +58,30 @@ rdoc_options:
 - UTF-8
 - -m
 - README
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: eimxml
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+rubyforge_project: mathml
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: MathML Library
+test_files: 
+- test/util_test.rb
+- test/math_ml_test_util_test.rb
+- test/math_ml_test.rb
+- test/math_ml_test_util.rb
+- test/string_test.rb