summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-07-06 00:17:18 +0000
committerKarl Berry <karl@freefriends.org>2009-07-06 00:17:18 +0000
commit113e17a8d8e8ae3b7af7140e4ab17590631c4ced (patch)
tree80f40c49440f6d01f840a4e5f06cdc064f824582
parent2ef52c0386a2e84ce1fff1163736bbb69fcfabb2 (diff)
context-letter update (4jul09)
git-svn-id: svn://tug.org/texlive/trunk@14137 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/context/third/letter/correspondence.pdfbin443213 -> 421659 bytes
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex2
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex11
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex19
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex16
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex10
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex60
-rw-r--r--Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex26
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii82
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv85
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-letter.tex7
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/t-resume.tex72
-rw-r--r--Master/texmf-dist/tex/context/third/letter/extension/label.nle22
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/default.nri49
-rw-r--r--Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri48
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/modern.nrs156
17 files changed, 299 insertions, 370 deletions
diff --git a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
index 4904e2340fa..56cd9c8c1b1 100644
--- a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
+++ b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
index 2d26ec7d613..860df76f26b 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
@@ -39,7 +39,7 @@
\appendtoks\def\\{ }\to\simplifiedcommands
\setupinteraction
- [state=stop,
+ [state=start,
title={Correspondence with ConTeXt},
author={Wolfgang Schuster},
color=black,
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex
index 932c8b1d38c..1c7fed9ae7a 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex
@@ -94,6 +94,17 @@ Thus, I came to the conclusion ...
\stopletter
\stoptyping
+\startframedtext[width=\textwidth,framecolor=red,align=flushleft,corner=00]
+The definition of the \type{\setuplettervalue} has changed in the module version from 2009.07.03,
+only braces are allowed to set values, brackets are optional and used to set the labeltext for
+the value in the current mainlanguage, the setup for both variants is:
+
+\starttyping
+\setlettervalue{key}{value}
+\setlettervalue{key}[labeltext]{value}
+\stoptyping
+\stopframedtext
+
If you are more interested in a KOMA-Script like solution to set with every command only one value their is as last alternative the \type {\setlettervalue} command, it comes in two different versions where the keyword is either written in braces or in bracket but the content itself is written between braces.
The first version with braces for two values has the following look.
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex
index 8a307320eee..8567fd992b7 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex
@@ -4,18 +4,25 @@
\startbuffer[firsthead]
\switchtobodyfont[6pt]
-\setlettervalue[fromname] {Max Mustermann}
-\setlettervalue[fromaddress]{Musterweg 12\\12345 Musterstadt}
-\setlettervalue[fromphone] {1234/567890}
-\setlettervalue[fromfax] {1234/567891}
-\setlettervalue[fromemail] {max.mustermann@muster.com}
-\setlettervalue[fromurl] {max.mustermann.com}
+\setlettervalue{fromname} {Max Mustermann}
+\setlettervalue{fromaddress}{Musterweg 12\\12345 Musterstadt}
+\setlettervalue{fromphone} {1234/567890}
+\setlettervalue{fromfax} {1234/567891}
+\setlettervalue{fromemail} {max.mustermann@muster.com}
+\setlettervalue{fromurl} {max.mustermann.com}
\stopbuffer
\chapter{Header and Footer}
\section{Header}
+\starttyping
+\setupletterstyle
+ [head]
+ [alternative=left|middle|right,
+ fromrule=top|bottom|no]
+\stoptyping
+
\placefigure
[fixed]
{none}
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex
index 9ac34484a9e..d7c8b668623 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex
@@ -118,14 +118,14 @@ The position and layout of the layers can be changed with the \type {\setuplette
closing={\blackrule[width=.33\hsize,height=4\lineheight,color=darkgray]},
appendices={\blackrule[width=.33\hsize,height=3\lineheight,color=darkgray]}]
-\setlettervalue[title] {\fakewords {5} {10}}
-\setlettervalue[subject] {\fakewords {5} {10}}
-\setlettervalue[opening] {\fakewords {3} {5}}
-\setlettervalue[content] {\fakewords{100}{150}}
-\setlettervalue[closing] {\fakewords {2} {4}}
-\setlettervalue[enclosure] {\fakewords {3} {6}}
-\setlettervalue[copy] {\fakewords {3} {6}}
-\setlettervalue[postscript]{\fakewords {3} {6}}
+\setlettervalue{title} {\fakewords {5} {10}}
+\setlettervalue{subject} {\fakewords {5} {10}}
+\setlettervalue{opening} {\fakewords {3} {5}}
+\setlettervalue{content} {\fakewords{100}{150}}
+\setlettervalue{closing} {\fakewords {2} {4}}
+\setlettervalue{enclosure} {\fakewords {3} {6}}
+\setlettervalue{copy} {\fakewords {3} {6}}
+\setlettervalue{postscript}{\fakewords {3} {6}}
\startletter
\fakewords{100}{150}
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex
index e4072840d40..5e5f8e58409 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex
@@ -508,11 +508,15 @@ The code results in the following result.
\starttyping
\setupletterstyle
[reference]
- [alternative=b]
+ [alternative=e]
\stoptyping
\start
+\getbuffer[reference]
+
+\setupletter[date][width=.25\hsize]
+
\startelement
\letterelement[reference][e]
\stopelement
@@ -629,7 +633,7 @@ You choose in the same way as the other alternatives.
\start\setuptyping[bodyfont=small]
\starttyping
-\defineletterelement[reference][customized]%
+\defineletterelement[reference][customized]
{\setupTABLE [height=18mm,frame=off,offset=0pt]%
\setupTABLE[c][1,2] [width=50.8mm]%
\setupTABLE[c][3,4,5][width=25.4mm]%
@@ -666,7 +670,7 @@ You choose in the same way as the other alternatives.
\page[right]
\starttyping
-\defineletterelement[reference][customized]%
+\defineletterelement[reference][customized]
{\bTABLE[frame=off,offset=0pt,width=.25\hsize]
\bTR
\bTD \labeltext{letter:name} \eTD
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex
index 9bc48ce12ea..2989e048b95 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex
@@ -8,18 +8,18 @@
\startbuffer[resume:short]
-\setresumevalue[image] {\blackrule[width=25mm,height=25mm]}
-\setresumevalue[firstname] {John}
-\setresumevalue[familyname]{Doe}
-\setresumevalue[title] {Resum\'e title (optional)}
-\setresumevalue[quote] {Some quote (optional)}
-\setresumevalue[street] {street and number}
-\setresumevalue[town] {postcode city}
-\setresumevalue[mobile] {mobile (optional)}
-\setresumevalue[phone] {phone (optional)}
-\setresumevalue[fax] {fax (optional)}
-\setresumevalue[email] {email (optional)}
-\setresumevalue[info] {additional information (optional)}
+\setresumevalue{image} {\blackrule[width=25mm,height=25mm]}
+\setresumevalue{firstname} {John}
+\setresumevalue{familyname}{Doe}
+\setresumevalue{title} {Resum\'e title (optional)}
+\setresumevalue{quote} {Some quote (optional)}
+\setresumevalue{street} {street and number}
+\setresumevalue{town} {postcode city}
+\setresumevalue{mobile} {mobile (optional)}
+\setresumevalue{phone} {phone (optional)}
+\setresumevalue{fax} {fax (optional)}
+\setresumevalue{email} {email (optional)}
+\setresumevalue{info} {additional information (optional)}
\startresume
@@ -61,18 +61,18 @@
\setupresumestyle[option][backgroundcolor=white,before=]
-\setresumevalue[image] {\blackrule[width=25mm,height=25mm]}
-\setresumevalue[firstname] {John}
-\setresumevalue[familyname]{Doe}
-\setresumevalue[title] {Resum\'e title (optional)}
-\setresumevalue[quote] {Some quote (optional)}
-\setresumevalue[street] {street and number}
-\setresumevalue[town] {postcode city}
-\setresumevalue[mobile] {mobile (optional)}
-\setresumevalue[phone] {phone (optional)}
-\setresumevalue[fax] {fax (optional)}
-\setresumevalue[email] {email (optional)}
-\setresumevalue[info] {additional information (optional)}
+\setresumevalue{image} {\blackrule[width=25mm,height=25mm]}
+\setresumevalue{firstname} {John}
+\setresumevalue{familyname}{Doe}
+\setresumevalue{title} {Resum\'e title (optional)}
+\setresumevalue{quote} {Some quote (optional)}
+\setresumevalue{street} {street and number}
+\setresumevalue{town} {postcode city}
+\setresumevalue{mobile} {mobile (optional)}
+\setresumevalue{phone} {phone (optional)}
+\setresumevalue{fax} {fax (optional)}
+\setresumevalue{email} {email (optional)}
+\setresumevalue{info} {additional information (optional)}
\startresume
@@ -144,7 +144,8 @@
\start
-\useresumestyle[classic]
+\useresumeinterface[moderncv]
+\useresumestyle [classic]
\getbuffer[resume:short]
@@ -152,7 +153,8 @@
\startexamplecontent[resume:classic]
-\useresumestyle[classic]
+\useresumeinterface[moderncv]
+\useresumestyle [classic]
\getbuffer[resume:long]
@@ -174,7 +176,8 @@
\start
-\useresumestyle[casual]
+\useresumeinterface[moderncv]
+\useresumestyle [casual]
\getbuffer[resume:short]
@@ -182,7 +185,8 @@
\startexamplecontent[resume:casual]
-\useresumestyle[casual]
+\useresumeinterface[moderncv]
+\useresumestyle [casual]
\getbuffer[resume:long]
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex
index 395821942bb..b195da5f530 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex
@@ -1,6 +1,6 @@
-\startcomponent lm-resume-interface
+\startcomponent correspondence-resume-interface
-\environment lm-environment
+\environment correspondence-environment
\chapter{Interface}
@@ -19,11 +19,11 @@ and with the same elements and styles. The difference between the \LaTeX{} and t
\ConTeXt-version is that you don't need a \type{\maketitle} command to place the
header for each style and it is placed by default.
-\startframedtext[width=\textwidth,framecolor=red,align=middle,corner=00]
-The current implementation of the moderncv interface is written as resume style and
-not as interface, this means you load it with \type{\useresumestyle} or as argument
-for \type{\usemodule} with the style key.
-\stopframedtext
+%\startframedtext[width=\textwidth,framecolor=red,align=middle,corner=00]
+%The current implementation of the moderncv interface is written as resume style and
+%not as interface, this means you load it with \type{\useresumestyle} or as argument
+%for \type{\usemodule} with the style key.
+%\stopframedtext
The available elements for the interface are described below.
@@ -53,7 +53,7 @@ results in
\start
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
\startelement
\cvline{supervisors}{Supervisors}
@@ -88,7 +88,7 @@ result in the following output
\start
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
\startelement
\cvlistitem{Item 1}
@@ -123,7 +123,7 @@ You can see this in the output from the example above.
\start
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
\startelement
\cvlistdoubleitem[$\circ$]{Item 1}{Item 3}
@@ -158,7 +158,7 @@ This results in the time period in the left margin and the information in the te
\start
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
\startelement
\cventry{year--year}{Degree}{Institution}{City}{\it Grade}{Description}
@@ -191,7 +191,7 @@ results in:
\start
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
\startelement
\cvlanguage{language 1}{Skill level}{Comment}
@@ -225,7 +225,7 @@ This produce the following output.
\start
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
\startelement
\cvcomputer{category 1}{XXX, YYY, ZZZ}{category 3}{XXX, YYY, ZZZ}
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
index b497a7d2197..1227f78f340 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-correspondence,
-%D version=2009.05.10,
+%D version=2009.07.03,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -20,13 +20,13 @@
\definemessageconstant {correspondence}
-\startmessages all library: correspondence
- title: correspondence
- 1: loading -- -- --
- 2: -- -- -- not found
- 3: correspage set -- processed (size --)
- 4: --: --
-\stopmessages
+\startinterface all
+ \setinterfacemessage{correspondence}{title}{correspondence}
+ \setinterfacemessage{correspondence}{1} {loading -- -- --}
+ \setinterfacemessage{correspondence}{2} {-- -- -- not found}
+ \setinterfacemessage{correspondence}{3} {correspage set -- processed (size --)}
+ \setinterfacemessage{correspondence}{4} {--: --}
+\stopinterface
%D Page numbering
@@ -136,7 +136,7 @@
{\def\dododosetupcorrespondencelayer##1%
{\def\dodododosetupcorrespondencelayer####1%
{\ifcsname dosetupcorrespondencelayer####1\endcsname
- \@EA\@EA\csname dosetupcorrespondencelayer####1\endcsname
+ \@EAEA\csname dosetupcorrespondencelayer####1\endcsname
\else
\@EA\dosetupcorrespondencelayeroption
\fi[#1][#2][##1][#5]}%
@@ -159,66 +159,54 @@
{\dodoubleargument\dodefinecorrespondencevalue}
\def\dodefinecorrespondencevalue[#1][#2]%
- {\setvalue{\e!setup#1\e!endsetup}{\dotripleempty\docorrespondencesetup[#2]}%
- \@EA\definecomplexorsimple\csname\e!set#1\e!value\endcsname
- \setvalue{\e!complex\e!set#1\e!value}[##1]##2{\setvalue{#2##1}{##2}}%
- \setvalue{\e!simple \e!set#1\e!value}##1##2{\setvalue{#2##1}{##2}}}
+ {\setvalue{\e!setup#1\e!endsetup}{\dotripleempty\docorrespondencesetupvalue[#2]}%
+ \setvalue{\e!set#1\e!value}##1{\doquadrupleempty\docorrespondencesetvalue[#1][#2][##1]}}
-\def\docorrespondencesetup[#1][#2][#3]%
+\def\docorrespondencesetupvalue[#1][#2][#3]%
{\doifelsenothing{#3}
{\getparameters[#1][#2]}
- {\def\dodocorrespondencesetup##1%
+ {\def\dodocorrespondencesetupvalue##1%
{\getparameters[#1##1][#3]}%
- \processcommalist[#2]\dodocorrespondencesetup}}
+ \processcommalist[#2]\dodocorrespondencesetupvalue}}
+
+\def\docorrespondencesetvalue[#1][#2][#3][#4]#5%
+ {\iffourthargument
+ \setuplabeltext[\currentmainlanguage][#1:#3=#4]%
+ \fi
+ \setvalue{#2#3}{#5}}
%D Tests
\long\def\doifcorrespondencevalue#1#2%
- {\ifcsname#1#2\endcsname
- \edef\!!stringa{\csname#1#2\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\gobbleoneargument
- \else
- \@EAEAEA\firstofoneargument
- \fi
- \else
+ {\edef\!!stringa{\csname#1#2\endcsname}%
+ \ifx\!!stringa\empty
\@EA\gobbleoneargument
+ \else
+ \@EA\firstofoneargument
\fi}
\long\def\doifelsecorrespondencevalue#1#2%
- {\ifcsname#1#2\endcsname
- \edef\!!stringa{\csname#1#2\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\secondoftwoarguments
- \else
- \@EAEAEA\firstoftwoarguments
- \fi
- \else
+ {\edef\!!stringa{\csname#1#2\endcsname}%
+ \ifx\!!stringa\empty
\@EA\secondoftwoarguments
+ \else
+ \@EA\firstoftwoarguments
\fi}
\long\def\doifcorrespondencestylevalue#1#2#3%
- {\ifcsname#1#2#3\endcsname
- \edef\!!stringa{\csname#1#2#3\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\gobbleoneargument
- \else
- \@EAEAEA\firstofoneargument
- \fi
+ {\edef\!!stringa{\csname#1#2#3\endcsname}%
+ \ifx\!!stringa\empty
+ \@EA\gobbleoneargument
\else
\@EA\firstofoneargument
\fi}
\long\def\doifelsecorrespondencestylevalue#1#2#3%
- {\ifcsname#1#2#3\endcsname
- \edef\!!stringa{\csname#1#2#3\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\secondoftwoarguments
- \else
- \@EAEAEA\firstoftwoarguments
- \fi
- \else
+ {\edef\!!stringa{\csname#1#2#3\endcsname}%
+ \ifx\!!stringa\empty
\@EA\secondoftwoarguments
+ \else
+ \@EA\firstoftwoarguments
\fi}
\def\correspondencestylevalue#1#2#3%
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
index 10ae878ef90..ffb3a6b7ed3 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-correspondence,
-%D version=2009.05.10,
+%D version=2009.07.03,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -136,7 +136,7 @@
{\def\dododosetupcorrespondencelayer##1%
{\def\dodododosetupcorrespondencelayer####1%
{\ifcsname dosetupcorrespondencelayer####1\endcsname
- \@EA\@EA\csname dosetupcorrespondencelayer####1\endcsname
+ \@EAEA\csname dosetupcorrespondencelayer####1\endcsname
\else
\@EA\dosetupcorrespondencelayeroption
\fi[#1][#2][##1][#5]}%
@@ -159,66 +159,54 @@
{\dodoubleargument\dodefinecorrespondencevalue}
\def\dodefinecorrespondencevalue[#1][#2]%
- {\setvalue{\e!setup#1\e!endsetup}{\dotripleempty\docorrespondencesetup[#2]}%
- \@EA\definecomplexorsimple\csname\e!set#1\e!value\endcsname
- \setvalue{\e!complex\e!set#1\e!value}[##1]##2{\setvalue{#2##1}{##2}}%
- \setvalue{\e!simple \e!set#1\e!value}##1##2{\setvalue{#2##1}{##2}}}
+ {\setvalue{\e!setup#1\e!endsetup}{\dotripleempty\docorrespondencesetupvalue[#2]}%
+ \setvalue{\e!set#1\e!value}##1{\doquadrupleempty\docorrespondencesetvalue[#1][#2][##1]}}
-\def\docorrespondencesetup[#1][#2][#3]%
+\def\docorrespondencesetupvalue[#1][#2][#3]%
{\doifelsenothing{#3}
{\getparameters[#1][#2]}
- {\def\dodocorrespondencesetup##1%
+ {\def\dodocorrespondencesetupvalue##1%
{\getparameters[#1##1][#3]}%
- \processcommalist[#2]\dodocorrespondencesetup}}
+ \processcommalist[#2]\dodocorrespondencesetupvalue}}
+
+\def\docorrespondencesetvalue[#1][#2][#3][#4]#5%
+ {\iffourthargument
+ \setuplabeltext[\currentmainlanguage][#1:#3=#4]%
+ \fi
+ \setvalue{#2#3}{#5}}
%D Tests
\long\def\doifcorrespondencevalue#1#2%
- {\ifcsname#1#2\endcsname
- \edef\!!stringa{\csname#1#2\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\gobbleoneargument
- \else
- \@EAEAEA\firstofoneargument
- \fi
- \else
+ {\edef\!!stringa{\csname#1#2\endcsname}%
+ \ifx\!!stringa\empty
\@EA\gobbleoneargument
+ \else
+ \@EA\firstofoneargument
\fi}
\long\def\doifelsecorrespondencevalue#1#2%
- {\ifcsname#1#2\endcsname
- \edef\!!stringa{\csname#1#2\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\secondoftwoarguments
- \else
- \@EAEAEA\firstoftwoarguments
- \fi
- \else
+ {\edef\!!stringa{\csname#1#2\endcsname}%
+ \ifx\!!stringa\empty
\@EA\secondoftwoarguments
+ \else
+ \@EA\firstoftwoarguments
\fi}
\long\def\doifcorrespondencestylevalue#1#2#3%
- {\ifcsname#1#2#3\endcsname
- \edef\!!stringa{\csname#1#2#3\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\gobbleoneargument
- \else
- \@EAEAEA\firstofoneargument
- \fi
+ {\edef\!!stringa{\csname#1#2#3\endcsname}%
+ \ifx\!!stringa\empty
+ \@EA\gobbleoneargument
\else
\@EA\firstofoneargument
\fi}
\long\def\doifelsecorrespondencestylevalue#1#2#3%
- {\ifcsname#1#2#3\endcsname
- \edef\!!stringa{\csname#1#2#3\endcsname}%
- \ifx\!!stringa\empty
- \@EAEAEA\secondoftwoarguments
- \else
- \@EAEAEA\firstoftwoarguments
- \fi
- \else
+ {\edef\!!stringa{\csname#1#2#3\endcsname}%
+ \ifx\!!stringa\empty
\@EA\secondoftwoarguments
+ \else
+ \@EA\firstoftwoarguments
\fi}
\def\correspondencestylevalue#1#2#3%
@@ -501,14 +489,14 @@ correspondence.files = {
name = "t-correspondence.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.06.29",
+ version = "2009.07.03",
description = "Core module"
} ,
{
name = "t-letter.tex",
path = "tex/context/third/letter/base/",
type = "base",
- version = "2009.02.13",
+ version = "2009.06.29",
description = "Letter Module"
} ,
@@ -545,21 +533,21 @@ correspondence.files = {
name = "default.nri",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.06.28",
+ version = "2009.06.30",
description = "Default resume interface"
} ,
{
name = "moderncv.nri",
path = "tex/context/third/letter/interface/",
type = "interface",
- version = "2009.03.31",
+ version = "2009.06.30",
description = "moderncv resume interface"
} ,
{
name = "label.nle",
path = "tex/context/third/letter/extension/",
type = "extension",
- version = "2009.06.29",
+ version = "2009.07.03",
description = "Text labels"
} ,
{
@@ -717,13 +705,6 @@ correspondence.files = {
description = "Default resume style"
} ,
{
- name = "modern.nrs",
- path = "tex/context/third/letter/style/",
- type = "style",
- version = "2009.04.10",
- description = "modercv basic style"
- } ,
- {
name = "classic.nrs",
path = "tex/context/third/letter/style/",
type = "style",
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
index 9d89595ae0f..d006ce9885d 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-correspondence,
-%D version=2009.05.10,
+%D version=2009.06.30,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -169,6 +169,8 @@
\setinterfacevariable {email} {email}
\setinterfacevariable {info} {info}
\setinterfacevariable {correspondence} {correspondence}
+ \setinterfacevariable {resumemain} {resumemain}
+ \setinterfacevariable {resumenext} {resumenext}
\stopinterface
\startinterface all
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex b/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
index 0f990c6597d..572366c24d3 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-letter,
-%D version=2009.03.04,
+%D version=2009.06.29,
%D title=\CONTEXT\ User Module,
%D subtitle=Framework for Letters,
%D author=Wolfgang Schuster,
@@ -618,6 +618,9 @@
[\c!alternative=\@@@@lsoptionalternative,
\c!location=] % use the header and footer option instead
+ \setupheader[\c!state=\v!stop] % no header or footer lines from ConTeXt,
+ \setupfooter[\c!state=\v!stop] % both elements are placed with layers
+
\setupbackgrounds
[\v!paper]
[\c!background=\v!color,
@@ -692,8 +695,6 @@
%D
%D Default settings for the option values of the letter.
-\setvalue{\v!letter:\????ls:\v!option}{\v!option}
-
\setupletterstyle
[\v!option]
[\c!marking=\v!yes,
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex b/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
index f752340a563..5fb65d427d7 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
@@ -1,6 +1,6 @@
%D \module
%D [ file=t-resume,
-%D version=2009.02.12,
+%D version=2009.06.30,
%D title=\CONTEXT\ User Module,
%D subtitle=Resumes,
%D author=Wolfgang Schuster,
@@ -41,13 +41,19 @@
\definecorrespondencevalue[\v!resume][\????rd]
%D \macros
-%D {doifresumevalue,doifelseresumevalue,doifresumestylevalue,doifelseresumestylevalue}
+%D {doifresumevalue,doifelseresumevalue,doifresumestylevalue,doifelseresumestylevalue,
+%D defineresumeelement,resetresumeelement,copyresumeelement,resumeelement}
\def\doifresumevalue {\doifcorrespondencevalue \????rd}
\def\doifelseresumevalue {\doifelsecorrespondencevalue \????rd}
\def\doifresumestylevalue {\doifcorrespondencestylevalue \????rs}
\def\doifelseresumestylevalue{\doifelsecorrespondencestylevalue\????rs}
+\def\defineresumeelement{\definecorrespondenceelement[\v!resume]}
+\def\resetresumeelement {\resetcorrespondenceelement [\v!resume]}
+\def\copyresumeelement {\copycorrespondenceelement [\v!resume]}
+\def\resumeelement {\correspondenceelement [\v!resume]}
+
%D \macros
%D {useresumeextension,useresumestyle,useresumeinterface}
@@ -151,6 +157,24 @@
\stopsetups
+%D Free layers to position logos etc.
+
+\dodefineresumelayer[\v!resumemain]
+
+\startsetups[\v!resume:\v!place:\v!resumemain]
+
+ \dosetresumelayer[\v!resumemain]
+
+\stopsetups
+
+\dodefineresumelayer[\v!resumenext]
+
+\startsetups[\v!resume:\v!place:\v!resumenext]
+
+ \dosetresumelayer[\v!resumenext]
+
+\stopsetups
+
%D Title
\dodefineresumesection[\v!title]
@@ -198,7 +222,7 @@
\startlocalsetups[\v!resume:\v!place:\v!topmark]
- \dosetresumelayer[\v!topmark]
+ \dosetheaderfooterlayer[\v!resume][\????rs][\v!topmark]
\stoplocalsetups
@@ -206,7 +230,7 @@
\startlocalsetups[\v!resume:\v!place:\v!botmark]
- \dosetresumelayer[\v!botmark]
+ \dosetheaderfooterlayer[\v!resume][\????rs][\v!botmark]
\stoplocalsetups
@@ -214,7 +238,7 @@
\startlocalsetups[\v!resume:\v!place:\v!cutmark]
- \dosetresumelayer[\v!cutmark]
+ \dosetheaderfooterlayer[\v!resume][\????rs][\v!cutmark]
\stoplocalsetups
@@ -222,14 +246,18 @@
\startlocalsetups[\v!resume:\v!place:\v!usermark]
- \dosetresumelayer[\v!usermark]
+ \dosetheaderfooterlayer[\v!resume][\????rs][\v!usermark]
\stoplocalsetups
- \doif\@@@@rsoptiontopmark \v!yes{\directsetup{\v!resume:\v!place:\v!topmark }}
- \doif\@@@@rsoptionbotmark \v!yes{\directsetup{\v!resume:\v!place:\v!botmark }}
- \doif\@@@@rsoptioncutmark \v!yes{\directsetup{\v!resume:\v!place:\v!cutmark }}
- \doif\@@@@rsoptionusermark\v!yes{\directsetup{\v!resume:\v!place:\v!usermark}}
+ \ifx\@@@@rsoptionmarking\v!yes
+
+ \doif\@@@@rsoptiontopmark \v!yes{\directsetup{\v!resume:\v!place:\v!topmark }}
+ \doif\@@@@rsoptionbotmark \v!yes{\directsetup{\v!resume:\v!place:\v!botmark }}
+ \doif\@@@@rsoptioncutmark \v!yes{\directsetup{\v!resume:\v!place:\v!cutmark }}
+ \doif\@@@@rsoptionusermark\v!yes{\directsetup{\v!resume:\v!place:\v!usermark}}
+
+ \fi
\stopsetups
@@ -246,6 +274,7 @@
\def\resume!list!backgrounds
{\v!resume:\c!backgroundimage,\v!resume:\c!background,%
+ \v!resume:\v!resumenext,\v!resume:\v!resumemain,
\v!resume:\v!head,\v!resume:\v!foot,\v!resume:\v!nexthead,%
\v!resume:\v!nextfoot,\v!resume:\v!topmark,\v!resume:\v!botmark,%
\v!resume:\v!cutmark,\v!resume:\v!usermark}
@@ -266,6 +295,9 @@
[\c!alternative=\@@@@rsoptionalternative,
\c!location=] % use the header and footer option instead
+ \setupheader[\c!state=\v!stop] % no header or footer lines from ConTeXt,
+ \setupfooter[\c!state=\v!stop] % both elements are placed with layers
+
\setupbackgrounds
[\v!paper]
[\c!background=\v!color,
@@ -273,7 +305,7 @@
\setupbackgrounds
[\v!page]
- [\c!setups={\v!resume:\v!place:\v!head,\v!resume:\v!place:\v!foot},
+ [\c!setups={\v!resume:\v!place:\v!head,\v!resume:\v!place:\v!foot,\v!resume:\v!place:\v!foldmark},
\c!background=\resume!list!backgrounds]
\doifresumestylevalue\v!option\c!bodyfont {\setupbodyfont [\@@@@rsoptionbodyfont ]}
@@ -304,30 +336,16 @@
\directsetup{\v!resume:\v!initialize} % Settings at the begin
\directsetup{\v!resume:\v!optimize } % Interface dependend
\directsetup{\v!resume:\v!layout } % Page layout
- \directsetup{\v!resume:\v!reset } % Reset layers
\directsetup{\v!resume:\v!layer } % Place layers
\directsetup{\v!resume:\v!sequence } % Place content
\directsetup{\v!resume:\v!finish } % Settings at the end
\stopsetups
-%D Reset the layer content.
-
-\def\resume!list!resetlayers
- {\v!topmark,\v!botmark,\v!cutmark,\v!usermark}
-
-\def\dodoresetresumelayer#1%
- {\resetlayer[\v!resume:#1]}
-
-\startsetups[\v!resume:\v!reset]
-
- \processcommacommand[\resume!list!resetlayers]\dodoresetresumelayer
-
-\stopsetups
-
\startsetups[\v!resume:\v!layer]
- \doif\@@@@rsoptionmarking \v!yes{\directsetup{\v!resume:\v!place:\v!foldmark}}
+ \doif\@@@@rsoptionresumemain\v!yes{\directsetup{\v!resume:\v!place:\v!resumemain}}
+ \doif\@@@@rsoptionresumenext\v!yes{\directsetup{\v!resume:\v!place:\v!resumenext}}
\stopsetups
diff --git a/Master/texmf-dist/tex/context/third/letter/extension/label.nle b/Master/texmf-dist/tex/context/third/letter/extension/label.nle
index 95a691c6940..b8af7c8ce75 100644
--- a/Master/texmf-dist/tex/context/third/letter/extension/label.nle
+++ b/Master/texmf-dist/tex/context/third/letter/extension/label.nle
@@ -1,6 +1,6 @@
%D \module
%D [ file=label,
-%D version=2009.06.29,
+%D version=2009.07.03,
%D title=\CONTEXT\ Letter Extension,
%D subject=Labels,
%D author=Wolfgang Schuster,
@@ -235,7 +235,7 @@
\setuplabeltext[\s!en][\v!letter:\c!zip=Zip]
\setuplabeltext[\s!nl][\v!letter:\c!zip=]
-\setuplabeltext[\s!de][\v!letter:\c!zip=Postleitzahl] % PLZ?
+\setuplabeltext[\s!de][\v!letter:\c!zip=PLZ]
\setuplabeltext[\s!fr][\v!letter:\c!zip=]
\setuplabeltext[\s!it][\v!letter:\c!zip=]
\setuplabeltext[\s!es][\v!letter:\c!zip=]
@@ -258,24 +258,6 @@
\setuplabeltext[\s!it][\v!letter:\c!street=]
\setuplabeltext[\s!es][\v!letter:\c!street=]
-%D Label: birthday
-
-\setuplabeltext[\s!en][\v!letter:\c!birthday=Birthday]
-\setuplabeltext[\s!nl][\v!letter:\c!birthday=]
-\setuplabeltext[\s!de][\v!letter:\c!birthday=Geburtstag]
-\setuplabeltext[\s!fr][\v!letter:\c!birthday=]
-\setuplabeltext[\s!it][\v!letter:\c!birthday=]
-\setuplabeltext[\s!es][\v!letter:\c!birthday=]
-
-%D Label: skype % for Henning Hraban Ramm
-
-\setuplabeltext[\s!en][\v!letter:\c!skype=Skype]
-\setuplabeltext[\s!nl][\v!letter:\c!skype=Skype]
-\setuplabeltext[\s!de][\v!letter:\c!skype=Skype]
-\setuplabeltext[\s!fr][\v!letter:\c!skype=Skype]
-\setuplabeltext[\s!it][\v!letter:\c!skype=Skype]
-\setuplabeltext[\s!es][\v!letter:\c!skype=Skype]
-
%D \subject{Memo}
%D Label: date
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/default.nri b/Master/texmf-dist/tex/context/third/letter/interface/default.nri
index 2c069b319c1..7ccb61be58b 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/default.nri
+++ b/Master/texmf-dist/tex/context/third/letter/interface/default.nri
@@ -1,6 +1,6 @@
%D \module
%D [ file=default,
-%D version=2009.06.28,
+%D version=2009.06.30,
%D title=\CONTEXT\ Resume Interface,
%D subtitle=Default Interface,
%D author=Wolfgang Schuster,
@@ -88,8 +88,49 @@
\executeifdefined{\v!resume:\v!nextfoot:\@@@@rsnextfootalternative}\donothing
\stopsetups
-\setupresumestyle
- [\v!option]
- [\c!color=blue]
+\defineresumeelement[\v!head][\v!a]
+ {}
+
+\startsetups[\v!resume:\v!head:\v!a]
+
+ \definelayer[resume:head:background]
+
+ \setlayer
+ [resume:head:background]
+ [\c!preset=\v!right\v!bottom,
+ \c!hoffset=1cm,
+ \c!voffset=5mm]
+ {\color[white]{Resume}} % variable
+
+ \setupresumestyle
+ [\v!head]
+ [\c!hoffset=\zeropoint,
+ \c!voffset=\zeropoint,
+ \c!width=\paperwidth,
+ \c!background={color,resume:head:background},
+ \c!backgroundcolor=gray]
+
+\stopsetups
+
+\defineresumeelement[\v!head][\v!b]
+ {}
+
+\startsetups[\v!resume:\v!head:\v!b]
+
+ \setupresumestyle
+ [\v!head]
+ [\c!hoffset=\zeropoint,
+ \c!voffset=\zeropoint,
+ \c!width=\paperwidth,
+ \c!background={color,resume:head:background},
+ \c!backgroundcolor=gray]
+
+\stopsetups
+
+\startsetups[\v!resume:\v!optimize]
+
+ \directsetup{\v!resume:\v!head:\@@@@rsheadalternative}
+
+\stopsetups
\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri b/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
index 94a626422fd..668c888c0d7 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
+++ b/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
@@ -1,6 +1,6 @@
%D \module
%D [ file=moderncv,
-%D version=2009.03.31,
+%D version=2009.06.30,
%D title=\CONTEXT\ Resume Interface,
%D subtitle=moderncv Interface,
%D author=Wolfgang Schuster,
@@ -11,8 +11,50 @@
\unprotect
+%D The moderncv interface enables color by default
+
\setupcolors[\c!state=\v!start]
+%D Resume environment, taken from the default interface
+
+\def\startresume
+ {\bgroup\dosingleempty\dostartresume}
+
+\long\def\dostartresume[#1]#2\stopresume
+ {\iffirstargument
+ \getparameters[\????rd][#1]%
+ \fi
+ \setbuffer[resumecontent]#2\endbuffer
+ \directsetup{\v!resume:\v!place}\egroup}
+
+\def\startresumecontent
+ {\dostartbuffer[resumecontent][startresumecontent][stopresumecontent]}
+
+\setupresume
+ [\c!content={\getbuffer[resumecontent]}]
+
+\startsetups[\v!resume:\v!content]
+\resumevalue\c!content
+\stopsetups
+
+\startsetups[\v!resume:\v!head]
+\executeifdefined{\v!resume:\v!head:\@@@@rsheadalternative}\donothing
+\stopsetups
+
+\startsetups[\v!resume:\v!foot]
+\executeifdefined{\v!resume:\v!foot:\@@@@rsfootalternative}\donothing
+\stopsetups
+
+\startsetups[\v!resume:\v!nexthead]
+\executeifdefined{\v!resume:\v!nexthead:\@@@@rsnextheadalternative}\donothing
+\stopsetups
+
+\startsetups[\v!resume:\v!nextfoot]
+\executeifdefined{\v!resume:\v!nextfoot:\@@@@rsnextfootalternative}\donothing
+\stopsetups
+
+%D Rewrite of the LaTeX package
+
\definemeasure[quotewidth] [.65\textwidth]
\definemeasure[separatorcolumnwidth] [.025\textwidth]
\definemeasure[hintscolumnwidth] [.15\textwidth]
@@ -148,6 +190,10 @@
[\v!nexthead,\v!nextfoot]
[\c!state=\v!next]
+\setupresumestyle
+ [\v!option]
+ [\c!color=blue]
+
\useresumestyle[classic]
\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/modern.nrs b/Master/texmf-dist/tex/context/third/letter/style/modern.nrs
deleted file mode 100644
index 47944a57325..00000000000
--- a/Master/texmf-dist/tex/context/third/letter/style/modern.nrs
+++ /dev/null
@@ -1,156 +0,0 @@
-%D \module
-%D [ file=modern,
-%D version=2009.04.10,
-%D title=\CONTEXT\ Resume Style,
-%D subtitle=Modern Style,
-%D author=Wolfgang Schuster,
-%D date=\currentdate,
-%D copyright=Wolfgang Schuster,
-%D email=schuster.wolfgang@googlemail.com,
-%D license=Public Domain]
-
-\unprotect
-
-\useresumestyle[default]
-
-\setupcolors[\c!state=\v!start]
-
-\definemeasure[quotewidth] [.65\textwidth]
-\definemeasure[separatorcolumnwidth] [.025\textwidth]
-\definemeasure[hintscolumnwidth] [.15\textwidth]
-\definemeasure[maincolumnwidth] [\dimexpr\textwidth-\measure{separatorcolumnwidth}-\measure{hintscolumnwidth}\relax]
-\definemeasure[doubleitemmaincolumnwidth] [\dimexpr(\measure{maincolumnwidth}-\measure{hintscolumnwidth}-\measure{separatorcolumnwidth})/2\relax]
-\definemeasure[listitemsymbolwidth] [2em] % LaTeX assingnment is not possible in ConTeXt
-\definemeasure[listitemmaincolumnwidth] [\dimexpr\measure{maincolumnwidth}-\measure{listitemsymbolwidth}\relax]
-\definemeasure[listdoubleitemmaincolumnwidth][\dimexpr.475\measure{listitemmaincolumnwidth}\relax]
-
-\def\ModerncvSectionCommand#1#2%
- {\hbox to \hsize
- {\blackrule[\c!width=\measure{hintscolumnwidth},\c!height=1ex,\c!depth=-.5ex,\c!color=resume:6]%
- \hskip\measure{separatorcolumnwidth}%
- \vtop{\hsize\measure{maincolumnwidth}#2}}}
-
-\setuphead
- [\v!section]
- [\c!color=resume:7,
- \c!number=\v!no,
- \c!incrementnumber=\v!no,
- \c!before={\blank[2*\v!medium]},
- \c!after={\blank[\v!medium]},
- \c!command=\ModerncvSectionCommand]
-
-\def\ModerncvSubsectionCommand#1#2%
- {\hbox to \hsize
- {\hskip\dimexpr\measure{hintscolumnwidth}+\measure{separatorcolumnwidth}\relax
- \vtop{\hsize\measure{maincolumnwidth}#2}}}
-
-\setuphead
- [\v!subsection]
- [\c!color=resume:8,
- \c!number=\v!no,
- \c!incrementnumber=\v!no,
- \c!before={\blank[2*\v!medium]},
- \c!after={\blank[\v!medium]},
- \c!command=\ModerncvSubsectionCommand]
-
-%D Moderncv compatible commands for the user data.
-
-\def\cvline
- {\dosingleempty\docvline}
-
-\def\docvline[#1]#2#3%
- {\bgroup\dontcomplain
- \starttable[s0|s0rp(\measure{hintscolumnwidth})|s0w(\measure{separatorcolumnwidth})|s0p(\measure{maincolumnwidth})|]
- \NC\doifelsenothing{#2}{~}{\setupinterlinespace\relax#2}\NC\NC\setupinterlinespace\relax#3\NC\NR
- \stoptable
- \egroup
- \doifelsenothing{#1}{\blank[.25em]}{\blank[#1]}}
-
-\def\cvdoubleitem#1#2#3#4%
- {\cvline{#1}
- {\hbox\bgroup
- \vtop{\hsize\measure{doubleitemmaincolumnwidth}#2}%
- \hfill
- \vtop{\hsize\measure{hintscolumnwidth}\raggedleft#3}%
- \hskip\measure{separatorcolumnwidth}%
- \vtop{\hsize\measure{doubleitemmaincolumnwidth}#4}%
- \egroup}}
-
-\def\cvlistitem
- {\dosingleempty\docvlistitem}
-
-\def\docvlistitem[#1]#2% default symbol is \textbullet and not \endash
- {\cvline[none]{}{\doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listitemmaincolumnwidth}#2}}}
-
-\def\cvlistdoubleitem
- {\dosingleempty\docvlistdoubleitem}
-
-\def\docvlistdoubleitem[#1]#2#3%
- {\cvline[none]{}%
- {\hbox\bgroup
- \doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listdoubleitemmaincolumnwidth}#2}%
- \hfill
- \doifsomething{#3}{\doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listdoubleitemmaincolumnwidth}#3}}%
- \egroup}}
-
-\def\cventry#1#2#3#4#5#6%
- {\cvline{#1}
- {{\bf#2}%
- \doifsomething{#3}{, {\it#3}}%
- \doifsomething{#4}{, {#4}}%
- \doifsomething{#5}{, {#5}}%
- .%
- %\doifsomething{#6}{\crlf\vtop{\hsize\measure{maincolumnwidth}\tx#6}}}}% should also work without the box
- \doifsomething{#6}{\crlf\tx#6}}}
-
-\def\cvlanguage#1#2#3%
- {\cvline{#1}
- {\hbox\bgroup
- \vtop{\hsize\dimexpr.225\measure{maincolumnwidth}\relax\bf#2}%
- \hfill
- \vtop{\hsize\dimexpr.725\measure{maincolumnwidth}\relax\raggedleft\itx#3}%
- \egroup}}
-
-\def\cvcomputer#1#2#3#4%
- {\cvdoubleitem{#1}{\tx#2}{#3}{\tx#4}}
-
-%D Page optimation, change the topspace to produce a distance of 2.5em
-%D between the bottom of the header and the first line of text.
-
-\newdimen\resume!height!head
-
-\startsetups[\v!resume:\v!optimize]
-
- \setbox\scratchbox\vbox{\dontcomplain\getvalue{\v!resume:\v!head:\@@@@rsheadalternative}}
-
- \ifdim\htdp\scratchbox>\zeropoint
-
- \global\resume!height!head\htdp\scratchbox
-
- \setupresumestyle
- [\v!firstpage]
- [\c!topspace=\dimexpr\resume!height!head+\resumestylevalue{\v!head\v!layer}\c!voffset+2.5em\relax]
-
- \fi
-
-\stopsetups
-
-\setupresumestyle
- [\v!firstpage,\v!secondpage]
- [\c!backspace=20mm,
- \c!width=168mm,
- \c!header=0pt,
- \c!footer=0pt,
- \c!topspace=30mm,
- \c!bottomspace=40mm,
- \c!height=\v!fit]
-
-\setupresumestyle
- [\v!head,\v!foot]
- [\c!state=\v!start]
-
-\setupresumestyle
- [\v!nexthead,\v!nextfoot]
- [\c!state=\v!next]
-
-\protect \endinput