Commits (10)
LOCAL_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
PACKAGE_DIR = $(LOCAL_DIR)/beamertheme-source
DOC_DIR = $(LOCAL_DIR)/doc
FONTS_DIR = $(LOCAL_DIR)/fonts
CACHE_DIR = $(LOCAL_DIR)/.latex-cache
PDFPC_SIZE = 40000
PACKAGE_SRC = $(wildcard $(PACKAGE_DIR)/*.dtx)
PACKAGE_STY = $(notdir $(PACKAGE_SRC:%.dtx=%.sty))
......@@ -9,12 +11,16 @@ PACKAGE_TGT = $(addprefix $(LOCAL_DIR)/,$(PACKAGE_STY))
DOC_PDF = $(patsubst %.tex,%.pdf,$(wildcard $(DOC_DIR)/*.tex))
COMPILE_TEX := latexmk -xelatex -output-directory=$(CACHE_DIR)
LATEXMK_GEN ?= -xelatex
export TEXINPUTS:=$(LOCAL_DIR):$(shell pwd):$(PACKAGE_DIR):${TEXINPUTS}
COMPILE_TEX = latexmk $(LATEXMK_GEN) -output-directory=$(CACHE_DIR)
export TEXINPUTS:=$(LOCAL_DIR):$(FONTS_DIR):$(shell pwd):$(PACKAGE_DIR):${TEXINPUTS}
.PHONY: all sty doc clean mrproper
.INTERMEDIATE: %.pdfpc
all: sty doc
sty: $(PACKAGE_TGT)
......@@ -25,7 +31,7 @@ clean::
@rm -rf "$(CACHE_DIR)"
mrproper:: clean
@rm -f $(PACKAGE_TGT) $(DOC_PDF)
@rm -f $(PACKAGE_TGT) $(DOC_PDF) $(patsubst %.tex,%.pdfpc,$(wildcard $(DOC_DIR)/*.tex))
$(PACKAGE_TGT): $(wildcard $(PACKAGE_DIR)/*.ins) $(PACKAGE_SRC)
@mkdir -p $(CACHE_DIR)
......@@ -36,3 +42,11 @@ $(PACKAGE_TGT): $(wildcard $(PACKAGE_DIR)/*.ins) $(PACKAGE_SRC)
@mkdir -p $(CACHE_DIR)
@cd $(dir $< ) && $(COMPILE_TEX) $(notdir $<)
@cp $(CACHE_DIR)/$(notdir $@) $@
@test ! -f $@pc -a -f $(CACHE_DIR)/$(notdir $@)pc && ( /bin/echo -e "[file]\n$@\n[font_size]\n$(PDFPC_SIZE)" ; cat $(CACHE_DIR)/$(notdir $@)pc | sed 's/\\\\/\n/g' | sed 's/\\par/\n\n/g' ) > $@pc || echo "ignoring PDFPC file" && exit 0
pdfpc-%: %.pdf
@pdfpc -p -C $<
evince-%: %.pdf
@evince $<
......@@ -76,24 +76,44 @@
%
% \begin{macrocode}
\definecolor{nDarkYellow}{RGB}{201,147,19}
\definecolor{nYellow}{RGB}{217,198,137}
\definecolor{nLightYellow}{RGB}{243,238,223}
\definecolor{nDarkGrey}{RGB}{152,164,174}
\definecolor{nGrey}{RGB}{210,213,215}
\definecolor{nLightGrey}{RGB}{235,236,238}
\definecolor{nDarkRed}{RGB}{141,20,41}
\definecolor{nRed}{RGB}{201,169,147}
\definecolor{nLightRed}{RGB}{237,231,222}
\definecolor{nDarkGreen}{RGB}{0,155,119}
\definecolor{nGreen}{RGB}{170,207,189}
\definecolor{nLightGreen}{RGB}{229,239,234}
\definecolor{nDarkBlue}{RGB}{0,56,101}
\definecolor{nBlue}{RGB}{144,167,198}
\definecolor{nLightBlue}{RGB}{221,229,240}
\definecolor{nDarkGrey}{RGB}{152,164,174}
\definecolor{nGrey}{RGB}{210,213,215}
\definecolor{nLightGrey}{RGB}{235,236,238}
\definecolor{nDarkYellow}{RGB}{201,147,19}
\definecolor{nYellow}{RGB}{217,198,137}
\definecolor{nLightYellow}{RGB}{243,238,223}
\definecolor{nBlack}{HTML}{011F32}
\definecolor{nWhite}{RGB}{250,250,250}
% \end{macrocode}
%
%
%
% \subsubsection{Alias colors}
%
% Support the colors provided by the old i4 beamer theme.
%
% \begin{macrocode}
\colorlet{i4red}{nDarkRed}
\colorlet{i4green}{nDarkGreen}
\colorlet{i4blue}{nDarkBlue}
\colorlet{i4yellow}{nDarkYellow}
\colorlet{i4grey}{nDarkGrey}
\definecolor{darkred}{rgb}{0.8,0,0}
\colorlet{beamergreen}{green!50!black}
% \end{macrocode}
%
%
......@@ -106,15 +126,23 @@
% \begin{macrocode}
\newcommand{\neo@colors@dark}{
\setbeamercolor{normal text}{%
fg=black!2,
fg=nWhite,
bg=nBlack
}
\setbeamercolor{normal item}{%
fg=nWhite,
bg=nDarkBlue
}
\usebeamercolor[fg]{normal text}
}
\newcommand{\neo@colors@light}{
\setbeamercolor{normal text}{%
fg=nBlack,
bg=black!2
bg=nWhite
}
\setbeamercolor{normal item}{%
fg=nDarkBlue,
bg=nWhite
}
}
\setbeamercolor{alerted text}{%
......@@ -130,17 +158,17 @@
% \subsubsection{Derived colors}
%
% The titles and structural elements (e.g. |itemize| bullets) are set in the
% same color as |normal text|. This would ideally done by setting |normal text|
% as a parent style, which we do to set |titlelike|, but this doesn't work for
% |structure| as its foreground is set explicitly in
% |beamercolorthemedefault.sty|.
% same color as |normal text|.and |normal item|. This would ideally done by
% setting |normal text| and |normal item| as a parent style, which we do to
% set |titlelike|, but this doesn't work for |structure| as its foreground
% is set explicitly in |beamercolorthemedefault.sty|.
%
% \begin{macrocode}
\setbeamercolor{titlelike}{use=normal text, parent=normal text}
\setbeamercolor{author}{use=normal text, parent=normal text}
\setbeamercolor{date}{use=normal text, parent=normal text}
\setbeamercolor{institute}{use=normal text, parent=normal text}
\setbeamercolor{structure}{use=normal text, fg=normal text.fg}
\setbeamercolor{structure}{use=normal item, fg=normal item.fg}
% \end{macrocode}
%
% The “primary” palette should be used for the most important navigational
......
......@@ -51,34 +51,15 @@
% \end{macrocode}
%
% \begin{macrocode}
\IfFileExists{FiraSans.sty}{
\RequirePackage[T1]{fontenc}
\RequirePackage[sfdefault]{FiraSans}
\RequirePackage[nomap,lining]{FiraMono}
\IfFileExists{FiraSans-Regular.otf}{
\defaultfontfeatures{
Scale = 1.0,
Extension = .otf
}
}{
\IfFileExists{./fonts/FiraSans-Regular.otf}{
\defaultfontfeatures{
Path = ./fonts/,
Scale = 1.0,
Extension = .otf
}
}{
\IfFileExists{../fonts/FiraSans-Regular.otf}{
\defaultfontfeatures{
Path = ../fonts/,
Scale = 1.0,
Extension = .otf
}
}{
\PackageWarning{beamerthemeneo}{%
Neither Fire Package nor Package fonts directory found - %
using system fonts. You need to have to fonts installed.%
}
}
\PackageWarning{beamerthemeneo}{%
FiraSans font not found in path, therefore using system fonts. %
Make sure you have the fonts installed.%
}
}
\setmonofont
......@@ -123,7 +104,6 @@
]{FiraSans}
\neo@fontsave
}
\AtBeginEnvironment{tabular}{%
\addfontfeature{Numbers={Monospaced}}%
}
......@@ -144,7 +124,6 @@
\neo@fontsave
}
\newcommand{\neo@fontbook}{
\def\mdseries@sf{k}
\def\bfseries@sf{mb}
\neo@fontsave
}
......@@ -413,6 +392,12 @@
\neo@sectiontitleformat{#1}}}}
{\@tempswatrue}
{}
\patchcmd{\beamer@section}
{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
{\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
\noexpand\neo@sectiontitleformat{\unexpanded{#1}}}}}
{\@tempswatrue}
{}
\patchcmd{\beamer@section}
{\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
{\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
......@@ -423,6 +408,12 @@
\PackageError{beamerfontthemeneo}{Patching section title failed}\@ehc
\fi
\@tempswafalse
\patchcmd{\beamer@subsection}
{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
{\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
\noexpand\neo@sectiontitleformat{\unexpanded{#1}}}}}
{\@tempswatrue}
{}
\patchcmd{\beamer@subsection}
{\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
{\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{%
......
......@@ -491,7 +491,10 @@
% \subsubsection{Lists and floats}
%
% \begin{macrocode}
\setbeamertemplate{itemize items}{\textbullet}
\setbeamertemplate{itemize items}{\raise1pt\hbox{\vrule width 0.8ex height 0.8ex}}
\setbeamertemplate{itemize subitem}{\raise1pt\hbox{\vrule width 0.5ex height 0.5ex}}
\setbeamertemplate{itemize subsubitem}{\raise.5ex\hbox{\vrule width 1ex height 0.2ex}}
\defbeamertemplate{description item}{align left}{\insertdescriptionitem\hfill}
\setbeamertemplate{caption label separator}{: }
\setbeamertemplate{caption}[numbered]
% \end{macrocode}
......@@ -556,7 +559,6 @@
\booltrue{neo@standout}
\begingroup
\setkeys{beamerframe}{c}
\setkeys{beamerframe}{noframenumbering}
\ifbeamercolorempty[bg]{palette primary}{
\setbeamercolor{background canvas}{
use=palette primary,
......
......@@ -147,10 +147,12 @@
\usefonttheme{neo}
% \end{macrocode}
%
% The |tol| theme for |pgfplots| is only loaded if |pgfplots| is used.
% The |tol| theme for |pgfplots| is only loaded if |pgfplots| is used,
% pdfpcnotes always
%
% \begin{macrocode}
\AtEndPreamble{%
\RequirePackage{pdfpcnotes}
\@ifpackageloaded{pgfplots}{%
\RequirePackage{pgfplotsthemetol}
}{}
......
......@@ -43,6 +43,9 @@ International License (https://creativecommons.org/licenses/by-sa/4.0/).
\generate{\file{pgfplotsthemetol.sty}{%
\from{pgfplotsthemetol.dtx}{package}}
}
\generate{\file{pdfpcnotes.sty}{%
\from{pdfpcnotes.dtx}{package}}
}
\obeyspaces
\Msg{**************************************************************}
......@@ -56,6 +59,7 @@ International License (https://creativecommons.org/licenses/by-sa/4.0/).
\Msg{* beamerfontthemeneo.sty *}
\Msg{* beamercolorthemeneo.sty *}
\Msg{* pgfplotsthemetol.sty *}
\Msg{* pdfpcnotes.sty *}
\Msg{* *}
\Msg{* To produce the documentation run the file ntheme.dtx *}
\Msg{* through LaTeX. *}
......
% \iffalse meta-comment -------------------------------------------------------
% Copyright 2013 by Carsten Brandt, details at
%
% http://cebe.github.io/pdfpc-latex-notes/
%
% This work is licensed under a MIT License
% ------------------------------------------------------------------------- \fi
% \iffalse
%<driver> \ProvidesFile{pdfpcnotes.dtx}
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpcnotes}
%</package>
% \fi
% \CheckSum{0}
% \StopEventually{}
% \iffalse
%<*package>
% ------------------------------------------------------------------------- \fi
%
% \subsection{Notes support for PDF PC}
%
% Write notes for the presentation tool in Latex
%
%
%
% \subsubsection{Package dependencies}
%
% \begin{macrocode}
\RequirePackage{kvoptions}
% \end{macrocode}
%
%
%
% \subsubsection{Options}
%
% \begin{macro}{sectionpage}
% Optionally add a slide marking the beginning of each section.
% \begin{macrocode}
\SetupKeyvalOptions{
family=PDFPC,
prefix=PDFPC@
}
\DeclareStringOption{duration}
\DeclareStringOption{starttime}
\DeclareStringOption{endtime}
\DeclareStringOption{lastminutes}
\ProcessKeyvalOptions*
% \end{macro}
%
% \begin{macro}{\neo@inner@setdefaults}
% Set default values for inner theme options.
% \begin{macrocode}
% Small macro to make inserting options easier.
\newcommand\PDFPC@option[2]{
\ifx#2\@empty\else
\immediate\write\pdfpcnotesfile{[#1]}%
\immediate\write\pdfpcnotesfile{#2}%
\fi
}
% create a new file handle
\newwrite\pdfpcnotesfile
% open file on \begin{document}
\AtBeginDocument{%
\immediate\openout\pdfpcnotesfile\jobname.pdfpc\relax
\PDFPC@option{duration}{\PDFPC@duration}
\PDFPC@option{start_time}{\PDFPC@starttime}
\PDFPC@option{end_time}{\PDFPC@endtime}
\PDFPC@option{last_minutes}{\PDFPC@lastminutes}
\immediate\write\pdfpcnotesfile{[notes]}
}
% define a # http://tex.stackexchange.com/a/37757/10327
\begingroup
\catcode`\#=12
\gdef\hashchar{#}%
\endgroup
\def\lastframenumber{0}
% define command \pnote{} that works like note but
% additionally writes notes to file in pdfpc readable format
\newcommand{\pnote}[1]{%
% keep normal notes working
\note{#1}%
% if frame changed - write a new header
\ifdim\theframenumber pt>\lastframenumber pt
\let\lastframenumber\theframenumber
\begingroup
\let\#\hashchar
\immediate\write\pdfpcnotesfile{\#\#\# \theframenumber}%
\endgroup
\fi
% write note to file
\immediate\write\pdfpcnotesfile{\unexpanded{#1}}%
}
% close file on \begin{document}
\AtEndDocument{%
\immediate\closeout\pdfpcnotesfile
}
% \end{macrocode}
%
% \iffalse
%</package>
% \fi
% \Finale
No preview for this file type
......@@ -150,10 +150,10 @@ added to each slide or to the section slides.
By default, \themename uses
\href{https://www.mozilla.org/en-US/styleguide/products/firefox-os/typeface/}
{Fira Sans}, a gorgeous typeface commissioned by Mozilla and designed by
\href{http://www.carrois.com/fira-3-1/}{Carrois}. For best results, you will
need the Fira typeface installed and use \XeLaTeX\ to typeset your slides.
However, \themename can also be used with other typefaces and \LaTeX{} build
systems.
\href{http://www.carrois.com/fira-3-1/}{Carrois}. For best results, you should
use the Fira typeface distributed by this package and use \XeLaTeX\ to typeset
your slides. However, \themename can also be used with other typefaces and
\LaTeX{} build systems.
\section{Getting Started}
......@@ -163,8 +163,8 @@ If you want to use the cutting-edge development version of \themename, you can
install it manually. Like any \LaTeX\ package, this involves four easy steps:
\begin{description}
\item[Download the source] with a |git clone| of the
\href{https://github.com/matze/mtheme}{\themename repository} or as a
\href{https://github.com/matze/mtheme/archive/master.zip}{zip archive}
\href{https://gitlab.cs.fau.de/i4/tex/i4neo.git}{\themename repository} or as a
\href{https://gitlab.cs.fau.de/i4/tex/i4neo/repository/master/archive.zip}{zip archive}
of the latest development version.
\item[Compile the style files] by running |make sty| inside the downloaded
......