diadia (20may15)

git-svn-id: svn://tug.org/texlive/trunk@37630 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 243 insertions, 166 deletions

diff --git a/Master/texmf-dist/tex/latex/diadia/diadia-english.trsl b/Master/texmf-dist/tex/latex/diadia/diadia-english.trsl
index e7ce8601176..de351b24d0c 100644
--- a/Master/texmf-dist/tex/latex/diadia/diadia-english.trsl
+++ b/Master/texmf-dist/tex/latex/diadia/diadia-english.trsl
@@ -52,6 +52,7 @@
 \DeclareTranslation{English}{dd-CU}{CU}%
 \DeclareTranslation{English}{dd-Pulse}{Pulse}%
 \DeclareTranslation{English}{dd-Hbaonec}{$\text{HbA}_{\text{1c}}$}%
+\DeclareTranslation{English}{dd-Value}{Value}%
 \endinput
 %%
 %% End of file `diadia-english.trsl'.
diff --git a/Master/texmf-dist/tex/latex/diadia/diadia-fallback.trsl b/Master/texmf-dist/tex/latex/diadia/diadia-fallback.trsl
index 2e004f0dce7..772e9bcb80b 100644
--- a/Master/texmf-dist/tex/latex/diadia/diadia-fallback.trsl
+++ b/Master/texmf-dist/tex/latex/diadia/diadia-fallback.trsl
@@ -52,6 +52,7 @@
 \DeclareTranslationFallback{dd-CU}{CU}%
 \DeclareTranslationFallback{dd-Pulse}{Pulse}%
 \DeclareTranslationFallback{dd-Hbaonec}{$\text{HbA}_{\text{1c}}$}%
+\DeclareTranslationFallback{dd-Value}{Value}%
 \endinput
 %%
 %% End of file `diadia-fallback.trsl'.
diff --git a/Master/texmf-dist/tex/latex/diadia/diadia-german.trsl b/Master/texmf-dist/tex/latex/diadia/diadia-german.trsl
index eff74b88906..3233204b09b 100644
--- a/Master/texmf-dist/tex/latex/diadia/diadia-german.trsl
+++ b/Master/texmf-dist/tex/latex/diadia/diadia-german.trsl
@@ -52,6 +52,7 @@
 \DeclareTranslation{German}{dd-CU}{BE}%
 \DeclareTranslation{German}{dd-Pulse}{Puls}%
 \DeclareTranslation{German}{dd-Hbaonec}{$\text{HbA}_{\text{1c}}$}%
