1 files changed, 87 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/pdfx/rvdtx.sty b/Master/texmf-dist/source/latex/pdfx/rvdtx.sty
index 2160142cfa2..3a13373d532 100644
--- a/Master/texmf-dist/source/latex/pdfx/rvdtx.sty
+++ b/Master/texmf-dist/source/latex/pdfx/rvdtx.sty
@@ -19,14 +19,42 @@
 %
 \newcounter{colorscheme}
 
-\DeclareOption{green}{\setcounter{colorscheme}{1}}
-\DeclareOption{orange}{\setcounter{colorscheme}{0}}
+\DeclareOption{red}{\setcounter{colorscheme}{0}}
+\DeclareOption{green}{\setcounter{colorscheme}{2}}
+\DeclareOption{orange}{\setcounter{colorscheme}{1}}
 \ProcessOptions
 
 \RequirePackage[dvipsnames,svgnames]{xcolor}
 
 \ifcase\thecolorscheme
 %
+% Red color spec (default)
+% 
+ \colorlet{itemcolor}{DarkRed}
+ \colorlet{verbcolor}{Sepia}
+ \colorlet{botrulecolor}{DarkRed}
+ \colorlet{botbgcolor}{DarkRed}
+ \colorlet{botcolor}{white}
+ \colorlet{pgrulecolor}{DarkRed!10}
+ \colorlet{pgbgcolor}{DarkRed!50}
+
+ \colorlet{quicklinkrulecolor}{white}
+ \colorlet{quicklinkcolor}{white}
+ \colorlet{topverticalrule}{white}
+ \colorlet{titlecolor}{white}
+ \colorlet{hlinkcolor}{white}
+ \colorlet{hlinktricolor}{white}
+ \colorlet{linkcolor}{orange}
+ \colorlet{urlcolor}{orange}
+
+ \colorlet{arrayrulecolor}{olive!30}
+ \colorlet{seccolor}{brown}
+
+ \colorlet{toprulecolor}{DarkRed}
+ \colorlet{topbgcolor}{DarkRed}
+ \colorlet{topcolor}{orange}
+\or
+%
 %  Orange color spec (default)
 %
  \colorlet{itemcolor}{brown}
@@ -81,7 +109,7 @@
  \colorlet{topbgcolor}{GreenYellow!20}
  \colorlet{topcolor}{GreenYellow!80}
 \fi
