texlive[43766] Master/texmf-dist: komacv (12apr17)
commits+karl at tug.org
commits+karl at tug.org
Wed Apr 12 23:08:50 CEST 2017
Revision: 43766
http://tug.org/svn/texlive?view=revision&revision=43766
Author: karl
Date: 2017-04-12 23:08:50 +0200 (Wed, 12 Apr 2017)
Log Message:
-----------
komacv (12apr17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example.tex
trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example_casual.pdf
trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example_classic.pdf
trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example_oldstyle.pdf
trunk/Master/texmf-dist/doc/latex/komacv/komacv.pdf
trunk/Master/texmf-dist/source/latex/komacv/komacv.dtx
trunk/Master/texmf-dist/source/latex/komacv/komacv.ins
trunk/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty
trunk/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty
trunk/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty
trunk/Master/texmf-dist/tex/latex/komacv/komacv.cls
Modified: trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example.tex 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example.tex 2017-04-12 21:08:50 UTC (rev 43766)
@@ -1,5 +1,6 @@
-%% start of file `komacv_example.tex'; shows exemplarily the use of the komacv class
-%% (c) Copyright 2014 Salome Södergran (salome.soedergran at gmx.ch)
+
+%%start of file `komacv_example.tex'; shows exemplarily the use of the komacv class
+%% (c) Copyright 2014-2017 Salome Södergran (salome.soedergran at gmx.ch)
%%
%% Test the flexibility of the class komacv by removing (or adding) the comment signs and changing the values. These are preset not as recommendations of good style but to make the effect as clear as possible!
%%
@@ -7,9 +8,10 @@
xcolor=svgnames,%
% color=mycolor,%
% DIV=19,
-style=classic,% OR
+% style=classic,% (default) OR
% style=casual,% OR
% style=oldstyle,%
+% headline=name,%
]{komacv}
\pagestyle{scrheadings}
@@ -23,21 +25,23 @@
% ===========================
% LENGTHS
% ===========================
-%\setlength\hintscolwidth{2cm}
-%\setlength\sepcolwidth{1em}
-%\setlength\quotewidth{.3\textwidth}
-%\setlength\titlesepwidth{50pt}
-%% \setlength\infocolwidth{6cm} % for oldstyle only!
-%% \setlength\sepinfocolwidth{6em} % for oldstyle only!
-%\setlength\footerwidth{.5\textwidth} % for casual style only
-%\setlength\aftertitlevspace{5\baselineskip}
-%\setlength\afterquotevspace{8\baselineskip}
-%\setlength\afterelementsvspace{40pt}
-%\setlength\beforesecvspace{3\baselineskip}
-%\setlength\aftersecvspace{4\baselineskip}
-%\setlength\beforesubsecvspace{3\baselineskip}
-%\setlength\aftersubsecvspace{4\baselineskip}
+% \setlength\titlenamemaxwidth{.4\textwidth}
+% \setlength\hintscolwidth{2cm}
+% \setlength\sepcolwidth{1em}
+% \setlength\quotewidth{.3\textwidth}
+% \setlength\titlesepwidth{50pt}
+% \setlength\infocolwidth{6cm} % for oldstyle only!
+% \setlength\sepinfocolwidth{6em} % for oldstyle only!
+% \setlength\footerwidth{.5\textwidth} % for casual style only
+% \setlength\aftertitlevspace{5\baselineskip}
+% \setlength\afterquotevspace{8\baselineskip}
+% \setlength\afterelementsvspace{40pt}
+% \setlength\beforesecvspace{3\baselineskip}
+% \setlength\aftersecvspace{4\baselineskip}
+% \setlength\beforesubsecvspace{3\baselineskip}
+% \setlength\aftersubsecvspace{4\baselineskip}
+
% ===========================
% COLORS
% ===========================
@@ -66,6 +70,7 @@
% \setmonofont{Courier New}
% \setkomafont{firstnamefont}{\fontsize{24}{26}\itshape}
+\addtokomafont{firstnamefont}{\fontsize{35}{50}}
% \addtokomafont{familynamefont}{\scshape}
% \setkomafont{addressfont}{\scriptsize}
% \setkomafont{acadtitlefont}{\usekomafont{familynamefont}}
@@ -84,7 +89,7 @@
% BIBLIOGRAPHY
% ===========================
\usepackage[backend=biber,
-style=authortitle,%
+style=ieee,%authortitle,%
sorting=ydnt,%
]{biblatex}
\bibliography{komacv.bib}
@@ -104,17 +109,24 @@
\renewcommand*{\phonenr}{001-23456789}
\renewcommand*{\faxnr}{001-23456788}
\renewcommand*{\email}{jeyre at ferndean.me.uk}
+\renewcommand*{\homepage}{www.jeyre.me.uk}
+% \renewcommand*{\twitter}{twitter.com/janeeyre}
+% \renewcommand*{\github}{github.com/janeeyre}
+\renewcommand*{\facebook}{facebook.com/jane.eyre}
+% \renewcommand*{\linkedin}{https://uk.linkedin.com/pub/jane-eyre}
\renewcommand*{\extrainfo}{Some extra info}
% \renewcommand*{\cvquote}{\enquote{Convinced I grew that neither earth should perish, \\nor one of the souls it treasured.}} %p.373
% \renewcommand\phonesymbol{Tel.~}
+% \headline[l]{name} % [c|l|r]{none|name|title}; default: [c]{none}
+% \renewcommand\headlinecontent{Jane Elizabeth Eyre Rochester}
% ===========================
% PICTURE
% ===========================
% \setlength\fboxrule{7pt}
-%\setlength\mframepicshift{30pt}
-%\photo[frame]{3cm}{jeyre}
-\photo[mframe]{3cm}{jeyre}
+% \setlength\mframepicshift{1cm}
+\photo[frame]{3cm}{jeyre}
+%\photo[mframe]{5cm}{jeyre}
\begin{document}
Modified: trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example_casual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example_classic.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/komacv/examples/komacv_example_oldstyle.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/komacv/komacv.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/komacv/komacv.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/komacv/komacv.dtx 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/source/latex/komacv/komacv.dtx 2017-04-12 21:08:50 UTC (rev 43766)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2014
+% Copyright (C) 2014-2017
% by Salome Södergran (salome.soedergran at gmx.ch)
% -----------------------------------------------
%
@@ -25,22 +25,30 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{komacv.dtx}[2014/08/10 v1.0.1 komacv class]
+\ProvidesFile{komacv.dtx}[2017/04/12 v1.1 komacv class]
%</driver>
%<class|classic|casual|oldstyle>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{komacv}
-%<class> [2014/08/10 v1.0.1 komacv class]
+%<class> [2017/04/12 v1.1 komacv class]
%<classic>\ProvidesPackage{komacv-classic}
%<casual>\ProvidesPackage{komacv-casual}
%<oldstyle>\ProvidesPackage{komacv-oldstyle}
-%<classic|casual|oldstyle> [2014/08/10 v1.0.1 style package for komacv class]
+%<classic|casual|oldstyle> [2017/04/12 v1.1 style package for komacv class]
%<*driver>
\documentclass{ltxdoc}
% \AtBeginDocument{\OnlyDescription}
-\EnableCrossrefs
-\PageIndex
-\RecordChanges
-\usepackage{csquotes,xspace,marginnote,metalogo}
+\EnableCrossrefs
+\RecordChanges % Gather update information
+\setcounter{IndexColumns}{2}
+\makeatletter
+ \renewenvironment{theglossary}{%
+ \glossary at prologue
+ \setlength\emergencystretch{5em}
+ \GlossaryParms \let\item\@idxitem \ignorespaces}{}
+ \makeatother
+\setlength{\IndexMin}{40ex}
+\setlength{\columnseprule}{.4pt}
+\usepackage{csquotes,xspace,marginnote,metalogo,ragged2e}
\newcommand*\mycls{\textsf{komacv}\xspace}
\newcommand*\mysty[1]{\texttt{#1}\xspace}
\newcommand*\cvitemusage{\cs{cvitem}\oarg{spacing}\marg{header}\marg{text}\xspace}
@@ -55,10 +63,10 @@
\makeatletter
\renewcommand{\Describe at Macro}{\@ifstar\Describe at MacroStar\Describe at MacroStarNoStar}
\newcommand\Describe at MacroStar[1]{\endgroup
- \marginnote{\raggedleft\PrintDescribeMacro{#1}}%
+ \marginnote{\RaggedLeft\PrintDescribeMacro{#1}}%
\SpecialUsageIndex{#1}\@esphack\ignorespaces}
\newcommand\Describe at MacroNoStar[1]{\endgroup
- \marginpar{\raggedleft\PrintDescribeMacro{#1}}%
+ \marginpar{\RaggedLeft\PrintDescribeMacro{#1}}%
\SpecialUsageIndex{#1}\@esphack\ignorespaces}
\renewcommand{\DescribeMacro}{\@ifstar\DescribeMacroStar\DescribeMacroNoStar}
\newcommand\DescribeMacroStar{\leavevmode\@bsphack
@@ -74,10 +82,15 @@
\makeatother
\usepackage[colorlinks=true]{hyperref}
-\hypersetup{pdftitle={A Perfect Day}}
+\hypersetup{pdftitle={CV}}
\begin{document}
\DocInput{komacv.dtx}
+ \PrintIndex\PrintChanges
+ % Make sure that the index is not printed twice
+ % (ltxdoc.cfg might have a second \PrintIndex command)
+ \let\PrintChanges\relax
+ \let\PrintIndex\relax
\end{document}
%</driver>
% \fi
@@ -103,6 +116,7 @@
%
% \changes{v1.0}{2014/08/06}{Initial version}
% \changes{v1.0.1}{2014/08/10}{Installation problem fixed}
+% \changes{v1.1}{2017/04/12}{Option headline added; user length \texttt{titlenamemaxwidth}; behavior of sections and subsections improved; several bugfixes}
%
% \GetFileInfo{komacv.dtx}
%
@@ -200,6 +214,23 @@
%
% |\renewcommand*\title{Curriculum vitae}|.
%
+% \begin{macro}{\headline}
+% With \cs{headline} you can set -- guess what? -- a headline for the whole document, either a title (like \enquote{Curriculum vitae}) or your name, which may come in handy if you have a very long name that is otherwise being displayed in an unsatisfying way.
+\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont}
+% \changes{v1.1}{2017/04/12}{Default font size changed, due to new font \texttt{headlinefont}}
+% The optional argument sets the alignment (l=left, r=right, c=centered).
+% \emph{Example:}
+%
+% |\headline[l]{name}|
+% sets (by default) your defined firstname and familyname as headline, to the left.
+%
+% |\headline[c]{title}|
+% sets (by default) \enquote{Curriculum vitae} as a centered headline.
+%
+% If you want to change the defaults, use\\
+% |\renewcommand\headlinecontent{your text}|.
+% \end{macro}
+%
% \DescribeMacro{\title}
% The macro \cs{title} sets nothing in the document itself but is for the pdf document properties only. Note that for this macro special characters (like German umlauts) must be given in the \LaTeX\ notation (e.\,g. |\"a|) even if utf is enabled for the document.
%
@@ -211,6 +242,11 @@
% \DescribeMacro{\faxnr}
% \DescribeMacro{\email}
% \DescribeMacro{\homepage}
+% \DescribeMacro{\twitter}
+% \DescribeMacro{\github}
+% \DescribeMacro{\facebook}
+% \DescribeMacro{\linkedin}
+
%
% The names of the macros are self-explanatory, so I will give just a few hints.
%
@@ -250,6 +286,10 @@
% \DescribeMacro{\faxsymbol}
% \DescribeMacro{\emailsymbol}
% \DescribeMacro{\homepagesymbol}
+% \DescribeMacro{\twittersymbol}
+% \DescribeMacro{\githubsymbol}
+% \DescribeMacro{\facebooksymbol}
+% \DescribeMacro{\linkedinsymbol}
% You can change (or set) the symbols (or the string) used before the phone, fax and mobile number, the e-mail address and the homepage with the according macros (see beside) and |\renewcommand|, e.\,g. \\
% |\renewcommand\phonesymbol{Tel.~}|
%
@@ -256,6 +296,7 @@
% \DescribeMacro{\listitemsymbol}
% In the same way the item symbol in the listitems may be changed with the macro \cs{listitemsymbol}.
%
+% \newpage
% \subsection{Picture}
% \label{sub:picture}
%
@@ -392,16 +433,17 @@
% The element specific font attributes are set with \cs{newkomafont} and may be adjusted with \cs{setkomafont} or \cs{addtokomafont}.
%
% \emph{For example}:
+%
% \DescribeMacro*{firstnamefont}
+% |\setkomafont{firstnamefont}{\fontsize{24}{26}\itshape}| \emph{or}
%
% \DescribeMacro*{familynamefont}
-% |\setkomafont{firstnamefont}{\fontsize{24}{26}\itshape}| \emph{or}
+% |\addtokomafont{familynamefont}{\scshape}| \emph{or}
%
% \DescribeMacro*{acadtitlefont}
-% |\addtokomafont{familynamefont}{\scshape}| \emph{or}
+% |\setkomafont{addressfont}{\usekomafont{quotefont}}|.
%
% \DescribeMacro*{addressfont}
-% |\setkomafont{addressfont}{\usekomafont{quotefont}}|.
%
%
% \DescribeMacro{quotefont}
@@ -432,7 +474,7 @@
% \label{sub:page-number}
%
% \DescribeMacro{\totalpagemark}
-% The command \cs{totalpagemark} prints the total number of pages. With the following definition in your preamble you will get the page number followed by a slash and the total number of pages in the outer foot of your pages (with the help of \textsf{scrpage2} which is loaded by the documentclass):
+% The command \cs{totalpagemark} prints the total number of pages. With the following definition in your preamble you will get the page number followed by a slash and the total number of pages in the outer foot of your pages (with the help of \textsf{scrlayer-scrpage} which is loaded by the documentclass):
%
% |\pagestyle{scrheadings}|
%
@@ -583,11 +625,9 @@
% For examples see the example files \mbox{\texttt{komacv\_example\_}\meta{style}\texttt{.pdf}} that come with this class. They should be located in the |doc|-directory of the tree where the class is stored. The example file \mbox{\texttt{komacv\_example.tex}} can be used to test the various possibilities |komacv| offers. Just remove (or add) comment signs and change the preset values.
%
% \section{Bugs and things to do}
-%Further testing and use will certainly make some bugs crawl out from the dark in which they hide from me until now. And I do not doubt the code of this class and the corresponding style-files could be made simpler and more elegant by someone with more experience in \LaTeX -programming. And I'm afraid too many errors and typos will be found in this documentation. So if you encounter any bugs, errors or typos, or if you have suggestions how to improve the |komacv| class and the style files, please do not hesitate to contact me at \texttt{salome.soedergran at gmx.ch}.
+%Further testing and use will certainly make some bugs crawl out from the dark in which they hide from me until now. If you encounter bugs, errors or typos, or if you have suggestions how to improve the |komacv| class and the style files, please do not hesitate to contact me at \texttt{salome.soedergran at gmx.ch}. I am thankful for any suggestions that help improving |komacv| though I dare not promise to be always very speedy in publishing a new version.
%
-% One thing that needs improvement I know of: Pagebreaks after section and subsection titles should be prohibited. I don't know yet how to achieve this.
%
-%
%\section{New CV styles}
% The flexibility of \mycls makes it fairly easy to create new CV styles. If you have created a CV style of your own and want to share it with others you have two possibilites:
%
@@ -598,10 +638,9 @@
%
%
%\section{Acknowledgements}
-% Thanks to Andreas Bießmann, Simon Dreher, Paul Menzel and Dominik Waßenhoven. Their suggestions helped to improve the now obsolete \\
-% |koma-moderncvlassic.sty| and (hopefully) to avoid similar mistakes in |komacv|.
+% Many thanks to Ulrike Fischer, Alexander Kränzlein, Matthias C.~Schmidt, Damian Martinez Dreyer, and Sebastian Röder for their suggestions and help. I am also grateful to Andreas Bießmann, Simon Dreher, Paul Menzel and Dominik Waßenhoven who helped to improve the now obsolete |koma-moderncvlassic.sty|.
+%
%
-%
% \StopEventually{\PrintIndex}
%
% \section{Implementation}
@@ -644,6 +683,8 @@
% \end{macrocode}
%
%\subsubsection*{Packages}
+% \changes{v1.1}{2017/04/12}{scrlayer-scrpage instead of the obsolete scrpage2}
+% \changes{v1.1}{2017/04/12}{Linebreaks (hyphenation and no justificaton in narrow lines) improved with \texttt{ragged2e}.}
% \begin{macrocode}
\RequirePackage[\komacv at xcolor]{xcolor}
\RequirePackage{%
@@ -651,7 +692,7 @@
ifpdf,%
ifluatex,%
ifxetex,%
- scrpage2,%
+ scrlayer-scrpage,%
marvosym,%
array,%
graphicx,%
@@ -659,6 +700,7 @@
enumitem,
hyperref%
}
+\RequirePackage[raggedrightboxes]{ragged2e}
% \end{macrocode}
%
%\subsubsection*{Colors}
@@ -668,6 +710,9 @@
\AtEndPreamble{%
\renewcommand*\mycolor{\komacv at color}
\colorlet{colortheme}{\mycolor}% specified in documentclass option
+ \@ifundefinedcolor{headlinecolor}{%
+ \colorlet{@headlinecolor}{black}}{%
+ \colorlet{@headlinecolor}{headlinecolor}}
\@ifundefinedcolor{firstnamecolor}{%
\colorlet{@firstnamecolor}{black}}{%
\colorlet{@firstnamecolor}{firstnamecolor}}
@@ -705,6 +750,7 @@
% \end{macrocode}
%
%\subsubsection*{Encoding and Fonts}
+% \changes{v1.1}{2017/04/12}{\cs{usefonttokomafont} instead of \cs{usekomafont}, avoiding unintended side effects}
% \begin{macrocode}
\ifboolexpr{bool{xetex} or bool{luatex}}{%
\RequirePackage{fontspec}%
@@ -712,8 +758,9 @@
\RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}%
}
-\newkomafont{firstnamefont}{\fontsize{34}{36}\mdseries\upshape}
-\newkomafont{familynamefont}{\usekomafont{firstnamefont}}
+\newkomafont{headlinefont}{\fontsize{30}{32}\mdseries\upshape}
+\newkomafont{firstnamefont}{\Huge\mdseries\upshape}
+\newkomafont{familynamefont}{\usefonttokomafont{firstnamefont}}
\newkomafont{acadtitlefont}{\LARGE\mdseries\itshape}
\newkomafont{addressfont}{\normalsize\mdseries\itshape}
\newkomafont{quotefont}{\large\itshape}
@@ -728,6 +775,7 @@
% \end{macrocode}
%
%\subsubsection*{Lengths}
+% \changes{v1.1}{2017/04/12}{New user length \cs{titlenamemaxwidth}}
% \begin{macrocode}
\setlength\parindent{0pt}
\setlength\columnsep{10\p@}
@@ -769,6 +817,8 @@
\newlength\@commentlength
\newlength\@titlenamewidth
\newlength\@titlenamemaxwidth
+\newlength\titlenamemaxwidth
+\setlength\titlenamemaxwidth{0pt}
\newlength\@titlenamefullwidth
\newlength\@titledetailswidth
\newlength\@infocolwidth
@@ -848,10 +898,10 @@
% listitem
\ifdimequal{\listitemsymbolwidth}{0pt}{%
\settowidth{\@listitemsymbolwidth}{\listitemsymbol{}~}%
- \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}%
}{%
\setlength{\@listitemsymbolwidth}{\listitemsymbolwidth}%
}
+ \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}%
% listdoubleitem
\ifdimequal{\listdbitemmaincolwidth}{0pt}{%
@@ -859,6 +909,7 @@
\setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% %
}{%
\setlength{\@listdbitemmaincolwidth}{\listdbitemmaincolwidth}%
+ \setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% %
}
% quote
@@ -935,6 +986,7 @@
% \end{macrocode}
%
%\subsubsection*{Symbols}
+\changes{v1.1}{2017/04/12}{Added macros and symbols for social media}
% \begin{macrocode}
\providecommand*\@addresssymbol{}
\providecommand*\addresssymbol{}
@@ -948,6 +1000,14 @@
\providecommand*\emailsymbol{}
\providecommand*\@homepagesymbol{}
\providecommand*\homepagesymbol{}
+\providecommand*\@twittersymbol{\faTwitter~}
+\providecommand*\twittersymbol{}
+\providecommand*\@githubsymbol{\faGithub~}
+\providecommand*\githubsymbol{}
+\providecommand*\@facebooksymbol{\faFacebook~}
+\providecommand*\facebooksymbol{}
+\providecommand*\@linkedinsymbol{\faLinkedin~}
+\providecommand*\linkedinsymbol{}
\providecommand*\@fsymbol{~~~\textbullet~~~}
\providecommand*\fsymbol{}
\providecommand*\@listitemsymbol{\textcolor{colortheme}{\Neutral}~}
@@ -972,6 +1032,18 @@
\ifdefempty{\homepagesymbol}{}{%
\renewcommand*\@homepagesymbol{\homepagesymbol}
}
+ \ifdefempty{\twittersymbol}{}{%
+\renewcommand*\@twittersymbol{\twittersymbol}
+}
+ \ifdefempty{\githubsymbol}{}{%
+\renewcommand*\@githubsymbol{\githubsymbol}
+}
+ \ifdefempty{\facebooksymbol}{}{%
+\renewcommand*\@facebooksymbol{\facebooksymbol}
+}
+ \ifdefempty{\linkedinsymbol}{}{%
+\renewcommand*\@linkedinesymbol{\linkedinsymbol}
+}
\ifdefempty{\fsymbol}{}{%
\renewcommand*\@fsymbol{\fsymbol}
}
@@ -1033,6 +1105,32 @@
\providecommand{\@photoname}{#3}}
% \end{macrocode}
%
+%\subsubsection*{Headline}
+% \changes{v1.1}{2017/04/12}{Vertical space between name and academic title adjusted}
+% \begin{macrocode}
+\providecommand\headlinetype{none}
+\providecommand\@headlinecontent{}
+\providecommand\headlinecontent{}
+\providecommand\headline[2]{\renewcommand\headlinecontent{#1}\renewcommand\headlinetype{#2}}
+
+\AtEndPreamble{%
+ \ifdefstring{\headlinetype}{name}{%
+ \ifdefempty{\headlinecontent}{%
+ \renewcommand*\@headlinecontent{\firstnamestyle{\firstname}\ \familynamestyle{\familyname}
+ \ifdefempty{\acadtitle}{}{%
+ \par\bigskip\acadtitlestyle{\acadtitle}}%
+ }}{%
+ \renewcommand*\@headlinecontent{\headlinecontent}
+ }}{}
+ \ifdefstring{\headlinetype}{title}{%
+ \ifdefempty{\headlinecontent}{%
+\renewcommand*\@headlinecontent{\headlinestyle{Curriculum Vitae}}
+ }{%
+ \renewcommand*\@headlinecontent{\headlinecontent}
+ }}{}
+}
+% \end{macrocode}
+%
%\subsubsection*{Title/Head}
% \begin{macrocode}
\newif\if at firstdetailselement\@firstdetailselementtrue
@@ -1050,35 +1148,38 @@
% \begin{macrocode}
\RequirePackage{lastpage}
\providecommand*{\totalpagemark}{% page and pagetotal
-\usekomafont{pagenumber}\pageref{LastPage}%
+\usefonttokomafont{pagenumber}\pageref{LastPage}%
}
% \end{macrocode}
%
%\subsubsection*{Element styles}
% \begin{macrocode}
- \newcommand*{\firstnamestyle}[1]{{%
- \usekomafont{firstnamefont}%
+\providecommand*\headlinestyle[1]{{%
+ \usefontofkomafont{headlinefont}%
+ \textcolor{@headlinecolor}{#1}}}
+ \providecommand*{\firstnamestyle}[1]{{%
+ \usefonttokomafont{firstnamefont}%
\textcolor{@firstnamecolor}{#1}}}
- \newcommand*{\familynamestyle}[1]{{%
- \usekomafont{familynamefont}%
+ \providecommand*{\familynamestyle}[1]{{%
+ \usefonttokomafont{familynamefont}%
\textcolor{@familynamecolor}{#1}}}
- \newcommand*{\acadtitlestyle}[1]{{%
- \usekomafont{acadtitlefont}%
+ \providecommand*{\acadtitlestyle}[1]{{%
+ \usefonttokomafont{acadtitlefont}%
\textcolor{@acadtitlecolor}{#1}}}
- \newcommand*{\addressstyle}[1]{{%
- \usekomafont{addressfont}%
+ \providecommand*{\addressstyle}[1]{{%
+ \usefonttokomafont{addressfont}%
\textcolor{@addresscolor}{#1}}}
- \newcommand*{\quotestyle}[1]{{%
- \usekomafont{quotefont}%
+ \providecommand*{\quotestyle}[1]{{%
+ \usefonttokomafont{quotefont}%
\textcolor{@quotecolor}{#1}}}
- \newcommand*{\hintstyle}[1]{{%
- \usekomafont{hintfont}%
+ \providecommand*{\hintstyle}[1]{{%
+ \usefonttokomafont{hintfont}%
\textcolor{@hintcolor}{#1}}}
- \newcommand*{\sectionstyle}[1]{%
- \usekomafont{section}%
+ \providecommand*{\sectionstyle}[1]{%
+ \usefonttokomafont{section}%
\textcolor{@seccolor}{#1}}
- \newcommand*{\subsectionstyle}[1]{%
- \usekomafont{subsection}%
+ \providecommand*{\subsectionstyle}[1]{%
+ \usefonttokomafont{subsection}%
\textcolor{@subseccolor}{#1}}
% \end{macrocode}
%
@@ -1092,7 +1193,7 @@
@{}p{\@hintscolwidth}%
@{\hspace{\@sepcolwidth}}p{\@maincolwidth}@{}%
}%
- \raggedleft\hintstyle{#2} &{#3}%
+ \RaggedLeft\hintstyle{#2} &{#3}%
\end{tabular}\\[#1]%
}
% \end{macrocode}
@@ -1105,7 +1206,7 @@
\begin{minipage}[t]{\@dbitemmaincolwidth}#3\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@hintscolwidth}%
- \noindent\raggedleft\hintstyle{#4}
+ \noindent\RaggedLeft\hintstyle{#4}
\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@dbitemmaincolwidth}%
@@ -1174,7 +1275,7 @@
% \begin{macrocode}
\newbox{\@commentmainbox}
\providecommand*{\cvitemwithcomment}[4][\@afterelementsvspace]{%
- \savebox{\@commentmainbox}{{\usekomafont{commentmainfont}#3}}%
+ \savebox{\@commentmainbox}{{\usefonttokomafont{commentmainfont}#3}}%
\settowidth\@commentmainlength{\usebox{\@commentmainbox}}%
\setlength{\@commentlength}{%
\@maincolwidth-\@sepcolwidth-\@commentmainlength%
@@ -1181,11 +1282,11 @@
}%
\cvitem[#1]{#2}{%
\begin{minipage}[t]{\@commentmainlength}%
- \usekomafont{commentmainfont} #3%
+ \usefonttokomafont{commentmainfont} #3%
\end{minipage}%
\hfill%
\begin{minipage}[t]{\@commentlength}%
- \raggedleft\usekomafont{commentfont} #4%
+ \RaggedLeft\usefonttokomafont{commentfont} #4%
\end{minipage}%
}%
}
@@ -1196,8 +1297,8 @@
% \begin{macrocode}
\providecommand*{\link}[2][]{%
\ifstrempty{#1}{%
- \href{#2}{\usekomafont{linkfont}#2}}{%
- \href{#2}{\usekomafont{linkfont}#1}}%
+ \href{#2}{\usefonttokomafont{linkfont}#2}}{%
+ \href{#2}{\usefonttokomafont{linkfont}#1}}%
}
% \end{macrocode}
%
@@ -1206,8 +1307,8 @@
% \begin{macrocode}
\providecommand*{\httplink}[2][]{%
\ifstrempty{#1}{%
- \href{http://#2}{\usekomafont{httplinkfont}#2}}{%
- \href{http://#2}{\usekomafont{httplinkfont}#1}}%
+ \href{http://#2}{\usefonttokomafont{httplinkfont}#2}}{%
+ \href{http://#2}{\usefonttokomafont{httplinkfont}#1}}%
}
% \end{macrocode}
%
@@ -1216,41 +1317,15 @@
% \begin{macrocode}
\providecommand*{\emaillink}[2][]{%
\ifstrempty{#1}{%
- \href{mailto:#2}{\usekomafont{emaillinkfont}#2}}{%
- \href{mailto:#2}{\usekomafont{emaillinkfont}#1}}%
+ \href{mailto:#2}{\usefonttokomafont{emaillinkfont}#2}}{%
+ \href{mailto:#2}{\usefonttokomafont{emaillinkfont}#1}}%
}
% \end{macrocode}
%
%\subsubsection*{Sections}
+% \changes{v1.1}{2017/04/12}{Lengths \cs{beforesecvspace}, \cs{aftersecvspace}, \cs{beforesubsecvspace} and \cs{aftersubsecvspace} added to \cs{section} and \cs{subsection} definitions}
% \begin{macrocode}
-\providecommand\origsection{}
-\let\origsection\section
-\providecommand\origsubsection{}
-\let\origsubsection\subsection
-
-\providecommand\@cvsimplesection[1]{%
- \origsection*{\sectionstyle{#1}}
-}
-\providecommand\@cvsimplesubsection[1]{%
- \origsubsection*{\subsectionstyle{#1}}
-}
-
-\providecommand\@cvbarsection[1]{%
- \origsection*{
- \phantomsection{}% reset the anchor for hyperrefs
- \addcontentsline{toc}{section}{#1}%
- \cvitem[0pt]{%
- \raggedleft\hintstyle{\color{@secbarcolor}%
- \rule{\@hintscolwidth}{1ex}}%
- }{\sectionstyle{#1}}
- }% end origsection
-} % end cvbarsection
-
-\providecommand\@cvbarsubsection[1]{%
- \origsubsection*{
- \cvitem[0pt]{}{\subsectionstyle{#1}}
- }%
-}
+% Depending on the style in use (see style descriptions).
% \end{macrocode}
@@ -1358,9 +1433,15 @@
%
%\subsubsection*{Title / Head}
% \begin{macrocode}
+\AtEndPreamble{%
+ \ifdimequal{\titlenamemaxwidth}{0pt}{%
+\setlength{\@titlenamemaxwidth}{.525\textwidth}
+}{
+\setlength\@titlenamemaxwidth{\titlenamemaxwidth}
+}
+}
\providecommand\@cvtitleclassic{%
%% set \cs{@titlenamemaxwidth| to the full name length, capped by \cs{@titlenamemaxwidth|
-\setlength{\@titlenamemaxwidth}{.525\textwidth}
\settowidth{\@titlenamefullwidth}{\firstnamestyle{\firstname~}\familynamestyle{\familyname}}
\ifdimless{\@titlenamemaxwidth}{\@titlenamefullwidth}{%
\setlength{\@titlenamewidth}{\@titlenamemaxwidth}
@@ -1379,15 +1460,24 @@
}%
}%
% name and title
- \begin{minipage}[b]{\@titlenamewidth}%
+\ifdefstring{\headlinetype}{none}{%
+}{
+ \begin{center}
+ \headlinestyle{\@headlinecontent}\par\bigskip
+ \end{center}
+}
+\begin{minipage}[b]{\@titlenamewidth}%
+ \RaggedRight
+ \ifdefstring{\headlinetype}{name}{\hfill\mbox{}}{%
\firstnamestyle{\firstname}\ %
\familynamestyle{\familyname}%
\ifdefempty{\acadtitle}{}{%
- \\[1.25em]\acadtitlestyle{\acadtitle}}%
- \end{minipage}%
+ \par\bigskip\acadtitlestyle{\acadtitle}}%
+ }
+\end{minipage}%
% optional data
\begin{minipage}[b]{\@titledetailswidth}%
- \raggedleft%\addressstyle{%
+ \RaggedLeft\addressstyle{%
\ifdefempty{\addressstreet}{}{%
\@titledetailsnewline%
\@addresssymbol\addressstreet%
@@ -1405,7 +1495,7 @@
\@titledetailsnewline\@homepagesymbol\httplink{\homepage}}%
\ifdefempty{\extrainfo}{}{%
\@titledetailsnewline\extrainfo}%
- %}%
+ }%
\end{minipage}%
% optional photo
\ifundef{\@photoname}{}{% with picture:
@@ -1432,10 +1522,26 @@
}
% \end{macrocode}
%
-%\subsubsection*{Sections}
+% \subsubsection*{Sections}
+% \changes{v1.1}{2017/04/12}{Definition of \cs{section} and \cs{subsection} changed, mainly to avoid pagebreaks (all styles)}
% \begin{macrocode}
-\renewcommand*{\section}[1]{\@cvbarsection{#1}}
-\renewcommand{\subsection}[1]{\@cvbarsubsection{#1}}
+\setcounter{secnumdepth}{1}
+
+\RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ font=\color{@seccolor}
+ ]{section}
+\renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ indent=\dimexpr\@sepcolwidth+\@hintscolwidth,
+ font={\normalfont\color{@subseccolor}}
+ ]{subsection}
% \end{macrocode}
%
%\subsubsection*{Elements}
@@ -1464,12 +1570,12 @@
% \begin{macrocode}
\newsavebox\@fboxa
\newsavebox\@fboxb
-\newcommand*\@sboxa[1]{\sbox\@fboxa{#1}}
-\newcommand*\@sboxb[1]{\sbox\@fboxb{#1}}
-\newcommand*\@uboxa{\usebox\@fboxa}
-\newcommand*\@uboxb{\usebox\@fboxb}
-\newcommand*\@flushf{\strut\@uboxa\@sboxa{}\@sboxb{}}
-\newcommand*\addtofooter[2][\@fsymbol]{%
+\providecommand*\@sboxa[1]{\sbox\@fboxa{#1}}
+\providecommand*\@sboxb[1]{\sbox\@fboxb{#1}}
+\providecommand*\@uboxa{\usebox\@fboxa}
+\providecommand*\@uboxb{\usebox\@fboxb}
+\providecommand*\@flushf{\strut\@uboxa\@sboxa{}\@sboxb{}}
+\providecommand*\addtofooter[2][\@fsymbol]{%
\@sboxb{\@uboxa{}#1#2}%
\settowidth\@fboxwidth{\@uboxb}%
\ifdimgreater{\@footerwidth}{\@fboxwidth}{%
@@ -1489,7 +1595,7 @@
\hspace*{\fill}%
\parbox{\@footerwidth}{%
\centering%
- \color{@addresscolor}\usekomafont{addressfont}%
+ \color{@addresscolor}\usefonttokomafont{addressfont}%
\ifdefempty{\addressstreet}{}{%
\addtofooter[]{\@addresssymbol\addressstreet}%
\ifdefempty{\addresscity}{}{%
@@ -1537,14 +1643,14 @@
\usebox{\@picbox}%
\hspace*{\@titlesepwidth}%
\parbox[b]{\@titlenamewidth}{%
- \raggedleft{\firstnamestyle\firstname}%
+ \RaggedLeft{\firstnamestyle\firstname}%
~{\familynamestyle\familyname}\\
- \raggedleft\color{@firstnamecolor}\rule{\@titlenamewidth}{.25ex}\par
+ \RaggedLeft\color{@firstnamecolor}\rule{\@titlenamewidth}{.25ex}\par
}% end parbox
\vspace{\@aftertitlevspace}
%% optional acadtitle
\ifdefempty{\acadtitle}{}{%
- \raggedleft\acadtitlestyle{\acadtitle}}\\[2.5em]%
+ \RaggedLeft\acadtitlestyle{\acadtitle}}\\[2.5em]%
%% optional quote
\ifdefempty{\cvquote}{}{%
{\centering
@@ -1562,8 +1668,23 @@
%
%\subsubsection*{Sections}
% \begin{macrocode}
-\renewcommand{\section}[1]{\@cvbarsection{#1}}
-\renewcommand{\subsection}[1]{\@cvbarsubsection{#1}}
+\setcounter{secnumdepth}{1}
+
+\RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ font=\color{@seccolor}
+ ]{section}
+\renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ indent=\dimexpr\@sepcolwidth+\@hintscolwidth,
+ font={\normalfont\color{@subseccolor}}
+ ]{subsection}
% \end{macrocode}
%
% \iffalse
@@ -1642,10 +1763,10 @@
\savebox{\@infobox}{%
\parbox[b]{\@infocolwidth}{%
% put the first line on the same baseline as the first sectiontitle:
- {\usekomafont{section}
+ {\usefonttokomafont{section}
\vspace*{1.6ex}
}
- \raggedleft\addressstyle{%
+ \RaggedLeft\addressstyle{%
\@infocontent%
}
}% end parbox
@@ -1710,8 +1831,22 @@
%\subsubsection*{Sections}
%\label{subsub:oldstyle-sections}
% \begin{macrocode}
-\renewcommand{\section}[1]{\@cvsimplesection{#1}}
-\renewcommand{\subsection}[1]{\@cvsimplesubsection{#1}}
+\setcounter{secnumdepth}{0}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ indent=\dimexpr\@sepcolwidth+\@hintscolwidth,
+ font=\color{@seccolor}
+ ]{section}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ font=\color{@subseccolor}
+ ]{subsection}
% \end{macrocode}
%
%\subsubsection*{Elements}
@@ -1722,7 +1857,7 @@
@{}p{\@maincolwidth}%
@{\hspace{\@sepcolwidth}}p{\@hintscolwidth}@{}%
}%
- {#3} & \raggedright\hintstyle{#2}%
+ {#3} & \RaggedRight\hintstyle{#2}%
\end{tabular}\\[#1]%
}
@@ -1731,7 +1866,7 @@
\begin{minipage}[t]{\@dbitemmaincolwidth}#3\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@hintscolwidth}%
- \noindent\raggedleft\hintstyle{#2}
+ \noindent\RaggedLeft\hintstyle{#2}
\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@dbitemmaincolwidth}%
Modified: trunk/Master/texmf-dist/source/latex/komacv/komacv.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/komacv/komacv.ins 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/source/latex/komacv/komacv.ins 2017-04-12 21:08:50 UTC (rev 43766)
@@ -1,4 +1,4 @@
-%% Copyright (C) 2014 by Salome Södergran (salome.soedergran at gmx.ch)
+%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran at gmx.ch)
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -23,7 +23,7 @@
This is a generated file.
-Copyright (C) 2014 by Salome Södergran (salome.soedergran at gmx.ch)
+Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran at gmx.ch)
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
Modified: trunk/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/tex/latex/komacv/komacv-casual.sty 2017-04-12 21:08:50 UTC (rev 43766)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2014 by Salome Södergran (salome.soedergran at gmx.ch)
+%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran at gmx.ch)
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,7 +22,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{komacv-casual}
- [2014/08/10 v1.0.1 style package for komacv class]
+ [2017/04/12 v1.1 style package for komacv class]
+\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont}
+
\addtokomafont{firstnamefont}{\sffamily\fontsize{38}{40}}
\addtokomafont{acadtitlefont}{\sffamily}
\addtokomafont{addressfont}{\sffamily\small}
@@ -29,12 +31,12 @@
\addtokomafont{hintfont}{\sffamily}
\newsavebox\@fboxa
\newsavebox\@fboxb
-\newcommand*\@sboxa[1]{\sbox\@fboxa{#1}}
-\newcommand*\@sboxb[1]{\sbox\@fboxb{#1}}
-\newcommand*\@uboxa{\usebox\@fboxa}
-\newcommand*\@uboxb{\usebox\@fboxb}
-\newcommand*\@flushf{\strut\@uboxa\@sboxa{}\@sboxb{}}
-\newcommand*\addtofooter[2][\@fsymbol]{%
+\providecommand*\@sboxa[1]{\sbox\@fboxa{#1}}
+\providecommand*\@sboxb[1]{\sbox\@fboxb{#1}}
+\providecommand*\@uboxa{\usebox\@fboxa}
+\providecommand*\@uboxb{\usebox\@fboxb}
+\providecommand*\@flushf{\strut\@uboxa\@sboxa{}\@sboxb{}}
+\providecommand*\addtofooter[2][\@fsymbol]{%
\@sboxb{\@uboxa{}#1#2}%
\settowidth\@fboxwidth{\@uboxb}%
\ifdimgreater{\@footerwidth}{\@fboxwidth}{%
@@ -54,7 +56,7 @@
\hspace*{\fill}%
\parbox{\@footerwidth}{%
\centering%
- \color{@addresscolor}\usekomafont{addressfont}%
+ \color{@addresscolor}\usefonttokomafont{addressfont}%
\ifdefempty{\addressstreet}{}{%
\addtofooter[]{\@addresssymbol\addressstreet}%
\ifdefempty{\addresscity}{}{%
@@ -98,14 +100,14 @@
\usebox{\@picbox}%
\hspace*{\@titlesepwidth}%
\parbox[b]{\@titlenamewidth}{%
- \raggedleft{\firstnamestyle\firstname}%
+ \RaggedLeft{\firstnamestyle\firstname}%
~{\familynamestyle\familyname}\\
- \raggedleft\color{@firstnamecolor}\rule{\@titlenamewidth}{.25ex}\par
+ \RaggedLeft\color{@firstnamecolor}\rule{\@titlenamewidth}{.25ex}\par
}% end parbox
\vspace{\@aftertitlevspace}
%% optional acadtitle
\ifdefempty{\acadtitle}{}{%
- \raggedleft\acadtitlestyle{\acadtitle}}\\[2.5em]%
+ \RaggedLeft\acadtitlestyle{\acadtitle}}\\[2.5em]%
%% optional quote
\ifdefempty{\cvquote}{}{%
{\centering
@@ -119,8 +121,23 @@
\AtBeginDocument{%
\thispagestyle{footer}
} % end \AtBeginDocument
-\renewcommand{\section}[1]{\@cvbarsection{#1}}
-\renewcommand{\subsection}[1]{\@cvbarsubsection{#1}}
+\setcounter{secnumdepth}{1}
+
+\RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ font=\color{@seccolor}
+ ]{section}
+\renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ indent=\dimexpr\@sepcolwidth+\@hintscolwidth,
+ font={\normalfont\color{@subseccolor}}
+ ]{subsection}
\endinput
%%
%% End of file `komacv-casual.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/tex/latex/komacv/komacv-classic.sty 2017-04-12 21:08:50 UTC (rev 43766)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2014 by Salome Södergran (salome.soedergran at gmx.ch)
+%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran at gmx.ch)
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,7 +22,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{komacv-classic}
- [2014/08/10 v1.0.1 style package for komacv class]
+ [2017/04/12 v1.1 style package for komacv class]
+\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont}
+
\addtokomafont{firstnamefont}{\sffamily}
\addtokomafont{acadtitlefont}{\sffamily}
\addtokomafont{addressfont}{\sffamily}
@@ -36,9 +38,15 @@
\setlength\@mframepicshift{\mframepicshift}
}
} % end \AtBeginDocument
+\AtEndPreamble{%
+ \ifdimequal{\titlenamemaxwidth}{0pt}{%
+\setlength{\@titlenamemaxwidth}{.525\textwidth}
+}{
+\setlength\@titlenamemaxwidth{\titlenamemaxwidth}
+}
+}
\providecommand\@cvtitleclassic{%
%% set \cs{@titlenamemaxwidth| to the full name length, capped by \cs{@titlenamemaxwidth|
-\setlength{\@titlenamemaxwidth}{.525\textwidth}
\settowidth{\@titlenamefullwidth}{\firstnamestyle{\firstname~}\familynamestyle{\familyname}}
\ifdimless{\@titlenamemaxwidth}{\@titlenamefullwidth}{%
\setlength{\@titlenamewidth}{\@titlenamemaxwidth}
@@ -57,15 +65,24 @@
}%
}%
% name and title
- \begin{minipage}[b]{\@titlenamewidth}%
+\ifdefstring{\headlinetype}{none}{%
+}{
+ \begin{center}
+ \headlinestyle{\@headlinecontent}\par\bigskip
+ \end{center}
+}
+\begin{minipage}[b]{\@titlenamewidth}%
+ \RaggedRight
+ \ifdefstring{\headlinetype}{name}{\hfill\mbox{}}{%
\firstnamestyle{\firstname}\ %
\familynamestyle{\familyname}%
\ifdefempty{\acadtitle}{}{%
- \\[1.25em]\acadtitlestyle{\acadtitle}}%
- \end{minipage}%
+ \par\bigskip\acadtitlestyle{\acadtitle}}%
+ }
+\end{minipage}%
% optional data
\begin{minipage}[b]{\@titledetailswidth}%
- \raggedleft%\addressstyle{%
+ \RaggedLeft\addressstyle{%
\ifdefempty{\addressstreet}{}{%
\@titledetailsnewline%
\@addresssymbol\addressstreet%
@@ -83,7 +100,7 @@
\@titledetailsnewline\@homepagesymbol\httplink{\homepage}}%
\ifdefempty{\extrainfo}{}{%
\@titledetailsnewline\extrainfo}%
- %}%
+ }%
\end{minipage}%
% optional photo
\ifundef{\@photoname}{}{% with picture:
@@ -108,8 +125,23 @@
\end{minipage}\\[\@afterquotevspace]%
}%
}
-\renewcommand*{\section}[1]{\@cvbarsection{#1}}
-\renewcommand{\subsection}[1]{\@cvbarsubsection{#1}}
+\setcounter{secnumdepth}{1}
+
+\RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ font=\color{@seccolor}
+ ]{section}
+\renewcommand*\thesection{\color{@secbarcolor}\rule{\@hintscolwidth}{1ex}\hspace{-1ex}\hspace{\@sepcolwidth}}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ indent=\dimexpr\@sepcolwidth+\@hintscolwidth,
+ font={\normalfont\color{@subseccolor}}
+ ]{subsection}
\endinput
%%
%% End of file `komacv-classic.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/tex/latex/komacv/komacv-oldstyle.sty 2017-04-12 21:08:50 UTC (rev 43766)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2014 by Salome Södergran (salome.soedergran at gmx.ch)
+%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran at gmx.ch)
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,7 +22,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{komacv-oldstyle}
- [2014/08/10 v1.0.1 style package for komacv class]
+ [2017/04/12 v1.1 style package for komacv class]
+\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont}
+
\KOMAoptions{DIV=15}
\setlength{\hintscolwidth}{3cm}
\addtokomafont{addressfont}{\small}
@@ -65,10 +67,10 @@
\savebox{\@infobox}{%
\parbox[b]{\@infocolwidth}{%
% put the first line on the same baseline as the first sectiontitle:
- {\usekomafont{section}
+ {\usefonttokomafont{section}
\vspace*{1.6ex}
}
- \raggedleft\addressstyle{%
+ \RaggedLeft\addressstyle{%
\@infocontent%
}
}% end parbox
@@ -128,14 +130,28 @@
\AtEndDocument{%
\end{addmargin}
}
-\renewcommand{\section}[1]{\@cvsimplesection{#1}}
-\renewcommand{\subsection}[1]{\@cvsimplesubsection{#1}}
+\setcounter{secnumdepth}{0}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ indent=\dimexpr\@sepcolwidth+\@hintscolwidth,
+ font=\color{@seccolor}
+ ]{section}
+
+ \RedeclareSectionCommand
+ [
+ beforeskip=\@beforesecvspace,
+ afterskip=\@aftersecvspace,
+ font=\color{@subseccolor}
+ ]{subsection}
\renewcommand*{\cvitem}[3][\@afterelementsvspace]{%
\begin{tabular}{%
@{}p{\@maincolwidth}%
@{\hspace{\@sepcolwidth}}p{\@hintscolwidth}@{}%
}%
- {#3} & \raggedright\hintstyle{#2}%
+ {#3} & \RaggedRight\hintstyle{#2}%
\end{tabular}\\[#1]%
}
@@ -144,7 +160,7 @@
\begin{minipage}[t]{\@dbitemmaincolwidth}#3\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@hintscolwidth}%
- \noindent\raggedleft\hintstyle{#2}
+ \noindent\RaggedLeft\hintstyle{#2}
\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@dbitemmaincolwidth}%
Modified: trunk/Master/texmf-dist/tex/latex/komacv/komacv.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/komacv/komacv.cls 2017-04-12 21:08:34 UTC (rev 43765)
+++ trunk/Master/texmf-dist/tex/latex/komacv/komacv.cls 2017-04-12 21:08:50 UTC (rev 43766)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2014 by Salome Södergran (salome.soedergran at gmx.ch)
+%% Copyright (C) 2014-2017 by Salome Södergran (salome.soedergran at gmx.ch)
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,7 +22,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{komacv}
- [2014/08/10 v1.0.1 komacv class]
+ [2017/04/12 v1.1 komacv class]
+\changes{v1.1}{2017/04/12}{New macro headline, and new correspondent elements headlinestyle, headlinecolor, headlinefont}
+
\providecommand*\mycolor{blue}
\RequirePackage{ifthen,kvoptions,calc}
\SetupKeyvalOptions{%
@@ -43,7 +45,7 @@
ifpdf,%
ifluatex,%
ifxetex,%
- scrpage2,%
+ scrlayer-scrpage,%
marvosym,%
array,%
graphicx,%
@@ -51,11 +53,15 @@
enumitem,
hyperref%
}
+\RequirePackage[raggedrightboxes]{ragged2e}
\definecolor{myblue}{rgb}{0.2,0.3,0.65}
\colorlet{mycolor}{myblue}
\AtEndPreamble{%
\renewcommand*\mycolor{\komacv at color}
\colorlet{colortheme}{\mycolor}% specified in documentclass option
+ \@ifundefinedcolor{headlinecolor}{%
+ \colorlet{@headlinecolor}{black}}{%
+ \colorlet{@headlinecolor}{headlinecolor}}
\@ifundefinedcolor{firstnamecolor}{%
\colorlet{@firstnamecolor}{black}}{%
\colorlet{@firstnamecolor}{firstnamecolor}}
@@ -96,8 +102,9 @@
\RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}%
}
-\newkomafont{firstnamefont}{\fontsize{34}{36}\mdseries\upshape}
-\newkomafont{familynamefont}{\usekomafont{firstnamefont}}
+\newkomafont{headlinefont}{\fontsize{30}{32}\mdseries\upshape}
+\newkomafont{firstnamefont}{\Huge\mdseries\upshape}
+\newkomafont{familynamefont}{\usefonttokomafont{firstnamefont}}
\newkomafont{acadtitlefont}{\LARGE\mdseries\itshape}
\newkomafont{addressfont}{\normalsize\mdseries\itshape}
\newkomafont{quotefont}{\large\itshape}
@@ -149,6 +156,8 @@
\newlength\@commentlength
\newlength\@titlenamewidth
\newlength\@titlenamemaxwidth
+\newlength\titlenamemaxwidth
+\setlength\titlenamemaxwidth{0pt}
\newlength\@titlenamefullwidth
\newlength\@titledetailswidth
\newlength\@infocolwidth
@@ -228,10 +237,10 @@
% listitem
\ifdimequal{\listitemsymbolwidth}{0pt}{%
\settowidth{\@listitemsymbolwidth}{\listitemsymbol{}~}%
- \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}%
}{%
\setlength{\@listitemsymbolwidth}{\listitemsymbolwidth}%
}
+ \setlength{\@listitemmaincolwidth}{\@maincolwidth-\@listitemsymbolwidth}%
% listdoubleitem
\ifdimequal{\listdbitemmaincolwidth}{0pt}{%
@@ -239,6 +248,7 @@
\setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% %
}{%
\setlength{\@listdbitemmaincolwidth}{\listdbitemmaincolwidth}%
+ \setlength{\@listdbitemmaincolwidth}{0.475\@listdbitemmaincolwidth}% %
}
% quote
@@ -312,6 +322,7 @@
\setlength{\@aftersubsecvspace}{\aftersubsecvspace}%
}
} % end AtEndPreamble
+\changes{v1.1}{2017/04/12}{Added macros and symbols for social media}
\providecommand*\@addresssymbol{}
\providecommand*\addresssymbol{}
\providecommand*\@mobilesymbol{\Mobilefone~}
@@ -324,6 +335,14 @@
\providecommand*\emailsymbol{}
\providecommand*\@homepagesymbol{}
\providecommand*\homepagesymbol{}
+\providecommand*\@twittersymbol{\faTwitter~}
+\providecommand*\twittersymbol{}
+\providecommand*\@githubsymbol{\faGithub~}
+\providecommand*\githubsymbol{}
+\providecommand*\@facebooksymbol{\faFacebook~}
+\providecommand*\facebooksymbol{}
+\providecommand*\@linkedinsymbol{\faLinkedin~}
+\providecommand*\linkedinsymbol{}
\providecommand*\@fsymbol{~~~\textbullet~~~}
\providecommand*\fsymbol{}
\providecommand*\@listitemsymbol{\textcolor{colortheme}{\Neutral}~}
@@ -348,6 +367,18 @@
\ifdefempty{\homepagesymbol}{}{%
\renewcommand*\@homepagesymbol{\homepagesymbol}
}
+ \ifdefempty{\twittersymbol}{}{%
+\renewcommand*\@twittersymbol{\twittersymbol}
+}
+ \ifdefempty{\githubsymbol}{}{%
+\renewcommand*\@githubsymbol{\githubsymbol}
+}
+ \ifdefempty{\facebooksymbol}{}{%
+\renewcommand*\@facebooksymbol{\facebooksymbol}
+}
+ \ifdefempty{\linkedinsymbol}{}{%
+\renewcommand*\@linkedinesymbol{\linkedinsymbol}
+}
\ifdefempty{\fsymbol}{}{%
\renewcommand*\@fsymbol{\fsymbol}
}
@@ -393,6 +424,27 @@
\providecommand{\@photoframe}{#1}%
\setlength{\@photowidth}{#2}%
\providecommand{\@photoname}{#3}}
+\providecommand\headlinetype{none}
+\providecommand\@headlinecontent{}
+\providecommand\headlinecontent{}
+\providecommand\headline[2]{\renewcommand\headlinecontent{#1}\renewcommand\headlinetype{#2}}
+
+\AtEndPreamble{%
+ \ifdefstring{\headlinetype}{name}{%
+ \ifdefempty{\headlinecontent}{%
+ \renewcommand*\@headlinecontent{\firstnamestyle{\firstname}\ \familynamestyle{\familyname}
+ \ifdefempty{\acadtitle}{}{%
+ \par\bigskip\acadtitlestyle{\acadtitle}}%
+ }}{%
+ \renewcommand*\@headlinecontent{\headlinecontent}
+ }}{}
+ \ifdefstring{\headlinetype}{title}{%
+ \ifdefempty{\headlinecontent}{%
+\renewcommand*\@headlinecontent{\headlinestyle{Curriculum Vitae}}
+ }{%
+ \renewcommand*\@headlinecontent{\headlinecontent}
+ }}{}
+}
\newif\if at firstdetailselement\@firstdetailselementtrue
\providecommand*{\@titledetailsnewline}{
\if at firstdetailselement%
@@ -404,31 +456,34 @@
\renewcommand\maketitle{\csexpandonce{@cvtitle\komacv at style}}
\RequirePackage{lastpage}
\providecommand*{\totalpagemark}{% page and pagetotal
-\usekomafont{pagenumber}\pageref{LastPage}%
+\usefonttokomafont{pagenumber}\pageref{LastPage}%
}
- \newcommand*{\firstnamestyle}[1]{{%
- \usekomafont{firstnamefont}%
+\providecommand*\headlinestyle[1]{{%
+ \usefontofkomafont{headlinefont}%
+ \textcolor{@headlinecolor}{#1}}}
+ \providecommand*{\firstnamestyle}[1]{{%
+ \usefonttokomafont{firstnamefont}%
\textcolor{@firstnamecolor}{#1}}}
- \newcommand*{\familynamestyle}[1]{{%
- \usekomafont{familynamefont}%
+ \providecommand*{\familynamestyle}[1]{{%
+ \usefonttokomafont{familynamefont}%
\textcolor{@familynamecolor}{#1}}}
- \newcommand*{\acadtitlestyle}[1]{{%
- \usekomafont{acadtitlefont}%
+ \providecommand*{\acadtitlestyle}[1]{{%
+ \usefonttokomafont{acadtitlefont}%
\textcolor{@acadtitlecolor}{#1}}}
- \newcommand*{\addressstyle}[1]{{%
- \usekomafont{addressfont}%
+ \providecommand*{\addressstyle}[1]{{%
+ \usefonttokomafont{addressfont}%
\textcolor{@addresscolor}{#1}}}
- \newcommand*{\quotestyle}[1]{{%
- \usekomafont{quotefont}%
+ \providecommand*{\quotestyle}[1]{{%
+ \usefonttokomafont{quotefont}%
\textcolor{@quotecolor}{#1}}}
- \newcommand*{\hintstyle}[1]{{%
- \usekomafont{hintfont}%
+ \providecommand*{\hintstyle}[1]{{%
+ \usefonttokomafont{hintfont}%
\textcolor{@hintcolor}{#1}}}
- \newcommand*{\sectionstyle}[1]{%
- \usekomafont{section}%
+ \providecommand*{\sectionstyle}[1]{%
+ \usefonttokomafont{section}%
\textcolor{@seccolor}{#1}}
- \newcommand*{\subsectionstyle}[1]{%
- \usekomafont{subsection}%
+ \providecommand*{\subsectionstyle}[1]{%
+ \usefonttokomafont{subsection}%
\textcolor{@subseccolor}{#1}}
\providecommand*{\cvitem}[3][\@afterelementsvspace]{%
\begin{tabular}{%
@@ -435,7 +490,7 @@
@{}p{\@hintscolwidth}%
@{\hspace{\@sepcolwidth}}p{\@maincolwidth}@{}%
}%
- \raggedleft\hintstyle{#2} &{#3}%
+ \RaggedLeft\hintstyle{#2} &{#3}%
\end{tabular}\\[#1]%
}
\providecommand*{\cvdoubleitem}[5][\@afterelementsvspace]{%
@@ -443,7 +498,7 @@
\begin{minipage}[t]{\@dbitemmaincolwidth}#3\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@hintscolwidth}%
- \noindent\raggedleft\hintstyle{#4}
+ \noindent\RaggedLeft\hintstyle{#4}
\end{minipage}%
\hspace*{\@sepcolwidth}%
\begin{minipage}[t]{\@dbitemmaincolwidth}%
@@ -492,7 +547,7 @@
}
\newbox{\@commentmainbox}
\providecommand*{\cvitemwithcomment}[4][\@afterelementsvspace]{%
- \savebox{\@commentmainbox}{{\usekomafont{commentmainfont}#3}}%
+ \savebox{\@commentmainbox}{{\usefonttokomafont{commentmainfont}#3}}%
\settowidth\@commentmainlength{\usebox{\@commentmainbox}}%
\setlength{\@commentlength}{%
\@maincolwidth-\@sepcolwidth-\@commentmainlength%
@@ -499,58 +554,30 @@
}%
\cvitem[#1]{#2}{%
\begin{minipage}[t]{\@commentmainlength}%
- \usekomafont{commentmainfont} #3%
+ \usefonttokomafont{commentmainfont} #3%
\end{minipage}%
\hfill%
\begin{minipage}[t]{\@commentlength}%
- \raggedleft\usekomafont{commentfont} #4%
+ \RaggedLeft\usefonttokomafont{commentfont} #4%
\end{minipage}%
}%
}
\providecommand*{\link}[2][]{%
\ifstrempty{#1}{%
- \href{#2}{\usekomafont{linkfont}#2}}{%
- \href{#2}{\usekomafont{linkfont}#1}}%
+ \href{#2}{\usefonttokomafont{linkfont}#2}}{%
+ \href{#2}{\usefonttokomafont{linkfont}#1}}%
}
\providecommand*{\httplink}[2][]{%
\ifstrempty{#1}{%
- \href{http://#2}{\usekomafont{httplinkfont}#2}}{%
- \href{http://#2}{\usekomafont{httplinkfont}#1}}%
+ \href{http://#2}{\usefonttokomafont{httplinkfont}#2}}{%
+ \href{http://#2}{\usefonttokomafont{httplinkfont}#1}}%
}
\providecommand*{\emaillink}[2][]{%
\ifstrempty{#1}{%
- \href{mailto:#2}{\usekomafont{emaillinkfont}#2}}{%
- \href{mailto:#2}{\usekomafont{emaillinkfont}#1}}%
+ \href{mailto:#2}{\usefonttokomafont{emaillinkfont}#2}}{%
+ \href{mailto:#2}{\usefonttokomafont{emaillinkfont}#1}}%
}
-\providecommand\origsection{}
-\let\origsection\section
-\providecommand\origsubsection{}
-\let\origsubsection\subsection
-\providecommand\@cvsimplesection[1]{%
- \origsection*{\sectionstyle{#1}}
-}
-\providecommand\@cvsimplesubsection[1]{%
- \origsubsection*{\subsectionstyle{#1}}
-}
-
-\providecommand\@cvbarsection[1]{%
- \origsection*{
- \phantomsection{}% reset the anchor for hyperrefs
- \addcontentsline{toc}{section}{#1}%
- \cvitem[0pt]{%
- \raggedleft\hintstyle{\color{@secbarcolor}%
- \rule{\@hintscolwidth}{1ex}}%
- }{\sectionstyle{#1}}
- }% end origsection
-} % end cvbarsection
-
-\providecommand\@cvbarsubsection[1]{%
- \origsubsection*{
- \cvitem[0pt]{}{\subsectionstyle{#1}}
- }%
-}
-
\hypersetup{
breaklinks,
unicode,
More information about the tex-live-commits
mailing list