From 08047a6eaaa8623f71990cf8cc9ed8557a6a0a42 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Sep 2010 14:08:22 +0000 Subject: context-letter update (30aug10) git-svn-id: svn://tug.org/texlive/trunk@19742 c570f23f-e606-0410-a88d-b1316a301751 --- .../third/letter/base/t-correspondence.mkii | 6 +- .../third/letter/base/t-correspondence.mkiv | 16 +++--- .../context/third/letter/base/t-correspondence.tex | 2 +- .../tex/context/third/letter/base/t-letter.tex | 9 ++- .../context/third/letter/interface/moderncv.nri | 65 +++++++++++++++------- .../tex/context/third/letter/style/casual.nrs | 8 +-- .../tex/context/third/letter/style/classic.nrs | 2 - 7 files changed, 66 insertions(+), 42 deletions(-) (limited to 'Master/texmf-dist/tex/context') 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 05e999bb1f9..2ab3835f4ea 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=2010.04.04, +%D version=2010.08.27, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, @@ -28,7 +28,7 @@ \setinterfacemessage{correspondence}{2} {-- -- -- not found} \setinterfacemessage{correspondence}{3} {correspage set -- processed (size --)} \setinterfacemessage{correspondence}{4} {--: --} - \setinterfacemessage{correspondence}{5} {your context is too old, you use you need at last version '--'} % not used in mkii + \setinterfacemessage{correspondence}{5} {your context is too old, you need at last version '--'} % not used in mkii \stopinterface %D Page numbering @@ -151,7 +151,7 @@ \getparameters[#2#3\v!layer][#4]} \def\dosetupcorrespondencelayerframe[#1][#2][#3][#4]% - {\setuplocalframed[#2#3\v!frame][#4]} + {\getparameters[#2#3\v!frame][#4]} \def\dosetupcorrespondencelayeroption[#1][#2][#3][#4]% {\getparameters[#2#3][#4]} 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 d805c566b5e..500deb86c96 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=2010.04.04, +%D version=2010.08.27, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, @@ -28,7 +28,7 @@ \setinterfacemessage{correspondence}{2} {-- -- -- not found} \setinterfacemessage{correspondence}{3} {correspage set -- processed (size --)} \setinterfacemessage{correspondence}{4} {--: --} - \setinterfacemessage{correspondence}{5} {your context is too old, you use you need at last version '--'} + \setinterfacemessage{correspondence}{5} {your context is too old, you need at last version '--'} \stopinterface %D Module setup @@ -161,7 +161,7 @@ \getparameters[#2#3\v!layer][#4]} \def\dosetupcorrespondencelayerframe[#1][#2][#3][#4]% - {\setuplocalframed[#2#3\v!frame][#4]} + {\getparameters[#2#3\v!frame][#4]} \def\dosetupcorrespondencelayeroption[#1][#2][#3][#4]% {\getcheckedparameters[#1\v!layer\v!option:#3][#2#3][#4]} @@ -504,14 +504,14 @@ correspondence.files = { name = "t-correspondence.tex", path = "tex/context/third/letter/base/", type = "base", - version = "2010.06.23", + version = "2010.08.27", description = "Core module" } , { name = "t-letter.tex", path = "tex/context/third/letter/base/", type = "base", - version = "2009.10.10", + version = "2010.08.27", description = "Letter Module" } , @@ -555,7 +555,7 @@ correspondence.files = { name = "moderncv.nri", path = "tex/context/third/letter/interface/", type = "interface", - version = "2009.09.20", + version = "2010.08.21", description = "moderncv resume interface" } , { @@ -723,14 +723,14 @@ correspondence.files = { name = "classic.nrs", path = "tex/context/third/letter/style/", type = "style", - version = "2010.03.02", + version = "2010.08.11", description = "modercv classic style" } , { name = "casual.nrs", path = "tex/context/third/letter/style/", type = "style", - version = "2010.03.02", + version = "2010.08.11", description = "modercv casual 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 a8036179235..c3a830cbdf2 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=2010.04.04, +%D version=2010.08.27, %D title=\CONTEXT\ User Module, %D subtitle=Correspondence, %D author=Wolfgang Schuster, 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 34cad56378f..0ce207e77bc 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.10.10, +%D version=2010.08.27, %D title=\CONTEXT\ User Module, %D subtitle=Framework for Letters, %D author=Wolfgang Schuster, @@ -59,6 +59,13 @@ \definecorrespondencesetup[\v!letter\v!style][\v!letter][\????ls] +\def\setupletterlayout [#1]{\setupletterstyle[#1]} +\def\setupletterlayer [#1]{\setupletterstyle[#1]} +\def\setupletterframe [#1]{\setupletterstyle[#1]} +\def\setuplettersection [#1]{\setupletterstyle[#1][\v!layer]} +\def\setupletterdescription[#1]{\setupletterstyle[#1][\v!frame]} +\def\setupletteroptions [#1]{\setupletterstyle[#1]} + %D \macros %D {setupletter} 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 f58e886cca5..5d8df614888 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.09.20, +%D version=2010.08.21, %D title=\CONTEXT\ Resume Interface, %D subtitle=moderncv Interface, %D author=Wolfgang Schuster, @@ -66,17 +66,22 @@ \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}% + {\hskip\dimexpr\measure{hintscolumnwidth}+\measure{separatorcolumnwidth}\relax \vtop{\hsize\measure{maincolumnwidth}#2}}} +\def\ModerncvSectionTextcommand + {\llap + {\blackrule[\c!width=\measure{hintscolumnwidth},\c!height=1ex,\c!depth=-.5ex,\c!color=resume:6]% + \hskip\measure{separatorcolumnwidth}}} + \setuphead [\v!section] [\c!color=resume:7, \c!incrementnumber=\v!no, \c!before={\blank[2*\v!medium]}, \c!after={\blank[\v!medium]}, - \c!command=\ModerncvSectionCommand] + \c!command=\ModerncvSectionCommand, + \c!deeptextcommand=\ModerncvSectionTextcommand] \def\ModerncvSubsectionCommand#1#2% {\hbox to \hsize @@ -104,14 +109,19 @@ \egroup \doifelsenothing{#1}{\blank[.25em]}{\blank[#1]}} -\def\cvdoubleitem#1#2#3#4% - {\cvline{#1} +\def\cvdoubleitem + {\dosingleempty\docvdoubleitem} + +\def\docvdoubleitem[#1]#2#3#4#5% + {\cvline + [#1] + {#2} {\hbox\bgroup - \vtop{\hsize\measure{doubleitemmaincolumnwidth}#2}% + \vtop{\hsize\measure{doubleitemmaincolumnwidth}#3}% \hfill - \vtop{\hsize\measure{hintscolumnwidth}\raggedleft#3}% + \vtop{\hsize\measure{hintscolumnwidth}\raggedleft#4}% \hskip\measure{separatorcolumnwidth}% - \vtop{\hsize\measure{doubleitemmaincolumnwidth}#4}% + \vtop{\hsize\measure{doubleitemmaincolumnwidth}#5}% \egroup}} \def\cvlistitem @@ -131,25 +141,38 @@ \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}}% +\def\cventry + {\dosingleempty\docventry} + +\def\docventry[#1]#2#3#4#5#6#7% + {\cvline + [#1] + {#2} + {{\bf#3}% + \doifsomething{#4}{, {\it#4}}% \doifsomething{#5}{, {#5}}% + \doifsomething{#6}{, {#6}}% .% - \doifsomething{#6}{\crlf\tx#6}}} + \doifsomething{#7}{\crlf\tx#7}}} -\def\cvlanguage#1#2#3% - {\cvline{#1} +\def\cvlanguage + {\dosingleempty\docvlanguage} + +\def\docvlanguage[#1]#2#3#4% + {\cvline + [#1] + {#2} {\hbox\bgroup - \vtop{\hsize\dimexpr.225\measure{maincolumnwidth}\relax\bf#2}% + \vtop{\hsize\dimexpr.225\measure{maincolumnwidth}\relax\bf#3}% \hfill - \vtop{\hsize\dimexpr.725\measure{maincolumnwidth}\relax\raggedleft\itx#3}% + \vtop{\hsize\dimexpr.725\measure{maincolumnwidth}\relax\raggedleft\itx#4}% \egroup}} -\def\cvcomputer#1#2#3#4% - {\cvdoubleitem{#1}{\tx#2}{#3}{\tx#4}} +\def\cvcomputer + {\dosingleempty\docvcomputer} + +\def\docvcomputer[#1]#2#3#4#5% + {\cvdoubleitem[#1]{#2}{\tx#3}{#4}{\tx#5}} %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. diff --git a/Master/texmf-dist/tex/context/third/letter/style/casual.nrs b/Master/texmf-dist/tex/context/third/letter/style/casual.nrs index a0185265f17..7991188e168 100644 --- a/Master/texmf-dist/tex/context/third/letter/style/casual.nrs +++ b/Master/texmf-dist/tex/context/third/letter/style/casual.nrs @@ -1,6 +1,6 @@ %D \module %D [ file=casual, -%D version=2009.03.31, +%D version=2010.08.11, %D title=\CONTEXT\ Resume Style, %D subtitle=Casual Style, %D author=Wolfgang Schuster, @@ -11,10 +11,6 @@ \unprotect -%D I take the layout from the default style. - -\useresumestyle[modern] - %D You can select between different color styles for the elements. %D Colors (moderncv name) @@ -135,7 +131,7 @@ \blackrule[\c!height=2\linewidth,\c!width=\hsize,\c!color=resume:1] \doifresumevalue\v!quote{\blank[\v!line]\attributedresumevalue\v!quote}} -% see beow for a better version +% see below for a better version % % \setvalue{\v!resume:\v!foot:\v!casual}% % {\attributedresumevalue\v!street\space -- \attributedresumevalue\v!town\par diff --git a/Master/texmf-dist/tex/context/third/letter/style/classic.nrs b/Master/texmf-dist/tex/context/third/letter/style/classic.nrs index c386fe1b770..4e04e39e2a4 100644 --- a/Master/texmf-dist/tex/context/third/letter/style/classic.nrs +++ b/Master/texmf-dist/tex/context/third/letter/style/classic.nrs @@ -11,8 +11,6 @@ \unprotect -\useresumestyle[modern] - %D Colors (moderncv names) %D %D \startlines -- cgit v1.2.3