optidef (22oct16)

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

3 files changed, 21 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/optidef/README.md b/Master/texmf-dist/doc/latex/optidef/README.md
index fcb4a93c217..ffef5ba9986 100644
--- a/Master/texmf-dist/doc/latex/optidef/README.md
+++ b/Master/texmf-dist/doc/latex/optidef/README.md
@@ -64,7 +64,7 @@ E-mail: j.lagogarcia@tudelft.nl
 
 Github: https://github.com/jeslago/optidef
 
-## Latest stable version: Optidef 2.1
+## Latest stable version: Optidef 2.2
 
 CTAN: https://www.ctan.org/pkg/optidef
 
@@ -75,6 +75,6 @@ Copyright 2016 Jesus Lago Garcia
 This work 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 2005/12/01 or later.
 
-This work has the LPPL maintenance status 'maintained'. The Current Maintainer of this work is J. Lago Garcia, under the supervision of Prof. Dr. Moritz Diehl and Prof. Dr. Sebastien Gross.
+This work has the LPPL maintenance status 'maintained'. The Current Maintainer of this work is J. Lago Garcia.
 
 This work consists of the file optidef.sty.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/optidef/optidef.pdf b/Master/texmf-dist/doc/latex/optidef/optidef.pdf
index 3f7749a2f57..98d6d12d0dc 100644
--- a/Master/texmf-dist/doc/latex/optidef/optidef.pdf
+++ b/Master/texmf-dist/doc/latex/optidef/optidef.pdf
diff --git a/Master/texmf-dist/doc/latex/optidef/optidef.tex b/Master/texmf-dist/doc/latex/optidef/optidef.tex
index 73c1e667126..3d9aa9e069f 100644
--- a/Master/texmf-dist/doc/latex/optidef/optidef.tex
+++ b/Master/texmf-dist/doc/latex/optidef/optidef.tex
@@ -7,7 +7,7 @@
 
 \lstset{basicstyle=\ttfamily,breaklines=true}
 % Title Page
-\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 2.1}}
+\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 2.2}}
 
 \author{Jesus Lago Garcia}
 
@@ -609,21 +609,21 @@ The standard appearance for long optimization variables is as follows:
 
 \section{Code definition}
 \begin{lstlisting}
-% optidef - Version 2.1
+% optidef - Version 2.2
 %
 %Copyright 2016 J. Lago Garcia
 %
 %This work 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 2005/12/01 or later.
 %
-%This work has the LPPL maintenance status 'maintained'. The Current Maintainer of this work is J. Lago Garcia, under the supervision of Prof. Dr. Moritz Diehl and Prof. Dr. Sebastien Gross.
+%This work has the LPPL maintenance status 'maintained'. The Current Maintainer of this work is J. Lago Garcia.
 %
 %E-mail: jesus.lago.garcia@venus.uni-freiburg.de
 %
 %This work consists of the file optidef.sty.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{optidef}[2016/09/25 - version=2.1,  Package for defining optimization problems]
+\ProvidesPackage{optidef}[2016/10/22 - version=2.2,  Package for defining optimization problems]
 
 \RequirePackage{environ}
 \RequirePackage{mathtools}	
@@ -1073,8 +1073,8 @@ The standard appearance for long optimization variables is as follows:
 %%%%%%%%%%%%%%%%%%%
 % SETTING DEFAULT FORMAT
 %%%%%%%%%%%%%%%%%%%
+% Originally, \toggletrue{bodyCon} was inside this function, however, spacing issues after environment made me remove it.
 \newcommand{\setStandardMini}{
-\toggletrue{bodyCon}
 \let\addConstraint\standardAddConstraint	
 }
 
@@ -1137,6 +1137,8 @@ The standard appearance for long optimization variables is as follows:
 % Specific environments defined with xparse package due to arguments options
 
 %MINIMIZATION ENVIRONMENTS
+% In the below definitions, \toggletrue{bodyCon} has to be added once the definition of the environment is finished. I tried to do inside the environment itself using \setStandardMini, but it produced some ugly text displacemente.
+
 % Single reference probems
 \DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1144,7 +1146,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{min} \BaseMini{#2}{#3}{#4}{#5}{#6}{min}}
 % Long version problem	
 {\setFormatLong{minimize} \BaseMini{#2}{#3}{#4}{#5}{#6}{minimize}}
-}{\endBaseMini}
+}{\endBaseMini\toggletrue{bodyCon}}
 
 \DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1152,7 +1154,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{arg~min} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~min}}
 % Long version problem	
 {\setFormatLong{arg~min} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~min}}
