[CHNOSZ-commits] r916 - in pkg/CHNOSZ: . vignettes

[noreply at r-forge.r-project.org]

Author: jedick
Date: 2025-06-02 11:14:27 +0200 (Mon, 02 Jun 2025)
New Revision: 916

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/vignettes/FAQ.Rmd
   pkg/CHNOSZ/vignettes/anintro.Rmd
   pkg/CHNOSZ/vignettes/custom_data.Rmd
   pkg/CHNOSZ/vignettes/eos-regress.Rmd
   pkg/CHNOSZ/vignettes/multi-metal.Rmd
Log:
Reduce vignette size with lower pngquant quality


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2025-06-02 08:49:04 UTC (rev 915)
+++ pkg/CHNOSZ/DESCRIPTION	2025-06-02 09:14:27 UTC (rev 916)
@@ -1,6 +1,6 @@
 Date: 2025-06-02
 Package: CHNOSZ
-Version: 2.1.0-87
+Version: 2.1.0-88
 Title: Thermodynamic Calculations and Diagrams for Geochemistry
 Authors at R: c(
     person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"),

Modified: pkg/CHNOSZ/vignettes/FAQ.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/FAQ.Rmd	2025-06-02 08:49:04 UTC (rev 915)
+++ pkg/CHNOSZ/vignettes/FAQ.Rmd	2025-06-02 09:14:27 UTC (rev 916)
@@ -114,7 +114,7 @@
 # Use pngquant to optimize PNG images
 library(knitr)
 knit_hooks$set(pngquant = hook_pngquant)
-pngquant <- "--speed=1 --quality=0-25"
+pngquant <- if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) "--speed=1 --quality=0-25" else "--speed=1 --quality=0-10"
 if (!nzchar(Sys.which("pngquant"))) pngquant <- NULL
 # To make warnings appear in text box 20230619
 # https://selbydavid.com/2017/06/18/rmarkdown-alerts/

Modified: pkg/CHNOSZ/vignettes/anintro.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/anintro.Rmd	2025-06-02 08:49:04 UTC (rev 915)
+++ pkg/CHNOSZ/vignettes/anintro.Rmd	2025-06-02 09:14:27 UTC (rev 916)
@@ -90,8 +90,8 @@
 })
 
 # Define variables used below
-basedpi = if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) 60 else 40
-pngquant <- "--quality=0-25"
+basedpi <- if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) 60 else 40
+pngquant <- if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) "--speed=1 --quality=0-25" else "--speed=1 --quality=0-10"
 # Avoid errors if pngquant isn't available (perhaps on R-Forge?)
 if (!nzchar(Sys.which("pngquant"))) pngquant <- NULL 
 

Modified: pkg/CHNOSZ/vignettes/custom_data.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/custom_data.Rmd	2025-06-02 08:49:04 UTC (rev 915)
+++ pkg/CHNOSZ/vignettes/custom_data.Rmd	2025-06-02 09:14:27 UTC (rev 916)
@@ -20,7 +20,7 @@
 ## Use pngquant to optimize PNG images
 library(knitr)
 knit_hooks$set(pngquant = hook_pngquant)
-pngquant <- "--speed=1 --quality=0-25"
+pngquant <- if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) "--speed=1 --quality=0-25" else "--speed=1 --quality=0-10"
 if (!nzchar(Sys.which("pngquant"))) pngquant <- NULL
 
 # Set dpi 20231129

Modified: pkg/CHNOSZ/vignettes/eos-regress.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/eos-regress.Rmd	2025-06-02 08:49:04 UTC (rev 915)
+++ pkg/CHNOSZ/vignettes/eos-regress.Rmd	2025-06-02 09:14:27 UTC (rev 916)
@@ -71,12 +71,9 @@
 })
 # Use pngquant to optimize PNG images
 knit_hooks$set(pngquant = hook_pngquant)
+pngquant <- if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) "--speed=1 --quality=0-25" else "--speed=1 --quality=0-10"
 # pngquant isn't available on R-Forge ...
-if (!nzchar(Sys.which("pngquant"))) {
-  pngquant <- NULL 
-} else {
-  pngquant <- "--speed=1 --quality=0-50"
-}
+if (!nzchar(Sys.which("pngquant"))) pngquant <- NULL 
 
 ## Colorize messages 20171031
 ## Adapted from https://gist.github.com/yihui/2629886#file-knitr-color-msg-rnw

Modified: pkg/CHNOSZ/vignettes/multi-metal.Rmd
===================================================================
--- pkg/CHNOSZ/vignettes/multi-metal.Rmd	2025-06-02 08:49:04 UTC (rev 915)
+++ pkg/CHNOSZ/vignettes/multi-metal.Rmd	2025-06-02 09:14:27 UTC (rev 916)
@@ -66,7 +66,7 @@
 ## Use pngquant to optimize PNG images
 knit_hooks$set(pngquant = hook_pngquant)
 ## Set chunk options
-pngquant <- "--quality=0-25"
+pngquant <- if(nzchar(Sys.getenv("CHNOSZ_BUILD_LARGE_VIGNETTES"))) "--speed=1 --quality=0-25" else "--speed=1 --quality=0-10"
 if (!nzchar(Sys.which("pngquant"))) pngquant <- NULL
 opts_chunk$set(dpi = basedpi, pngquant = pngquant)