Skip to content

Commit 5e1da64

Browse files
committed
fix: OSD: unicode, singular/plural horizon depth units
1 parent 67a3715 commit 5e1da64

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

R/parseOSD_functions.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@
305305
.extractHzData <- function(tp, logfile = "OSD.log", filename = "FOO.txt") {
306306

307307
# detect horizons with both top and bottom depths
308-
hz.rule <- "([\\^\\'\\/a-zA-Z0-9]+(?: and [\\^\\'\\/a-zA-Z0-9]+)?)\\s*[-=\u2014]+\\s*([Ol0-9.]+)\\s*?(to|-)?\\s+?([Ol0-9.]+)\\s*?(inches|in|cm|centimeters)"
308+
hz.rule <- "([\\^\\'\\/a-zA-Z0-9]+(?: and [\\^\\'\\/a-zA-Z0-9]+)?)\\s*[-=\u2014]+\\s*([Ol0-9.]+)\\s*?(to|-)?\\s+?([Ol0-9.]+)\\s*?(inche?s?|in|cm|centimeters?)"
309309

310310
# detect horizons with no bottom depth
311-
hz.rule.no.bottom <- "([\\^\\'\\/a-zA-Z0-9]+(?: and [\\^\\'\\/a-zA-Z0-9]+)?)\\s*[-=]+?\\s*([Ol0-9./ ]+)\\s*(inche?s?|in|cm|centimeters)?\\s*(to|-)?\\s*([Ol0-9./ ]+)?\\s*(inche?s?|in|cm|centimeters)?"
311+
hz.rule.no.bottom <- "([\\^\\'\\/a-zA-Z0-9]+(?: and [\\^\\'\\/a-zA-Z0-9]+)?)\\s*[-=\u2014]+?\\s*([Ol0-9./ ]+)\\s*(inche?s?|in|cm|centimeters?)?\\s*(to|-)?\\s*([Ol0-9./ ]+)?\\s*(inche?s?|in|cm|centimeters?)?"
312312

313313
## default encoding of colors: Toggle dry/moist assumption
314314
##

0 commit comments

Comments
 (0)