-}{\endBaseMini}
+}{\endBaseMini\toggletrue{bodyCon}}
 
 
 % No reference
@@ -1162,7 +1164,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{min} \BaseMiniStar{#2}{#3}{#4}{#6}{min}}
 % Long version problem	
 {\setFormatLong{minimize} \BaseMiniStar{#2}{#3}{#4}{#6}{minimize}}
-}{\textbf{\endBaseMiniStar}}
+}{\endBaseMiniStar\toggletrue{bodyCon}}
 
 \DeclareDocumentEnvironment{argmini*}{D||{l} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1170,7 +1172,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{arg~min}\BaseMiniStar{#2}{#3}{#4}{#6}{arg~min}}
 % Long version problem	
 {\setFormatLong{arg~min} \BaseMiniStar{#2}{#3}{#4}{#6}{arg~min}}
-}{\textbf{\endBaseMiniStar}}
+}{\endBaseMiniStar\toggletrue{bodyCon}}
 
 
 % Multiple reference
@@ -1180,7 +1182,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{min} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{min}}
 % Long version problem	
 {\setFormatLong{minimize} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{minimize}}
-}{\endBaseMiniExclam}
+}{\endBaseMiniExclam\toggletrue{bodyCon}}
 
 \DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1188,7 +1190,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{arg~min}\BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~min}}
 % Long version problem	
 {\setFormatLong{arg~min} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~min}}
-}{\endBaseMiniExclam}
+}{\endBaseMiniExclam\toggletrue{bodyCon}}
 
 
 
@@ -1202,7 +1204,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{max} \BaseMini{#2}{#3}{#4}{#5}{#6}{max}}
 % Long version problem	
 {\setFormatLong{maximize} \BaseMini{#2}{#3}{#4}{#5}{#6}{maximize}}
-}{\endBaseMini}
+}{\endBaseMini\toggletrue{bodyCon}}
 
 \DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1210,7 +1212,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{arg~max} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~max}}
 % Long version problem	
 {\setFormatLong{arg~max} \BaseMini{#2}{#3}{#4}{#5}{#6}{arg~max}}
-}{\endBaseMini}
+}{\endBaseMini\toggletrue{bodyCon}}
 
 
 % No reference
@@ -1220,7 +1222,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{max} \BaseMiniStar{#2}{#3}{#4}{#6}{max}}
 % Long version problem	
 {\setFormatLong{maximize} \BaseMiniStar{#2}{#3}{#4}{#6}{maximize}}
-}{\textbf{\endBaseMiniStar}}
+}{\endBaseMiniStar\toggletrue{bodyCon}}
 
 \DeclareDocumentEnvironment{argmaxi*}{D||{l} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1228,7 +1230,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{arg~max}\BaseMiniStar{#2}{#3}{#4}{#6}{arg~max}}
 % Long version problem	
 {\setFormatLong{arg~max} \BaseMiniStar{#2}{#3}{#4}{#6}{arg~max}}
-}{\textbf{\endBaseMiniStar}}
+}{\endBaseMiniStar\toggletrue{bodyCon}}
 
 
 % Multiple reference
@@ -1238,7 +1240,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{max} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{max}}
 % Long version problem	
 {\setFormatLong{maximize} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{maximize}}
-}{\endBaseMiniExclam}
+}{\endBaseMiniExclam\toggletrue{bodyCon}}
 
 \DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{0} m m m m}
 {\ifthenelse{\equal{#1}{s}}
@@ -1246,7 +1248,7 @@ The standard appearance for long optimization variables is as follows:
 {\setFormatShort{arg~max}\BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~max}}
 % Long version problem	
 {\setFormatLong{arg~max} \BaseMiniExclam{#2}{#3}{#4}{#5}{#6}{arg~max}}
-}{\endBaseMiniExclam}
+}{\endBaseMiniExclam\toggletrue{bodyCon}}
 \end{lstlisting}
 
 \end{document}