Style. Move aspects between package and template

Some stuff such as page geometry are moved from the Fripost package to
the Pandoc temmplate.

1 files changed, 6 insertions, 15 deletions

diff --git a/tex/fripost.sty b/tex/fripost.sty
index 3064f1b..b238641 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,12 +29,6 @@
 \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}
@@ -58,12 +55,6 @@
 }
 \ProcessOptions\relax
 %    \end{macrocode}
-%% Page geometry
-%    \begin{macrocode}
-\@ifclassloaded{article}{
-  \RequirePackage{a4wide}
-}{}
-%    \end{macrocode}
 %% Sections
 %    \begin{macrocode}
 \@ifclassloaded{article}{