From e99b46a2020a6b6578b0c3c88c17d5980e4d921a Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 22 Nov 2022 13:49:02 +0100 Subject: Start new development version --- DESCRIPTION | 4 ++-- NEWS.md | 6 +++++- README.html | 19 ++++++------------- README.md | 4 +++- _pkgdown.yml | 4 ++-- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2d871530..b147a940 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: mkin Type: Package Title: Kinetic Evaluation of Chemical Degradation Data -Version: 1.2.1 -Date: 2022-11-18 +Version: 1.2.2 +Date: 2022-11-22 Authors@R: c( person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "johannes.ranke@jrwb.de", diff --git a/NEWS.md b/NEWS.md index c4c3ddee..7f14e06b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,8 @@ -# mkin 1.2.1 (unreleased) +# mkin 1.2.2 + +- + +# mkin 1.2.1 (2022-11-19) - '{data,R}/ds_mixed.rda': Include the test data in the package instead of generating it in 'tests/testthat/setup_script.R'. Refactor the generating code to make it consistent and update tests. diff --git a/README.html b/README.html index 7b23c79e..0ef35547 100644 --- a/README.html +++ b/README.html @@ -298,8 +298,8 @@ pre code { border-radius: 4px; } -.tabset-dropdown > .nav-tabs > li.active:before { - content: ""; +.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before { + content: "\e259"; font-family: 'Glyphicons Halflings'; display: inline-block; padding: 10px; @@ -307,16 +307,9 @@ pre code { } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - border: none; -} - -.tabset-dropdown > .nav-tabs.nav-tabs-open:before { - content: ""; + content: "\e258"; font-family: 'Glyphicons Halflings'; - display: inline-block; - padding: 10px; - border-right: 1px solid #ddd; + border: none; } .tabset-dropdown > .nav-tabs > li.active { @@ -367,7 +360,7 @@ pre code {

mkin

-

mkin status badge Build Status codecov

+

mkin status badge Build Status codecov

The R package mkin provides calculation routines for the analysis of chemical degradation data, including multicompartment kinetics as needed for modelling the formation and decline of transformation products, or if several degradation compartments are involved.

Installation

@@ -421,7 +414,7 @@ pre code {

GUI

-

There is a graphical user interface that may be useful. Please refer to its documentation page for installation instructions and a manual.

+

There is a graphical user interface that may be useful. Please refer to its documentation page for installation instructions and a manual. It only supports evaluations using (generalised) nonlinear regression, but not simultaneous fits using nonlinear mixed-effects models.

News

diff --git a/README.md b/README.md index ad522aea..3166c932 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,9 @@ version is found in the ['dev' subdirectory](https://pkgdown.jrwb.de/mkin/dev/). There is a graphical user interface that may be useful. Please refer to its [documentation page](https://pkgdown.jrwb.de/gmkin/) -for installation instructions and a manual. +for installation instructions and a manual. It only supports +evaluations using (generalised) nonlinear regression, but +not simultaneous fits using nonlinear mixed-effects models. ## News diff --git a/_pkgdown.yml b/_pkgdown.yml index 98ed84f2..ca5ea6e0 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,8 +1,8 @@ url: https://pkgdown.jrwb.de/mkin development: - mode: release - version_label: default + mode: devel + version_label: info template: bootswatch: spacelab -- cgit v1.2.1