-
+%
 \def\floatpagefraction{.99}
 \usepackage{geometry}
 \geometry{top=2in,
@@ -94,6 +122,7 @@
 \def\pdftex{\textsc{pdf\TeX}\xspace}
 \def\defmacro#1{\texttt{\@bsl#1}}
 \def\thanh{H\`an Th\^e Th\`anh\xspace}
+\def\Thanh{H\`an Th\'{\^e} Th\`anh\xspace}
 
 \let\@DRAFTout@Hook\@empty
 \newcommand{\DRAFTout}{\g@addto@macro\@DRAFTout@Hook}
@@ -169,9 +198,11 @@
 
 \MakeShortVerb{\|}
 
-\IfFileExists{charter.sty}{\RequirePackage{charter}}{}
-\IfFileExists{lfr.sty}{\RequirePackage[scaled=.9]{lfr}}{}
-\IfFileExists{prima.sty}{\RequirePackage[scaled=.8]{prima}}{}
+\IfFileExists{libertine.sty}{\RequirePackage[osf]{libertine}}{}
+\IfFileExists{sourcesanspro.sty}
+   {\RequirePackage[osf,light,semibold]{sourcesanspro}}{}
+\IfFileExists{inconsolata.sty}{\RequirePackage[scaled=.95,noupquote]{inconsolata}
+   \def\ttdefault{zi4}}{\def\ttdefault{cmtt}}
 
 \def\theCodelineNo{\reset@font\tiny\arabic{CodelineNo}}
  
@@ -189,17 +220,36 @@
       {1.5ex \@plus .2ex}%
       {\normalfont\normalsize\bfseries\color{seccolor}}}
 
+\let\sv@section\section
+
+\newwrite\qlinkwrite
+\immediate\openout\qlinkwrite=\jobname.links
+\renewcommand\section{\@ifstar{\star@section}{\normal@section}}
+\def\star@section#1{\def\next{#1}
+    \sv@section*{#1}%
+    \immediate\write\qlinkwrite{\string\fxmark{section.\thesection}%
+     {\expandafter\strip@prefix\meaning\next}}%
+}
+
+\newcommand\normal@section[2][]{\def\next{#1}
+    \ifx\next\@empty\def\next{#2}\else\if#1*\def\next{#1}\fi\fi
+    \sv@section[#1]{#2}%
+    \immediate\write\qlinkwrite{\string\fxmark{section.\thesection}%
+     {\expandafter\strip@prefix\meaning\next}}%
+}
+
 %\RequirePackage[draft]{pdfdraftcopy}
 % \draftstring{}
  \puttext(0,36){\botstring}%
- \puttext(0,840){\copy\topbox}
+ \puttext(0,842){\copy\topbox}
 
 \RequirePackage{colortbl}
 \arrayrulecolor{arrayrulecolor}
 \let\shline\hline
 \def\hline{\noalign{\vskip3pt}\shline\noalign{\vskip4pt}}
 
-\RequirePackage[pdftex,colorlinks]{hyperref}
+\RequirePackage{hyperref}
+\hypersetup{pdftex,colorlinks}
 \def\Hlink#1#2{\hyperlink{#2}{\color{hlinktricolor}%
      $\blacktriangleright$~\color{hlinkcolor}#1}}
  \def\@linkcolor{linkcolor}
@@ -216,10 +266,9 @@
 \def\@keywords{\LaTeX, \xml}
 
 \long\def\Hrule{\\[-4pt]\hspace*{-3em}%
-     {\color{quicklinkrulecolor}\rule{\linewidth}{.1pt}}\\}
+     {\color{quicklinkrulecolor}\rule{\linewidth}{0pt}}\\}
 
-\long\def\dtxmark[#1][#2]#3#4#5{\def\next{#1}%
-     \ifcase\next\or\Hlink{#4}{#3}\Hrule \fi}
+\long\def\fxmark#1#2{\Hlink{#2}{#1}\Hrule}
 
 \newbox\topbox
 \long\def\maketitle{\global\setbox\topbox=\vbox{\hsize=\paperwidth
@@ -227,19 +276,22 @@
     \fcolorbox{toprulecolor}{topbgcolor}%
     {\parbox[t][1.5in][c]{\paperwidth}%
       {\hspace*{15mm}%
-       \parbox[c]{.35\paperwidth}{\fontsize{18pt}{20pt}%
+       \parbox[c]{.475\paperwidth}{\fontsize{18pt}{20pt}%
           \raggedright\normalfont\sffamily \selectfont
-          \color{titlecolor} \@title\\[6pt]
-          {\normalsize\rmfamily\scshape\@author}}%
-%          {\footnotesize\textsc{keywords:} \@keywords}}%
+          \color{titlecolor} \@title\\[12pt]
+          \parbox{\linewidth}{\fontsize{12}{13.5}\fontseries{m}%
+            \sffamily\upshape\selectfont\@author\strut}
+        }%
         \hfill
         \parbox[c][1.5in][c]{1mm}{\color{topverticalrule}%
           \rule{.1pt}{1.5in}}%
         \hfill
         \parbox[c][1.5in][c]{.35\paperwidth}%
         {\normalfont\footnotesize\sffamily\color{quicklinkcolor}%
-           \vspace*{6pt} QUICK LINKS\Hrule
-            \IfFileExists{tmp.out}{\input tmp.out}{}%
+          \raggedcolumns\sffamily\fontsize{7.5}{8}\fontseries{m}\selectfont
+           \begin{multicols}{2}[QUICK LINKS]
+            \IfFileExists{tmp.links}{\input tmp.links}{}%
+           \end{multicols} 
          }\hspace*{5mm}%
       }%
     }%
@@ -247,25 +299,24 @@
 }
 \gdef\botstring{\fcolorbox{botrulecolor}{botbgcolor}%
     {\parbox[t][.5in][t]{\paperwidth}%
-      {\normalfont\sffamily\footnotesize%
+      {\normalfont\sffamily\fontseries{m}\footnotesize\selectfont%
         \color{botcolor}%
         \hspace*{5mm}\parbox[c][.5in][c]{.45\paperwidth}%
          {\raggedright River Valley Technologies,
            \href{http://www.river-valley.com}{%
             \texttt{http://www.river-valley.com}}\\
-            \textsc{sjp} Building, Cotton Hills, Trivandrum
-           695014, India\\  9, Browns Court, Kennford,
-           Exeter, United Kingdom          
+            \textsc{jwra} 34, Jagathy, Trivandrum
+           695014, India
         }\hfill%
        \parbox[c][.5in][c]{1cm}
-        {\centering\sffamily\mdseries
+        {\centering\sffamily\fontseries{m}\selectfont
           \fcolorbox{pgrulecolor}{pgbgcolor}{\thepage}%
         }\hfill
        \parbox[c][.5in][c]{.45\paperwidth}
-        {\raggedleft\begin{tabular}{rl}%
-          Version:&\@version\\
-          Date:&\@date\\
-          Contact:&\@contact
+        {\raggedleft\sffamily\fontsize{7.5}{8}\fontseries{m}\selectfont
+          \begin{tabular}{rl}%
+          Version:&\@version/\@date\\[3pt]
+          Contacts:&\parbox{.3\paperwidth}{\@contact}
          \end{tabular}\hspace*{5mm}%
         }%
       }%
@@ -282,9 +333,9 @@
         \fontfamily\ttdefault
         \fontseries\mddefault
         \fontshape\updefault
-        \color{verbcolor}\small}%
+        \color{verbcolor}\selectfont}%
 
-\def\verbatim@font{\normalfont\color{verbcolor}\ttfamily}
+\def\verbatim@font{\normalfont\color{verbcolor}\fontfamily{zi4}\selectfont}
 
 \def\verb{\relax\ifmmode\hbox\else\leavevmode\null\fi
   \bgroup
@@ -339,6 +390,14 @@
     {\\\hline\end{tabular}\nobreak\@decl@date\par\nobreak
      \vspace{0.75ex}\vskip -\parskip\ignorespacesafterend\noindent}
 
+\def\Small{\fontsize{8.5}{9.5}\selectfont}
+\def\PDF{\@ifnextchar/{\@PDF}{\@@PDF}}
+\def\@PDF/#1{{\Small PDF/#1}}
+\def\PDFVT{{\Small PDF/VT}\xspace}
+\def\@@PDF{{\Small PDF}\xspace}
+\def\ISO{{\Small ISO}\xspace}
+\def\tsc#1{{\Small#1}\xspace}
+
 \endinput
 
 %%