releasing v2.2.0-beta

CHANGELOG.md

@@ -1,5 +1,12 @@
 # 2
 
+## 2.2
+
+### 2.2.0-beta
+
+* Possibility to add the image (logo and name) of another company
+* A few corrections of the way the package has to be installed
+
 ## 2.1
 
 ### 2.1.1

install/unix.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+cd "$(readlink -m "$0/../../")" # chdir to the root directory of the package archive
+
 TEXMFLOCAL="$(kpsewhich -var-value TEXMFLOCAL)"
 PACKAGE="$TEXMFLOCAL/tex/latex/beamerx/"
 FONTS="$TEXMFLOCAL/fonts/truetype/"

install/windows.bat

@@ -1,4 +1,5 @@
 @ECHO OFF
+CD ..
 FOR /F %%i IN ('kpsewhich -var-value TEXMFLOCAL') DO SET TEXMFLOCAL=%%i
 SET PACKAGEFOLDER=%TEXMFLOCAL%/tex/latex/beamerx
 SET FONTSFOLDER=%TEXMFLOCAL%/fonts

makeversion

@@ -137,6 +137,9 @@ else
 fi;
 makechangelog;
 
+find . -type f -name '*.sty' | xargs -n1 -d'\n' sed -i '/\\ProvidesPackage/ s/\[[^,]*,/\['"$(date +%Y\\/%m\\/%d)"' '"$newv"',/'
+find . -type f -name '*.sty' | xargs -n1 -d'\n' git add
+
 git add CHANGELOG.md && {
   nparents=$(git cat-file -p HEAD | sed -n '/^parent/ p' | wc -l)
   if [ $nparents -gt 1 ]; then

source/beamerx.sty

@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerx}[2016/12/11 v2.0.0beta, standard scientific slideshows layout for Ecole polytechnique (Palaiseau,France).]
+\ProvidesPackage{beamerx}[2017/01/19 v2.2.0-beta, standard scientific slideshows layout for Ecole polytechnique (Palaiseau,France).]
 
 %=======================================================================
 % Declaration des options
@@ -260,12 +260,17 @@
 \setbeamersize{text margin right=\beamerxmargin}
 
 \newcommand{\beamerxshorttitle}{-- \insertshorttitle}
+\newcommand{\beamerxcompany}{}
+\newcommand{\company}[1]{%
+  \renewcommand{\beamerxcompany}{-- \textbf{#1} }%
+}
+\newcommand{\beamerxfootleft}{\textbf{ÉCOLE POLYTECHNIQUE} \beamerxcompany}
 \newcommand\resetfootline{%
   \setbeamertemplate{footline}{%
     \color{xfootcolor}%
     \hspace*{\beamerxmargin}%
     \raisebox{\beamerxmargin}{%
-      \textbf{ÉCOLE POLYTECHNIQUE} %
+      \beamerxfootleft%
       \beamerxshorttitle%
     }%
     \hspace*{\fill}
@@ -373,6 +378,20 @@
 % Diapos conforme charte graphique
 %=======================================================================
 %--- Maketitle
+\def\includebeamerxlogo{}
+\newcommand{\nologo}[1]{%
+  \renewcommand{\includebeamerxlogo}{\color{white}\includegraphics[height=0.25\paperheight,keepaspectratio]{beamerxlogo}}
+}
+\nologo{}
+\def\logo{}
+\renewcommand{\logo}[1]{%
+  \renewcommand{\includebeamerxlogo}{%
+    \begin{minipage}{0.18377693\paperheight}\color{white}\centering%
+      \includegraphics[width=\textwidth,keepaspectratio]{beamerxlogo}\\[0.01250\paperwidth]
+      \includegraphics[width=\textwidth,keepaspectratio]{#1}
+    \end{minipage}
+  }%
+}
 \AtBeginDocument{%
   \renewcommand\maketitle{%
     \setlength{\unitlength}{0.00625\paperwidth}%
@@ -386,7 +405,7 @@
         }%
         \put(6,45){%
           \makebox(0,0)[l]{%
-            \color{white}\includegraphics[height=0.25\paperheight,keepaspectratio]{beamerxlogo}%
+            \includebeamerxlogo{}%
           }%
         }%
         \put(3,3){%

todo.txt

@@ -21,11 +21,11 @@ x makerelease script
 x lighter release archive (remove exemple.tex and unnecessary pictures)
 x install scripts (step by step)
 x add font support for lualatex/linux first (we'll see then for other distribs)
-- default color theme
+o default color theme
   the user can choose a default color theme, and it defines the \section and
   \subsection commands
   if the user doesn't choose, the \section and \subsection commands remain unchanged
 x install script for windows
 - test font support on windows
-- integration of another logo : stack with horizontal logo of the school
-- integration of a company name : with ÉCOLE POLYTECHNIQUE - COMPANY - ...
+x integration of another logo : stack with horizontal logo of the school
+x integration of a company name : with ÉCOLE POLYTECHNIQUE - COMPANY - ...