1 files changed, 53 insertions, 42 deletions
diff --git a/tex/fripost.sty b/tex/fripost.sty
index 3064f1b..bd7b25e 100644
--- a/tex/fripost.sty
+++ b/tex/fripost.sty
@@ -2,9 +2,6 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fripost}
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
-\RequirePackage[english, swedish]{babel}
 \RequirePackage{calc}
 \RequirePackage{graphicx}
 %    \end{macrocode}
@@ -19,6 +16,12 @@
 %    \begin{macrocode}
 \RequirePackage{lmodern}
 \RequirePackage{helvet}
+\RequirePackage{soul}
+\PassOptionsToPackage{hyphens}{url}
+\RequirePackage{url}
+\RequirePackage{parskip}
+\RequirePackage{multicol}
+\RequirePackage{hyphenat}
 \newcommand \textemail [1] {\texttt{\small #1}}
 \newcommand \texturl [1] {\texttt{\small #1}}
 \newcommand \textpath [1] {\texturl{#1}}
@@ -26,62 +29,70 @@
 \newcommand \titlefont {\Large\sffamily\mdseries\color{grayFri}}
 \newcommand \descriptionfont {\bfseries\color{grayFri}}
 \newcommand \textestemate [1] {{\small\sffamily\mdseries\color{grayFri} #1}}
-\RequirePackage{hyperref}
-\RequirePackage{hyphenat}
-\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}{-4\baselineskip}
 %    \end{macrocode}
 %% Options
 %    \begin{macrocode}
-%% \DeclareOption{standalone}{
-
-%% }
-
 \newif\if@minutes\@minutesfalse
-\DeclareOption{minutes}{\@minutestrue}
-
-\DeclareOption{by-laws}{
-
-}
+\newif\if@bylaws\@bylawsfalse
+\newif\if@report\@reportfalse
+\newcommand\resetopts{\@minutesfalse\@bylawsfalse\@reportfalse}
+\DeclareOption{standalone}{\resetopts}
+\DeclareOption{minutes}{\resetopts\@minutestrue}
+\DeclareOption{by-laws}{\resetopts\@bylawstrue}
+\DeclareOption{report}{\resetopts\@reporttrue}
+\ExecuteOptions{report}
 \ProcessOptions\relax
 %    \end{macrocode}
-%% Page geometry
+%% Titling
 %    \begin{macrocode}
-\@ifclassloaded{article}{
-  \RequirePackage{a4wide}
-}{}
+\RequirePackage{titling}
+\pretitle{\titlefont\centering}
+\posttitle{%
+  \if@minutes~--~\fi%
+  \if@bylaws~--~\fi%
+  \if@report\\[.2\baselineskip]\fi}
+\preauthor{%
+  \titlefont\centering%
+  \if@report\normalsize\fi}
+\postauthor{
+  \if@minutes\\\fi%
+  \if@bylaws\\\fi%
+  \if@report~--~\fi}
+\predate{%
+  \titlefont\centering%
+  \if@bylaws\color{white}\fi%
+  \if@report\normalsize\fi}
+\postdate{%
+  \par%
+  \if@minutes\vspace{-0.5\baselineskip}\fi%
+  \if@bylaws\vspace{-1.4\baselineskip}\fi%
+  \if@report\vspace{-0.5\baselineskip}\fi}
+\setlength{\droptitle}{-4\baselineskip}
 %    \end{macrocode}
 %% Sections
 %    \begin{macrocode}
 \@ifclassloaded{article}{
   \RequirePackage{sectsty}
   \setcounter{secnumdepth}{3} % section numbering by default
-  \allsectionsfont{
-    \sffamily\mdseries\color{grayFri}
+  \allsectionsfont{%
+    \sffamily\mdseries\color{grayFri}%
+    \if@minutes\normalsize\fi
+    \if@bylaws\normalsize\fi
+  }
+  \paragraphfont{\rmfamily\normalsize}
+  \subparagraphfont{\rmfamily\normalsize}
+  \def\@seccntformat#1{ % section formatting
+    \if@bylaws\S\ \fi % paragraph sign for policy
+    \csname the#1\endcsname % numbering
+    \quad % space
   }
-  \if@minutes
-  \allsectionsfont{\sffamily\mdseries\color{grayFri}\normalsize}
-  \fi
+  
 }{}
 \@ifclassloaded{leaflet}{
   \RequirePackage{sectsty}
-  \allsectionsfont{
-    \sffamily\mdseries\color{grayFri}
-    \centering
-    }
+  \allsectionsfont{%
+    \sffamily\mdseries\color{grayFri}%
+    \centering}
 }{}
 %    \end{macrocode}
 %% Enumeration