Skip to content

Add support for Hungarian language @aref #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions R/ebook.R
Original file line number Diff line number Diff line change
@@ -126,8 +126,8 @@ resolve_refs_md = function(content, ref_table, to_md = output_md()) {
# replace (\#eq:label) with equation numbers
content = add_eq_numbers(content, ids, ref_table, to_md)

# look for \@ref(label) and resolve to actual figure/table/section numbers
m = gregexpr('(?<!`)\\\\@ref\\(([-:[:alnum:]]+)\\)', content, perl = TRUE)
# look for \@ref(label) or \@aref(label) and resolve to actual figure/table/section numbers
m = gregexpr('(?<!`)\\\\@a?ref\\(([-:[:alnum:]]+)\\)', content, perl = TRUE)
refs = regmatches(content, m)
regmatches(content, m) = lapply(refs, ref_to_number, ref_table, TRUE)
content
20 changes: 15 additions & 5 deletions R/html.R
Original file line number Diff line number Diff line change
@@ -453,7 +453,8 @@ source_link_setting = function(config, type) {
#'
#' Post-process the HTML content to resolve references of figures, tables, and
#' sections, etc. The references are written in the form \code{\@ref(key)} in
#' the R Markdown source document.
#' or \code{\@aref(key)} the R Markdown source document, the latter intended
#' for use with Hungarian language text.
#' @param content A character vector of the HTML content.
#' @param global Whether to number the elements incrementally throughout the
#' whole document, or number them by the first-level headers. For an R
@@ -472,8 +473,8 @@ resolve_refs_html = function(content, global = FALSE) {
content = res$content
ref_table = c(res$ref_table, parse_section_labels(content))

# look for @ref(label) and resolve to actual figure/table/section numbers
m = gregexpr('(?<!\\\\)@ref\\(([-:[:alnum:]]+)\\)', content, perl = TRUE)
# look for @ref(label) or @aref(label) and resolve to actual figure/table/section numbers
m = gregexpr('(?<!\\\\)(@a?ref)\\(([-:[:alnum:]]+)\\)', content, perl = TRUE)
refs = regmatches(content, m)
for (i in seq_along(refs)) {
if (length(refs[[i]]) == 0) next
@@ -492,7 +493,14 @@ is_img_line = function(x) grepl('^<img src=".* alt="', x)

ref_to_number = function(ref, ref_table, backslash) {
if (length(ref) == 0) return(ref)
lab = gsub(if (backslash) '^\\\\@ref\\(|\\)$' else '^@ref\\(|\\)$', '', ref)
magyar_article = function(num) {
num <- sub("[.].*$", "", num)
num <- sub("[^[:digit:]]", "", num)
ifelse(grepl("^5", num) |
(grepl("^1", num) & (nchar(num) %% 3 == 1)), "az", "a")
}
aref = grepl("@aref", ref)
lab = gsub(if (backslash) '^\\\\@a?ref\\(|\\)$' else '^@a?ref\\(|\\)$', '', ref)
ref = prefix_section_labels(lab)
num = ref_table[ref]
i = is.na(num)
@@ -501,10 +509,12 @@ ref_to_number = function(ref, ref_table, backslash) {
warning('The label(s) ', paste(lab[i], collapse = ', '), ' not found', call. = FALSE)
num[i] = '<strong>??</strong>'
}
# equation references should include paratheses
az <- magyar_article(num[aref])
# equation references should include parentheses
i = grepl('^eq:', ref)
num[i] = paste0('(', num[i], ')')
res = sprintf('<a href="#%s">%s</a>', ref, num)
res[aref] <- paste(az, res[aref])
# do not add relative links to equation numbers in ePub/Word (not implemented)
ifelse(backslash & i, num, res)
}
6 changes: 3 additions & 3 deletions R/latex.R
Original file line number Diff line number Diff line change
@@ -109,12 +109,12 @@ tufte_book2 = function(...) {
resolve_refs_latex = function(x) {
# equation references \eqref{}
x = gsub(
'(?<!\\\\textbackslash{})@ref\\((eq:[-/:[:alnum:]]+)\\)', '\\\\eqref{\\1}', x,
'(?<!\\\\textbackslash{})@a?ref\\((eq:[-/:[:alnum:]]+)\\)', '\\\\eqref{\\1}', x,
perl = TRUE
)
# normal references \ref{}
# normal references \ref{} or \aref{}
x = gsub(
'(?<!\\\\textbackslash{})@ref\\(([-/:[:alnum:]]+)\\)', '\\\\ref{\\1}', x,
'(?<!\\\\textbackslash{})@(a?)ref\\(([-/:[:alnum:]]+)\\)', '\\\\\\1ref{\\2}', x,
perl = TRUE
)
x = gsub(sprintf('\\(\\\\#((%s):[-/[:alnum:]]+)\\)', reg_label_types), '\\\\label{\\1}', x)