From 8dd6bbe0a2b9f31e1bc0029b496bb16233154985 Mon Sep 17 00:00:00 2001 From: UndeadMaelys Date: Wed, 4 May 2022 21:24:27 +0200 Subject: [PATCH] fixed r2h2mod --- R2H2.lua | 11 +++---- converter.lua | 2 +- input.txt | 46 ++++++++++++++-------------- test.html | 84 +++++++++++++++++++++++++-------------------------- 4 files changed, 70 insertions(+), 73 deletions(-) diff --git a/R2H2.lua b/R2H2.lua index 48f5bfe..4a5fd0e 100644 --- a/R2H2.lua +++ b/R2H2.lua @@ -62,11 +62,6 @@ function convertToHeonian(text) if v == "-c" or v == "--copy" then autocopy = true end end - -- evaluate conditions that cancel the script - if text == "" then - step = false - end - -- if its necessary to run the script, then we continue :D if step then -- prepare text @@ -106,7 +101,9 @@ function convertToHeonian(text) char_step = false end -- init checkup - if string.sub(text,i,i) == "." then -- this forces the new syllable, since . is the syllable separator, also skips the symbol and repositions + if string.sub(text,i,i) == "." + or string.sub(text,i,i) == "'" + or string.sub(text,i,i) == "’" then -- this forces the new syllable, since . is the syllable separator, also skips the symbol and repositions -- debug log if debug then print("") end if debug then print(" @[".. tostring(i).."]"..debug_s.." new syllable MARKER found") end @@ -227,7 +224,7 @@ function convertToHeonian(text) -- debug log if debug then print(" [!] no idea; moving on to next [".. pos + 1 .."]") end -- no idea - -- transcribed_text = transcribed_text .. "?" + transcribed_text = transcribed_text .. string.sub(text,i+1,i+1) i = i + 1 -- debug log if debug then print(" >>> adjusting by (1) from [".. pos .. "] to [".. i .. "]" ) end diff --git a/converter.lua b/converter.lua index 2e2b682..7675e2f 100644 --- a/converter.lua +++ b/converter.lua @@ -82,7 +82,7 @@ while p ~= nil do apply_html("html/convo/text/end.html") -- heonian apply_html("html/convo/text/start_heonian.html") - print(convertToHeonian(strip_symbols(string.sub(text,p+2,np-1)))) + print(convertToHeonian(string.sub(text,p+2,np-1))) apply_html("html/convo/text/end.html") else -- new user name diff --git a/input.txt b/input.txt index abf9f94..0cb1c0d 100644 --- a/input.txt +++ b/input.txt @@ -1,5 +1,5 @@ LU'NYA - nyan’pash! balfur yu e she polika'nya dre? + nyan'pash! balfur yu e she polika'nya dre? ESH'NYUI re chu meshu yu polika'nya @@ -14,56 +14,56 @@ ESH'NYUI uwu LU'NYA - relfur chu mya pu yu mya relfur lup apatka’nya faka’nya’pash ponme mya wawote polika’nya peekaka’nya’pash. + relfur chu mya pu yu mya relfur lup apatka'nya faka'nya'pash ponme mya wawote polika'nya peekaka'nya'pash. ESH'NYUI - mi’shi’pash~ - balfur yu e ton polika’nya dre? + mi'shi'pash~ + balfur yu e ton polika'nya dre? LU'NYA - mishi’pash!! - relfurla mya ton polika'nya yu meluton ka’nya! + mishi'pash!! + relfurla mya ton polika'nya yu meluton ka'nya! balfurla yu dra? ESH'NYUI - relfurla yu esh’dre mya ton polika’nya yu puroton ka’nya~ - relfur yu shi’ro’bae’pu yu pon’ya ka’nya~ + relfurla yu esh'dre mya ton polika'nya yu puroton ka'nya~ + relfur yu shi'ro'bae'pu yu pon'ya ka'nya~ LU'NYA - puroton yu ponya ton ka’nya! + puroton yu ponya ton ka'nya! ESH'NYUI - be’nyui-rerenlafura yu meluton mimifaka’nya… + be'nyui-rerenlafura yu meluton mimifaka'nya… relfur yu meluton mimiku'pash~ LU'NYA - ’o, relfur chu parefaka’nya… - be’nyui-babanlafura yu meluton naomiminku dre? + 'o, relfur chu parefaka'nya… + be'nyui-babanlafura yu meluton naomiminku dre? ESH'NYUI - uu, relfur yu naomiminku mya mimifuku mya ton ka’nya... + uu, relfur yu naomiminku mya mimifuku mya ton ka'nya... relfur yu guraton to meluton mimifuku.. - relfur yu ton mimiku’pash~ + relfur yu ton mimiku'pash~ LU'NYA ishi-balfur yu mishi'pash! - balfur chu mya arilaen yu en ka’nya peekaka’nya fa'dre? + balfur chu mya arilaen yu en ka'nya peekaka'nya fa'dre? ESH'NYUI yesh-balfur yu mishi'pash~ (>///////////////<) - relfur yu ari’laen parefaka’nya, balfur yu pareka’nya dra? + relfur yu ari'laen parefaka'nya, balfur yu pareka'nya dra? LU'NYA - relfur chu arilaen dedaka’nya. - imanla rila shashka’nya’pash. - imanla shoo chu ike to pikeshe ka’nya. + relfur chu arilaen dedaka'nya. + imanla rila shashka'nya'pash. + imanla shoo chu ike to pikeshe ka'nya. / - relfur chu arilaenlan luka’nya’pash. + relfur chu arilaenlan luka'nya'pash. ESH'NYUI - arilaenla shoo chu pikeshe fuka’nya’bash dra? + arilaenla shoo chu pikeshe fuka'nya'bash dra? LU'NYA - gao chu relfur yu fayu kan’ya. - relfur chu arilaen dedaka’nya. + gao chu relfur yu fayu kan'ya. + relfur chu arilaen dedaka'nya. diff --git a/test.html b/test.html index be6c4f7..b42936b 100644 --- a/test.html +++ b/test.html @@ -18,10 +18,10 @@ LU'NYA