+\DeclareTranslation{German}{dd-Value}{Wert}%
 \endinput
 %%
 %% End of file `diadia-german.trsl'.
diff --git a/Master/texmf-dist/tex/latex/diadia/diadia.cfg b/Master/texmf-dist/tex/latex/diadia/diadia.cfg
new file mode 100644
index 00000000000..12eaf409dd2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/diadia/diadia.cfg
@@ -0,0 +1,233 @@
+%%
+%% This is file `diadia.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% diadia.dtx  (with options: `cfg')
+%% 
+%% Copyright (C) 2015 by:
+%% Josef Kleber
+%% <josef.kleber@gmx.de>
+%% 
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is Josef Kleber.
+%% 
+%% This work consists of all files listed in manifest.txt.
+%% 
+\pgfplotsset{%
+  compat=1.12,%
+  date ZERO=2015-01-01%
+}%
+\pgfplotsset{%
+  ddpuser/.style=%
+  {},%
+  ddpdefault/.style=%
+  {%
+    thick,%
+    date coordinates in=x,%
+    cycle list name=diadiacyclelist,%
+    tick align=inside,%
+    unbounded coords=jump,%
+    xticklabel={\day.\month.},%
+    legend style={at={(0.5,-0.25)},%
+      font=\footnotesize,%
+      anchor=north,%
+      legend columns=-1},%
+    ddpuser%
+  },%
+  ddpweight/.style=%
+  {%
+    smooth,%
+    area style,%
+    ylabel=\DD@JK@trans@Weight%
+  },%
+  ddpweightplot/.style=%
+  {%
+    teal,%
+    fill=teal!50,%
+    mark=halfcircle*,%
+    every mark/.append style={solid,fill=.!80!black}%
+  },%
+  ddpbloodpressure/.style=%
+  {%
+    ylabel=\DD@JK@trans@BloodPressure%
+  },%
+  ddpinsulin/.style=%
+  {%
+    ylabel=\DD@JK@trans@Insulin%
+  },%
+  ddpbloodsugar/.style=%
+  {%
+    smooth,%
+    ylabel=\DD@JK@trans@BloodSugar%
+  },%
+  ddppulse/.style=%
+  {%
+    smooth,%
+    ylabel=\DD@JK@trans@Pulse%
+  },%
+  ddpcu/.style=%
+  {%
+    ybar,%
+    ylabel=\DD@JK@trans@CU%
+  },%
+  ddphbaonec/.style=%
+  {%
+    ybar,%
+    ylabel=\DD@JK@trans@Hbaonec%
+  },
+  nomarks/.style=%
+  {%
+    mark={},
+    every mark/.style={}%
+  }%
+}%
+\pgfplotstableset%
+{%
+  empty cells with={--},%
+  columns/date/.style={date type},%
+  columns/bsl1/.style={string replace={nan}{}},%
+  columns/bsl2/.style={string replace={nan}{}},%
+  columns/bsl3/.style={string replace={nan}{}},%
+  columns/id1/.style={string replace={nan}{}},%
+  columns/id2/.style={string replace={nan}{}},%
+  columns/id3/.style={string replace={nan}{}},%
+  columns/bps/.style={string replace={nan}{}},%
+  columns/bpd/.style={string replace={nan}{}},%
+  columns/weight/.style={fixed,fixed zerofill,precision=1,string replace={nan}{}},%
+  columns/cu/.style={string replace={nan}{}},%
+  columns/pul/.style={string replace={nan}{}},%
+  columns/hba1c/.style={fixed,fixed zerofill,precision=1,string replace={nan}{}},%
+  columns/value/.style={string replace={nan}{}},%
+  columns/avg07/.style={string replace={nan}{}},%
+  columns/avg14/.style={string replace={nan}{}},%
+  columns/avg30/.style={string replace={nan}{}},%
+  columns/avg60/.style={string replace={nan}{}},%
+  columns/avg90/.style={string replace={nan}{}}%
+}%
+\pgfplotstableset%
+{%
+  columns/date/.append style={column name={\DD@JK@trans@Date}},%
+  columns/bsl1/.append style={column name={\DD@JK@trans@BSi}},%
+  columns/bsl2/.append style={column name={\DD@JK@trans@BSii}},%
+  columns/bsl3/.append style={column name={\DD@JK@trans@BSiii}},%
+  columns/id1/.append style={column name={\DD@JK@trans@IDi}},%
+  columns/id2/.append style={column name={\DD@JK@trans@IDii}},%
+  columns/id3/.append style={column name={\DD@JK@trans@IDiii}},%
+  columns/bps/.append style={column name={\DD@JK@trans@BPs}},%
+  columns/bpd/.append style={column name={\DD@JK@trans@BPd}},%
+  columns/weight/.append style={column name={\DD@JK@trans@Weight}},%
+  columns/cu/.append style={column name={\DD@JK@trans@CU}},%
+  columns/pul/.append style={column name={\DD@JK@trans@Pulse}},%
+  columns/hba1c/.append style={column name={\DD@JK@trans@Hbaonec}},%
+  columns/value/.append style={column name={\DD@JK@trans@Value}},%
+  columns/avg07/.append style={column name={$\varnothing_{7}$}},%
+  columns/avg14/.append style={column name={$\varnothing_{14}$}},%
+  columns/avg30/.append style={column name={$\varnothing_{30}$}},%
+  columns/avg60/.append style={column name={$\varnothing_{60}$}},%
+  columns/avg90/.append style={column name={$\varnothing_{90}$}},%
+}%
+\pgfplotscreateplotcyclelist{diadiacyclelist}%
+{%
+  {teal,mark=halfcircle*,every mark/.append style={solid,fill=.!80!black}},%
+  {orange,mark=halfcircle*,every mark/.append style={solid,fill=.!80!black,rotate=180}},%
+  {cyan,mark=o,every mark/.append style={solid,fill=.!80!black}},%
+  {yellow,mark=star,every mark/.append style={solid,fill=.!80!black}}%
+}%
+\tikzset%
+{%
+  plot1/.style=%
+  {%
+    teal,%
+    mark=halfcircle*,%
+    every mark/.append style={solid,fill=.!80!black}%
+  },%
+  plot2/.style=%
+  {%
+    orange,%
+    mark=halfcircle*,%
+    every mark/.append style={solid,fill=.!80!black,rotate=180}%
+  },%
+  plot3/.style=%
+  {%
+    cyan,%
+    mark=o,%
+    every mark/.append style={solid,fill=.!80!black}%
+  },%
+  plot4/.style=%
+  {%
+    yellow,%
+    mark=star,%
+    every mark/.append style={solid,fill=.!80!black}%
+  }%
+}%
+\tikzset%
+{%
+  ddpannotation/.style=%
+  {%
+    fill=yellow!50!white,%
+    rectangle,%
+    rounded corners=3pt,%
+    font=\tiny%
+  },%
+  setlimit/.style=%
+  {%
+    red,%
+    thick%
+  },%
+  ddaddplotfill/.style=%
+  {%
+    fill=teal!50,%
+  },%
+}%
+\tcbset%
+{%
+  ddboxdefault/.style=%
+  {%
+    enhanced,%
+    fonttitle=\bfseries\large,%
+    coltitle=black,%
+    center title,%
+    titlerule=.75mm,%
+    toprule=1mm,%
+    bottomrule=1mm,%
+    toptitle=2mm,%
+    bottomtitle=2mm%
+  },%
+  medicationchart/.style=%
+  {%
+    ddboxdefault,%
+    fontupper=\footnotesize,%
+    colback=yellow!10!white,%
+    colframe=yellow!60!black,%
+    colbacktitle=yellow!20!white,%
+    left=0mm,%
+    right=0mm,%
+    top=0mm,%
+    bottom=0mm,%
+    boxsep=0mm,%
+  },%
+  infobox/.style=%
+  {%
+    ddboxdefault,%
+    width=\linewidth-10.888pt,%
+    colback=orange!10!white,%
+    colframe=orange!60!black,%
+    colbacktitle=orange!20!white%
+  },%
+}%
+\endinput
+%%
+%% End of file `diadia.cfg'.
diff --git a/Master/texmf-dist/tex/latex/diadia/diadia.sty b/Master/texmf-dist/tex/latex/diadia/diadia.sty
index a6e5cf83293..4d4b7af2e23 100644
--- a/Master/texmf-dist/tex/latex/diadia/diadia.sty
+++ b/Master/texmf-dist/tex/latex/diadia/diadia.sty
@@ -27,7 +27,7 @@
 %% This work consists of all files listed in manifest.txt.
 %% 
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{diadia}[2015/05/11 v1.0 diadia.sty - Josef Kleber (C) 2015]%
+\ProvidesPackage{diadia}[2015/05/20 v1.1 diadia.sty - Josef Kleber (C) 2015]%
 \RequirePackage{xkeyval}%
 \newcommand*\DD@JK@define@key[4]%
 {%
@@ -65,6 +65,7 @@
 \RequirePackage[many]{tcolorbox}%
 \RequirePackage{environ}%
 \RequirePackage{multicol}%
+\RequirePackage{amssymb}%
 \usepgfplotslibrary{dateplot}%
 \def\DD@JK@closedcycle{}%
 \def\DD@JK@addplotdefault{}%
@@ -97,176 +98,16 @@
 \def\DD@JK@trans@CU{\GetTranslation{dd-CU}}%
 \def\DD@JK@trans@Pulse{\GetTranslation{dd-Pulse}}%
 \def\DD@JK@trans@Hbaonec{\GetTranslation{dd-Hbaonec}}%
+\def\DD@JK@trans@Value{\GetTranslation{dd-Value}}%
 \newcolumntype{Z}{>{\raggedright\let\newline\\\arraybackslash}X}%
 \newcolumntype{Y}{>{\raggedright\let\newline\\\arraybackslash}p{\DD@JK@mcnotewidth}}%
-\pgfplotsset{%
-  compat=1.12,%
-  date ZERO=2015-01-01%
-}%
-\pgfplotsset{%
-  ddpuser/.style=%
-  {},%
-  ddpdefault/.style=%
-  {%
-    thick,%
-    date coordinates in=x,%
-    xticklabel={\day.\month.},%
-    legend style={at={(0.5,-0.25)},%
-      font=\footnotesize,%
-      anchor=north,%
-      legend columns=-1},%
-    ddpuser%
-  },%
-  ddpweight/.style=%
-  {%
-    smooth,%
-    area style,%
-    ylabel=\DD@JK@trans@Weight%
-  },%
-  ddpweightplot/.style=%
-  {%
-    teal,%
-    fill=teal!50,%
-    mark=halfcircle*,%
-    every mark/.append style={solid,fill=.!80!black}%
-  },%
-  ddpbloodpressure/.style=%
-  {%
-    cycle list name=diadiacyclelist,%
-    unbounded coords=jump,%
-    ylabel=\DD@JK@trans@BloodPressure%
-  },%
-  ddpinsulin/.style=%
-  {%
-    cycle list name=diadiacyclelist,%
-    unbounded coords=jump,%
-    ylabel=\DD@JK@trans@Insulin%
-  },%
-  ddpbloodsugar/.style=%
-  {%
-    smooth,%
-    cycle list name=diadiacyclelist,%
-    unbounded coords=jump,%
-    ylabel=\DD@JK@trans@BloodSugar%
-  },%
-  ddppulse/.style=%
-  {%
-    smooth,%
-    cycle list name=diadiacyclelist,%
-    unbounded coords=jump,%
-    ylabel=\DD@JK@trans@Pulse%
-  },%
-  ddpcu/.style=%
-  {%
-    ybar,%
-    tick align=inside,%
-    cycle list name=diadiacyclelist,%
-    unbounded coords=jump,%
-    ylabel=\DD@JK@trans@CU%
-  },%
-  ddphbaonec/.style=%
-  {%
-    ybar,%
-    tick align=inside,%
-    cycle list name=diadiacyclelist,%
-    unbounded coords=jump,%
-    ylabel=\DD@JK@trans@Hbaonec%
-  }%
-}%
-\pgfplotstableset%
+\IfFileExists{diadia.cfg}%
 {%
-  empty cells with={--},%
-  columns/date/.style={date type},%
-  columns/bsl1/.style={string replace={nan}{}},%
-  columns/bsl2/.style={string replace={nan}{}},%
-  columns/bsl3/.style={string replace={nan}{}},%
-  columns/id1/.style={string replace={nan}{}},%
-  columns/id2/.style={string replace={nan}{}},%
-  columns/id3/.style={string replace={nan}{}},%
-  columns/bps/.style={string replace={nan}{}},%
-  columns/bpd/.style={string replace={nan}{}},%
-  columns/weight/.style={fixed,fixed zerofill,precision=1,string replace={nan}{}},%
-  columns/cu/.style={string replace={nan}{}},%
-  columns/pul/.style={string replace={nan}{}},%
-  columns/hba1c/.style={fixed,fixed zerofill,precision=1,string replace={nan}{}}%
+  \input{diadia.cfg}%
 }%
-\pgfplotstableset%
 {%
-  columns/date/.append style={column name={\DD@JK@trans@Date}},%
-  columns/bsl1/.append style={column name={\DD@JK@trans@BSi}},%
-  columns/bsl2/.append style={column name={\DD@JK@trans@BSii}},%
-  columns/bsl3/.append style={column name={\DD@JK@trans@BSiii}},%
-  columns/id1/.append style={column name={\DD@JK@trans@IDi}},%
-  columns/id2/.append style={column name={\DD@JK@trans@IDii}},%
-  columns/id3/.append style={column name={\DD@JK@trans@IDiii}},%
-  columns/bps/.append style={column name={\DD@JK@trans@BPs}},%
-  columns/bpd/.append style={column name={\DD@JK@trans@BPd}},%
-  columns/weight/.append style={column name={\DD@JK@trans@Weight}},%
-  columns/cu/.append style={column name={\DD@JK@trans@CU}},%
-  columns/pul/.append style={column name={\DD@JK@trans@Pulse}},%
-  columns/hba1c/.append style={column name={\DD@JK@trans@Hbaonec}}%
-}%
-\pgfplotscreateplotcyclelist{diadiacyclelist}%
-{%
-  {teal,mark=halfcircle*,every mark/.append style={solid,fill=.!80!black}},%
-  {orange,mark=halfcircle*,every mark/.append style={solid,fill=.!80!black,rotate=180}},%
-  {cyan,mark=o,every mark/.append style={solid,fill=.!80!black}},%
-  {yellow,mark=star,every mark/.append style={solid,fill=.!80!black}}%
-}%
-\tikzset%
-{%
-  ddpannotation/.style=%
-  {%
-    fill=yellow!50!white,%
-    rectangle,%
-    rounded corners=3pt,%
-    font=\tiny%
-  },%
-  setlimit/.style=%
-  {%
-    red,%
-    thick%
-  },%
-  ddaddplotfill/.style=%
-  {%
-    fill=teal!50,%
-  },%
-}%
-\tcbset%
-{%
-  ddboxdefault/.style=%
-  {%
-    enhanced,%
-    fonttitle=\bfseries\large,%
-    coltitle=black,%
-    center title,%
-    titlerule=.75mm,%
-    toprule=1mm,%
-    bottomrule=1mm,%
-    toptitle=2mm,%
-    bottomtitle=2mm%
-  },%
-  medicationchart/.style=%
-  {%
-    ddboxdefault,%
-    fontupper=\footnotesize,%
-    colback=yellow!10!white,%
-    colframe=yellow!60!black,%
-    colbacktitle=yellow!20!white,%
-    left=0mm,%
-    right=0mm,%
-    top=0mm,%
-    bottom=0mm,%
-    boxsep=0mm,%
-  },%
-  infobox/.style=%
-  {%
-    ddboxdefault,%
-    width=\linewidth-10.888pt,%
-    colback=orange!10!white,%
-    colframe=orange!60!black,%
-    colbacktitle=orange!20!white%
-  },%
+  \PackageError{diadia}{diadia.cfg not found}%
+  {Please install diadia.cfg! The style definitions are missing!}%
 }%
 \newcommand*{\annotation}[4][]%
 {%