try to handle latex words

Author: tjmahr

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: WrapRmd
 Title: RStudio Addin for Wrapping RMarkdown Paragraphs
-Version: 0.0.0.9005
+Version: 0.0.0.9006
 Authors@R: c(
     person("Tristan", "Mahr", , "[email protected]", role = c("aut", "cre")),
     person("Shir", "Dekel", email = "[email protected]", role = "ctb", comment = c(ORCID = "0000-0003-1773-2446"))
@@ -20,6 +20,6 @@ Imports:
 Suggests: 
     testthat
 LazyData: true
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,3 +1,8 @@
+# WrapRmd 0.0.0.9006
+
+  - LaTeX-looking words (matching `\[A-Za-z]{`) are unescaped if 
+    commonmark escaped the leading backslash.
+
 # WrapRmd 0.0.0.9005
 
   - Inline math (that starts and ends with a `$` character) is treated like R 

R/package.R

@@ -4,9 +4,8 @@
 #' without inserting linebreaks into spans of inline R code.
 #'
 #' @name WrapRmd
-#' @docType package
 #' @import stringr
-NULL
+"_PACKAGE"
 
 
 #' Wrap text but don't insert lines breaks into inline R code
@@ -191,9 +190,10 @@ md_wrap <- function(
     str_replace("\\n$", "")
 
   wrapped %>%
-    unescape(raw_string, "[") %>%
-    unescape(raw_string, "]") %>%
-    unescape(raw_string, "!") %>%
+    unescape(raw_string, stringr::fixed("[")) %>%
+    unescape(raw_string, stringr::fixed("]")) %>%
+    unescape(raw_string, stringr::fixed("!")) %>%
+    unescape_latex_words(raw_string) %>%
     restore_escape(raw_string, "\\@ref")
 }
 
@@ -232,37 +232,62 @@ restore_escape <- function(string, raw_string, target) {
   string
 }
 
+unescape_latex_words <- function(string, raw_string) {
+  latex_words <- raw_string %>%
+    stringr::str_extract_all("\\\\[A-Za-z]+\\{") %>%
+    unlist() %>%
+    unique()
+
+  for (word in latex_words) {
+    string <- unescape(string, raw_string, fixed(word))
+  }
+  string
+
+}
+
 unescape <- function(string, raw_string, target) {
+  esc_target <- if (inherits(target, "stringr_fixed")) {
+    target
+  } else {
+    esc(target)
+  }
+
   # Find the target in the original string
-  location_in_raw <- str_locate_all(raw_string, esc(target))[[1]] %>%
+  location_in_raw <- raw_string %>%
+    str_locate_all(esc_target) %>%
+    getElement(1) %>%
     as.data.frame()
 
-  # Check each use of target to see if it was exepcted in the raw string
+  # Check each use of target to see if it was escaped in the raw string
   for (i in seq_along(location_in_raw$start)) {
     char_loc <- location_in_raw$start[[i]]
-    escaped <- substr(raw_string, char_loc - 1, char_loc) == esc(target)
+    char_loc_end <- location_in_raw$end[[i]]
+    escaped <- substr(raw_string, char_loc - 1, char_loc_end) == esc(esc_target)
     location_in_raw$escaped[[i]] <- escaped
   }
 
   # Find the target in the wrapped string
-  location_in_wrapped <- str_locate_all(string, esc(target))[[1]]
+  location_in_wrapped <- str_locate_all(string, esc_target)[[1]]
 
   # Check for escapes in the wrapped text
   for (i in seq_along(location_in_wrapped[, 1])) {
     char_loc <- location_in_wrapped[i, 1]
-    escaped_in_wrapped <- substr(string, char_loc - 1, char_loc) == esc(target)
+    char_loc_end <- location_in_wrapped[i, 2]
+
+    escaped_in_wrapped <- substr(string, char_loc - 1, char_loc_end) == esc(esc_target)
     escaped_in_raw <- location_in_raw$escaped[[i]]
 
     # If an escape was added, remove it and update target locations
     if (escaped_in_wrapped & !escaped_in_raw) {
-      str_sub(string, char_loc - 1, char_loc) <- target
-      location_in_wrapped <- str_locate_all(string, esc(target))[[1]]
+      str_sub(string, char_loc - 1, char_loc_end) <- target
+      location_in_wrapped <- str_locate_all(string, esc_target)[[1]]
     }
   }
 
   string
 }
 
+
 esc <- function(x) {
   paste0("\\", x)
 }

README.md

@@ -1,7 +1,5 @@
 # WrapRmd
 
-[![Travis-CI Build Status](https://travis-ci.org/tjmahr/WrapRmd.svg?branch=master)](https://travis-ci.org/tjmahr/WrapRmd)
-
 An [RStudio Addin](https://rstudio.github.io/rstudioaddins/) to wrap paragraphs
 of RMarkdown text without inserting line breaks into inline R code.
 
@@ -14,7 +12,11 @@ You can install the plain version WrapRmd from GitHub with:
 devtools::install_github("tjmahr/WrapRmd")
 ```
 
-This package used the [commonmark](https://cran.r-project.org/web/packages/commonmark/index.html) package to wrap and reformat to markdown text. Using commonmark means that it can wrap links and markdown lists. The package does some additional work to handle inline R Markdown.
+This package used the
+[commonmark](https://cran.r-project.org/web/packages/commonmark/index.html)
+package to wrap and reformat to markdown text. Using commonmark means that it
+can wrap links and markdown lists. The package does some additional work to
+handle inline R Markdown.
 
 ## Overview
 

man/WrapRmd.Rd

@@ -20,3 +20,12 @@ test_that("escape \ in math mode", {
 })
 
 
+test_that("no escape LaTeX", {
+  string <-
+"Someone said something [@bibref-to-article], and I am doing something in
+\\experiment{1} to test it."
+
+  expect_equal(str_rmd_wrap(string, 80), string)
+})
+
+

tests/testthat/test-escaping.R

@@ -1,6 +1,9 @@
 test_that("basic wrapping", {
   no_code <- "regular words on a line"
-  expect_equal(str_rmd_wrap(no_code), no_code)
+  expect_equal(
+    str_rmd_wrap(no_code),
+    no_code
+  )
 
   long_paragraph <- "`r hello` and `r 1 + 1` and `r 1 + b + b + c` and drop a line right here `r maybe_here` `r goodbye`"