cmpj (16jan13)

git-svn-id: svn://tug.org/texlive/trunk@28862 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 57 insertions, 73 deletions

diff --git a/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty b/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty
index fc4b9dd0788..c0e0268c527 100644
--- a/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty
+++ b/Master/texmf-dist/tex/latex/cmpj/cmpj2.sty
@@ -7,9 +7,9 @@
 %%%    http://www.icmp.lviv.ua/journal/                                  %%%
 %%%    using LaTeX2e                                                     %%%
 %%%                                                                      %%%
-%%%    Last time modified: August 12, 2012                               %%%
+%%%    Last time modified: January 15, 2013                              %%%
 %%%                                                                      %%%
-%%%    Copyright (C) 2012 by the Institute for Condensed Matter Physics  %%%
+%%%    Copyright (C) 2013 by the Institute for Condensed Matter Physics  %%%
 %%%                      of the National Academy of Sciences of Ukraine  %%%
 %%%                      all rights reserved.                            %%%
 %%%                                                                      %%%
@@ -22,11 +22,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cmpj2}
-                [2012/08/12 v2.01
+                [2013/01/15 v2.03
      The Condensed Matter Physics journal package]
 \def\filename{cmpj2.sty}
-\def\fileversion{2.01}
-\def\filedate{2012/08/12}
+\def\fileversion{2.03}
+\def\filedate{2013/01/15}
 \immediate\write32{This is '\filename' v\fileversion \space <\filedate> ^^J%
      the Condensed Matter Physics journal package}
 
@@ -41,6 +41,7 @@
 \RequirePackage{ifthen}
 \RequirePackage[pdfstartview=FitH]{hyperref}
 %\def\href#1#2{}
+\RequirePackage{url}
 \RequirePackage{doi}
 
 \DeclareOption{preprint}{%
@@ -248,8 +249,8 @@
 
 \DeclareOption{eqsecnum}{\eqsecnum}
 
-\def\latsf{cmss}
-\def\cyrsf{cmss}
+\def\lat@sf{cmss}
+\def\cyr@sf{cmss}
 \def\Hv@scale{0.889}
 \def\Pr@scale{0.889}
 \def\cmpj@sf{}
@@ -257,14 +258,14 @@
 \def\cmpj@sf@helvet{
   \IfFileExists{t1phv.fd}{
 %      \RequirePackage[scaled=0.95]{helvet}
-    \def\latsf{phv}
+    \def\lat@sf{phv}
   }{
-    \def\latsf{cmss}
+    \def\lat@sf{cmss}
   }
   \IfFileExists{t2appr.fd}{
-    \def\cyrsf{ppr}
+    \def\cyr@sf{ppr}
   }{
-    \def\cyrsf{cmss}
+    \def\cyr@sf{cmss}
   }
 }
 
@@ -276,8 +277,8 @@
     \RequirePackage[default,scale=0.86]{droidserif}
     \RequirePackage[defaultsans,scale=0.86]{droidsans}
     \RequirePackage[defaultmono,scale=0.86]{droidmono}
-    \def\latsf{fds}
-    \def\cyrsf{fds}
+    \def\lat@sf{fds}
+    \def\cyr@sf{fds}
   }{\cmpj@sf@helvet}
 }
 
@@ -291,32 +292,33 @@
 
 \ProcessOptions
 
+\urlstyle{same}
 \cmpj@sf
 
-\def\hvsf{\sffamily\upshape}
+\def\hv@sf{\sffamily\upshape}
 
 %%  Sectioning  %%
 
 \renewcommand\section{\@startsection {section}{1}{\z@}%
                                    {-3.5ex \@plus -1ex \@minus -.2ex}%
                                    {2.3ex \@plus.2ex}%
-                                   {\normalfont\Large\hvsf\bfseries\mathversion{bold}}}
+                                   {\normalfont\Large\hv@sf\bfseries\mathversion{bold}}}
 \renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
                                      {-3.25ex\@plus -1ex \@minus -.2ex}%
                                      {1.5ex \@plus .2ex}%
-                                     {\normalfont\large\hvsf\bfseries\mathversion{bold}}}
+                                     {\normalfont\large\hv@sf\bfseries\mathversion{bold}}}
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
                                      {-3.25ex\@plus -1ex \@minus -.2ex}%
                                      {1.5ex \@plus .2ex}%
-                                     {\normalfont\normalsize\hvsf\bfseries\mathversion{bold}}}
+                                     {\normalfont\normalsize\hv@sf\bfseries\mathversion{bold}}}
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
                                     {3.25ex \@plus1ex \@minus.2ex}%
                                     {-1em}%