-nyan’pash! balfur yu e she polika'nya dre? +nyan'pash! balfur yu e she polika'nya dre?

- + 

@@ -42,7 +42,7 @@ re chu meshu yu polika'nya (po'nyash!!!)

- +p!!)

@@ -57,13 +57,13 @@ LU'NYA aa, anko!

- + 

(po'nyash!)

- +p)

@@ -78,7 +78,7 @@ ESH'NYUI ba yu e wawote to pu mipura lili'nya dre?

- +

uwu @@ -96,10 +96,10 @@ LU'NYA

-relfur chu mya pu yu mya relfur lup apatka’nya faka’nya’pash ponme mya wawote polika’nya peekaka’nya’pash. +relfur chu mya pu yu mya relfur lup apatka'nya faka'nya'pash ponme mya wawote polika'nya peekaka'nya'pash.

- +yyy

@@ -111,13 +111,13 @@ ESH'NYUI

-mi’shi’pash~ +mi'shi'pash~



-balfur yu e ton polika’nya dre? +balfur yu e ton polika'nya dre?

 @@ -132,16 +132,16 @@ LU'NYA

-mishi’pash!! +mishi'pash!!

- +!

-relfurla mya ton polika'nya yu meluton ka’nya! +relfurla mya ton polika'nya yu meluton ka'nya!

- +y

balfurla yu dra? @@ -159,13 +159,13 @@ ESH'NYUI

-relfurla yu esh’dre mya ton polika’nya yu puroton ka’nya~ +relfurla yu esh'dre mya ton polika'nya yu puroton ka'nya~

- +y

-relfur yu shi’ro’bae’pu yu pon’ya ka’nya~ +relfur yu shi'ro'bae'pu yu pon'ya ka'nya~

 @@ -180,7 +180,7 @@ LU'NYA

-puroton yu ponya ton ka’nya! +puroton yu ponya ton ka'nya!

 @@ -195,10 +195,10 @@ ESH'NYUI

-be’nyui-rerenlafura yu meluton mimifaka’nya… +be'nyui-rerenlafura yu meluton mimifaka'nya…

- +

relfur yu meluton mimiku'pash~ @@ -216,13 +216,13 @@ LU'NYA

-’o, relfur chu parefaka’nya… +'o, relfur chu parefaka'nya…

- +o 

-be’nyui-babanlafura yu meluton naomiminku dre? +be'nyui-babanlafura yu meluton naomiminku dre?

 @@ -237,19 +237,19 @@ ESH'NYUI

-uu, relfur yu naomiminku mya mimifuku mya ton ka’nya... +uu, relfur yu naomiminku mya mimifuku mya ton ka'nya...

- + yy.

relfur yu guraton to meluton mimifuku..

- +

-relfur yu ton mimiku’pash~ +relfur yu ton mimiku'pash~

 @@ -267,13 +267,13 @@ LU'NYA ishi-balfur yu mishi'pash!

- +

-balfur chu mya arilaen yu en ka’nya peekaka’nya fa'dre? +balfur chu mya arilaen yu en ka'nya peekaka'nya fa'dre?

- +y

@@ -288,19 +288,19 @@ ESH'NYUI yesh-balfur yu mishi'pash~

- +

(>///////////////<)

- +>///////////////<)

-relfur yu ari’laen parefaka’nya, balfur yu pareka’nya dra? +relfur yu ari'laen parefaka'nya, balfur yu pareka'nya dra?

- + 

@@ -312,29 +312,29 @@ LU'NYA

-relfur chu arilaen dedaka’nya. +relfur chu arilaen dedaka'nya.



-imanla rila shashka’nya’pash. +imanla rila shashka'nya'pash.



-imanla shoo chu ike to pikeshe ka’nya. +imanla shoo chu ike to pikeshe ka'nya.

- +

-relfur chu arilaenlan luka’nya’pash. +relfur chu arilaenlan luka'nya'pash.

 @@ -349,7 +349,7 @@ ESH'NYUI

-arilaenla shoo chu pikeshe fuka’nya’bash dra? +arilaenla shoo chu pikeshe fuka'nya'bash dra?

 @@ -364,13 +364,13 @@ LU'NYA

-gao chu relfur yu fayu kan’ya. +gao chu relfur yu fayu kan'ya.



-relfur chu arilaen dedaka’nya. +relfur chu arilaen dedaka'nya.

