refactor: use tinkr::get_protected() (#70)

R/translate.R

@@ -157,11 +157,13 @@ translate_part <- function(xml,
   woolish$body <- fakify_xml(xml)
 
   ## protect content inside curly braces and math ----
-  woolish$body <- tinkr::protect_math(woolish$body)
-  woolish$body <- tinkr::protect_curly(woolish$body)
-  curlies <- xml2::xml_find_all(woolish$body, "//*[@curly]")
+  ## protect content inside curly braces and math ----
+  woolish$protect_math()$protect_curly()
+
+  curlies <- woolish$get_protected("curly")
   purrr::walk(curlies, protect_curly)
-  maths <- xml2::xml_find_all(woolish$body, "//*[@asis='true']")
+
+  maths <- woolish$get_protected("math")
   purrr::walk(maths, protect_math)
 
   ## protect content inside square brackets ----
@@ -379,10 +381,19 @@ unprotect_curly <- function(curly) {
 }
 
 protect_math <- function(math) {
+  if (xml2::xml_name(math) == "softbreak") {
+    xml2::xml_attr(math, "softbreak") <- "yes"
+  }
+
   xml2::xml_name(math) <- "math"
+
 }
 unprotect_math <- function(math) {
-  xml2::xml_name(math) <- "text"
+  if (xml2::xml_has_attr(math, "softbreak")) {
+    xml2::xml_name(math) <- "softbreak"
+  } else {
+    xml2::xml_name(math) <- "text"
+  }
 }
 protect_squaries <- function(node) {
   text <- xml2::xml_text(node)

tests/testthat/fixtures/example-equations-curly/api/translate-adef71-POST.json → tests/testthat/fixtures/example-equations-curly/api/translate-8089b4-POST.json

@@ -2,7 +2,7 @@
     "translations": [
         {
             "detected_source_language": "FR",
-            "text": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE document SYSTEM \"CommonMark.dtd\">\n<document xmlns=\"http://commonmark.org/xml/1.0\">\n  <paragraph>\n    <text xml:space=\"preserve\"/>\n    <math asis=\"true\">$a_{ij}$<\/math>\n    <text/>\n  <\/paragraph>\n<\/document>\n"
+            "text": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE document SYSTEM \"CommonMark.dtd\">\n<document xmlns=\"http://commonmark.org/xml/1.0\">\n  <paragraph>\n    <text xml:space=\"preserve\"/>\n    <math asis=\"true\" math=\"true\">$a_{ij}$<\/math>\n    <text/>\n  <\/paragraph>\n<\/document>\n"
         }
     ]
 }

tests/testthat/fixtures/example-equations-footnote/api/translate-37ec3f-POST.json

@@ -0,0 +1,8 @@
+{
+    "translations": [
+        {
+            "detected_source_language": "FR",
+            "text": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE document SYSTEM \"CommonMark.dtd\">\n<document xmlns=\"http://commonmark.org/xml/1.0\">\n  <paragraph>\n   <text xml:space=\"preserve\">See <\/text>\n   <math asis=\"true\" math=\"true\">$a$<\/math>\n   <text xml:space=\"preserve\">\n      <text xml:space=\"preserve\"> an equation with a note afterwards <\/text>\n     <squary>\n        <notranslate>^1<\/notranslate>\n      <\/squary>\n     <text>.<\/text>\n   <\/text>\n  <\/paragraph>\n  <paragraph>\n   <text xml:space=\"preserve\">\n     <squary><notranslate>^1<\/notranslate>:<\/squary>\n      <text> a footnote.<\/text>\n   <\/text>\n  <\/paragraph>\n<\/document>\n"
+        }
+    ]
+}

tests/testthat/fixtures/example-equations/api/translate-929c07-POST.json

@@ -0,0 +1,8 @@
+{
+    "translations": [
+        {
+            "detected_source_language": "EN",
+            "text": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE document SYSTEM \"CommonMark.dtd\">\n<document xmlns=\"http://commonmark.org/xml/1.0\">\n  <paragraph>\n   <text xml:space=\"preserve\">Algo de texto.<\/text>\n  <\/paragraph>\n  <paragraph>\n    <math xml:space=\"preserve\" asis=\"true\" math=\"true\">$$<\/math>\n    <math asis=\"true\" math=\"true\" softbreak=\"yes\"/>\n    <math xml:space=\"preserve\" asis=\"true\" math=\"true\">E = m \\times c^2<\/math>\n    <math asis=\"true\" math=\"true\" softbreak=\"yes\"/>\n    <math xml:space=\"preserve\" asis=\"true\" math=\"true\">$$<\/math>\n  <\/paragraph>\n  <paragraph>\n   <text xml:space=\"preserve\">¿Te parece bonita esta ecuación? Observa que <\/text>\n   <math asis=\"true\" math=\"true\">$\\alpha=1$<\/math>\n    <text> y <\/text>\n   <math asis=\"true\" math=\"true\">$b$<\/math>\n    <text> no está definida.<\/text>\n  <\/paragraph>\n  <paragraph>\n    <text xml:space=\"preserve\"/>\n    <math asis=\"true\" math=\"true\">$i_t = j_t$<\/math>\n    <text/>\n  <\/paragraph>\n<\/document>\n"
+        }
+    ]
+}