From 9f8d3ee3eadd0dde763dc60d289ffa2618a2933a Mon Sep 17 00:00:00 2001 From: Jan Wille <jan.wille@stud.hs-hannover.de> Date: Thu, 22 Apr 2021 21:33:41 +0200 Subject: [PATCH] Fixed abstract formating and cleanup --- HsH-classes.dtx | 63 +++++++++++++++++++++++------------------- HsH-classes.ins | 3 -- src/HsH-article.cls | 53 +++++++++++++++++------------------ src/HsH-report.cls | 51 +++++++++++++++++----------------- src/HsH-standalone.cls | 25 ++++++++--------- 5 files changed, 97 insertions(+), 98 deletions(-) diff --git a/HsH-classes.dtx b/HsH-classes.dtx index d271b46..41c7630 100644 --- a/HsH-classes.dtx +++ b/HsH-classes.dtx @@ -34,44 +34,43 @@ \newif\if@german% %% document options ------------------------------------------------------------------------------- -\DeclareOption{german}{% +\DeclareOption{german}{ \@germantrue } -\DeclareOption{ngerman}{% +\DeclareOption{ngerman}{ \@germantrue } -\DeclareOption{english}{% +\DeclareOption{english}{ \@germanfalse } -\DeclareOption{f1}{% use logo of fakulty 1 +\DeclareOption{f1}{ \renewcommand{\HsHlogoPage}{2} } -\DeclareOption{f2}{% use logo of fakulty 2 +\DeclareOption{f2}{ \renewcommand{\HsHlogoPage}{3} } -\DeclareOption{f3}{% use logo of fakulty 3 +\DeclareOption{f3}{ \renewcommand{\HsHlogoPage}{4} } -\DeclareOption{f4}{% use logo of fakulty 4 +\DeclareOption{f4}{ \renewcommand{\HsHlogoPage}{5} } -\DeclareOption{f5}{% use logo of fakulty 5 +\DeclareOption{f5}{ \renewcommand{\HsHlogoPage}{6} } -\DeclareOption{sans}{% use san serif font +\DeclareOption{sans}{ \renewcommand{\familydefault}{\sfdefault} } -\DeclareOption{roman}{% use roman/serif font +\DeclareOption{roman}{ \renewcommand{\familydefault}{\rmdefault} } %<article>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} %<report>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}} %<standalone>\DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}} % -%<article|report>\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options -%<standalone>\ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % standart options +%<article|report>\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options +%<standalone>\ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % default options \ProcessOptions\relax - %% Load KOMA class %<article>\LoadClass{scrartcl} %<report>\LoadClass{scrreprt} @@ -91,7 +90,8 @@ \PassOptionsToPackage{T1}{fontenc} \RequirePackage{fontenc} % -\RequirePackage{lmodern} % font +% font +\RequirePackage{lmodern} % % required for importing images \RequirePackage{graphicx} @@ -149,12 +149,12 @@ %<*article|report> %% title matters ---------------------------------------------------------------------------------- % -\newcommand*{\@matrikelnr}{}% -\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}% -\newcommand*{\@professor}{}% -\newcommand{\professor}[1]{\gdef\@professor{#1}}% -\newcommand*{\@keywords}{}% -\newcommand{\keywords}[1]{\gdef\@keywords{#1}}% +\newcommand*{\@matrikelnr}{} +\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}} +\newcommand*{\@professor}{} +\newcommand{\professor}[1]{\gdef\@professor{#1}} +\newcommand*{\@keywords}{} +\newcommand{\keywords}[1]{\gdef\@keywords{#1}} \let\@author\@empty \let\@keywords\@empty @@ -215,9 +215,12 @@ \renewcommand{\labelitemiv}{$\cdot$} %% do stuff -\setlength\parindent{0pt} % indentation of new paragraphs +% indentation of new paragraphs +\setlength\parindent{0pt} +% all stuff is pushed to the top of the page ingenerall \raggedbottom -\renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled +% rulers when using draft disabled +\renewcommand{\layercontentsmeasure}{\@empty} %% custom commands \newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}} @@ -252,15 +255,17 @@ % %<*article|report> %% nicer abstract --------------------------------------------------------------------------------- -\renewenvironment{abstract}{% -%<article> \section*{\centering\abstractname} -%<report> \chapter*{\centering\abstractname} - \addcontentsline{toc}{chapter}{\abstractname} - \small - \quotation +\renewenvironment{abstract}{ + \quotation + \setlength\parindent{0pt} +%<article> \section*{\abstractname} +%<article> \addcontentsline{toc}{section}{\abstractname} +%<report> \chapter*{\abstractname} +%<report> \addcontentsline{toc}{chapter}{\abstractname} }{% \ifx\@keywords\@empty\else - \vspace{1cm} +%<article> \vskip 0.5em +%<report> \vskip 2em \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi} \@keywords \fi diff --git a/HsH-classes.ins b/HsH-classes.ins index f4f98f4..a5a419e 100644 --- a/HsH-classes.ins +++ b/HsH-classes.ins @@ -56,9 +56,6 @@ and version 1.3 or later is part of all distributions of LaTeX version \Msg{* HsH-standalone.cls *} \Msg{* config.tex *} \Msg{* *} -\Msg{* To produce the documentation run the file HsH-classes.dtx *} -\Msg{* through pdfLaTeX. *} -\Msg{* *} \Msg{* Happy TeXing! *} \Msg{* *} \Msg{*************************************************************} diff --git a/src/HsH-article.cls b/src/HsH-article.cls index a352dad..f1de34f 100644 --- a/src/HsH-article.cls +++ b/src/HsH-article.cls @@ -32,40 +32,39 @@ \newif\if@german% %% document options ------------------------------------------------------------------------------- -\DeclareOption{german}{% +\DeclareOption{german}{ \@germantrue } -\DeclareOption{ngerman}{% +\DeclareOption{ngerman}{ \@germantrue } -\DeclareOption{english}{% +\DeclareOption{english}{ \@germanfalse } -\DeclareOption{f1}{% use logo of fakulty 1 +\DeclareOption{f1}{ \renewcommand{\HsHlogoPage}{2} } -\DeclareOption{f2}{% use logo of fakulty 2 +\DeclareOption{f2}{ \renewcommand{\HsHlogoPage}{3} } -\DeclareOption{f3}{% use logo of fakulty 3 +\DeclareOption{f3}{ \renewcommand{\HsHlogoPage}{4} } -\DeclareOption{f4}{% use logo of fakulty 4 +\DeclareOption{f4}{ \renewcommand{\HsHlogoPage}{5} } -\DeclareOption{f5}{% use logo of fakulty 5 +\DeclareOption{f5}{ \renewcommand{\HsHlogoPage}{6} } -\DeclareOption{sans}{% use san serif font +\DeclareOption{sans}{ \renewcommand{\familydefault}{\sfdefault} } -\DeclareOption{roman}{% use roman/serif font +\DeclareOption{roman}{ \renewcommand{\familydefault}{\rmdefault} } \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} -\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options +\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options \ProcessOptions\relax - %% Load KOMA class \LoadClass{scrartcl} \KOMAoption{toc}{bibliography,listof} @@ -75,7 +74,7 @@ \RequirePackage{inputenc} \PassOptionsToPackage{T1}{fontenc} \RequirePackage{fontenc} -\RequirePackage{lmodern} % font +\RequirePackage{lmodern} \RequirePackage{graphicx} \RequirePackage{amsmath} \if@german\RequirePackage{ziffer}\fi @@ -100,12 +99,12 @@ \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz} %% title matters ---------------------------------------------------------------------------------- -\newcommand*{\@matrikelnr}{}% -\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}% -\newcommand*{\@professor}{}% -\newcommand{\professor}[1]{\gdef\@professor{#1}}% -\newcommand*{\@keywords}{}% -\newcommand{\keywords}[1]{\gdef\@keywords{#1}}% +\newcommand*{\@matrikelnr}{} +\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}} +\newcommand*{\@professor}{} +\newcommand{\professor}[1]{\gdef\@professor{#1}} +\newcommand*{\@keywords}{} +\newcommand{\keywords}[1]{\gdef\@keywords{#1}} \let\@author\@empty \let\@keywords\@empty @@ -148,9 +147,9 @@ \renewcommand{\labelitemiv}{$\cdot$} %% do stuff -\setlength\parindent{0pt} % indentation of new paragraphs +\setlength\parindent{0pt} \raggedbottom -\renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled +\renewcommand{\layercontentsmeasure}{\@empty} %% custom commands \newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}} @@ -174,14 +173,14 @@ \makeatother } %% nicer abstract --------------------------------------------------------------------------------- -\renewenvironment{abstract}{% - \section*{\centering\abstractname} - \addcontentsline{toc}{chapter}{\abstractname} - \small - \quotation +\renewenvironment{abstract}{ + \quotation + \setlength\parindent{0pt} + \section*{\abstractname} + \addcontentsline{toc}{section}{\abstractname} }{% \ifx\@keywords\@empty\else - \vspace{1cm} + \vskip 0.5em \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi} \@keywords \fi diff --git a/src/HsH-report.cls b/src/HsH-report.cls index 46a0aed..e04f752 100644 --- a/src/HsH-report.cls +++ b/src/HsH-report.cls @@ -32,40 +32,39 @@ \newif\if@german% %% document options ------------------------------------------------------------------------------- -\DeclareOption{german}{% +\DeclareOption{german}{ \@germantrue } -\DeclareOption{ngerman}{% +\DeclareOption{ngerman}{ \@germantrue } -\DeclareOption{english}{% +\DeclareOption{english}{ \@germanfalse } -\DeclareOption{f1}{% use logo of fakulty 1 +\DeclareOption{f1}{ \renewcommand{\HsHlogoPage}{2} } -\DeclareOption{f2}{% use logo of fakulty 2 +\DeclareOption{f2}{ \renewcommand{\HsHlogoPage}{3} } -\DeclareOption{f3}{% use logo of fakulty 3 +\DeclareOption{f3}{ \renewcommand{\HsHlogoPage}{4} } -\DeclareOption{f4}{% use logo of fakulty 4 +\DeclareOption{f4}{ \renewcommand{\HsHlogoPage}{5} } -\DeclareOption{f5}{% use logo of fakulty 5 +\DeclareOption{f5}{ \renewcommand{\HsHlogoPage}{6} } -\DeclareOption{sans}{% use san serif font +\DeclareOption{sans}{ \renewcommand{\familydefault}{\sfdefault} } -\DeclareOption{roman}{% use roman/serif font +\DeclareOption{roman}{ \renewcommand{\familydefault}{\rmdefault} } \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}} -\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options +\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % default options \ProcessOptions\relax - %% Load KOMA class \LoadClass{scrreprt} \KOMAoption{toc}{bibliography,listof} @@ -75,7 +74,7 @@ \RequirePackage{inputenc} \PassOptionsToPackage{T1}{fontenc} \RequirePackage{fontenc} -\RequirePackage{lmodern} % font +\RequirePackage{lmodern} \RequirePackage{graphicx} \RequirePackage{amsmath} \if@german\RequirePackage{ziffer}\fi @@ -100,12 +99,12 @@ \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz} %% title matters ---------------------------------------------------------------------------------- -\newcommand*{\@matrikelnr}{}% -\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}% -\newcommand*{\@professor}{}% -\newcommand{\professor}[1]{\gdef\@professor{#1}}% -\newcommand*{\@keywords}{}% -\newcommand{\keywords}[1]{\gdef\@keywords{#1}}% +\newcommand*{\@matrikelnr}{} +\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}} +\newcommand*{\@professor}{} +\newcommand{\professor}[1]{\gdef\@professor{#1}} +\newcommand*{\@keywords}{} +\newcommand{\keywords}[1]{\gdef\@keywords{#1}} \let\@author\@empty \let\@keywords\@empty @@ -149,9 +148,9 @@ \renewcommand{\labelitemiv}{$\cdot$} %% do stuff -\setlength\parindent{0pt} % indentation of new paragraphs +\setlength\parindent{0pt} \raggedbottom -\renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled +\renewcommand{\layercontentsmeasure}{\@empty} %% custom commands \newcommand{\uproman}[1]{\uppercase\expandafter{\romannumeral#1}} @@ -175,14 +174,14 @@ \makeatother } %% nicer abstract --------------------------------------------------------------------------------- -\renewenvironment{abstract}{% - \chapter*{\centering\abstractname} +\renewenvironment{abstract}{ + \quotation + \setlength\parindent{0pt} + \chapter*{\abstractname} \addcontentsline{toc}{chapter}{\abstractname} - \small - \quotation }{% \ifx\@keywords\@empty\else - \vspace{1cm} + \vskip 2em \paragraph{\if@german Schlüsselwörter:\else Keywords:\fi} \@keywords \fi diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls index 44cd027..2ae116d 100644 --- a/src/HsH-standalone.cls +++ b/src/HsH-standalone.cls @@ -32,40 +32,39 @@ \newif\if@german% %% document options ------------------------------------------------------------------------------- -\DeclareOption{german}{% +\DeclareOption{german}{ \@germantrue } -\DeclareOption{ngerman}{% +\DeclareOption{ngerman}{ \@germantrue } -\DeclareOption{english}{% +\DeclareOption{english}{ \@germanfalse } -\DeclareOption{f1}{% use logo of fakulty 1 +\DeclareOption{f1}{ \renewcommand{\HsHlogoPage}{2} } -\DeclareOption{f2}{% use logo of fakulty 2 +\DeclareOption{f2}{ \renewcommand{\HsHlogoPage}{3} } -\DeclareOption{f3}{% use logo of fakulty 3 +\DeclareOption{f3}{ \renewcommand{\HsHlogoPage}{4} } -\DeclareOption{f4}{% use logo of fakulty 4 +\DeclareOption{f4}{ \renewcommand{\HsHlogoPage}{5} } -\DeclareOption{f5}{% use logo of fakulty 5 +\DeclareOption{f5}{ \renewcommand{\HsHlogoPage}{6} } -\DeclareOption{sans}{% use san serif font +\DeclareOption{sans}{ \renewcommand{\familydefault}{\sfdefault} } -\DeclareOption{roman}{% use roman/serif font +\DeclareOption{roman}{ \renewcommand{\familydefault}{\rmdefault} } \DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}} -\ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % standart options +\ExecuteOptions{margin=0.25cm,fontsize=11pt,a4paper,ngerman,sans} % default options \ProcessOptions\relax - %% Load KOMA class \LoadClass[multi=tikzpicture,multi=circuitikz]{standalone} @@ -74,7 +73,7 @@ \RequirePackage{inputenc} \PassOptionsToPackage{T1}{fontenc} \RequirePackage{fontenc} -\RequirePackage{lmodern} % font +\RequirePackage{lmodern} \RequirePackage{graphicx} \RequirePackage{amsmath} \if@german\RequirePackage{ziffer}\fi -- GitLab