Style. Complete remaining aspects form former meeting preamble

1 files changed, 96 insertions, 41 deletions

diff --git a/tex/fripost.sty b/tex/fripost.sty
index 67ac5fa..d5bb49c 100644
--- a/tex/fripost.sty
+++ b/tex/fripost.sty
@@ -1,30 +1,53 @@
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{fripost}[
- %% Version goes here
-]
-
-\RequirePackage{lmodern}
-\RequirePackage{fancyhdr}
-\RequirePackage[british, english, swedish]{babel}
+%% Package declaration
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{fripost}
 \RequirePackage[utf8]{inputenc}
 \RequirePackage[T1]{fontenc}
-\RequirePackage[usenames, dvipsnames]{color}
-\RequirePackage{helvet}
-\RequirePackage{multicol}
-\RequirePackage{url}
-\RequirePackage{color}
-\RequirePackage{sectsty, soul, enumerate}
+\RequirePackage[swedish, british, english]{babel}
 \RequirePackage{calc}
 \RequirePackage{graphicx}
+%    \end{macrocode}
+%% Colours
+%    \begin{macrocode}
+\PassOptionsToPackage{svgnames}{xcolor}
+\RequirePackage{xcolor}
+\colorlet{fpgray}{White!30!Black}
+\definecolor{grayFri}{gray}{.3}
+%    \end{macrocode}
+%% Font macros and basic paragraph formatting
+%    \begin{macrocode}
+\RequirePackage{lmodern}
+\RequirePackage{helvet}
+\newcommand \textemail [1] {\texttt{\small #1}}
+\newcommand \texturl [1] {\texttt{\small #1}}
+\newcommand \textpath [1] {\texturl{#1}}
+\newcommand \texthost [1] {\textit{#1}}
+\newcommand \titlefont {\Large\sffamily\mdseries\color{grayFri}}
+\newcommand \textestemate [1] {{\small\sffamily\mdseries\color{grayFri} #1}}
 \RequirePackage{hyperref}
 \RequirePackage{hyphenat}
-\RequirePackage{a4wide}
-
+\RequirePackage{soul}
+\RequirePackage{url}
+\RequirePackage{parskip}
+\RequirePackage{multicol}
+%    \end{macrocode}
+%% Titling
+%    \begin{macrocode}
+\RequirePackage{titling}
+\pretitle{\titlefont\centering}
+\posttitle{}
+\preauthor{\titlefont\centering--~}
+\postauthor{\\}
+\predate{\titlefont\centering}
+\postdate{\par}
+\setlength{\droptitle}{0pt}
+%    \end{macrocode}
 %% Options
+%    \begin{macrocode}
+%% \DeclareOption{standalone}{
 
-\DeclareOption{standalone}{
-
-}
+%% }
 
 \DeclareOption{minutes}{
 
@@ -33,29 +56,61 @@
 \DeclareOption{by-laws}{
 
 }
-
 \ExecuteOptions{standalone}
-
 \ProcessOptions\relax
-
-%% Colours
-
-\definecolor{gray70}{gray}{.3}
-\definecolor{gray50}{gray}{.5}
-\definecolor{gray20}{gray}{.8}
-\definecolor{gray05}{gray}{.95}
-\definecolor{gray00}{gray}{1.0}
-
-\definecolor{blueG}{RGB}{0,76,103}
-\definecolor{greyG}{RGB}{172,160,149}
-\definecolor{orangeG}{RGB}{255,160,35}
-
-\definecolor{grayFri}{gray}{.3}
-
+%    \end{macrocode}
+%% Page geometry
+%    \begin{macrocode}
+\RequirePackage{a4wide}
+%    \end{macrocode}
 %% Sections
-
+%    \begin{macrocode}
 \allsectionsfont{\sffamily\mdseries\color{grayFri}\centering}
-
-%% End
-
-\endinput
+%    \end{macrocode}
+%% Enumeration
+%    \begin{macrocode}
+\RequirePackage{enumerate}
+\newcommand \enumiform {\quad\sffamily\small\color{grayFri}}
+\newcommand \textenumerate [1] {{\quad\sffamily\small\color{grayFri} #1}}
+\renewcommand{\labelitemi}{\textenumerate{$\bullet$}}
+\renewcommand{\labelitemii}{\textenumerate{$\circ$}}
+\renewcommand{\labelenumi}{\textenumerate{\arabic{enumi}\,\,}}
+\renewcommand{\labelenumii}{\textenumerate{(\alph{enumii})}}
+%    \end{macrocode}
+%% Headers
+%    \begin{macrocode}
+\RequirePackage{fancyhdr}
+\setlength {\headheight} {30pt}
+
+\renewcommand{\headrule}{{%
+    \hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}}
+
+\renewcommand{\footrule}{{%
+    \vskip-\footruleskip\vskip-\footrulewidth
+    \hrule width\headwidth height\headrulewidth\vskip\footruleskip}}
+
+\pagestyle{fancy}
+\lhead{\footnotesize \textsc{\textsf{Fripost}} föreningen för fri e-post}
+\chead{\footnotesize}
+\rhead{\footnotesize Förslag till dagordning -- årsmöte}
+\lfoot{\footnotesize \url{fripost.org}}
+\cfoot{\footnotesize \thepage}
+\rfoot{\footnotesize utskr.\ \today}
+%    \end{macrocode}
+%% Time estimations in meeting agendas
+%    \begin{macrocode}
+\newcommand \itemtime [2] {%
+  \hfill\textestemate{#1\quad{}#2}\hspace{2cm}\mbox{}%
+}
+%    \end{macrocode}
+%% Signature line
+%    \begin{macrocode}
+\newcommand{\signatureline}[1]{%
+  \noindent%
+    \parbox{6.5cm}{%
+      \mbox{}\vspace{1.5cm}\\%
+      \rule{\linewidth}{0.4pt}\\%
+      #1%
+    }%
+}%
+%    \end{macrocode}