-                                    {\normalfont\normalsize\hvsf\bfseries\mathversion{bold}}}
+                                    {\normalfont\normalsize\hv@sf\bfseries\mathversion{bold}}}
 \renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
                                        {3.25ex \@plus1ex \@minus .2ex}%
                                        {-1em}%
-                                      {\normalfont\normalsize\hvsf\bfseries\mathversion{bold}}}
+                                      {\normalfont\normalsize\hv@sf\bfseries\mathversion{bold}}}
 
 \def\@seccntformat#1{\csname the#1\endcsname.\hspace{0.5em}}
 
@@ -365,9 +367,10 @@
 \def\issue@volume{?}%
 \def\issue@number{?}%
 \def\article@number{?????}
+\def\cp@issue@year{}
 %\def\doi@number{10.XXXX/CMPJ.XX.XXXXX}
 
-\def\issue#1#2#3#4{\def\issue@year{#1}%
+\def\issue#1#2#3#4{\def\issue@year{#1}\def\cp@issue@year{,\space#1}%
                  \def\issue@volume{#2}%
                  \def\issue@number{#3}%
                  \def\article@number{#4}%
@@ -378,27 +381,28 @@
 \def\doinumber#1{\def\doi@number{#1}}
 %\def\bibdoi#1{\href{http://dx.doi.org/#1}{doi:#1}}
 \def\bibdoi{\doi}
+\def\arxiv#1{\href{http://arxiv.org/abs/#1}{arXiv:#1}}
 
-\def\print@title{{\LARGE \hvsf\bfseries\upshape\mathversion{bold} \@title \par}}
+\def\print@title{{\LARGE \hv@sf\bfseries\upshape\mathversion{bold} \@title \par}}
 \def\print@author{%
     \vskip 1.5em%
-    {\hvsf
+    {\hv@sf
       \lineskip .5em%
         \large\upshape\@author\par}
   }
 \def\print@address{\vskip 0.5em
-        \small\hvsf\upshape\@address\par
+        \small\hv@sf\upshape\@address\par
         }
 
 \def\@maketitle{%
   \newpage
   \noindent\parbox[t]{11cm}{%
             \ifthenelse{\equal{1}{\pageref{last@page}}}{%
-            \small\hvsf Condensed Matter Physics,~\issue@year,\space%
+            \small\hv@sf Condensed Matter Physics,~\issue@year,\space%
             Vol.~\issue@volume, No~\issue@number,\space%
             \article@number:\space\pageref{last@page}%
             }{%
-            \small\hvsf Condensed Matter Physics,~\issue@year,\space%
+            \small\hv@sf Condensed Matter Physics,~\issue@year,\space%
             Vol.~\issue@volume, No~\issue@number,\space%
             \article@number:\space1--\pageref{last@page}%
             }%
@@ -431,7 +435,7 @@
   \@ifundefined{@author}{}{\print@author}%
   \@ifundefined{@address}{}{\print@address}%
     \vskip 1em%
-    {\normalsize\hvsf\upshape \@date}%
+    {\normalsize\hv@sf\upshape \@date}%
   }%
   \par
   \vskip 1.5em}
@@ -444,22 +448,22 @@
     \else
       \everypar{\parskip 3pt plus1pt minus2pt
       \parindent=0pt\hangindent=\@titleindent\hangafter=0}
-      \noindent\small\hvsf\upshape\ignorespaces
+      \noindent\small\hv@sf\upshape\ignorespaces
     \fi}
     {\if@twocolumn\else\vskip 1.5em plus 0.2em \fi\upshape}
 
 \newcommand\keywords{\par\vskip 1ex
-        \noindent\raggedright\upshape{\hvsf\bfseries Key words:}\slshape\space}
+        \noindent\raggedright\upshape{\hv@sf\bfseries Key words:}\slshape\space}
 
 \newcommand\pacs{\par\vskip 1ex
-        \noindent\raggedright\upshape{\hvsf\bfseries PACS:}\slshape\space}
+        \noindent\raggedright\upshape{\hv@sf\bfseries PACS:}\slshape\space}
 
 \def\@copyright{}
 \def\author{\@dblarg{\make@author}}
 \long\def\make@author[#1]#2{\gdef\fancy@author{#1}\gdef\@author{#2}\gdef\@copyright{\copyright}}
 
 \def\copyright@size{\small}
-\def\copyright@author{\@author}
+\def\copyright@author{\@author\cp@issue@year}
 \def\authorcopyright{\@ifnextchar[
         \iauthorcopyright{\iauthorcopyright[\small]}}
 \def\iauthorcopyright[#1]#2{\gdef\copyright@size{#1}
@@ -502,10 +506,10 @@
 
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \sbox\@tempboxa{{\small{\hvsf\bfseries #1.} #2}}%
+  \sbox\@tempboxa{{\small{\hv@sf\bfseries #1.} #2}}%
   \setlength{\@captionwidth}{0.9\hsize}
   \ifdim \wd\@tempboxa >\@captionwidth
-    \centerline{\parbox{\@captionwidth}{\small{\hvsf\bfseries #1.} #2}}
+    \centerline{\parbox{\@captionwidth}{\small{\hv@sf\bfseries #1.} #2}}
   \else
     \global \@minipagefalse
     \hb@xt@\@captionwidth{\hfil\box\@tempboxa\hfil}%
@@ -541,31 +545,6 @@
 \renewcommand{\bibnumfmt}[1]{#1.}
 \@ifundefined{bibfont}{\newcommand{\bibfont}{\small}}{\renewcommand{\bibfont}{\small}}
 
-% Collapse citation numbers to ranges.
-
-% \newcount\@tempcntc
-% \def\@citex[#1]#2{\if@filesw\immediate\write\@auxout{\string\citation{#2}}\fi
-%   \@tempcnta\z@\@tempcntb\m@ne\def\@citea{}\@cite{\@for\@citeb:=#2\do
-%     {\@ifundefined
-%        {b@\@citeb}{\@citeo\@tempcntb\m@ne\@citea
-%         \def\@citea{,\penalty\@m\ }{\bf ?}\@warning
-%        {Citation `\@citeb' on page \thepage \space undefined}}%
-%     {\setbox\z@\hbox{\global\@tempcntc0\csname b@\@citeb\endcsname\relax}%
-%      \ifnum\@tempcntc=\z@ \@citeo\@tempcntb\m@ne
-%        \@citea\def\@citea{,\penalty\@m}
-%        \hbox{\csname b@\@citeb\endcsname}%
-%      \else
-%       \advance\@tempcntb\@ne
-%       \ifnum\@tempcntb=\@tempcntc
-%       \else\advance\@tempcntb\m@ne\@citeo
-%       \@tempcnta\@tempcntc\@tempcntb\@tempcntc\fi\fi}}\@citeo}{#1}}
-%
-% \def\@citeo{\ifnum\@tempcnta>\@tempcntb\else\@citea
-%   \def\@citea{,\penalty\@m}%
-%   \ifnum\@tempcnta=\@tempcntb\the\@tempcnta\else
-%    {\advance\@tempcnta\@ne\ifnum\@tempcnta=\@tempcntb \else \def\@citea{--}\fi
-%     \advance\@tempcnta\m@ne\the\@tempcnta\@citea\the\@tempcntb}\fi\fi}
-
 %%  Ukrainian Part  %%
 
 \newcommand\makeukrtitle{
@@ -594,7 +573,7 @@
   \global\let\date\relax
   \global\let\and\relax
 }
-\def\print@ukrtitle{{\Large \hvsf\bfseries\upshape\mathversion{bold} \@title \par}}
+\def\print@ukrtitle{{\Large \hv@sf\bfseries\upshape\mathversion{bold} \@title \par}}
 
 \def\@makeukrtitle{%
 \par\vskip 1.5cm
@@ -603,9 +582,9 @@
   \@ifundefined{@title}{}{\print@ukrtitle}%
   \@ifundefined{@author}{}{\print@author}%
   \@ifundefined{@address}{}{\print@address}%
-%  {\Large \hvsf \bfseries\upshape \@title \par}%
+%  {\Large \hv@sf \bfseries\upshape \@title \par}%
 %    \vskip 1em%
-%    {\normalsize\hvsf\upshape \@date}%
+%    {\normalsize\hv@sf\upshape \@date}%
   }%
   \par
   \vskip 1.5em}
@@ -621,7 +600,7 @@
   \tolerance=3000
   \renewcommand{\encodingdefault}{T2A}
 %  \renewcommand{\sfdefault}{ppr}
-  \renewcommand{\sfdefault}{\cyrsf}
+  \renewcommand{\sfdefault}{\cyr@sf}
   \fontencoding{T2A}\selectfont
   \renewcommand{\addr}[1]{\item}
   \long\def\make@author[##1]##2{\gdef\@author{##2}}
@@ -647,14 +626,14 @@
     \else
       \everypar{\parskip 3pt plus1pt minus2pt
       \parindent=0pt\hangindent=\@titleindent\hangafter=0}
-      \noindent\small\hvsf\upshape\ignorespaces
+      \noindent\small\hv@sf\upshape\ignorespaces
     \fi}
     {\lastpage\if@twocolumn\else\vskip 2em\fi\upshape
      \clearpage\if@twoside \ifodd\c@page\else
      \hbox{}\def\fancy@author{}\def\article@page{}\newpage\if@twocolumn\hbox{}\newpage\fi\fi\fi
      }
   \renewcommand\keywords{\par\vskip 1ex
-      \noindent\raggedright\upshape{\hvsf\bfseries
+      \noindent\raggedright\upshape{\hv@sf\bfseries
         \CYRK\cyrl\cyryu\cyrch\cyro\cyrv\cyrii\space
         \cyrs\cyrl\cyro\cyrv\cyra:}\slshape\space}
 %%
@@ -668,8 +647,8 @@
 
 %%  General  %%
 
-\voffset -1in
-\hoffset -1in
+%\voffset -1in
+%\hoffset -1in
 \textwidth 150mm
 %\textheight 227mm
 \textheight 646pt    % = 227.0430331mm
@@ -678,10 +657,13 @@
 \headsep 6mm
 \addtolength{\topmargin}{-\headheight}
 \addtolength{\topmargin}{-\headsep}
+\addtolength{\topmargin}{-1in}
 \oddsidemargin 35mm
 \setlength{\evensidemargin}{210mm}
 \addtolength{\evensidemargin}{-\textwidth}
 \addtolength{\evensidemargin}{-\oddsidemargin}
+\addtolength{\oddsidemargin}{-1in}
+\addtolength{\evensidemargin}{-1in}
 \baselineskip 15pt
 \newlength{\@titlewidth}
 \newlength{\@titleindent}
@@ -693,7 +675,7 @@
 %\addtolength{\@captionwidth}{-2\parindent}
 \renewcommand{\encodingdefault}{T1}
 %\renewcommand{\sfdefault}{phv}
-\renewcommand{\sfdefault}{\latsf}
+\renewcommand{\sfdefault}{\lat@sf}
 \frenchspacing
 \let\@afterindentfalse\@afterindenttrue
 
@@ -704,8 +686,8 @@
 
 %%  Headings  %%
 
-%\def\sfphv{\fontencoding{T1}\fontfamily{phv}\selectfont\upshape}
-\def\sfphv{\fontencoding{T1}\fontfamily{\latsf}\selectfont\upshape}
+%\def\sf@phv{\fontencoding{T1}\fontfamily{phv}\selectfont\upshape}
+\def\sf@phv{\fontencoding{T1}\fontfamily{\lat@sf}\selectfont\upshape}
 \newcounter{isspage}
 \def\issue@page@odd{}
 \def\issue@page@even{}
@@ -714,6 +696,8 @@
       \setlength{\evensidemargin}{210mm}%
       \addtolength{\evensidemargin}{-\textwidth}%
       \addtolength{\evensidemargin}{-\oddsidemargin}%
+      \addtolength{\oddsidemargin}{-1in}
+      \addtolength{\evensidemargin}{-1in}
                  \setcounter{isspage}{#1}%
                  \addtocounter{isspage}{-1}%
                  \def\issue@page@odd{%
@@ -734,16 +718,16 @@
                      }%
 }
 
-\lhead[\fancyplain{}{}]{\fancyplain{}{\small\sfphv\fancy@title}}
+\lhead[\fancyplain{}{}]{\fancyplain{}{\small\sf@phv\fancy@title}}
 \chead[\fancyplain{}{}]{\fancyplain{}{}}
-\rhead[\fancyplain{}{\small\sfphv\def\refaddr##1{}\fancy@author}]
+\rhead[\fancyplain{}{\small\sf@phv\def\refaddr##1{}\fancy@author}]
       {\fancyplain{}{}}
-\lfoot[\fancyplain{}{\issue@page@even\normalsize\sfphv\article@page}]
+\lfoot[\fancyplain{}{\issue@page@even\normalsize\sf@phv\article@page}]
       {\fancyplain{\copyright@size\@copyright\space\parbox[t]{0.9\textwidth}
-      {\copyright@size\sfphv\def\refaddr##1{}\copyright@author}}{}}
+      {\copyright@size\sf@phv\def\refaddr##1{}\copyright@author}}{}}
 \cfoot[\fancyplain{}{}]{\fancyplain{}{}}
 \rfoot[\fancyplain{}{}]
-      {\fancyplain{\normalsize\sfphv\article@page\issue@page@odd}{\normalsize\sfphv\article@page\issue@page@odd}}
+      {\fancyplain{\normalsize\sf@phv\article@page\issue@page@odd}{\normalsize\sf@phv\article@page\issue@page@odd}}
 \renewcommand{\headrulewidth}{0.4pt}
 \renewcommand{\footrulewidth}{0.4pt}
 \renewcommand{\plainheadrulewidth}{0pt}