bugfixes

inbo · Nov 27, 2023 · 22e6eda · 22e6eda
1 parent 60edcb8
commit 22e6eda
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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 \
@@ -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()'

diff --git a/R/ebook.R b/R/ebook.R
@@ -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")
   )
   style <- ifelse(has_name(fm, "style"), fm$style, "INBO")
   assert_that(length(style) == 1)

diff --git a/R/pdf_report.R b/R/pdf_report.R
@@ -117,8 +117,12 @@ pdf_report <- function(
   } else {
     if (has_name(fm, "doi")) {
       validate_doi(fm$doi)
+      draft <- draft && !all(c("depotnr", "doi", "reportnr") %in% names(fm))
+    } else {
+      draft <- TRUE
+      fm$doi <- "!!! missing DOI !!!"
     }
-    draft <- draft && !all(c("depotnr", "doi", "reportnr") %in% names(fm))
+    fm$pagefootmessage <- fm$doi
   }
   if (draft) {
     c(en = "DRAFT", fr = "CONCEPTION", nl = "ONTWERP")[fm$lang] |>
@@ -132,11 +136,16 @@ 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(),
-    fm[c("corresponding", "doi", "internal", "lof", "lot", "watermark")],
+    fm[
+      c(
+        "corresponding", "doi", "internal", "lof", "lot", "watermark",
+        "pagefootmessage"
+      )
+    ],
     shortauthor = gsub("\\&", "\\\\&", fm$shortauthor),
     babel = paste(languages[c(fm$other_lang, fm$lang)], collapse = ",")
   )

diff --git a/inst/local_tex/tex/latex/inborapport_2015/inbo_report.sty b/inst/local_tex/tex/latex/inborapport_2015/inbo_report.sty
@@ -14,12 +14,8 @@
 \fancyhead{}
 \fancyfoot{}
 \fancyfoot[LO, RE]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \mainColourURL{\href{https://www.vlaanderen.be/inbo}{vlaanderen.be/inbo}}}}
-\fancyfoot[LE, RO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont Pagina~\textbf{\thepage}~van~\textbf{\pageref*{LastPage}}}}
-\ifnum \@public = 0
+\fancyfoot[LE, RO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont Pagina~\textbf{\thepage}~van~\textbf{\pageref*{LastPage}} }}
 \fancyfoot[CE, CO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \@pagefootmessage}}
-\else
-\fancyfoot[CE, CO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \@doi}}
-\fi
 \renewcommand{\footrule}{\vbox to 8pt{\hbox
 to\headwidth{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont\leaders\hbox{/}\hfill}\vss}}
 \renewcommand{\headrulewidth}{0pt}
@@ -29,12 +25,8 @@ to\headwidth{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}
   \fancyhead{}
   \fancyfoot{}
   \fancyfoot[LO, RE]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \mainColourURL{\href{https://www.vlaanderen.be/inbo}{vlaanderen.be/inbo}}}}
-  \ifnum \@public = 0
-  \fancyfoot[CE, CO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \@pagefootmessage}}
-  \else
-  \fancyfoot[CE, CO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \@doi}}
-  \fi
   \fancyfoot[LE, RO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont Pagina~\textbf{\thepage}~van~\textbf{\pageref*{LastPage}}}}
+  \fancyfoot[CE, CO]{{\color{main.colour}\fontsize{\fontsizefooter}{\fontsizefooterinter}\selectfont \@pagefootmessage}}
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footrulewidth}{0pt}
 }