diff options
author | Karl Berry <karl@freefriends.org> | 2012-01-17 00:01:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-01-17 00:01:02 +0000 |
commit | d09f4ca68c6df756737f810b80fa1190bd5b57d9 (patch) | |
tree | 6e09bb333920a0ecdbafd99817637e437b999bcf | |
parent | 06cb5c1303792dae4ef9a8828457c61a71985d49 (diff) |
moderncv (16jan12)
git-svn-id: svn://tug.org/texlive/trunk@25126 c570f23f-e606-0410-a88d-b1316a301751
22 files changed, 50 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG index a7c3901f55a..411f0f4cd6c 100644 --- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG +++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG @@ -1,6 +1,13 @@ +version 0.16 (15 Jan 2012) + - added starred versions of \section and \subsection (that are identical to their + non-starred version, to e.g. enable biblatex support as requested by S. Verberkt + (launchpad bug #913102). + - corrected a misalignment of the colored rule in front of the section titles in + the classic and casual styles, as reported by P. Neidhardt (launchpad bug #915910). + version 0.15.1 (23 December 2011) - - corrected a bug in the classic style causing the address font and color not being - carried over newlines, as reported by J. Smith. + - corrected a bug in the classic style causing the address font and color not + being carried over newlines, as reported by J. Smith. version 0.15 (19 December 2011) - corrected list spacing. @@ -39,7 +46,7 @@ version 0.13 (06 November 2011) - added a "purple" color option, as proposed by B. Ravel. - added a 3rd optional argument to the \photo command to control the thickness of the framebox. Setting it to 0pt will disable the frame around the photo, as - requested by T. Krennwallner (launchpad byg #664568). + requested by T. Krennwallner (launchpad bug #664568). version 0.12 (03 August 2010) - prevented pagebreaks after sections and subsections (launchpad bug #409902), diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf Binary files differindex 16680e4a1eb..dc357a6e62c 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex index d18829c78ff..88000040d3f 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template-zh.tex @@ -1,5 +1,5 @@ %% start of file `template-zh.tex'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -18,7 +18,7 @@ \usepackage{CJKutf8} % 调整页面出血 -\usepackage[scale=0.8]{geometry} +\usepackage[scale=0.75]{geometry} %\setlength{\hintscolumnwidth}{3cm} % 如果你希望改变日期栏的宽度 % 个人信息 diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf Binary files differindex 0c6b8376330..9e6d00c9935 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex index f55bcd24b08..c835c0a2b8b 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template.tex +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.tex @@ -1,5 +1,5 @@ %% start of file `template.tex'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -19,7 +19,7 @@ %\usepackage{CJKutf8} % if you need to use CJK to typeset your resume in Chinese, Japanese or Korean % adjust the page margins -\usepackage[scale=0.8]{geometry} +\usepackage[scale=0.75]{geometry} %\setlength{\hintscolumnwidth}{3cm} % if you want to change the width of the column with the dates % personal data diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf Binary files differindex 8545f9c7fa3..304f587cd7f 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf Binary files differindex 49b63a9a693..ea4b7ba8296 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf Binary files differindex c56d27238e1..58a67959dc7 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf Binary files differindex 744c843fd11..c2f5b8cd2d0 100644 --- a/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf +++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_oldstyle_grey.pdf diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls index 8801b9aaee6..cbdcfc04606 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls +++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls @@ -1,5 +1,5 @@ %% start of file `moderncv.cls'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{moderncv}[2011/12/23 v0.15.1 modern curriculum vitae document class] +\ProvidesClass{moderncv}[2012/01/15 v0.16 modern curriculum vitae document class] %------------------------------------------------------------------------------- @@ -252,17 +252,14 @@ % makes a cv section % usage: \section{<title>} \newcommand*{\section}[1]{} -\AtEndPreamble{% - \@ifpackageloaded{natbib} - { - \RequirePackage{suffix} - \WithSuffix\newcommand\section*{\section} - }{} -} +% starred variant, which is identical but defined to allow its use (e.g. for natbib compatibility, who uses \section*{} for the bibliography header) +\RequirePackage{suffix} +\AtBeginDocument{\WithSuffix\newcommand\section*{\section}} % makes a cv subsection % usage: \subsection{title} \newcommand*{\subsection}[1]{} +\AtBeginDocument{\WithSuffix\newcommand\subsection*{\subsection}} % makes a cv line with a header and a corresponding text % usage: \cvitem[spacing]{header}{text} diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty index 45873d9cfb8..2fd270605bb 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorblack.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorblack}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: black] +\ProvidesPackage{moderncvcolorblack}[2012/01/15 v0.16 modern curriculum vitae color scheme: black] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty index 303902d6386..c7107f066ba 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorblue.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorblue}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: blue] +\ProvidesPackage{moderncvcolorblue}[2012/01/15 v0.16 modern curriculum vitae color scheme: blue] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty index 30c960af7d4..a33c4a9d837 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorgreen.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorgreen}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: green] +\ProvidesPackage{moderncvcolorgreen}[2012/01/15 v0.16 modern curriculum vitae color scheme: green] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty index 2e3416fc038..8403d457ba5 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorgrey.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorgrey}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: grey] +\ProvidesPackage{moderncvcolorgrey}[2012/01/15 v0.16 modern curriculum vitae color scheme: grey] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty index 107805d01f2..181af4419ce 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolororange.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolororange}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: orange] +\ProvidesPackage{moderncvcolororange}[2012/01/15 v0.16 modern curriculum vitae color scheme: orange] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty index d751d1c3873..65fb8290eeb 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorpurple.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorpurple}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: purple] +\ProvidesPackage{moderncvcolorpurple}[2012/01/15 v0.16 modern curriculum vitae color scheme: purple] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty index 0940bb6227d..2874efbc6c4 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcolorred.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcolorred}[2011/12/23 v0.15.1 modern curriculum vitae color scheme: red] +\ProvidesPackage{moderncvcolorred}[2012/01/15 v0.16 modern curriculum vitae color scheme: red] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty index 6ccc3a9a29b..c05d480b6ce 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty @@ -1,5 +1,5 @@ %% start of file `moderncvcompatibility.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvcompatibility}[2011/12/23 v0.15.1 modern curriculum vitae compatibility patches] +\ProvidesPackage{moderncvcompatibility}[2012/01/15 v0.16 modern curriculum vitae compatibility patches] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty index ce4b4f12c67..09d33f199b6 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstylecasual.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstylecasual}[2011/12/23 v0.15.1 modern curriculum vitae style scheme: casual] +\ProvidesPackage{moderncvstylecasual}[2012/01/15 v0.16 modern curriculum vitae style scheme: casual] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty index 7e4f540a458..7317ef032d8 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleclassic.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleclassic}[2011/12/23 v0.15.1 modern curriculum vitae style scheme: classic] +\ProvidesPackage{moderncvstyleclassic}[2012/01/15 v0.16 modern curriculum vitae style scheme: classic] %------------------------------------------------------------------------------- @@ -47,7 +47,7 @@ % length used \newlength{\quotewidth} \newlength{\hintscolumnwidth} -\setlength{\hintscolumnwidth}{0.15\textwidth} +\setlength{\hintscolumnwidth}{0.175\textwidth} \newlength{\separatorcolumnwidth} \setlength{\separatorcolumnwidth}{0.025\textwidth} \newlength{\maincolumnwidth} @@ -125,15 +125,17 @@ {{\centering{}\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}% } +\newlength{\baseletterheight} +\settoheight{\baseletterheight}{\sectionstyle{o}} +\setlength{\baseletterheight}{\baseletterheight-0.95ex} \renewcommand*{\section}[1]{% \vspace*{2.5ex}% - \parbox[m]{\hintscolumnwidth}{\raggedleft\hintfont{\color{color1}\rule{\hintscolumnwidth}{1ex}}}% + \parbox[t]{\hintscolumnwidth}{\strut\raggedleft\raisebox{\baseletterheight}{\color{color1}\rule{\hintscolumnwidth}{0.95ex}}}% \phantomsection{}% reset the anchor for hyperrefs \addcontentsline{toc}{part}{#1}% \hspace{\separatorcolumnwidth}% - \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}% + \parbox[t]{\maincolumnwidth}{\strut\sectionstyle{#1}}% \par\nobreak\vskip 1ex\@afterheading}% to avoid a pagebreak after the heading -% starred variant, which is identical but defined to allow its use (e.g. for natbib compatibility, who uses \section*{} for the bibliography header) \renewcommand*{\subsection}[1]{% \begin{tabular}{@{}p{\hintscolumnwidth}@{\hspace{\separatorcolumnwidth}}p{\maincolumnwidth}@{}}% diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty index 8cb5bde6df4..8c7a35ad306 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleempty.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleempty}[2011/12/23 v0.15.1 modern curriculum vitae scheme: empty] +\ProvidesPackage{moderncvstyleempty}[2012/01/15 v0.16 modern curriculum vitae scheme: empty] %------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty index 61678de56c9..8b374e07a62 100644 --- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty +++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty @@ -1,5 +1,5 @@ %% start of file `moderncvstyleoldstyle.sty'. -%% Copyright 2006-2011 Xavier Danaux (xdanaux@gmail.com). +%% Copyright 2006-2012 Xavier Danaux (xdanaux@gmail.com). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License version 1.3c, @@ -10,7 +10,7 @@ % identification %------------------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{moderncvstyleoldstyle}[2011/12/23 v0.15.1 modern curriculum vitae style: oldstyle] +\ProvidesPackage{moderncvstyleoldstyle}[2012/01/15 v0.16 modern curriculum vitae style: oldstyle] %------------------------------------------------------------------------------- |