Skip to content

Commit

Permalink
bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ThierryO committed Nov 27, 2023
1 parent 60edcb8 commit cd064aa
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
13 changes: 12 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ RUN apt-get update \
r-cran-tinytex \
r-cran-webshot

## Install textshape
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
libfribidi-dev \
libharfbuzz-dev \
&& Rscript -e 'remotes::install_cran("textshape")'

## Install ragg
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -176,7 +183,11 @@ RUN Rscript -e 'remotes::install_cran("lipsum")'
RUN Rscript -e 'remotes::install_cran("here")'

## Install gert
RUN Rscript -e 'remotes::install_cran("gert")'
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libssl-dev \
&& Rscript -e 'remotes::install_cran("gert")'

## Install webshot dependency
RUN Rscript -e 'webshot::install_phantomjs()'
Expand Down
2 changes: 1 addition & 1 deletion R/ebook.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ epub_book <- function() {
validate_rightsholder() -> fm
assert_that(
has_name(fm, "reportnr"), has_name(fm, "year"),
has_name("cover_description")
has_name(fm, "cover_description")

Check warning on line 20 in R/ebook.R

View check run for this annotation

Codecov / codecov/patch

R/ebook.R#L18-L20

Added lines #L18 - L20 were not covered by tests
)
style <- ifelse(has_name(fm, "style"), fm$style, "INBO")
assert_that(length(style) == 1)
Expand Down
2 changes: 1 addition & 1 deletion R/pdf_report.R
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ pdf_report <- function(
var_arg <- c(
documentclass = "report",
style = c(
Flanders_en = "flanders_report", Flandres_fr = "flandre_report",
Flanders_en = "flanders_report", Flanders_fr = "flandre_report",
Vlaanderen_nl = "vlaanderen_report", INBO_nl = "inbo_report"
)[paste(fm$style, fm$lang, sep = "_")] |>
unname(),
Expand Down

0 comments on commit cd064aa

Please sign in to comment.