summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/proofread
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-01 22:29:50 +0000
committerKarl Berry <karl@freefriends.org>2017-03-01 22:29:50 +0000
commite3e9184431d3e062adb0f42af32b089090894211 (patch)
tree15d33b8ea56a171a39176ab3c4617233051a058a /Master/texmf-dist/tex/latex/proofread
parent7a887709527e09b9ec3c4343b7236ae9a099fcd8 (diff)
proofread (1mar17)
git-svn-id: svn://tug.org/texlive/trunk@43370 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/proofread')
-rw-r--r--Master/texmf-dist/tex/latex/proofread/proofread.sty76
1 files changed, 57 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/proofread/proofread.sty b/Master/texmf-dist/tex/latex/proofread/proofread.sty
index 49cf6570048..b853a83637e 100644
--- a/Master/texmf-dist/tex/latex/proofread/proofread.sty
+++ b/Master/texmf-dist/tex/latex/proofread/proofread.sty
@@ -14,16 +14,34 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{proofread}
- [2015/12/07 v1.01 Commands for inserting annotations]
-
+ [2017/02/28 v1.02 Commands for inserting annotations]
+\RequirePackage{marginnote}
+\ifx\undefined\DoubleSpacing
+ \RequirePackage{setspace}
+\else
+ \let\setstretch\setSpacing
+ \let\onehalfspacing\OnehalfSpacing
+ \let\doublespacing\DoubleSpacing
+\fi
+\newif\ifPR@spaced\PR@spacedfalse
+\newdimen\PR@unit\PR@unit.6\baselineskip
+\DeclareOption{onehalfspacing}{\onehalfspacing\PR@spacedtrue\PR@unit.525\baselineskip}
+\DeclareOption{doublespacing}{\doublespacing\PR@spacedtrue\PR@unit.35\baselineskip}
+\newif\ifPR@corrected\PR@correctedfalse
+\newif\ifPR@uncorrected\PR@uncorrectedfalse
+\DeclareOption{corrected}{\PR@correctedtrue}
+\DeclareOption{uncorrected}{\PR@uncorrectedtrue}
+\newif\ifPR@frame\PR@framefalse
+\newdimen\PR@lw\PR@lw=0pt
+\DeclareOption{frame}{\PR@lw=.5pt\PR@frametrue}
+\ProcessOptions
\RequirePackage{soul}
\RequirePackage{tikz}
-\RequirePackage{etoolbox}
\usetikzlibrary{calc}
\usetikzlibrary{decorations.pathmorphing}
\newcommand{\PR@defhiliter}[3][]{%
- \tikzset{every hiliter/.style={color=#2, fill opacity=#3, #1}}%
+ \tikzset{every hiliter/.style={fill=#2,fill opacity=#3, #1}}%
}
\PR@defhiliter{yellow}{.25}
@@ -47,7 +65,11 @@
\newdimen\PR@hilite@current
\DeclareRobustCommand*\hilite[1][]{%
- \tikzset{this hiliter/.style={#1}}%
+ \ifPR@frame%
+ \tikzset{this hiliter/.style={#1,draw=black,line width=\PR@lw}}%
+ \else%
+ \tikzset{this hiliter/.style={#1}}%
+ \fi
\SOUL@setup
%
\def\SOUL@preamble{%
@@ -102,40 +124,56 @@
}%
\SOUL@
}
-\AtEndPreamble{\marginparpush2pt}
-\ifdef{\marginparmargin}{\marginparmargin{outer}}{}
+\AtBeginDocument{\marginparpush2pt}
+\ifx\undefined\marginparmargin\else\marginparmargin{outer}\fi
\newbox\PR@soulbox
\newcount\PR@markerno\PR@markerno=1
\newcommand{\com}[1]{%
- \marginpar{%
+ \marginnote{%
+ \setstretch{1}%
+ \raggedright%
\footnotesize%
- \the\PR@markerno:#1%
- }%
+ \the\PR@markerno: #1%
+ }[\PR@skip]%
+ \global\PR@skip0pt
\global\advance\PR@markerno1%
}
+\newdimen\PR@skip\PR@skip0\PR@unit
+\newcommand{\skp}[1][1]{%
+ \PR@skip#1\PR@unit%
+}
\newcommand{\del}[1]{%
\com{delete}%
\sbox\PR@soulbox{\st{#1}}%
\hilite[red]{{\usebox\PR@soulbox}}%
- \bgroup\egroup%
}
-\newcommand{\yel}[2][\mbox{}]{%
+\newcommand{\yel}[2][]{%
\com{#1}%
- \hilite[yellow]{#2}%
- \bgroup\egroup%
+ \hilite{#2}%
}
\newcommand{\add}[1]{%
\com{add}%
- \hilite[green,draw=blue]{#1}%
- \bgroup\egroup%
+ \hilite[green]{#1}%
}
\newcommand{\rep}[2]{%
- \com{was:#1}%
+ \com{was: #1}%
\hilite[blue]{#2}%
- \bgroup\egroup%
}
+\ifPR@uncorrected
+ \ifPR@corrected
+ \PackageError{proofread}{You may not use both the corrected and uncorrected options}
+ \fi
+ \def\com#1{} \def\add#1{} \def\del#1{#1} \def\rep#1#2{#1}
+ \renewcommand{\yel}[2][]{#2}\renewcommand{\hilite}[2][]{#2}
+\else
+ \ifPR@corrected
+ \def\com#1{} \def\add#1{#1} \def\del#1{} \def\rep#1#2{#2}
+ \renewcommand{\yel}[2][]{#2}\renewcommand{\hilite}[2][]{#2}
+ \fi
+\fi
+
%%
-%% Copyright (C) 2015 by Wybo Dekker <wybo@dekkerdocumenten.nl>
+%% Copyright (C) 2017 by Wybo Dekker <wybo@dekkerdocumenten.nl>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either