Merge branch 'master' into saemix

17 files changed, 36 insertions, 12 deletions

diff --git a/DESCRIPTION b/DESCRIPTION
index a47f0b74..5bd507ff 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: mkin
 Type: Package
 Title: Kinetic Evaluation of Chemical Degradation Data
-Version: 1.0.3.9000
-Date: 2021-02-15
+Version: 1.0.4.9000
+Date: 2021-02-24
 Authors@R: c(
   person("Johannes", "Ranke", role = c("aut", "cre", "cph"),
     email = "jranke@uni-bremen.de",
diff --git a/NEWS.md b/NEWS.md
index 9c3c86b5..38cac245 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-# mkin 1.0.3.9000
+# mkin 1.0.4.9000
 
 ## General
 
@@ -12,6 +12,12 @@
 
 - 'saem': generic function to fit saemix models using 'saemix_model' and 'saemix_data', with a generator 'saem.mmkin', summary and plot methods
 
+# mkin 1.0.4 (Unreleased)
+
+- 'plot.mixed.mmkin': Reset graphical parameters on exit
+
+- All plotting functions setting graphical parameters: Use on.exit() for resetting graphical parameters
+
 # mkin 1.0.3 (2021-02-15)
 
 - Review and update README, the 'Introduction to mkin' vignette and some of the help pages
diff --git a/docs/404.html b/docs/404.html
index 48cba3d7..86397bff 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="https://pkgdown.jrwb.de/mkin/index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/docs/articles/index.html b/docs/articles/index.html
index 22753e8d..8e05af32 100644
--- a/docs/articles/index.html
+++ b/docs/articles/index.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/docs/authors.html b/docs/authors.html
index 61d29bf0..533ca458 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/docs/index.html b/docs/index.html
index 82aab7f3..72fd88f4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -37,7 +37,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/docs/news/index.html b/docs/news/index.html
index 1428dc78..d6b2a8fb 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
@@ -141,6 +141,14 @@
       <small>Source: <a href='https://github.com/jranke/mkin/blob/master/NEWS.md'><code>NEWS.md</code></a></small>
     </div>
 
+    <div id="mkin-104-2021-02-24" class="section level1">
+<h1 class="page-header" data-toc-text="1.0.4">
+<a href="#mkin-104-2021-02-24" class="anchor"></a>mkin 1.0.4 (2021-02-24)</h1>
+<ul>
+<li><p>‘plot.mixed.mmkin’: Reset graphical parameters on exit</p></li>
+<li><p>All plotting functions setting graphical parameters: Use on.exit() for resetting graphical parameters</p></li>
+</ul>
+</div>
     <div id="mkin-103-2021-02-15" class="section level1">
 <h1 class="page-header" data-toc-text="1.0.3">
 <a href="#mkin-103-2021-02-15" class="anchor"></a>mkin 1.0.3 (2021-02-15)</h1>
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
index 71325fcc..76b2f3b9 100644
--- a/docs/pkgdown.yml
+++ b/docs/pkgdown.yml
@@ -10,7 +10,7 @@ articles:
   web_only/NAFTA_examples: NAFTA_examples.html
   web_only/benchmarks: benchmarks.html
   web_only/compiled_models: compiled_models.html
-last_built: 2021-02-15T18:11Z
+last_built: 2021-02-24T14:00Z
 urls:
   reference: https://pkgdown.jrwb.de/mkin/reference
   article: https://pkgdown.jrwb.de/mkin/articles
diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png
index 762a3dd4..1cbcb153 100644
--- a/docs/reference/Rplot001.png
+++ b/docs/reference/Rplot001.png
diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png
index d24e35b4..745d583d 100644
--- a/docs/reference/Rplot002.png
+++ b/docs/reference/Rplot002.png
diff --git a/docs/reference/endpoints.html b/docs/reference/endpoints.html
index 584079d2..a83276f3 100644
--- a/docs/reference/endpoints.html
+++ b/docs/reference/endpoints.html
@@ -78,7 +78,7 @@ advantage that the SFORB model can also be used for metabolites." />
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/docs/reference/index.html b/docs/reference/index.html
index e21304b9..36ef6367 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -71,7 +71,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/docs/reference/plot.mixed.mmkin-1.png b/docs/reference/plot.mixed.mmkin-1.png
index 9c9a2211..2224d96e 100644
--- a/docs/reference/plot.mixed.mmkin-1.png
+++ b/docs/reference/plot.mixed.mmkin-1.png
diff --git a/docs/reference/plot.mixed.mmkin-2.png b/docs/reference/plot.mixed.mmkin-2.png
index 0f66ff0f..28168495 100644
--- a/docs/reference/plot.mixed.mmkin-2.png
+++ b/docs/reference/plot.mixed.mmkin-2.png
diff --git a/docs/reference/plot.mixed.mmkin.html b/docs/reference/plot.mixed.mmkin.html
index 4b72a308..b75fa6e6 100644
--- a/docs/reference/plot.mixed.mmkin.html
+++ b/docs/reference/plot.mixed.mmkin.html
@@ -72,7 +72,7 @@
       </button>
       <span class="navbar-brand">
         <a class="navbar-link" href="../index.html">mkin</a>
-        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.3</span>
+        <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Released version">1.0.4</span>
       </span>
     </div>
 
diff --git a/tests/figs/plotting/mixed-model-fit-for-mmkin-object.svg b/tests/figs/plotting/mixed-model-fit-for-mmkin-object.svg
index e022af25..b3abac39 100644
--- a/tests/figs/plotting/mixed-model-fit-for-mmkin-object.svg
+++ b/tests/figs/plotting/mixed-model-fit-for-mmkin-object.svg
@@ -710,4 +710,9 @@
 <polyline points='531.56,398.39 534.08,395.87 536.60,398.39 534.08,400.91 531.56,398.39 ' style='stroke-width: 0.75; stroke: #CD0BBC;' clip-path='url(#cpMzk4Ljk3fDcwMC4wNHw1MjcuNTN8MzA2LjEw)' />
 <polyline points='542.22,397.33 544.74,394.81 547.26,397.33 544.74,399.85 542.22,397.33 ' style='stroke-width: 0.75; stroke: #CD0BBC;' clip-path='url(#cpMzk4Ljk3fDcwMC4wNHw1MjcuNTN8MzA2LjEw)' />
 <polyline points='542.22,430.83 544.74,428.31 547.26,430.83 544.74,433.35 542.22,430.83 ' style='stroke-width: 0.75; stroke: #CD0BBC;' clip-path='url(#cpMzk4Ljk3fDcwMC4wNHw1MjcuNTN8MzA2LjEw)' />
+<defs>
+  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA=='>
+    <rect x='59.04' y='59.04' width='630.72' height='443.52' />
+  </clipPath>
+</defs>
 </svg>
diff --git a/tests/figs/plotting/mixed-model-fit-for-nlme-object.svg b/tests/figs/plotting/mixed-model-fit-for-nlme-object.svg
index b2955239..3eb2b0f8 100644
--- a/tests/figs/plotting/mixed-model-fit-for-nlme-object.svg
+++ b/tests/figs/plotting/mixed-model-fit-for-nlme-object.svg
@@ -1348,4 +1348,9 @@
 <polygon points='464.66,238.64 469.14,238.64 469.14,234.16 464.66,234.16 ' style='stroke-width: 0.75; stroke: none; fill: #9E9E9E;' clip-path='url(#cpNDA5LjAwfDY5NC45MHw1MTUuMDR8MTQ2LjA3)' />
 <polygon points='449.43,276.29 453.91,276.29 453.91,271.81 449.43,271.81 ' style='stroke-width: 0.75; stroke: none; fill: #9E9E9E;' clip-path='url(#cpNDA5LjAwfDY5NC45MHw1MTUuMDR8MTQ2LjA3)' />
 <polygon points='449.43,366.64 453.91,366.64 453.91,362.16 449.43,362.16 ' style='stroke-width: 0.75; stroke: none; fill: #9E9E9E;' clip-path='url(#cpNDA5LjAwfDY5NC45MHw1MTUuMDR8MTQ2LjA3)' />
+<defs>
+  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA=='>
+    <rect x='59.04' y='59.04' width='630.72' height='443.52' />
+  </clipPath>
+</defs>
 </svg>