From 026c17312aa7531cc4a3ea490faacbc534c46176 Mon Sep 17 00:00:00 2001
From: w2ak <w2ak@users.noreply.github.com>
Date: Thu, 19 Jan 2017 00:24:59 +0100
Subject: [PATCH 1/4] adapted install scripts

---
 install/unix.sh     | 2 ++
 install/windows.bat | 1 +
 2 files changed, 3 insertions(+)

diff --git a/install/unix.sh b/install/unix.sh
index 00c49f2..6337667 100755
--- a/install/unix.sh
+++ b/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/"
diff --git a/install/windows.bat b/install/windows.bat
index 4430588..f2152c1 100644
--- a/install/windows.bat
+++ b/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

From 0ad0d13feaf95bb16804f3467fb5b28b936ac9fa Mon Sep 17 00:00:00 2001
From: w2ak <w2ak@users.noreply.github.com>
Date: Thu, 19 Jan 2017 01:04:11 +0100
Subject: [PATCH 2/4] version script

---
 makeversion        | 3 +++
 source/beamerx.sty | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/makeversion b/makeversion
index 7488bf8..8efb0cc 100755
--- a/makeversion
+++ b/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
diff --git a/source/beamerx.sty b/source/beamerx.sty
index c4fa8a7..bdebaae 100644
--- a/source/beamerx.sty
+++ b/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}[2016/12/11 v2.1.1, standard scientific slideshows layout for Ecole polytechnique (Palaiseau,France).]
 
 %=======================================================================
 % Declaration des options

From 8c62f21e61cdfa975dfe24caaf5ef76db5bd6d85 Mon Sep 17 00:00:00 2001
From: w2ak <w2ak@users.noreply.github.com>
Date: Fri, 13 Jan 2017 20:36:39 +0100
Subject: [PATCH 3/4] adding a company name

---
 source/beamerx.sty | 7 ++++++-
 todo.txt           | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/beamerx.sty b/source/beamerx.sty
index bdebaae..c65f941 100644
--- a/source/beamerx.sty
+++ b/source/beamerx.sty
@@ -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}
diff --git a/todo.txt b/todo.txt
index 7804057..c1cc8c3 100644
--- a/todo.txt
+++ b/todo.txt
@@ -28,4 +28,4 @@ x add font support for lualatex/linux first (we'll see then for other distribs)
 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 a company name : with ÉCOLE POLYTECHNIQUE - COMPANY - ...

From d1bd0120482270ec09d500fdf01bf2baff9e712a Mon Sep 17 00:00:00 2001
From: w2ak <w2ak@users.noreply.github.com>
Date: Fri, 13 Jan 2017 19:49:14 +0100
Subject: [PATCH 4/4] adding a logo

---
 source/beamerx.sty | 16 +++++++++++++++-
 todo.txt           |  4 ++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/source/beamerx.sty b/source/beamerx.sty
index c65f941..29a6286 100644
--- a/source/beamerx.sty
+++ b/source/beamerx.sty
@@ -378,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}%
@@ -391,7 +405,7 @@
         }%
         \put(6,45){%
           \makebox(0,0)[l]{%
-            \color{white}\includegraphics[height=0.25\paperheight,keepaspectratio]{beamerxlogo}%
+            \includebeamerxlogo{}%
           }%
         }%
         \put(3,3){%
diff --git a/todo.txt b/todo.txt
index c1cc8c3..66309ab 100644
--- a/todo.txt
+++ b/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
+x integration of another logo : stack with horizontal logo of the school
 x integration of a company name : with ÉCOLE POLYTECHNIQUE - COMPANY - ...