releasing v2.1.0

BinetReseau · Jan 9, 2017 · 858c85c · 858c85c
2 parents b190001 + cd8bf39
commit 858c85c
Show file tree

Hide file tree

Showing 27 changed files with 82 additions and 237 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # 2
 
+## 2.1
+
+### 2.1.0
+
+* Added font support for XeLaTeX and LuaLaTeX. This means you need to install
+the fonts (refer to the install section of the wiki) in order to keep it working
+with these compilers.
+* Install script for unix systems.
+
 ## 2.0
 
 ### 2.0.2-beta

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all clean cleandist
+.PHONY: all clean cleandist linux-install mac-install release
 
 all:
 	make -C source/ all
@@ -8,3 +8,12 @@ clean:
 
 cleandist:
 	make -C source/ cleandist
+
+linux-install:
+	sudo ./install/unix.sh
+
+mac-install:
+	sudo ./install/unix.sh
+
+release:
+	./makerelease ./release/
diff --git a/README.md b/README.md
@@ -1,2 +1,11 @@
 # polytechnique-beamer
+
 Ce dossier contient la source du package pour les diaporamas à l'École polytechnique.
+
+# Install
+
+To install the package, you can run the corresponding script in `install/` or do a manual package install and put the files from `source/` and `fonts/` in the correct folders.
+
+```sh
+sudo ./install/linux.sh
+```
diff --git a/fonts/DroidSerif/DroidSerif-Bold.ttf b/fonts/DroidSerif/DroidSerif-Bold.ttf
diff --git a/fonts/DroidSerif/DroidSerif-BoldItalic.ttf b/fonts/DroidSerif/DroidSerif-BoldItalic.ttf
diff --git a/fonts/DroidSerif/DroidSerif-Italic.ttf b/fonts/DroidSerif/DroidSerif-Italic.ttf
diff --git a/fonts/DroidSerif/DroidSerif.ttf b/fonts/DroidSerif/DroidSerif.ttf
diff --git a/fonts/Muli/Muli-Bold.ttf b/fonts/Muli/Muli-Bold.ttf
diff --git a/fonts/Muli/Muli-BoldItalic.ttf b/fonts/Muli/Muli-BoldItalic.ttf
diff --git a/fonts/Muli/Muli-Italic.ttf b/fonts/Muli/Muli-Italic.ttf
diff --git a/fonts/Muli/Muli-Regular.ttf b/fonts/Muli/Muli-Regular.ttf
diff --git a/fonts/RobotoMono/RobotoMono-Bold.ttf b/fonts/RobotoMono/RobotoMono-Bold.ttf
diff --git a/fonts/RobotoMono/RobotoMono-BoldItalic.ttf b/fonts/RobotoMono/RobotoMono-BoldItalic.ttf
diff --git a/fonts/RobotoMono/RobotoMono-Italic.ttf b/fonts/RobotoMono/RobotoMono-Italic.ttf
diff --git a/fonts/RobotoMono/RobotoMono-Regular.ttf b/fonts/RobotoMono/RobotoMono-Regular.ttf
diff --git a/guide/guide.tex b/guide/guide.tex
diff --git a/install/.exclude b/install/.exclude
@@ -0,0 +1,7 @@
+minimal.tex
+exemple.tex
+maketestfiles
+light.jpg
+dark.jpg
+Makefile
+welcome-short.jpg
diff --git a/install/notes.txt b/install/notes.txt
diff --git a/install/unix.sh b/install/unix.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+TEXMFLOCAL="$(kpsewhich -var-value TEXMFLOCAL)"
+PACKAGE="$TEXMFLOCAL/tex/latex/beamerx/"
+FONTS="$TEXMFLOCAL/fonts/truetype/"
+PERMS="Dg+s,ug+w,o-w,+X"
+mkdir -p "$PACKAGE" "$FONTS"
+rsync --recursive --exclude-from=install/.exclude --delete-excluded --chmod=$PERMS source/ $PACKAGE/
+rsync --recursive --update --chmod=$PERMS fonts/ $FONTS/
+texhash || mktexlsr
diff --git a/makerelease b/makerelease
@@ -31,12 +31,12 @@ make &&
              -or -name '*.jpg'\
              -or -name '*.md'\
              -or -name 'LICENSE*'
