ovec 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072ab08b381a445811c64db29452dd28f5b1c575
-  data.tar.gz: 7fc5d8aa41477ffcf71499df5d44cc88f35a52dd
+  metadata.gz: 4b2459b51d262b95de241e84262bc517012ee99a
+  data.tar.gz: 83d33adee0490378adbf4dd6981a729b0c309942
 SHA512:
-  metadata.gz: 22dbbd36ec18a956479d356ba949405b3e211631b3ec89f1f30d0e9435a69a7d1d4590b525b1d909dc57d88974cc80d38f6f2a6ffdf2276f5e25c403667e5aa9
-  data.tar.gz: 2e193c2a77a1daefeff432b8ab8da85f8f70807e76e1194268f0170fa72a69c9a844352466df5b3e760612fdcf1d60985a7328c2e12d5f533fb48f00c3704ffc
+  metadata.gz: c384c7ed9ef32b7d9e573cfc27dc5b9601a02a75a18bb6782ee377d17ccb8e14493087cd1c3b3e939b4d4d4fc2193257b02f7cafde02e659b4f683ac4d298ae0
+  data.tar.gz: c70482565d874fb48f556da168f95357028f09031967e796c99519421642637ae61951af3b546d702ddf703d8f5a7e73005c08f5d7ce1c576240b8d8c988aa68

data/TODO

@@ -10,4 +10,3 @@
 
 - ne-UTF8 soubory
 - mista parsovacich chyb
-- vlnkovani na rozhrani radku

data/lib/ovec/tier.rb

@@ -4,9 +4,8 @@ module Ovec
 	class Tier < TextManipulator
 		# The last character this regex matches is changed to a tilde.
 		REGEX = /(
-			((\p{Z}|[~\n()\[\]\{\}])[KkSsVvZzOoUu](\p{Z}|\n))|   # KSVZOU jako samostatne slovo
-			([\.\?\!](\p{Z}|\~)+[KSVZOUAI](\p{Z}|\n))| # KSVZOUAI na zacatku vety
-			(\A[KSVZOUAI](\p{Z}|\n))|                  # KSVZOUAI na zacatku textu
+			((\p{Z}|[~\n(\[\{]|\A)[KkSsVvZzOoUu](\p{Z}|\n|\Z))|   # KSVZOU jako samostatne slovo
+			((([\.\?\!](\p{Z}|\~)+)|(\A\p{Z}*))[KSVZOUAI](\p{Z}|\n))| # KSVZOUAI na zacatku vety
 			(\p{Z}(?=--(\p{Z}|\n)))|              # mezera, za kterou je pomlcka
 			(,(\p{Z}|\~|\n)+a(\p{Z}|\n))               # ... modulo 10, a~timto prvkem ...; TODO: plati tohle i pro "i"?
 		)/x
@@ -43,6 +42,8 @@ module Ovec
 						# newline -- move the tied word to the other line.
 						j = change - 1
 						while j >= 0
+							break if @joined[j] == '\n' # Don't cross newlines.
+
 							if @joined[j] == ' '
 								chunk, offset = _find_chunk_and_offset(j)
 								chunk[offset] = '\n'

data/lib/ovec/version.rb

@@ -1,4 +1,4 @@
 module Ovec
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 	NAME_WITH_VERSION = "Ovec #{VERSION}"
 end

data/test/lib/ovec/tier.rb

@@ -8,7 +8,7 @@ module Ovec
 
 		private
 		def assert_ties_to(input, output)
-			parser = Ovec::Parser.new(debug: true)
+			parser = Ovec::Parser.new(debug: false)
 			tree = parser.parse(input.dup)
 
 			tm = Ovec::TexManipulator.new
@@ -25,18 +25,7 @@ module Ovec
 		def test_basic_without_ties
 			text = "Ahoj. Jak se máš?"
 			text_duplicate = text.dup
-
-			parser = Ovec::Parser.new(debug: true)
-			tree = parser.parse(text)
-
-			tm = Ovec::TexManipulator.new
-			tm.bind(tree)
-
-			tm.run_text_manipulator(@tier)
-
-			text = tree.to_tex
-
-			assert_equal text, text_duplicate
+			assert_ties_to text, text_duplicate
 		end
 
 		def test_simple_tie
@@ -80,6 +69,8 @@ module Ovec
 		def test_tie_in_newline
 			assert_ties_to "V\nrámci\ntohohle", "V~rámci\ntohohle"
 			assert_ties_to "V\nrámci tohohle", "V~rámci tohohle"
+			assert_ties_to "medved\nv\nulu", "medved\nv~ulu"
+			assert_ties_to "v\nulu", "v~ulu"
 		end
 
 		def test_date_regex_ok

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovec
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Michal Pokorný