modernposter (4jan18)

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

6 files changed, 51 insertions, 48 deletions

diff --git a/Master/texmf-dist/doc/latex/modernposter/README.md b/Master/texmf-dist/doc/latex/modernposter/README.md
index bd376f9d705..55a83609b85 100644
--- a/Master/texmf-dist/doc/latex/modernposter/README.md
+++ b/Master/texmf-dist/doc/latex/modernposter/README.md
@@ -1,6 +1,6 @@
-## modernposter - A modern LaTeX poster theme (2018/01/02 v1.01.2)
+## modernposter - A modern LaTeX poster theme (2018/01/04 v1.02.1)
 
-This class extends the a0poster class in that it adds support to easily create posters without the need for taking care of the layout at all. It allows to use \maketitle to generate a fancy header containing the title information and also provides macros to position various different types of text boxes in a two-column layout. The color scheme and some parts of the Makefile are inspired by the [metropolis beamer theme](https://github.com/matze/mtheme). 
+This class extends the a0poster class in that it adds support to easily create posters without the need for taking care of the layout at all. It allows to use \maketitle to generate a fancy header containing the title information and also provides macros to position various different types of text boxes in a two-column layout. The color scheme is inspired by the [metropolis beamer theme](https://github.com/matze/mtheme). 
 
 Below you can find a preview of the demo:
 
@@ -8,7 +8,7 @@ Below you can find a preview of the demo:
 
 ## Usage
 
-Below you can find a toy example, demonstrating how to use modernposter
+Below you can find a toy example, demonstrating how to use modernposter.
 
 ```latex
 \documentclass{modernposter}
diff --git a/Master/texmf-dist/doc/latex/modernposter/demo.pdf b/Master/texmf-dist/doc/latex/modernposter/demo.pdf
index 1401c6d392b..8e1ac72180f 100644
--- a/Master/texmf-dist/doc/latex/modernposter/demo.pdf
+++ b/Master/texmf-dist/doc/latex/modernposter/demo.pdf
diff --git a/Master/texmf-dist/doc/latex/modernposter/demo.tex b/Master/texmf-dist/doc/latex/modernposter/demo.tex
index 9eb7643f22e..c2fed54906f 100644
--- a/Master/texmf-dist/doc/latex/modernposter/demo.tex
+++ b/Master/texmf-dist/doc/latex/modernposter/demo.tex
@@ -2,7 +2,7 @@
 %
 % This file is part of the modernposter LaTeX template
 %
-% Version 1.01.2 2018/01/02
+% Version 1.02.1 2018/01/04
 %
 % Copyright 2018 David Derler
 %
@@ -11,9 +11,11 @@
 \documentclass{modernposter}
 %
 % You may use the hlcolor option to pass a custom highlight color
-% in HTML format.
+% in HTML format. You may use the logo option to pass a path to
+% a logo. You may use the helvet option to switch to the Helvetica
+% font.
 % 
-% \documentclass[logo=logo.png,hlcolor=F70146]{modernposter}
+% \documentclass[helvet,logo=logo.png,hlcolor=F70146]{modernposter}
 
 \title{This is a Modernposter Demo}
 \author{Firstname Lastname}
diff --git a/Master/texmf-dist/doc/latex/modernposter/modernposter.pdf b/Master/texmf-dist/doc/latex/modernposter/modernposter.pdf
index 78e2865342c..111a09908e7 100644
--- a/Master/texmf-dist/doc/latex/modernposter/modernposter.pdf
+++ b/Master/texmf-dist/doc/latex/modernposter/modernposter.pdf
diff --git a/Master/texmf-dist/doc/latex/modernposter/modernposter.tex b/Master/texmf-dist/doc/latex/modernposter/modernposter.tex
index 2d4ee4d17c5..33ba8ad267d 100644
--- a/Master/texmf-dist/doc/latex/modernposter/modernposter.tex
+++ b/Master/texmf-dist/doc/latex/modernposter/modernposter.tex
@@ -2,7 +2,7 @@
 %
 % This file is part of the modernposter LaTeX template
 %
-% Version 1.01.2 2018/01/02
+% Version 1.02.1 2018/01/04
 %
 % Copyright 2018 David Derler
 %
@@ -13,6 +13,8 @@
 \usepackage{xcolor}
 \usepackage[hidelinks=true]{hyperref}
 \usepackage{listings}
+\usepackage{examplep}
+\usepackage{amsmath}
 \lstset{
   basicstyle=\footnotesize\ttfamily,
   breaklines=true,
@@ -27,7 +29,7 @@
 
 \title{modernposter - A modern \LaTeX~poster theme}
 \author{David Derler}
-\date{Version 1.01.2 2018/01/02}
+\date{Version 1.02.1 2018/01/04}
 
 \begin{document}
   \maketitle
@@ -38,12 +40,24 @@
   \section{Installation}
   The package can be installed by copying the {\tt modernposter.cls} file to the folder of your \LaTeX~distribution, which contains the manually installed packages.\footnote{For TeXLive distributions this should be {\tt $\sim$/texmf/tex/latex/modernposter/}.} Alternatively, you may choose to clone the github repository\footnote{\url{https://github.com/derlerd/modernposter}} containing the development version of this package and use the {\tt install} target of the Makefile contained in this repository. This target will automatically install the package at {\tt $\sim$/texmf/tex/latex/modern\-poster/} and the documentation at {\tt $\sim$/texmf/doc/latex/modernposter/}.
   \section{Usage}
-  This package is intended to save time whenever a poster needs to be created. Thus we have tried to keep the package as easy to use as possible. Below, we describe the available options followed by a toy example which should illustrate the usage of the package. For more details also refer to the {\tt demo.tex} file in the package.
+  This package is intended to save time whenever a poster needs to be created. Thus we have tried to keep the package as easy to use as possible. Below, we describe the available options as well as the available macros. In addition, we provide a toy example which should illustrate the usage of the package. For more details also refer to the {\tt demo.tex} file in the package.
   \subsection{Options}
-  The following options can be set. All option keys allow to optionally supply an explicit value.  
+  The following options can be set. Some option keys allow to optionally supply an explicit value.  
   \begin{description}
-  	\item[{\tt logo=[logo]}] This option allows to provide a path to a logo which is then included on the top right of the page. For example, {\tt logo=img.png}.
-  	\item[{\tt hlcolor=[color]}] This option allows to override the highlight color. The color needs to be supplied in HTML format. For example, {\tt hlcolor=F70146}. 
+  	\item[\PVerb{logo=[logo]}] This option allows to provide a path to a logo which is then included on the top right of the page. For example, {\tt logo=img.png}.
+  	\item[\PVerb{hlcolor=[color]}] This option allows to override the highlight color. The color needs to be supplied in HTML format. For example, {\tt hlcolor=F70146}. 
+    \item[\PVerb{helvet}] This option, if supplied, switches the font from Fira Sans to Helvetica.
+  \end{description}
+  \subsection{Environments}
+  The following environments are provided by the package.
+  \begin{description}
+  	\item[\tt postercolumn:] The template is designed for a two-column layout. This environment represents a column. 
+  \end{description}
+  \subsection{Commands}
+  The following commands are provided by the package.
+  \begin{description}
+  	\item[\PVerb{\posterbox{[t]}{[c]}}:] This command can be used within a {\tt postercolumn} environment to place a text box within a column. It takes two arguments being the title \PVerb{t} as well as the content \PVerb{c} of the box.
+  	\item[\PVerb{\doubleposterbox[height]{[t1]}{[c1]{[t2]}{[c2]}}}:] This command can be used within a {\tt postercolumn} environment to place two text boxes. The combined height of those two text boxes is identical to the height of a text box placed with {\tt posterbox}. There is an optional parameter {\tt height}, which allows to define the height of the first text box relative to the height of a text box placed with {\tt posterbox}. It takes four arguments being the title {\tt t1} and the content {\tt c1} of the first text box and the title {\tt c2} and the content {\tt c2} of the second text box, respectively.
   \end{description}
   \subsection{Toy Example}
   The following listing demonstrates the basic usage of the package.
@@ -84,6 +98,7 @@
   \section{Version History}
   \begin{description}
   	\item[1.0] Initial release.
-  	\item[1.01.2] Improved versioning; added explicit version numbers to every file.
+  	\item[1.01.2] Improved versioning; Added explicit version numbers to every file.
+  	\item[1.02.1] Implemented option to switch between Fira Sans and Helvetica; Removed some unused stuff \& reduced dependencies on other packages; Improved documentation
   \end{description}
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/modernposter/modernposter.cls b/Master/texmf-dist/tex/latex/modernposter/modernposter.cls
index 3db991199b7..04e43f329d4 100644
--- a/Master/texmf-dist/tex/latex/modernposter/modernposter.cls
+++ b/Master/texmf-dist/tex/latex/modernposter/modernposter.cls
@@ -2,14 +2,14 @@
 %
 % This file is part of the modernposter LaTeX template
 %
-% Version 1.01.2 2018/01/02
+% Version 1.02.1 2018/01/04
 %
 % Copyright 2018 David Derler
 %
 % This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 
 % International license (cf. https://creativecommons.org/licenses/by-sa/4.0/)  
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{modernposter}[2018/01/02 v1.01.2 Modern poster template. Inspired by metropolis beamer template.]
+\ProvidesClass{modernposter}[2018/01/04 v1.02.1 A modern LaTeX poster template. Color scheme inspired by metropolis beamer theme.]
 
 \LoadClass[portrait]{a0poster}
 
@@ -18,32 +18,9 @@
 %------------------------------------------------------------------------------
 \RequirePackage{xcolor}
 
-\definecolor{c1}{HTML}{CB4B16}
-\definecolor{c2}{HTML}{586E75}
-\definecolor{c3}{HTML}{6C71C4}
-\definecolor{c4}{HTML}{D33682}
-\definecolor{c5}{HTML}{268BD2}
-\definecolor{c6}{HTML}{B58900}
-\definecolor{c7}{HTML}{859900}
-\definecolor{c8}{HTML}{DC322F}
-\definecolor{c9}{HTML}{002B36}
-\definecolor{c10}{HTML}{FF8000}
-
 \definecolor{mDarkTeal}{HTML}{23373b}
 \definecolor{mDarkBrown}{HTML}{604c38}
 
-\newcommand{\orange}[1]{\textcolor{c10}{#1}}
-\newcommand{\gray}[1]{\textcolor{c2}{#1}}
-\newcommand{\purple}[1]{\textcolor{c3}{#1}}
-\newcommand{\pink}[1]{\textcolor{c4}{#1}}
-\newcommand{\blue}[1]{\textcolor{c5}{#1}}
-\newcommand{\yellow}[1]{\textcolor{c6}{#1}}
-\newcommand{\green}[1]{\textcolor{c7}{#1}}
-\newcommand{\red}[1]{\textcolor{c8}{#1}}
-\newcommand{\black}[1]{\textcolor{c9}{#1}
-
-}
-
 %------------------------------------------------------------------------------
 % Options
 %------------------------------------------------------------------------------
@@ -54,8 +31,14 @@
 \pgfkeys{/modernposter/.cd,
   hlcolor/.store in=\modernposter@hlcolor,
   logo/.store in=\modernposter@logo,
-  hlcolor=FF8000,
-  logo=none}
+  hlcolor=FF8000}
+
+\ProcessPgfOptions{/modernposter}
+
+\pgfkeys{/modernposter/.cd,
+  logo/.code={\def\@logotrue{}},
+  helvet/.code={\def\@helvettrue{}},
+}
 
 \ProcessPgfOptions{/modernposter}
 
@@ -94,9 +77,7 @@
 \let\oldparboxrestore\@arrayparboxrestore
 \renewcommand{\@arrayparboxrestore}{
   \oldparboxrestore
-  \makeatletter
   \parskip0.4em
-  \makeatother
   }
 
 \let\faiconold\faicon
@@ -105,7 +86,13 @@
 \renewcommand{\labelitemi}{$\bullet$~~}
 \renewcommand{\labelitemii}{\faicon{angle-right}~~}
 
-\RequirePackage[light,sfdefault]{FiraSans}
+\ifdefined\@helvettrue
+  \RequirePackage{helvet}
+  \renewcommand\familydefault{\sfdefault}
+\else
+  \RequirePackage[light,sfdefault]{FiraSans}	
+\fi
+
 
 %------------------------------------------------------------------------------
 % Begin/End Document commands
@@ -124,14 +111,14 @@
 }
 
 \AtBeginDocument{
-  \makeatletter
+  \ifdefined\@helvettrue\else
     \def\bfseries@sf{m}
     \SetSymbolFont{operators}{normal}{\math@encoding}{\math@sfdefault}{l}{n}
     \SetSymbolFont{operators}{bold}{\math@encoding}{\math@sfdefault}{m}{n}
     \DeclareSymbolFont{SFMath}{\math@encoding}{\math@sfdefault}{l}{sl}
     \SetSymbolFont{SFMath}{normal}{\math@encoding}{\math@sfdefault}{l}{sl}
     \SetSymbolFont{SFMath}{bold}{\math@encoding}{\math@sfdefault}{m}{\mathnormal@bold@shape}
-  \makeatother   
+  \fi
 }
 
 \AtEndDocument{
@@ -142,7 +129,6 @@
 % Title commands
 %------------------------------------------------------------------------------
 \RequirePackage[hidelinks]{hyperref}
-\RequirePackage{xifthen,xstring}
 
 \def\@email{}
 \newcommand{\email}[1]{\def\@email{#1}}
@@ -163,11 +149,11 @@
           fill=hlcol, 
           yshift=-15em] (sep) at (current page.north) 
       {};
-    \expandafter\ifstrequal\expandafter{\modernposter@logo}{none}{}{
+    \ifdefined\@logotrue
     \node[anchor=west, 
           xshift=1em] (logo) at (header.east) 
       {\includegraphics[width=13em]{\modernposter@logo}};
-    }
+    \fi
     \node[anchor=east, 
           yshift=3.4em, 
           xshift=-2.5em] (title) at (header.east)