From fedc6efe05a5c1287d23b80746d534570dd34998 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sat, 19 Oct 2024 22:13:26 +0200 Subject: [PATCH 01/30] add first steps --- .dev/CRAN_Release.cmd | 2 +- .github/workflows/R-CMD-check-occasional.yaml | 2 +- DESCRIPTION | 4 ++-- vignettes/datatable-benchmarking.Rmd | 4 ++-- vignettes/datatable-faq.Rmd | 4 ++-- vignettes/datatable-importing.Rmd | 4 ++-- vignettes/datatable-intro.Rmd | 4 ++-- vignettes/datatable-joins.Rmd | 4 ++-- vignettes/datatable-keys-fast-subset.Rmd | 4 ++-- vignettes/datatable-programming.Rmd | 4 ++-- vignettes/datatable-reference-semantics.Rmd | 4 ++-- vignettes/datatable-reshape.Rmd | 4 ++-- vignettes/datatable-sd-usage.Rmd | 4 ++-- vignettes/datatable-secondary-indices-and-auto-indexing.Rmd | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.dev/CRAN_Release.cmd b/.dev/CRAN_Release.cmd index 5af9a9d10c..8d7f1bf0ef 100644 --- a/.dev/CRAN_Release.cmd +++ b/.dev/CRAN_Release.cmd @@ -344,7 +344,7 @@ Rdevel-strict-[gcc|clang] CMD check data.table_1.16.99.tar.gz Rdevel-strict-[gcc|clang] isTRUE(.Machine$sizeof.longdouble==0) # check noLD is being tested options(repos = "http://cloud.r-project.org") -install.packages(c("bit64", "bit", "R.utils", "xts", "zoo", "yaml", "knitr", "markdown"), +install.packages(c("bit64", "bit", "R.utils", "xts", "zoo", "yaml", "litedown"), Ncpus=4) # Issue #5491 showed that CRAN is running UBSAN on .Rd examples which found an error so we now run full R CMD check q("no") diff --git a/.github/workflows/R-CMD-check-occasional.yaml b/.github/workflows/R-CMD-check-occasional.yaml index dee8bf452b..68a49b0090 100644 --- a/.github/workflows/R-CMD-check-occasional.yaml +++ b/.github/workflows/R-CMD-check-occasional.yaml @@ -113,7 +113,7 @@ jobs: TEST_DATA_TABLE_WITH_OTHER_PACKAGES=as.character(run_other) ) - do_vignettes = requireNamespace("knitr", quietly=TRUE) + do_vignettes = requireNamespace("", quietly=TRUE) build_args = NULL check_args = c("--no-manual", "--as-cran") diff --git a/DESCRIPTION b/DESCRIPTION index d17f2ea75c..e514fe0eba 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,12 +3,12 @@ Version: 1.16.99 Title: Extension of `data.frame` Depends: R (>= 3.3.0) Imports: methods -Suggests: bit64 (>= 4.0.0), bit (>= 4.0.4), R.utils, xts, zoo (>= 1.8-1), yaml, knitr, markdown +Suggests: bit64 (>= 4.0.0), bit (>= 4.0.4), R.utils, xts, zoo (>= 1.8-1), yaml, litedown Description: Fast aggregation of large data (e.g. 100GB in RAM), fast ordered joins, fast add/modify/delete of columns by group using no copies at all, list columns, friendly and fast character-separated-value read/write. Offers a natural and flexible syntax, for faster development. License: MPL-2.0 | file LICENSE URL: https://r-datatable.com, https://Rdatatable.gitlab.io/data.table, https://github.com/Rdatatable/data.table BugReports: https://github.com/Rdatatable/data.table/issues -VignetteBuilder: knitr +VignetteBuilder: litedown Encoding: UTF-8 ByteCompile: TRUE Authors@R: c( diff --git a/vignettes/datatable-benchmarking.Rmd b/vignettes/datatable-benchmarking.Rmd index 66788d46d6..bbd7629641 100644 --- a/vignettes/datatable-benchmarking.Rmd +++ b/vignettes/datatable-benchmarking.Rmd @@ -2,7 +2,7 @@ title: "Benchmarking data.table" date: "`r Sys.Date()`" output: - markdown::html_format: + litedown::html_format: options: toc: true number_sections: true @@ -10,7 +10,7 @@ output: css: [default, css/toc.css] vignette: > %\VignetteIndexEntry{Benchmarking data.table} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index eb03ce6942..a35fd688d7 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -2,7 +2,7 @@ title: "Frequently Asked Questions about data.table" date: "`r Sys.Date()`" output: - markdown::html_format: + litedown::html_format: options: toc: true number_sections: true @@ -10,7 +10,7 @@ output: css: [default, css/toc.css] vignette: > %\VignetteIndexEntry{Frequently Asked Questions about data.table} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-importing.Rmd b/vignettes/datatable-importing.Rmd index 2d08ffcf9e..5a839d9215 100644 --- a/vignettes/datatable-importing.Rmd +++ b/vignettes/datatable-importing.Rmd @@ -2,10 +2,10 @@ title: "Importing data.table" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Importing data.table} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index 72eabbd8e7..6c1378a854 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -2,10 +2,10 @@ title: "Introduction to data.table" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Introduction to data.table} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index b3b30598d1..bc974c2df7 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -2,10 +2,10 @@ title: "Joins in data.table" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Joins in data.table} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} editor_options: chunk_output_type: console diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index 5602c32051..d9ce8347e0 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -2,10 +2,10 @@ title: "Keys and fast binary search based subset" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Keys and fast binary search based subset} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index eedb5e9928..7e2bcf86f5 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -2,10 +2,10 @@ title: "Programming on data.table" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Programming on data.table} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index 3f9fd7328b..cfd0208649 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -2,10 +2,10 @@ title: "Reference semantics" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Reference semantics} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index e5efb660f0..953247830d 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -2,10 +2,10 @@ title: "Efficient reshaping using data.tables" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Efficient reshaping using data.tables} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index a1c76713d4..cf83989653 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -2,7 +2,7 @@ title: "Using .SD for Data Analysis" date: "`r Sys.Date()`" output: - markdown::html_format: + litedown::html_format: options: toc: true number_sections: true @@ -10,7 +10,7 @@ output: css: [default, css/toc.css] vignette: > %\VignetteIndexEntry{Using .SD for Data Analysis} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index ba3ec267e8..15d2a19509 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -2,10 +2,10 @@ title: "Secondary indices and auto indexing" date: "`r Sys.Date()`" output: - markdown::html_format + litedown::html_format vignette: > %\VignetteIndexEntry{Secondary indices and auto indexing} - %\VignetteEngine{knitr::knitr} + %\VignetteEngine{litedown::vignette} \usepackage[utf8]{inputenc} --- From b1f1adb9ec292cd38b4074ce9f8cfa89109234b5 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sat, 19 Oct 2024 22:42:37 +0200 Subject: [PATCH 02/30] add litedown R CMD check occasional --- .github/workflows/R-CMD-check-occasional.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check-occasional.yaml b/.github/workflows/R-CMD-check-occasional.yaml index 68a49b0090..6a011cf84e 100644 --- a/.github/workflows/R-CMD-check-occasional.yaml +++ b/.github/workflows/R-CMD-check-occasional.yaml @@ -113,7 +113,7 @@ jobs: TEST_DATA_TABLE_WITH_OTHER_PACKAGES=as.character(run_other) ) - do_vignettes = requireNamespace("", quietly=TRUE) + do_vignettes = requireNamespace("litedown", quietly=TRUE) build_args = NULL check_args = c("--no-manual", "--as-cran") From 2fc3ddc77acd781f9e9980abc35994cc1e3ee91f Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sat, 19 Oct 2024 23:26:21 +0200 Subject: [PATCH 03/30] remove knitr::opts_chunk --- vignettes/datatable-faq.Rmd | 6 ------ vignettes/datatable-intro.Rmd | 7 ------- vignettes/datatable-joins.Rmd | 7 ------- vignettes/datatable-keys-fast-subset.Rmd | 6 ------ vignettes/datatable-programming.Rmd | 7 ------- vignettes/datatable-reference-semantics.Rmd | 6 ------ vignettes/datatable-reshape.Rmd | 6 ------ vignettes/datatable-sd-usage.Rmd | 9 --------- .../datatable-secondary-indices-and-auto-indexing.Rmd | 6 ------ 9 files changed, 60 deletions(-) diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index a35fd688d7..16a3a1d2e2 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -23,12 +23,6 @@ h2 { ```{r, echo = FALSE, message = FALSE} library(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE) .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index 6c1378a854..29c446ea9e 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -11,13 +11,6 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE -) .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index bc974c2df7..ec473b20d8 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -13,13 +13,6 @@ editor_options: ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE -) ``` In this vignette you will learn how to perform any join operation using resources available in the `data.table` syntax. diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index d9ce8347e0..b48356dbb8 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -11,12 +11,6 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE) .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index 7e2bcf86f5..a12c3a97e8 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -11,13 +11,6 @@ vignette: > ```{r init, include = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE -) ``` diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index cfd0208649..9e0d90ca6e 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -11,12 +11,6 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE) .old.th = setDTthreads(1) ``` This vignette discusses *data.table*'s reference semantics which allows to *add/update/delete* columns of a *data.table by reference*, and also combine them with `i` and `by`. It is aimed at those who are already familiar with *data.table* syntax, its general form, how to subset rows in `i`, select and compute on columns, and perform aggregations by group. If you're not familiar with these concepts, please read the `vignette("datatable-intro", package="data.table")` first. diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index 953247830d..2cc8153e09 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -11,12 +11,6 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE) .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index cf83989653..f1a96e0c6f 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -16,15 +16,6 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE, - out.width = '100%', - dpi = 144 -) .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index 15d2a19509..96cd007cb0 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -11,12 +11,6 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) -knitr::opts_chunk$set( - comment = "#", - error = FALSE, - tidy = FALSE, - cache = FALSE, - collapse = TRUE) .old.th = setDTthreads(1) ``` From ac1fb4438c747a564d2ca5129ec71bfb5cb7d494 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sat, 19 Oct 2024 23:58:27 +0200 Subject: [PATCH 04/30] set comment char --- vignettes/datatable-faq.Rmd | 2 ++ vignettes/datatable-intro.Rmd | 2 ++ vignettes/datatable-joins.Rmd | 2 ++ vignettes/datatable-keys-fast-subset.Rmd | 2 ++ vignettes/datatable-programming.Rmd | 2 ++ vignettes/datatable-reference-semantics.Rmd | 2 ++ vignettes/datatable-reshape.Rmd | 2 ++ vignettes/datatable-sd-usage.Rmd | 2 ++ vignettes/datatable-secondary-indices-and-auto-indexing.Rmd | 2 ++ 9 files changed, 18 insertions(+) diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index 16a3a1d2e2..c53449fe21 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -23,6 +23,8 @@ h2 { ```{r, echo = FALSE, message = FALSE} library(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index 29c446ea9e..ca704bb6e3 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -11,6 +11,8 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index ec473b20d8..a7c93649f4 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -13,6 +13,8 @@ editor_options: ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" ``` In this vignette you will learn how to perform any join operation using resources available in the `data.table` syntax. diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index b48356dbb8..7316c55825 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -11,6 +11,8 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index a12c3a97e8..5219bd4d73 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -11,6 +11,8 @@ vignette: > ```{r init, include = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" ``` diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index 9e0d90ca6e..a120d96e83 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -11,6 +11,8 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` This vignette discusses *data.table*'s reference semantics which allows to *add/update/delete* columns of a *data.table by reference*, and also combine them with `i` and `by`. It is aimed at those who are already familiar with *data.table* syntax, its general form, how to subset rows in `i`, select and compute on columns, and perform aggregations by group. If you're not familiar with these concepts, please read the `vignette("datatable-intro", package="data.table")` first. diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index 2cc8153e09..72e05e03c9 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -11,6 +11,8 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index f1a96e0c6f..83d13c709f 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -16,6 +16,8 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index 96cd007cb0..cb1fb550ab 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -11,6 +11,8 @@ vignette: > ```{r, echo = FALSE, message = FALSE} require(data.table) +opts = litedown::reactor() +opts$comment = "#" .old.th = setDTthreads(1) ``` From 905586d7b21982d1173f95b5bf80a5c53dc3a264 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sun, 20 Oct 2024 00:55:45 +0200 Subject: [PATCH 05/30] add error option --- vignettes/datatable-faq.Rmd | 1 + vignettes/datatable-intro.Rmd | 1 + vignettes/datatable-joins.Rmd | 1 + vignettes/datatable-keys-fast-subset.Rmd | 1 + vignettes/datatable-programming.Rmd | 1 + vignettes/datatable-reference-semantics.Rmd | 1 + vignettes/datatable-reshape.Rmd | 1 + vignettes/datatable-sd-usage.Rmd | 1 + vignettes/datatable-secondary-indices-and-auto-indexing.Rmd | 1 + 9 files changed, 9 insertions(+) diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index c53449fe21..0a90c882ac 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -25,6 +25,7 @@ h2 { library(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index ca704bb6e3..3fec735e04 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -13,6 +13,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index a7c93649f4..fe27b87b7b 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -15,6 +15,7 @@ editor_options: require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE ``` In this vignette you will learn how to perform any join operation using resources available in the `data.table` syntax. diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index 7316c55825..ffa9bea8b3 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -13,6 +13,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index 5219bd4d73..2e47d8dbc3 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -13,6 +13,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE ``` diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index a120d96e83..c95164f853 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -13,6 +13,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` This vignette discusses *data.table*'s reference semantics which allows to *add/update/delete* columns of a *data.table by reference*, and also combine them with `i` and `by`. It is aimed at those who are already familiar with *data.table* syntax, its general form, how to subset rows in `i`, select and compute on columns, and perform aggregations by group. If you're not familiar with these concepts, please read the `vignette("datatable-intro", package="data.table")` first. diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index 72e05e03c9..5fa687814a 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -13,6 +13,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index 83d13c709f..4df48b1197 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -18,6 +18,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index cb1fb550ab..d192e6016b 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -13,6 +13,7 @@ vignette: > require(data.table) opts = litedown::reactor() opts$comment = "#" +opts$error = FALSE .old.th = setDTthreads(1) ``` From 1c1471270a4ac02dcd340097f7f6b0f2134d9eab Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sun, 20 Oct 2024 22:52:06 +0200 Subject: [PATCH 06/30] update comment char --- vignettes/datatable-benchmarking.Rmd | 8 ++++++++ vignettes/datatable-faq.Rmd | 16 ++++++++-------- vignettes/datatable-importing.Rmd | 8 ++++++++ vignettes/datatable-intro.Rmd | 5 +++-- vignettes/datatable-joins.Rmd | 5 +++-- vignettes/datatable-keys-fast-subset.Rmd | 5 +++-- vignettes/datatable-programming.Rmd | 7 ++++--- vignettes/datatable-reference-semantics.Rmd | 5 +++-- vignettes/datatable-reshape.Rmd | 5 +++-- vignettes/datatable-sd-usage.Rmd | 5 +++-- ...table-secondary-indices-and-auto-indexing.Rmd | 5 +++-- 11 files changed, 49 insertions(+), 25 deletions(-) diff --git a/vignettes/datatable-benchmarking.Rmd b/vignettes/datatable-benchmarking.Rmd index bbd7629641..61fd3dd550 100644 --- a/vignettes/datatable-benchmarking.Rmd +++ b/vignettes/datatable-benchmarking.Rmd @@ -14,6 +14,14 @@ vignette: > \usepackage[utf8]{inputenc} --- +```{r, echo = FALSE, message = FALSE} +library(data.table) +opts = litedown::reactor() +opts$comment = "# " +opts$error = FALSE +opts$print = xfun:::record_print.default +``` + -```{r, echo = FALSE, message = FALSE} -library(data.table) -opts = litedown::reactor() -opts$comment = "#" -opts$error = FALSE -.old.th = setDTthreads(1) -``` - The first section, Beginner FAQs, is intended to be read in order, from start to finish. It's just written in a FAQ style to be digested more easily. It isn't really the most frequently asked questions. A better measure for that is looking on Stack Overflow. This FAQ is required reading and considered core documentation. Please do not ask questions on Stack Overflow or raise issues on GitHub until you have read it. We can all tell when you ask that you haven't read it. So if you do ask and haven't read it, don't use your real name. diff --git a/vignettes/datatable-importing.Rmd b/vignettes/datatable-importing.Rmd index 5a839d9215..b9e51ee4b2 100644 --- a/vignettes/datatable-importing.Rmd +++ b/vignettes/datatable-importing.Rmd @@ -9,6 +9,14 @@ vignette: > \usepackage[utf8]{inputenc} --- +```{r, echo = FALSE, message = FALSE} +opts = litedown::reactor() +opts$comment = "# " +opts$error = FALSE +opts$print = xfun:::record_print.default +.old.th = setDTthreads(1) +``` + -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` This document is meant to guide on measuring performance of `data.table`. Single place to document best practices and traps to avoid. diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index c374c3632b..10b96f1c27 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -1,6 +1,6 @@ --- title: "Frequently Asked Questions about data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format: options: @@ -26,9 +26,9 @@ h2 { } -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-importing.Rmd b/vignettes/datatable-importing.Rmd index eeebf395c6..a9236d4d44 100644 --- a/vignettes/datatable-importing.Rmd +++ b/vignettes/datatable-importing.Rmd @@ -1,6 +1,6 @@ --- title: "Importing data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -20,9 +20,9 @@ h2 { } -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` This document is focused on using `data.table` as a dependency in other R packages. If you are interested in using `data.table` C code from a non-R application, or in calling its C functions directly, jump to the [last section](#non-r-api) of this vignette. diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index db25afc431..f60297d5e7 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -1,6 +1,6 @@ --- title: "Introduction to data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) @@ -41,7 +41,7 @@ In this vignette, we will use [NYC-flights14](https://raw.githubusercontent.com/ We can use `data.table`'s fast-and-friendly file reader `fread` to load `flights` directly as follows: -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index fdba28b7b3..ae0196308e 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -1,6 +1,6 @@ --- title: "Joins in data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -18,7 +18,7 @@ litedown::reactor(comment = "# ", print = NA) ```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` In this vignette you will learn how to perform any join operation using resources available in the `data.table` syntax. diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index b5a345a98f..1b24ae682e 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -1,6 +1,6 @@ --- title: "Keys and fast binary search based subset" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) @@ -27,7 +27,7 @@ This vignette is aimed at those who are already familiar with *data.table* synta We will use the same `flights` data as in the [`vignette("datatable-intro", package="data.table")`](datatable-intro.html) vignette. -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index e66f7b61f7..2e3463b98e 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -1,6 +1,6 @@ --- title: "Programming on data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r init, include = FALSE} require(data.table) diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index b2b1dc1e20..e5c4b9bc3b 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -1,6 +1,6 @@ --- title: "Reference semantics" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) @@ -27,7 +27,7 @@ This vignette discusses *data.table*'s reference semantics which allows to *add/ We will use the same `flights` data as in the [`vignette("datatable-intro", package="data.table")`](datatable-intro.html) vignette. -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index 3ca7d70178..30962ea2da 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -1,6 +1,6 @@ --- title: "Efficient reshaping using data.tables" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) @@ -23,7 +23,7 @@ This vignette discusses the default usage of reshaping functions `melt` (wide to *** -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index ad1a8a0f38..c1075c9704 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -1,6 +1,6 @@ --- title: "Using .SD for Data Analysis" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format: options: @@ -21,9 +21,9 @@ vignette: > } -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index 48f95044f0..8b4e2ad025 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -1,6 +1,6 @@ --- title: "Secondary indices and auto indexing" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: litedown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, file='_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) @@ -27,7 +27,7 @@ This vignette assumes that the reader is familiar with data.table's `[i, j, by]` We will use the same `flights` data as in the [`vignette("datatable-intro", package="data.table")`](datatable-intro.html) vignette. -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/fr/datatable-benchmarking.Rmd b/vignettes/fr/datatable-benchmarking.Rmd index 846f34c0b6..2221b709d1 100644 --- a/vignettes/fr/datatable-benchmarking.Rmd +++ b/vignettes/fr/datatable-benchmarking.Rmd @@ -1,6 +1,6 @@ --- title: "Analyse comparative (benchmark) de data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format: options: @@ -18,9 +18,9 @@ h2 { } -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` Ce document a pour but de guider la mesure de la performance de `data.table`. Il centralise la documentation des meilleures pratiques et des pièges à éviter. diff --git a/vignettes/fr/datatable-faq.Rmd b/vignettes/fr/datatable-faq.Rmd index a90bfc5cd1..1951d5853f 100644 --- a/vignettes/fr/datatable-faq.Rmd +++ b/vignettes/fr/datatable-faq.Rmd @@ -1,6 +1,6 @@ --- title: "Foire aux questions de data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format: options: @@ -19,9 +19,9 @@ h2 { #TOC { width: 100%; } -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/fr/datatable-importing.Rmd b/vignettes/fr/datatable-importing.Rmd index 27823fb3de..c16d3af090 100644 --- a/vignettes/fr/datatable-importing.Rmd +++ b/vignettes/fr/datatable-importing.Rmd @@ -1,6 +1,6 @@ --- title: "Importation dans data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -15,9 +15,9 @@ h2 { } -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` Ce document se concentre sur l'utilisation de `data.table` comme dépendance dans d'autres packages R. Si vous souhaitez utiliser le code C de `data.table` à partir d'une application non-R, ou appeler directement ses fonctions C, passez à la [dernière section](#non-r-API) de cette vignette. diff --git a/vignettes/fr/datatable-intro.Rmd b/vignettes/fr/datatable-intro.Rmd index ece8cf2030..4691640124 100644 --- a/vignettes/fr/datatable-intro.Rmd +++ b/vignettes/fr/datatable-intro.Rmd @@ -1,6 +1,6 @@ --- title: "Introduction à data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) @@ -47,7 +47,7 @@ Dans cette vignette, nous utiliseront les données [NYC-flights14](https://raw.g Vous pouvez utiliser le lecteur de fichiers rapide et convivial 'fread' de 'data.table' pour charger 'flights' ditectement ainsi : -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/fr/datatable-keys-fast-subset.Rmd b/vignettes/fr/datatable-keys-fast-subset.Rmd index b052171fcf..8dee574240 100644 --- a/vignettes/fr/datatable-keys-fast-subset.Rmd +++ b/vignettes/fr/datatable-keys-fast-subset.Rmd @@ -1,6 +1,6 @@ --- title: "Extraire des sous-ensemble avec les clés et la recherche binaire rapide" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) @@ -32,7 +32,7 @@ Cette vignette s'adresse à ceux qui sont déjà familiers avec la syntaxe de *d Nous utiliserons les mêmes données `flights` que dans la vignette *"Introduction à data.table"*. -```{r echo = FALSE} +```{r, echo = FALSE} options(with = 100L) ``` diff --git a/vignettes/fr/datatable-programming.Rmd b/vignettes/fr/datatable-programming.Rmd index 7249c2de23..09d0e0b1b6 100644 --- a/vignettes/fr/datatable-programming.Rmd +++ b/vignettes/fr/datatable-programming.Rmd @@ -1,6 +1,6 @@ --- title: "Programmation avec data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r init, include = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-reference-semantics.Rmd b/vignettes/fr/datatable-reference-semantics.Rmd index b383e96d1d..700450a2ad 100644 --- a/vignettes/fr/datatable-reference-semantics.Rmd +++ b/vignettes/fr/datatable-reference-semantics.Rmd @@ -1,6 +1,6 @@ --- title: "Sémantique de référence" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) @@ -32,7 +32,7 @@ Cette vignette traite de la sémantique de référence de *data.table* qui perme Nous utiliserons les mêmes données `flights` que dans la vignette *"Introduction à data.table"*. -```{r echo = FALSE} +```{r, echo = FALSE} options(with = 100L) ``` diff --git a/vignettes/fr/datatable-reshape.Rmd b/vignettes/fr/datatable-reshape.Rmd index d56ae60576..a9411aa40c 100644 --- a/vignettes/fr/datatable-reshape.Rmd +++ b/vignettes/fr/datatable-reshape.Rmd @@ -1,6 +1,6 @@ --- title: "Restructurer efficacement avec les data.tables" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) @@ -28,7 +28,7 @@ Cette vignette traite de l'utilisation par défaut des fonctions de transformati *** -```{r echo = FALSE} +```{r, echo = FALSE} options(with = 100L) ``` diff --git a/vignettes/fr/datatable-sd-usage.Rmd b/vignettes/fr/datatable-sd-usage.Rmd index 0106a08fcf..fbd955ac8f 100644 --- a/vignettes/fr/datatable-sd-usage.Rmd +++ b/vignettes/fr/datatable-sd-usage.Rmd @@ -1,6 +1,6 @@ --- title: "Utiliser .SD pour l’analyse de données" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format: options: @@ -12,9 +12,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd index 2fa3a1b5aa..712e3055ea 100644 --- a/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd @@ -1,6 +1,6 @@ --- title: "Indices secondaires et auto-indexation" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` +`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) @@ -32,7 +32,7 @@ Cette vignette suppose que le lecteur est familier avec la syntaxe `[i, j, by]` Nous utiliserons les mêmes données `flights` que dans la vignette *"Introduction à data.table"*. -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/ru/datatable-importing.Rmd b/vignettes/ru/datatable-importing.Rmd index 51aaac2fb6..0f30e9fa55 100644 --- a/vignettes/ru/datatable-importing.Rmd +++ b/vignettes/ru/datatable-importing.Rmd @@ -1,6 +1,6 @@ --- title: "Использование data.table в других пакетах" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -15,9 +15,9 @@ h2 { } -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Данное руководство также доступно на следующих языках: %s")` +`{r} .write.translation.links("Данное руководство также доступно на следующих языках: %s")` Этот документ рассказывает об использовании `data.table` в качестве зависимости в других R-пакетах. Если вас интересует использование C-кода diff --git a/vignettes/ru/datatable-intro.Rmd b/vignettes/ru/datatable-intro.Rmd index 4fe1427f70..ecfea5cd11 100644 --- a/vignettes/ru/datatable-intro.Rmd +++ b/vignettes/ru/datatable-intro.Rmd @@ -1,6 +1,6 @@ --- title: "Введение в data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -9,9 +9,9 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Данное руководство также доступно на следующих языках: %s")` +`{r} .write.translation.links("Данное руководство также доступно на следующих языках: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) @@ -68,7 +68,7 @@ knitr::opts_chunk$set( Мы можем использовать функцию чтения файлов `fread` из `data.table`, чтобы загрузить рейсы (`flights`) следующим образом: -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` diff --git a/vignettes/ru/datatable-reshape.Rmd b/vignettes/ru/datatable-reshape.Rmd index dc205f0b74..ca660f0d95 100644 --- a/vignettes/ru/datatable-reshape.Rmd +++ b/vignettes/ru/datatable-reshape.Rmd @@ -1,6 +1,6 @@ --- title: "Быстрое изменение формы данных с помощью data.table" -date: "`r Sys.Date()`" +date: "`{r} Sys.Date()`" output: markdown::html_format vignette: > @@ -20,9 +20,9 @@ knitr::opts_chunk$set( .old.th = setDTthreads(1) ``` -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, file='../_translation_links.R'} ``` -`r .write.translation.links("Данное руководство также доступно на следующих языках: %s")` +`{r} .write.translation.links("Данное руководство также доступно на следующих языках: %s")` В этом руководстве рассматривается стандартное использование функций изменения формы данных `melt` (из широкой в длинную) и `dcast` (из длинной в @@ -31,7 +31,7 @@ knitr::opts_chunk$set( *** -```{r echo = FALSE} +```{r, echo = FALSE} options(width = 100L) ``` From 5ed155dd6a2e2eb879f886fb7e60d86698fca653 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Mon, 24 Mar 2025 23:58:07 +0100 Subject: [PATCH 13/30] move knitr tests --- {tests => inst/tests}/knitr.Rmd | 0 {tests => inst/tests}/knitr.Rout.mock | 0 inst/tests/other.Rraw | 3 ++ tests/knitr.R | 9 ---- tests/knitr.Rout.save | 72 --------------------------- 5 files changed, 3 insertions(+), 81 deletions(-) rename {tests => inst/tests}/knitr.Rmd (100%) rename {tests => inst/tests}/knitr.Rout.mock (100%) delete mode 100644 tests/knitr.R delete mode 100644 tests/knitr.Rout.save diff --git a/tests/knitr.Rmd b/inst/tests/knitr.Rmd similarity index 100% rename from tests/knitr.Rmd rename to inst/tests/knitr.Rmd diff --git a/tests/knitr.Rout.mock b/inst/tests/knitr.Rout.mock similarity index 100% rename from tests/knitr.Rout.mock rename to inst/tests/knitr.Rout.mock diff --git a/inst/tests/other.Rraw b/inst/tests/other.Rraw index 96f40b071b..ea06b9c702 100644 --- a/inst/tests/other.Rraw +++ b/inst/tests/other.Rraw @@ -181,6 +181,9 @@ if (loaded[["knitr"]]) { # Which is fine and works thanks to cedta(). DT = data.table(x=1, y=2) test(11, kable(DT), output="x.*y.*1.*2") + invisible(knit(testDir("knitr.Rmd"), quiet=TRUE)) + cat(readLines("knitr.md"), sep="\n") + invisible(file.remove("knitr.md")) } if (loaded[["parallel"]]) { diff --git a/tests/knitr.R b/tests/knitr.R deleted file mode 100644 index 678510e11d..0000000000 --- a/tests/knitr.R +++ /dev/null @@ -1,9 +0,0 @@ -if (!suppressPackageStartupMessages(requireNamespace("knitr", quietly=TRUE))) { - cat(readLines("knitr.Rout.mock", warn=FALSE), sep="\n") - q('no') -} - -library(knitr) -invisible(knit("knitr.Rmd", quiet=TRUE)) -cat(readLines("knitr.md"), sep="\n") -invisible(file.remove("knitr.md")) diff --git a/tests/knitr.Rout.save b/tests/knitr.Rout.save deleted file mode 100644 index 790006d3a2..0000000000 --- a/tests/knitr.Rout.save +++ /dev/null @@ -1,72 +0,0 @@ - -R version 4.3.2 (2023-10-31) -- "Eye Holes" -Copyright (C) 2023 The R Foundation for Statistical Computing -Platform: x86_64-pc-linux-gnu (64-bit) - -R is free software and comes with ABSOLUTELY NO WARRANTY. -You are welcome to redistribute it under certain conditions. -Type 'license()' or 'licence()' for distribution details. - -R is a collaborative project with many contributors. -Type 'contributors()' for more information and -'citation()' on how to cite R or R packages in publications. - -Type 'demo()' for some demos, 'help()' for on-line help, or -'help.start()' for an HTML browser interface to help. -Type 'q()' to quit R. - -> if (!suppressPackageStartupMessages(requireNamespace("knitr", quietly=TRUE))) { -+ cat(readLines("knitr.Rout.mock", warn=FALSE), sep="\n") -+ q('no') -+ } -> -> library(knitr) -> invisible(knit("knitr.Rmd", quiet=TRUE)) -> cat(readLines("knitr.md"), sep="\n") - -```r -require(data.table) # print? -DT = data.table(x=1:3, y=4:6) # no -DT # yes -``` - -``` -## x y -## -## 1: 1 4 -## 2: 2 5 -## 3: 3 6 -``` - -```r -DT[, z := 7:9] # no -print(DT[, z := 10:12]) # yes -``` - -``` -## x y z -## -## 1: 1 4 10 -## 2: 2 5 11 -## 3: 3 6 12 -``` - -```r -if (1 < 2) DT[, a := 1L] # no -DT # yes -``` - -``` -## x y z a -## -## 1: 1 4 10 1 -## 2: 2 5 11 1 -## 3: 3 6 12 1 -``` -Some text. - -> invisible(file.remove("knitr.md")) -> -> proc.time() - user system elapsed - 0.247 0.044 0.283 From e4b79128cd7fa15054c57a6bc8750e0ff9b13138 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Tue, 22 Apr 2025 12:50:29 +0300 Subject: [PATCH 14/30] Enhances: knitr Since we register a method for knitr::knit_print, keep it mentioned in the DESCRIPTION. --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 8f0d8d604e..07cd073dd7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,6 +4,7 @@ Title: Extension of `data.frame` Depends: R (>= 3.3.0) Imports: methods Suggests: bit64 (>= 4.0.0), bit (>= 4.0.4), R.utils, xts, zoo (>= 1.8-1), yaml, litedown +Enhances: knitr Description: Fast aggregation of large data (e.g. 100GB in RAM), fast ordered joins, fast add/modify/delete of columns by group using no copies at all, list columns, friendly and fast character-separated-value read/write. Offers a natural and flexible syntax, for faster development. License: MPL-2.0 | file LICENSE URL: https://r-datatable.com, https://Rdatatable.gitlab.io/data.table, https://github.com/Rdatatable/data.table From 1e191d5466a3ac2ce64cb8e362bb5c4eed8853f6 Mon Sep 17 00:00:00 2001 From: Ivan K Date: Tue, 22 Apr 2025 13:21:48 +0300 Subject: [PATCH 15/30] Register xfun::record_print method for data.table As with knit_print, avoid printing x when !shouldPrint(x). Use the overloaded method in the vignettes instead of relying on the auto-printing detection in print.data.table. --- NAMESPACE | 5 ++++- R/onLoad.R | 6 ++++++ R/print.data.table.R | 4 ++++ vignettes/datatable-benchmarking.Rmd | 2 +- vignettes/datatable-faq.Rmd | 2 +- vignettes/datatable-importing.Rmd | 2 +- vignettes/datatable-intro.Rmd | 2 +- vignettes/datatable-joins.Rmd | 2 +- vignettes/datatable-keys-fast-subset.Rmd | 2 +- vignettes/datatable-programming.Rmd | 2 +- vignettes/datatable-reference-semantics.Rmd | 2 +- vignettes/datatable-reshape.Rmd | 2 +- vignettes/datatable-sd-usage.Rmd | 2 +- vignettes/datatable-secondary-indices-and-auto-indexing.Rmd | 2 +- 14 files changed, 25 insertions(+), 12 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index dc3cfe7d0d..d98e04ba46 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -104,7 +104,10 @@ if (getRversion() >= "4.0.0") { # version of R (and that is checked in .onLoad with error if not). export(.rbind.data.table) # only export in R<4.0.0 where it is still used; R-devel now detects it is missing doc, #5600 } -if (getRversion() >= "3.6.0") S3method(knitr::knit_print, data.table) # else manual delayed registration from the onLoad hook +if (getRversion() >= "3.6.0") { + S3method(knitr::knit_print, data.table) + S3method(xfun::record_print, data.table) +} # else manual delayed registration from the onLoad hook S3method(dim, data.table) S3method(dimnames, data.table) S3method("dimnames<-", data.table) diff --git a/R/onLoad.R b/R/onLoad.R index e3e9a783e7..8b2aeff99c 100644 --- a/R/onLoad.R +++ b/R/onLoad.R @@ -67,6 +67,12 @@ setHook(packageEvent("knitr", "onLoad"), function(...) { registerS3method("knit_print", "data.table", knit_print.data.table, envir = asNamespace("knitr")) }) + if (isNamespaceLoaded("xfun")) { + registerS3method("record_print", "data.table", record_print.data.table, envir = asNamespace("xfun")) + } + setHook(packageEvent("xfun", "onLoad"), function(...) { + registerS3method("record_print", "data.table", record_print.data.table, envir = asNamespace("xfun")) + }) } # Set options for the speed boost in v1.8.0 by avoiding 'default' arg of getOption(,default=) diff --git a/R/print.data.table.R b/R/print.data.table.R index 3453759449..a26722efbb 100644 --- a/R/print.data.table.R +++ b/R/print.data.table.R @@ -297,3 +297,7 @@ knit_print.data.table = function(x, ...) { if (!shouldPrint(x)) return(invisible(x)) NextMethod() } +record_print.data.table = function(x, ...) { + if (!shouldPrint(x)) return(character()) + NextMethod() +} diff --git a/vignettes/datatable-benchmarking.Rmd b/vignettes/datatable-benchmarking.Rmd index 4decf7dbc1..ce13108ec1 100644 --- a/vignettes/datatable-benchmarking.Rmd +++ b/vignettes/datatable-benchmarking.Rmd @@ -14,7 +14,7 @@ vignette: > ```{r, echo = FALSE, message = FALSE} library(data.table) -litedown::reactor(comment = "# ", print = NA) +litedown::reactor(comment = "# ") ``` -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` This document is meant to guide on measuring performance of `data.table`. Single place to document best practices and traps to avoid. diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index 46b72ffe72..77acb9b692 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -26,9 +26,8 @@ h2 { } -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-fread-and-fwrite.Rmd b/vignettes/datatable-fread-and-fwrite.Rmd index 15a5f85571..5d2f8c8982 100644 --- a/vignettes/datatable-fread-and-fwrite.Rmd +++ b/vignettes/datatable-fread-and-fwrite.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`r .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/datatable-importing.Rmd b/vignettes/datatable-importing.Rmd index 6b93a38ade..f43aee4114 100644 --- a/vignettes/datatable-importing.Rmd +++ b/vignettes/datatable-importing.Rmd @@ -20,9 +20,8 @@ h2 { } -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` This document is focused on using `data.table` as a dependency in other R packages. If you are interested in using `data.table` C code from a non-R application, or in calling its C functions directly, jump to the [last section](#non-r-api) of this vignette. diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index 5fb3cdad48..d432fcffc2 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index 94167655b4..ad1b8bd558 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -16,9 +16,8 @@ library(data.table) litedown::reactor(comment = "# ") ``` -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` In this vignette you will learn how to perform any join operation using resources available in the `data.table` syntax. diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index 6eee37e585..d38a6416ee 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index c64f191f70..2347463baf 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r init, include = FALSE} require(data.table) diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index fc394ff2e1..9c55e558ad 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index b8e53ffb6d..d96126a4d4 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index 6b21b51178..0284abeb7f 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -21,9 +21,8 @@ vignette: > } -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index 9cb7f1cabd..269cdf0603 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='_translation_links.R'} +```{r, echo=FALSE, results='asis', file='_translation_links.R', i18n_msg='Translations of this document are available in: %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/fr/datatable-benchmarking.Rmd b/vignettes/fr/datatable-benchmarking.Rmd index 2221b709d1..717acc149a 100644 --- a/vignettes/fr/datatable-benchmarking.Rmd +++ b/vignettes/fr/datatable-benchmarking.Rmd @@ -18,9 +18,8 @@ h2 { } -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` Ce document a pour but de guider la mesure de la performance de `data.table`. Il centralise la documentation des meilleures pratiques et des pièges à éviter. diff --git a/vignettes/fr/datatable-faq.Rmd b/vignettes/fr/datatable-faq.Rmd index 2c4548267c..f04866d212 100644 --- a/vignettes/fr/datatable-faq.Rmd +++ b/vignettes/fr/datatable-faq.Rmd @@ -26,9 +26,8 @@ h2 { } -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} library(data.table) diff --git a/vignettes/fr/datatable-fread-and-fwrite.Rmd b/vignettes/fr/datatable-fread-and-fwrite.Rmd index e8f86c40ea..110e488337 100644 --- a/vignettes/fr/datatable-fread-and-fwrite.Rmd +++ b/vignettes/fr/datatable-fread-and-fwrite.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`r .write.translation.links("Une traduction de ce document est disponible en : %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-importing.Rmd b/vignettes/fr/datatable-importing.Rmd index 5a98482954..e4d8504401 100644 --- a/vignettes/fr/datatable-importing.Rmd +++ b/vignettes/fr/datatable-importing.Rmd @@ -20,9 +20,8 @@ h2 { } -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` Ce document se concentre sur l'utilisation de `data.table` comme dépendance dans d'autres packages R. Si vous souhaitez utiliser le code C de `data.table` à partir d'une application non-R, ou appeler directement ses fonctions C, passez à la [dernière section](#non-r-API) de cette vignette. diff --git a/vignettes/fr/datatable-intro.Rmd b/vignettes/fr/datatable-intro.Rmd index 65e782eacd..40a2f0ec57 100644 --- a/vignettes/fr/datatable-intro.Rmd +++ b/vignettes/fr/datatable-intro.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-joins.Rmd b/vignettes/fr/datatable-joins.Rmd index 19883112a2..678c43175b 100644 --- a/vignettes/fr/datatable-joins.Rmd +++ b/vignettes/fr/datatable-joins.Rmd @@ -16,9 +16,8 @@ require(data.table) litedown::reactor(comment = "# ") ``` -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`r .write.translation.links("Une traduction de ce document est disponible en : %s")` Dans cette vignette nous apprendrons à réaliser les opérations de jointure en utilisant les ressources de la syntaxe `data.table`. diff --git a/vignettes/fr/datatable-keys-fast-subset.Rmd b/vignettes/fr/datatable-keys-fast-subset.Rmd index 7465ec74a4..f14079b51e 100644 --- a/vignettes/fr/datatable-keys-fast-subset.Rmd +++ b/vignettes/fr/datatable-keys-fast-subset.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-programming.Rmd b/vignettes/fr/datatable-programming.Rmd index f8ca951863..709cd68913 100644 --- a/vignettes/fr/datatable-programming.Rmd +++ b/vignettes/fr/datatable-programming.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r init, include = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-reference-semantics.Rmd b/vignettes/fr/datatable-reference-semantics.Rmd index 33063ad8d3..fd64e9f9f2 100644 --- a/vignettes/fr/datatable-reference-semantics.Rmd +++ b/vignettes/fr/datatable-reference-semantics.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-reshape.Rmd b/vignettes/fr/datatable-reshape.Rmd index d6dece3184..04a2ec4694 100644 --- a/vignettes/fr/datatable-reshape.Rmd +++ b/vignettes/fr/datatable-reshape.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-sd-usage.Rmd b/vignettes/fr/datatable-sd-usage.Rmd index da3f4794bf..722f9964f3 100644 --- a/vignettes/fr/datatable-sd-usage.Rmd +++ b/vignettes/fr/datatable-sd-usage.Rmd @@ -21,9 +21,8 @@ vignette: > } -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd index 470c5571e3..abefbb585a 100644 --- a/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Une traduction de ce document est disponible en : %s'} ``` -`{r} .write.translation.links("Translations of this document are available in: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/ru/datatable-importing.Rmd b/vignettes/ru/datatable-importing.Rmd index 5b2489cba1..e01cf615cb 100644 --- a/vignettes/ru/datatable-importing.Rmd +++ b/vignettes/ru/datatable-importing.Rmd @@ -20,9 +20,8 @@ h2 { } -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Данное руководство также доступно на следующих языках: %s'} ``` -`{r} .write.translation.links("Данное руководство также доступно на следующих языках: %s")` Этот документ рассказывает об использовании `data.table` в качестве зависимости в других R-пакетах. Если вас интересует использование C-кода diff --git a/vignettes/ru/datatable-intro.Rmd b/vignettes/ru/datatable-intro.Rmd index ef429cf8b6..2e0471a060 100644 --- a/vignettes/ru/datatable-intro.Rmd +++ b/vignettes/ru/datatable-intro.Rmd @@ -9,9 +9,8 @@ vignette: > \usepackage[utf8]{inputenc} --- -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Данное руководство также доступно на следующих языках: %s'} ``` -`{r} .write.translation.links("Данное руководство также доступно на следующих языках: %s")` ```{r, echo = FALSE, message = FALSE} require(data.table) diff --git a/vignettes/ru/datatable-reshape.Rmd b/vignettes/ru/datatable-reshape.Rmd index 96fdeb12c3..642f71a521 100644 --- a/vignettes/ru/datatable-reshape.Rmd +++ b/vignettes/ru/datatable-reshape.Rmd @@ -15,9 +15,8 @@ litedown::reactor(comment = "# ") .old.th = setDTthreads(1) ``` -```{r, echo=FALSE, file='../_translation_links.R'} +```{r, echo=FALSE, results='asis', file='../_translation_links.R', i18n_msg='Данное руководство также доступно на следующих языках: %s'} ``` -`{r} .write.translation.links("Данное руководство также доступно на следующих языках: %s")` В этом руководстве рассматривается стандартное использование функций изменения формы данных `melt` (из широкой в длинную) и `dcast` (из длинной в From be197d9bb94a56b3f7c4678b78b4e2c0b3982d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Demi=C3=A1n=20Villalba?= Date: Tue, 28 Oct 2025 17:02:36 -0300 Subject: [PATCH 29/30] change `{r} Sys.date()` by !r Sys.date() in YAML header --- vignettes/datatable-benchmarking.Rmd | 2 +- vignettes/datatable-faq.Rmd | 2 +- vignettes/datatable-importing.Rmd | 2 +- vignettes/datatable-intro.Rmd | 2 +- vignettes/datatable-joins.Rmd | 2 +- vignettes/datatable-keys-fast-subset.Rmd | 2 +- vignettes/datatable-programming.Rmd | 2 +- vignettes/datatable-reference-semantics.Rmd | 2 +- vignettes/datatable-reshape.Rmd | 2 +- vignettes/datatable-sd-usage.Rmd | 2 +- vignettes/datatable-secondary-indices-and-auto-indexing.Rmd | 2 +- vignettes/fr/datatable-benchmarking.Rmd | 2 +- vignettes/fr/datatable-faq.Rmd | 2 +- vignettes/fr/datatable-importing.Rmd | 2 +- vignettes/fr/datatable-intro.Rmd | 2 +- vignettes/fr/datatable-joins.Rmd | 2 +- vignettes/fr/datatable-keys-fast-subset.Rmd | 2 +- vignettes/fr/datatable-programming.Rmd | 2 +- vignettes/fr/datatable-reference-semantics.Rmd | 2 +- vignettes/fr/datatable-reshape.Rmd | 2 +- vignettes/fr/datatable-sd-usage.Rmd | 2 +- vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd | 2 +- vignettes/ru/datatable-importing.Rmd | 2 +- vignettes/ru/datatable-intro.Rmd | 2 +- vignettes/ru/datatable-reshape.Rmd | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/vignettes/datatable-benchmarking.Rmd b/vignettes/datatable-benchmarking.Rmd index c3ba16971f..a997505e05 100644 --- a/vignettes/datatable-benchmarking.Rmd +++ b/vignettes/datatable-benchmarking.Rmd @@ -1,6 +1,6 @@ --- title: "Benchmarking data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format: options: diff --git a/vignettes/datatable-faq.Rmd b/vignettes/datatable-faq.Rmd index 77acb9b692..0f4ae0b254 100644 --- a/vignettes/datatable-faq.Rmd +++ b/vignettes/datatable-faq.Rmd @@ -1,6 +1,6 @@ --- title: "Frequently Asked Questions about data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format: options: diff --git a/vignettes/datatable-importing.Rmd b/vignettes/datatable-importing.Rmd index f43aee4114..a49bec9e54 100644 --- a/vignettes/datatable-importing.Rmd +++ b/vignettes/datatable-importing.Rmd @@ -1,6 +1,6 @@ --- title: "Importing data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-intro.Rmd b/vignettes/datatable-intro.Rmd index d432fcffc2..d0ad7d3a28 100644 --- a/vignettes/datatable-intro.Rmd +++ b/vignettes/datatable-intro.Rmd @@ -1,6 +1,6 @@ --- title: "Introduction to data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-joins.Rmd b/vignettes/datatable-joins.Rmd index ad1b8bd558..a63e2df0ff 100644 --- a/vignettes/datatable-joins.Rmd +++ b/vignettes/datatable-joins.Rmd @@ -1,6 +1,6 @@ --- title: "Joins in data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-keys-fast-subset.Rmd b/vignettes/datatable-keys-fast-subset.Rmd index d38a6416ee..d14257d74c 100644 --- a/vignettes/datatable-keys-fast-subset.Rmd +++ b/vignettes/datatable-keys-fast-subset.Rmd @@ -1,6 +1,6 @@ --- title: "Keys and fast binary search based subset" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-programming.Rmd b/vignettes/datatable-programming.Rmd index 2347463baf..262439e5df 100644 --- a/vignettes/datatable-programming.Rmd +++ b/vignettes/datatable-programming.Rmd @@ -1,6 +1,6 @@ --- title: "Programming on data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-reference-semantics.Rmd b/vignettes/datatable-reference-semantics.Rmd index 9c55e558ad..44bfd5cf06 100644 --- a/vignettes/datatable-reference-semantics.Rmd +++ b/vignettes/datatable-reference-semantics.Rmd @@ -1,6 +1,6 @@ --- title: "Reference semantics" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-reshape.Rmd b/vignettes/datatable-reshape.Rmd index d96126a4d4..1df9ef8e53 100644 --- a/vignettes/datatable-reshape.Rmd +++ b/vignettes/datatable-reshape.Rmd @@ -1,6 +1,6 @@ --- title: "Efficient reshaping using data.tables" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/datatable-sd-usage.Rmd b/vignettes/datatable-sd-usage.Rmd index 0284abeb7f..0b388f0e0f 100644 --- a/vignettes/datatable-sd-usage.Rmd +++ b/vignettes/datatable-sd-usage.Rmd @@ -1,6 +1,6 @@ --- title: "Using .SD for Data Analysis" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format: options: diff --git a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd index 269cdf0603..4af8959199 100644 --- a/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/datatable-secondary-indices-and-auto-indexing.Rmd @@ -1,6 +1,6 @@ --- title: "Secondary indices and auto indexing" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/fr/datatable-benchmarking.Rmd b/vignettes/fr/datatable-benchmarking.Rmd index 717acc149a..4a89473393 100644 --- a/vignettes/fr/datatable-benchmarking.Rmd +++ b/vignettes/fr/datatable-benchmarking.Rmd @@ -1,6 +1,6 @@ --- title: "Analyse comparative (benchmark) de data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format: options: diff --git a/vignettes/fr/datatable-faq.Rmd b/vignettes/fr/datatable-faq.Rmd index f04866d212..2dc5364228 100644 --- a/vignettes/fr/datatable-faq.Rmd +++ b/vignettes/fr/datatable-faq.Rmd @@ -1,6 +1,6 @@ --- title: "Foire aux questions de data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format: options: diff --git a/vignettes/fr/datatable-importing.Rmd b/vignettes/fr/datatable-importing.Rmd index e4d8504401..863a7f5984 100644 --- a/vignettes/fr/datatable-importing.Rmd +++ b/vignettes/fr/datatable-importing.Rmd @@ -1,6 +1,6 @@ --- title: "Importation dans data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/fr/datatable-intro.Rmd b/vignettes/fr/datatable-intro.Rmd index 40a2f0ec57..ebebfb4efd 100644 --- a/vignettes/fr/datatable-intro.Rmd +++ b/vignettes/fr/datatable-intro.Rmd @@ -1,6 +1,6 @@ --- title: "Introduction à data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/fr/datatable-joins.Rmd b/vignettes/fr/datatable-joins.Rmd index 678c43175b..8d9acb95bb 100644 --- a/vignettes/fr/datatable-joins.Rmd +++ b/vignettes/fr/datatable-joins.Rmd @@ -1,6 +1,6 @@ --- title: "Jointures avec data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: litedown::html_format vignette: > diff --git a/vignettes/fr/datatable-keys-fast-subset.Rmd b/vignettes/fr/datatable-keys-fast-subset.Rmd index f14079b51e..5a5b61e120 100644 --- a/vignettes/fr/datatable-keys-fast-subset.Rmd +++ b/vignettes/fr/datatable-keys-fast-subset.Rmd @@ -1,6 +1,6 @@ --- title: "Extraire des sous-ensemble avec les clés et la recherche binaire rapide" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/fr/datatable-programming.Rmd b/vignettes/fr/datatable-programming.Rmd index 709cd68913..99259b3d20 100644 --- a/vignettes/fr/datatable-programming.Rmd +++ b/vignettes/fr/datatable-programming.Rmd @@ -1,6 +1,6 @@ --- title: "Programmation avec data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/fr/datatable-reference-semantics.Rmd b/vignettes/fr/datatable-reference-semantics.Rmd index fd64e9f9f2..142079617a 100644 --- a/vignettes/fr/datatable-reference-semantics.Rmd +++ b/vignettes/fr/datatable-reference-semantics.Rmd @@ -1,6 +1,6 @@ --- title: "Sémantique de référence" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/fr/datatable-reshape.Rmd b/vignettes/fr/datatable-reshape.Rmd index 04a2ec4694..58c3024068 100644 --- a/vignettes/fr/datatable-reshape.Rmd +++ b/vignettes/fr/datatable-reshape.Rmd @@ -1,6 +1,6 @@ --- title: "Restructurer efficacement avec les data.tables" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/fr/datatable-sd-usage.Rmd b/vignettes/fr/datatable-sd-usage.Rmd index 722f9964f3..26d458a999 100644 --- a/vignettes/fr/datatable-sd-usage.Rmd +++ b/vignettes/fr/datatable-sd-usage.Rmd @@ -1,6 +1,6 @@ --- title: "Utiliser .SD pour l’analyse de données" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format: options: diff --git a/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd b/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd index abefbb585a..3875df5820 100644 --- a/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd +++ b/vignettes/fr/datatable-secondary-indices-and-auto-indexing.Rmd @@ -1,6 +1,6 @@ --- title: "Indices secondaires et auto-indexation" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/ru/datatable-importing.Rmd b/vignettes/ru/datatable-importing.Rmd index e01cf615cb..4c26c7bf70 100644 --- a/vignettes/ru/datatable-importing.Rmd +++ b/vignettes/ru/datatable-importing.Rmd @@ -1,6 +1,6 @@ --- title: "Использование data.table в других пакетах" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/ru/datatable-intro.Rmd b/vignettes/ru/datatable-intro.Rmd index 2e0471a060..0c53382965 100644 --- a/vignettes/ru/datatable-intro.Rmd +++ b/vignettes/ru/datatable-intro.Rmd @@ -1,6 +1,6 @@ --- title: "Введение в data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > diff --git a/vignettes/ru/datatable-reshape.Rmd b/vignettes/ru/datatable-reshape.Rmd index 642f71a521..4a16c550c1 100644 --- a/vignettes/ru/datatable-reshape.Rmd +++ b/vignettes/ru/datatable-reshape.Rmd @@ -1,6 +1,6 @@ --- title: "Быстрое изменение формы данных с помощью data.table" -date: "`{r} Sys.Date()`" +date: !r Sys.Date() output: markdown::html_format vignette: > From 1285908f3065349013d000852e5fd5ef6abbbcd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Demi=C3=A1n=20Villalba?= Date: Tue, 28 Oct 2025 17:52:02 -0300 Subject: [PATCH 30/30] translation script tweaks --- vignettes/_translation_links.R | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/vignettes/_translation_links.R b/vignettes/_translation_links.R index 6aecacb6a5..cd0c1e611f 100644 --- a/vignettes/_translation_links.R +++ b/vignettes/_translation_links.R @@ -9,17 +9,20 @@ path = knitr::current_input(TRUE) i18n_msg = knitr::opts_current$get("i18n_msg") } else { - path = litedown::get_context("input") + path = normalizePath(litedown::get_context("input")) i18n_msg = litedown::reactor("i18n_msg") } - path_dir = dirname(path) - if (basename(path_dir) == "vignettes") { + rmdfile = basename(path) + rmddir = dirname(path) + if (basename(rmddir) == "vignettes") { lang = "en" + main_dir = rmddir } else { - lang = basename(path_dir) - path_dir = dirname(path_dir) # might be "vignettes" + lang = basename(rmddir) + main_dir = dirname(rmddir) # should be "vignettes" } - translation = dir(path_dir, recursive = TRUE, pattern = glob2rx(path)) + # search for translated rmd's with same name in subfolders + translation = dir(main_dir, recursive = TRUE, pattern = glob2rx(rmdfile)) transl_lang = dirname(translation) transl_lang[transl_lang == "."] = "en" if (any(transl_lang != lang)) { @@ -30,7 +33,6 @@ } else { block = "" } - #if (knitr) block else litedown::raw_text(block) cat(block) } .write.translation.links()