+  find ./install/
+  find ./fonts/
 } | tee >(xargs -d'\n' tar czf "$folder/$tgz") >(xargs -d'\n' zip -q "$folder/$zip") | cat - && {
   cd $folder &&
   gpg2 --armor --output "$zip.sig" --detach-sign "$zip" &&
   gpg2 --armor --output "$tgz.sig" --detach-sign "$tgz" &&
-  md5sum "$tgz" > "$tgz.md5" &&
-  md5sum "$zip" > "$zip.md5" &&
-  sha256sum "$tgz" > "$tgz.sha256" &&
-  sha256sum "$zip" > "$zip.sha256";
+  md5sum "$tgz" "$zip" > "$arch.md5" &&
+  sha256sum "$tgz" "$zip" > "$arch.sha256";
 }
diff --git a/source/Makefile b/source/Makefile
@@ -4,6 +4,9 @@ TEXFILES:=$(shell find . -type f -name '*.tex')
 
 all: minimal.pdf
 
+minimal.pdf: minimal.tex
+	lualatex -interaction=nonstopmode $<
+
 %.pdf: %.tex
 	pdflatex -interaction=nonstopmode $<
 	pdflatex -interaction=nonstopmode $<

diff --git a/source/beamerx.sty b/source/beamerx.sty
@@ -33,7 +33,34 @@
 \RequirePackage{xargs}
 \RequirePackage{adjustbox}
 \RequirePackage{pgf}
-
+\RequirePackage{ifluatex,ifxetex}
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+\else % xelatex or lualatex
+  \RequirePackage{fontspec}
+  \AtBeginDocument{
+    \setsansfont{Muli}[
+      Extension=.ttf,
+      UprightFont=*-Regular,
+      ItalicFont=*-Italic,
+      BoldFont=*-Bold,
+      BoldItalicFont=*-BoldItalic
+    ]
+    \setromanfont{DroidSerif}[
+      Extension=.ttf,
+      UprightFont=*,
+      ItalicFont=*-Italic,
+      BoldFont=*-Bold,
+      BoldItalicFont=*-BoldItalic
+    ]
+    \setmonofont{RobotoMono}[
+      Extension=.ttf,
+      UprightFont=*-Regular,
+      ItalicFont=*-Italic,
+      BoldFont=*-Bold,
+      BoldItalicFont=*-BoldItalic
+    ]
+  }
+\fi
 %=======================================================================
 % Definition des couleurs
 %=======================================================================

diff --git a/source/dark.jpg b/source/dark.jpg
diff --git a/source/exemple.tex b/source/exemple.tex
diff --git a/source/minimal.tex b/source/minimal.tex
@@ -1,16 +1,11 @@
 % vim: expandtab tabstop=2 softtabstop=2 shiftwidth=2
 \documentclass[aspectratio=169]{beamer}
+\usepackage[frenchb,noconfigs]{babel}
 \usepackage{ifluatex,ifxetex}
-\ifluatex%
-  \usepackage{fontspec}
-  \setsansfont{Comfortaa}
-\else\ifxetex%
-  \usepackage{fontspec}
-\else%
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
   \usepackage[utf8]{inputenc}
   \usepackage[T1]{fontenc}
-\fi\fi%
-\usepackage[frenchb,noconfigs]{babel}
+\fi
 
 \usepackage{beamerx}
 \usepackage{lipsum}
@@ -44,7 +39,6 @@
     \begin{column}{0.25\textwidth}
       \begin{block}{Groups}
         While not well known, the collective nouns used for cats and kittens are a clowder of cats and a kindle of kittens.
-        \vspace*{5ex}
       \end{block}
     \end{column}
     \begin{column}{0.5\textwidth-1ex}

diff --git a/source/pei-short.jpg b/source/pei-short.jpg
diff --git a/source/welcome-short.jpg b/source/welcome-short.jpg