endiagram (5apr13)

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

4 files changed, 35 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/latex/endiagram/README b/Master/texmf-dist/doc/latex/endiagram/README
index 4a856fe0aeb..d67f8be38b8 100644
--- a/Master/texmf-dist/doc/latex/endiagram/README
+++ b/Master/texmf-dist/doc/latex/endiagram/README
@@ -1,9 +1,9 @@
 --------------------------------------------------------------------------
-the ENdiagram package v0.1a
+the ENdiagram package v0.1b
 
   easy creation of potential energy curve diagrams
 
-2012/08/20
+2013/04/04
 --------------------------------------------------------------------------
 Clemens Niederberger
 Web:    https://www.bitbucket.org/cgnieder/endiagram
@@ -12,7 +12,7 @@ E-Mail: contact@mychemistry.eu
 If you have any ideas, questions, suggestions or bugs to report, please
 feel free to contact me.
 --------------------------------------------------------------------------
-Copyright 2012 Clemens Niederberger
+Copyright 2012--2013 Clemens Niederberger
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/endiagram/endiagram_en.pdf b/Master/texmf-dist/doc/latex/endiagram/endiagram_en.pdf
index c141d30e4f8..a50d7e1e1f1 100644
--- a/Master/texmf-dist/doc/latex/endiagram/endiagram_en.pdf
+++ b/Master/texmf-dist/doc/latex/endiagram/endiagram_en.pdf
diff --git a/Master/texmf-dist/doc/latex/endiagram/endiagram_en.tex b/Master/texmf-dist/doc/latex/endiagram/endiagram_en.tex
index fe739d5c81a..385ad45ce89 100644
--- a/Master/texmf-dist/doc/latex/endiagram/endiagram_en.tex
+++ b/Master/texmf-dist/doc/latex/endiagram/endiagram_en.tex
@@ -1,5 +1,4 @@
 % arara: pdflatex
-% arara: makeindex: { sort: true , style: endiagram_en.ist }
 % arara: biber
 % arara: pdflatex
 % arara: pdflatex
@@ -16,7 +15,7 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-% Copyright 2012 Clemens Niederberger
+% Copyright 2012--2013 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -44,8 +43,8 @@
   subtitle     = {Easy creation of potential energy curve diagrams.} ,
   name         = ENdiagram ,
   info         = {Easy creation of potential energy curve diagrams} ,
-  date         = 2012/08/20 ,
-  version      = 0.1a ,
+  date         = 2013/04/04 ,
+  version      = 0.1b ,
   keywords     = {energy diagrams,tikz,LaTeX},
   modules      = true ,
   code-box     = {
@@ -55,13 +54,10 @@
     roundcorner     = 3pt
   }
 }
-\usepackage[osf]{libertine}
-\cnpkgcolors{
-  main   => cnpkgred ,
-  key    => yellow!40!brown ,
-  module => cnpkgblue ,
-  link   => black!90
-}
+
+\usepackage{libertinehologopatch}
+
+\cnpkgusecolorscheme{friendly}
 
 \renewcommand*\othersectionlevelsformat[3]{%
   \textcolor{main}{#3\autodot}\enskip}
@@ -106,21 +102,34 @@
 
 \usepackage{acro}
 \acsetup{short-format=\scshape}
-\DeclareAcronym{su}{su}{standard unit}
-\DeclareAcronym{CTAN}{ctan}{Comprehensive \TeX\ Archive Network}
-\DeclareAcronym{MWE}{mwe}{minimal working example}
+\DeclareAcronym{su}{
+  short = su ,
+  long  = standard unit
+}
+\DeclareAcronym{CTAN}{
+  short = ctan ,
+  long  = Comprehensive \TeX{} Archive Network
+}
+\DeclareAcronym{MWE}{
+  short = mwe ,
+  long  = minimal working example
+}
 
 \begin{filecontents}{\jobname.ist}
  heading_prefix "{\\bfseries "
  heading_suffix "\\hfil}\\nopagebreak\n"
  headings_flag  1
- delim_0 "\\dotfill "
- delim_1 "\\dotfill "
- delim_2 "\\dotfill "
- delim_r "\\nohyperpage{\\textendash}"
+ delim_0 "\\dotfill\\hyperpage{"
+ delim_1 "\\dotfill\\hyperpage{"
+ delim_2 "\\dotfill\\hyperpage{"
+ delim_r "}\\textendash\\hyperpage{"
+ delim_t "}"
  suffix_2p "\\nohyperpage{\\,f.}"
  suffix_3p "\\nohyperpage{\\,ff.}"
 \end{filecontents}
+\usepackage{imakeidx}
+\indexsetup{noclearpage,othercode=\footnotesize}
+\makeindex[options={-s \jobname.ist},intoc,columns=3]
 
 \begin{filecontents}{\jobname.bib}
 @book{brueckner,
@@ -159,7 +168,6 @@
   { \hfill \newline }
 \ExplSyntaxOff
 
-\makeindex
 \begin{document}
 
 \section{Licence and Requirements}
diff --git a/Master/texmf-dist/tex/latex/endiagram/endiagram.sty b/Master/texmf-dist/tex/latex/endiagram/endiagram.sty
index bea29774539..4b9970c0902 100644
--- a/Master/texmf-dist/tex/latex/endiagram/endiagram.sty
+++ b/Master/texmf-dist/tex/latex/endiagram/endiagram.sty
@@ -11,7 +11,7 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-% Copyright 2012 Clemens Niederberger
+% Copyright 2012--2013 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -32,8 +32,8 @@
 \usetikzlibrary{calc}
 \ProvidesExplPackage
   {endiagram}
-  {2012/08/20}
-  {0.1a}
+  {2013/04/04}
+  {0.1b}
   {Easy creation of potential energy curve diagrams}
 
 % --------------------------------------------------------------------------- %
@@ -188,7 +188,7 @@
       }
     \int_zero:N \l_ENdiagram_points_int
     \int_gset:Nn \g_ENdiagram_points_max_int
-      { \clist_length:N \l_ENdiagram_points_clist }
+      { \clist_count:N \l_ENdiagram_points_clist }
     \int_compare:nT { \g_ENdiagram_points_max_int < 3 }
       { \msg_error:nn { ENdiagram } { points-missing } }
     \clist_map_inline:Nn \l_ENdiagram_points_clist
@@ -1533,6 +1533,7 @@ Version history
 2012/06/26 v0.1
 2012/08/20 v0.1a - most basic necessary changes due to new l3fp module => more
                    revisions on various places still needed!
+2013/04/04 v0.1b - changed deprecated \clist_length:N into \clist_count:N 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % TODO