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

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

Author: jedick
Date: 2023-09-14 13:53:54 +0200 (Thu, 14 Sep 2023)
New Revision: 805

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/vignettes/mklinks.sh
Log:
Fix link made by mklinks.sh for stack_mosaic() in multi-metal.Rmd


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2023-09-11 03:10:54 UTC (rev 804)
+++ pkg/CHNOSZ/DESCRIPTION	2023-09-14 11:53:54 UTC (rev 805)
@@ -1,6 +1,6 @@
-Date: 2023-09-11
+Date: 2023-09-14
 Package: CHNOSZ
-Version: 2.0.0-24
+Version: 2.0.0-25
 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/mklinks.sh
===================================================================
--- pkg/CHNOSZ/vignettes/mklinks.sh	2023-09-11 03:10:54 UTC (rev 804)
+++ pkg/CHNOSZ/vignettes/mklinks.sh	2023-09-14 11:53:54 UTC (rev 805)
@@ -21,7 +21,7 @@
 sed -i 's/<code>?check.GHS<\/code>/<code><a href="..\/html\/util.data.html" style="background-image:none;">?check.GHS<\/a><\/code>/g' anintro.html
 
 # anintro.html: add links to function names
-# Start at line 120 (below the TOC)
+# Start at line 312 (below the TOC)
 sed -i '312,$s/<code>info()<\/code>/<code><a href="..\/html\/info.html" style="background-image:none;">info()<\/a><\/code>/g' anintro.html
 sed -i '312,$s/<code>ZC()<\/code>/<code><a href="..\/html\/util.formula.html" style="background-image:none;">ZC()<\/a><\/code>/g' anintro.html
 sed -i '312,$s/<code>affinity()<\/code>/<code><a href="..\/html\/affinity.html" style="background-image:none;">affinity()<\/a><\/code>/g' anintro.html
@@ -108,7 +108,9 @@
 sed -i 's/affinity()/<a href="..\/html\/affinity.html">affinity()<\/a>/g' multi-metal.html
 sed -i 's/mash()/<a href="..\/html\/mix.html">mash()<\/a>/g' multi-metal.html
 sed -i 's/diagram()/<a href="..\/html\/diagram.html">diagram()<\/a>/g' multi-metal.html
-sed -i 's/mosaic()/<a href="..\/html\/mosaic.html">mosaic()<\/a>/g' multi-metal.html
+sed -i 's/stack_mosaic()/<a href="..\/html\/stack_mosaic.html">stack_mosaic()<\/a>/g' multi-metal.html
+# Put a ">" in front so this doesn't match stack_mosaic 20230914
+sed -i 's/>mosaic()/><a href="..\/html\/mosaic.html">mosaic()<\/a>/g' multi-metal.html
 sed -i 's/equilibrate()/<a href="..\/html\/equilibrate.html">equilibrate()<\/a>/g' multi-metal.html
 sed -i 's/rebalance()/<a href="..\/html\/mix.html">rebalance()<\/a>/g' multi-metal.html
 sed -i 's/ratlab()/<a href="..\/html\/util.expression.html">ratlab()<\/a>/g' multi-metal.html