udesoftec (14apr14)

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

6 files changed, 31 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf b/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf
index 5728020cfb8..3479cb296a2 100644
--- a/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf
+++ b/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf
diff --git a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG
index b5ec0d5c8bb..0ca1f6ef82f 100644
--- a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG
+++ b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG
@@ -1,3 +1,9 @@
+2014/04/14 v1.3.6
+* fixed problems with combination of cls-options 'proposal' 
+  and 'final'
+* fixed problem when no layout was chosen
+* fixed missing inlinetodo-command for option 'omit-todo'
+
 2014/04/07 v1.3.5
 * added document option 'proposal' which equals all omit-*
 * corrected English version of confidentially clause
diff --git a/Master/texmf-dist/source/latex/udesoftec/README b/Master/texmf-dist/source/latex/udesoftec/README
index 824106e4751..e11d39054a1 100644
--- a/Master/texmf-dist/source/latex/udesoftec/README
+++ b/Master/texmf-dist/source/latex/udesoftec/README
@@ -2,7 +2,7 @@ udesoftec documentclass and bibstyle
 
 Maintainer: J. Peter M. Schuler
 Copyright:  2014 J. Peter M. Schuler
-Version:    2014/04/07 v1.3.5 udesoftec
+Version:    2014/04/14 v1.3.6 udesoftec
 License:    lppl
 Topic:      dissertation
 
diff --git a/Master/texmf-dist/source/latex/udesoftec/VERSION b/Master/texmf-dist/source/latex/udesoftec/VERSION
index 8d92f67afba..b44f99ff4e4 100644
--- a/Master/texmf-dist/source/latex/udesoftec/VERSION
+++ b/Master/texmf-dist/source/latex/udesoftec/VERSION
@@ -1 +1 @@
-2014/04/07 v1.3.5 udesoftec
\ No newline at end of file
+2014/04/14 v1.3.6 udesoftec
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex
index dacbf56ce23..c744ae05b2b 100644
--- a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex
+++ b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex
@@ -1,7 +1,7 @@
 % !Mode:: "TeX:UTF-8"
-%% udesoftec-doc.tex
-% Copyright 2014 J. Peter M. Schuler
-% 2014/04/07 v1.3.5 udesoftec
+%% udesoftec-doc.te
+%% Copyright 2014 J. Peter M. Schuler
+%% 2014/04/14 v1.3.6 udesoftec
 \documentclass[screenlayout,omit-lof,omit-lot,omit-sd]{udesoftec} 
 \usepackage{udesoftec-extra}
 
@@ -31,6 +31,7 @@
 \chapter*{English summary for this document}\label{sec:abstract}\addcontentsline{toc}{chapter}{English summary for this document}
 This LaTeX package provides a documentclass for use in written theses at the University of Duisburg-Essen, Research Group for Business Informatics and Software Engineering. It is based on pdflatex and bibtex using KOMA-Script and natbib and  many other popular packages. The current documentation is only available in german. However the  \hyperref[sec:classoptions]{class options in section \ref*{sec:classoptions}} and \hyperref[sec:variables]{configuration variables for the titlepage in section \ref*{sec:variables}} should be quite understandable and the \hyperref[sec:paketlist]{package listing in the appendix} shows where to look for further information. A \hyperref[sec:exampleproject]{MWE and a download of an example project is also available in section \ref*{sec:exampleproject}.}
 
+
 \section*{Installation}
   Install with MikTeX or if using TeX Live (e.g. BasicTeX) with \lstinline!tlmgr! using the command mentioned in section \ref{sec:classinstall}.
 
diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls
index f5a1100249d..301d275ca78 100644
--- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls
+++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls
@@ -1,7 +1,7 @@
 % !Mode:: "TeX:UTF-8"
 %% udesoftec.cls
 %% Copyright 2014 J. Peter M. Schuler
-%% 2014/04/07 v1.3.5 udesoftec
+%% 2014/04/14 v1.3.6 udesoftec
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -32,7 +32,7 @@
 % and
 % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
 \NeedsTeXFormat{LaTeX2e}%
-\ProvidesClass{udesoftec}[2014/04/07 v1.3.5 Thesis class and bibstyle for UDE SOFTEC]%
+\ProvidesClass{udesoftec}[2014/04/14 v1.3.6 Thesis class and bibstyle for UDE SOFTEC]%
 
 %%%% nag %%%%%%%%%%%%% 
 % purpose: identifies deprecated code and suggests better pckgs
@@ -68,6 +68,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% all template conditions %%%%%%
 \newif\ifdocumentIsFinal
+\newif\ifdocumentIsProposal
 \newif\iftemplateUseSansSerifFont
 \newif\iftemplateUseBookLayout
 \newif\iftemplateFakeBookLayout
@@ -92,9 +93,11 @@
 \newif\iftemplateDocumentLayoutChoosen
 \templateDocumentLayoutChoosenfalse
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% all default values and the options %%%%%
 \documentIsFinalfalse
+\documentIsProposalfalse
 \DeclareOption{draft}{\documentIsFinalfalse}
 \DeclareOption{final}{\documentIsFinaltrue}
 \documentOmitLOTfalse
@@ -112,30 +115,32 @@
 \DeclareOption{omit-todos}{\documentOmitTodostrue}
 
 \DeclareOption{proposal}{
+\documentIsProposaltrue
 \documentOmitLOTtrue
 \documentOmitSDtrue
 \documentOmitLOFtrue
 \documentOmitLOAtrue
 \documentOmitTOCtrue
-\documentOmitTodostrue
+\documentOmitTodosfalse
 }
+\templateFakeBookLayoutfalse			
 \templateUseColorfulLinkstrue
 \templateUseSansSerifFonttrue	
-\templateFakeBookLayoutfalse			
-\templateUseBookLayouttrue		
+\templateUseBookLayoutfalse		
 \templateDocumentLayoutChoosentrue		
 				
 \DeclareOption{printlayout}{
+    \templateFakeBookLayoutfalse			
 	\templateUseColorfulLinksfalse
 	\templateUseSansSerifFontfalse	
-	\templateFakeBookLayoutfalse			
 	\templateUseBookLayouttrue				
 	\templateDocumentLayoutChoosentrue
 }
 \DeclareOption{screenlayout}{
-	\templateUseBookLayoutfalse
-	\templateUseSansSerifFonttrue
+    \templateFakeBookLayoutfalse			
 	\templateUseColorfulLinkstrue
+	\templateUseSansSerifFonttrue
+	\templateUseBookLayoutfalse
 	\templateDocumentLayoutChoosentrue
 }
 \DeclareOption{screenwithprintpaginglayout}{
@@ -231,11 +236,15 @@ Pr\"ufungsbeh\"orde vorgelegen.
 \ProcessOptions\relax
 
 \ifdocumentIsFinal
+  \ifdocumentIsProposal
+    \documentOmitTodostrue
+  \else
 \documentOmitLOTfalse
 \documentOmitLOFfalse
 \documentOmitLOAfalse
 \documentOmitTOCfalse
 \documentOmitTodostrue
+  \fi
 \else%
 \fi%
 
@@ -635,6 +644,8 @@ colorinlistoftodos
 	\newcommand*{\todoDesign}[1]{}
 	\newcommand*{\todoText}[1]{}
 	\newcommand*{\todoFigure}[1]{}
+    \newcommand*{\inlinetodo}[1]{}
+    \newcommand*{\todoinline}[1]{}
 \else
 	\let\defaultTodo\todo
 	\renewcommand{\todo}[1]{%