summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-07 22:26:05 +0000
committerKarl Berry <karl@freefriends.org>2015-09-07 22:26:05 +0000
commit695a2f60611a97240108f1b90942db770c62ebb7 (patch)
treeda2f3da68ec664bcc49bf59cee6925fc6013e098
parent21a10a7aa5bdb63196dbd1f9843f624fcded25a8 (diff)
proofread (7sep15)
git-svn-id: svn://tug.org/texlive/trunk@38319 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/proofread/README18
-rw-r--r--Master/texmf-dist/doc/latex/proofread/README.txt18
-rw-r--r--Master/texmf-dist/doc/latex/proofread/example.tex102
-rw-r--r--Master/texmf-dist/doc/latex/proofread/proofread.hd0
-rw-r--r--Master/texmf-dist/doc/latex/proofread/proofread.pdfbin0 -> 223889 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proofread/vimrc6
-rw-r--r--Master/texmf-dist/source/latex/proofread/proofread.dtx397
-rw-r--r--Master/texmf-dist/source/latex/proofread/proofread.ins74
-rw-r--r--Master/texmf-dist/tex/latex/proofread/proofread.sty157
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/proofread.tlpsrc0
12 files changed, 774 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/proofread/README b/Master/texmf-dist/doc/latex/proofread/README
new file mode 100644
index 00000000000..89d7aa78f63
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proofread/README
@@ -0,0 +1,18 @@
+|
+---------:| ---------------------------------------------------------------
+proofread:| Commands for inserting annotations
+ Author:| Wybo Dekker
+ E-mail:| wybo@dekkerdocumenten.nl
+ License:| Released under the LaTeX Project Public License v1.3c or later
+ See:| http://www.latex-project.org/lppl.txt
+
+Short description:
+The proofread package defines a few LaTeX commands that are useful
+when you proofread a latex document. These allow you to easily highlight
+text and add comments in the margin. Vim escape sequences are provided
+for inserting these LaTeX commands in the source. The package is based
+on code for a text highlighting command that was published by Antal S-Z
+in http://tex.stackexchange.com/questions/5959.
+The main file, proofread.dtx, is self-extracting, so you can generate the
+style file by compiling proofread.dtx with pdflatex.
+
diff --git a/Master/texmf-dist/doc/latex/proofread/README.txt b/Master/texmf-dist/doc/latex/proofread/README.txt
new file mode 100644
index 00000000000..89d7aa78f63
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proofread/README.txt
@@ -0,0 +1,18 @@
+|
+---------:| ---------------------------------------------------------------
+proofread:| Commands for inserting annotations
+ Author:| Wybo Dekker
+ E-mail:| wybo@dekkerdocumenten.nl
+ License:| Released under the LaTeX Project Public License v1.3c or later
+ See:| http://www.latex-project.org/lppl.txt
+
+Short description:
+The proofread package defines a few LaTeX commands that are useful
+when you proofread a latex document. These allow you to easily highlight
+text and add comments in the margin. Vim escape sequences are provided
+for inserting these LaTeX commands in the source. The package is based
+on code for a text highlighting command that was published by Antal S-Z
+in http://tex.stackexchange.com/questions/5959.
+The main file, proofread.dtx, is self-extracting, so you can generate the
+style file by compiling proofread.dtx with pdflatex.
+
diff --git a/Master/texmf-dist/doc/latex/proofread/example.tex b/Master/texmf-dist/doc/latex/proofread/example.tex
new file mode 100644
index 00000000000..e14aeecd022
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proofread/example.tex
@@ -0,0 +1,102 @@
+\documentclass{article}
+\usepackage[a5paper,right=50mm]{geometry}
+\usepackage[dutch]{babel}
+\usepackage{microtype}
+\usepackage{proofread}
+\begin{document}
+Een canon van het Nederlands verleden.
+
+Iedere tijd ontwerpt een eigen versie van het verleden. Vroeger gebeurde
+dat bij het kampvuur. Later werd dat op scholen meeslepend verteld. Nu zou
+televisie het voor de hand liggende medium zijn. Alleen, dat gebeurt niet.
+Daar \rep{schijnt}{lijkt} de gedachte te heersen dat geschiedenis eigenlijk te saai is
+om een aardig kijkerspubliek te trekken. Daarom krijgt het de vorm van een
+gezelschaps\del{ }spelletje, zoals de verkiezing van `de grootste Nederlander
+aller tijden'.
+
+Het is de vraag op grond van welke kennis de kijkers straks deze
+historische `idol' kiezen. \yel[commentaar op een zin]{Gezien de verbrokkeling van het
+geschiedenisonderwijs kan het hier moeilijk om veel meer gaan dan
+bliksemschichten in het donker.}
+
+Dat er weinig belangstelling zou zijn voor serieuze geschiedenis is een
+merkwaardig vooroordeel in `Hilversum', dat ook heerst in `Den
+Haag'. Alleen al de opmerkelijk hoge oplagen van een auteur als Geert
+Mak zouden op het tegendeel kunnen wijzen.
+
+Weinig behulpzaam zijn pleidooien van al diegenen die, bezield van de meest
+nobele gedachten, beweren dat er geen historisch besef meer bestaat.
+Daarbij blijken zij meestal te bedoelen dat niemand meer een proefwerk kan
+maken dat sommigen van ons nog wel kennen van de middelbare school
+(althans: van v\'o\'or de Mammoetwet): `wie deed wat, wanneer en waarom?'
+Met hoon duikt telkens weer het beruchte proefwerk van het Historisch
+Nieuwsblad op, waarin Kamerleden op dit soort vragen een dikke onvoldoende
+scoorden. Een herhaling onlangs onder `gewone mensen' leverde een nog
+droeviger beeld op.
+
+Naast onwil heerst ook onzekerheid: welk verhaal valt hier te vertellen? De
+schuchterheid over het historisch verhaal is vooral een gevolg van
+veranderingen in de samenleving. Nederland is `ontzuild'. Kerken en
+politieke bewegingen hebben aan overtuigingskracht ingeboet. Het
+(emancipatie-)verleden van de eigen bevolkingsgroep is minder bruikbaar
+geworden. Bijpassende rituelen zijn vervaagd. De geschiedenis is minder
+vanzelfsprekend. Niet langer zijn hieraan wijze lessen en aansporingen te
+ontlenen. Historische kennis is verschraald tot eruditie.
+
+Als we weer historisch besef willen kweken, dan gaat het niet zozeer om de
+weetjes: de jaartallen van rampen, vorsten en ontdekkingen\,---\,al is daar op
+zich\add{zelf} helemaal niets mis mee. Het gaat om de gedachte dat het heden niet
+goed te begrijpen valt zonder enig inzicht in de ontwikkeling tot dat
+heden. Anders gezegd, het gaat om het vermijden van het misverstand dat de
+wereld een schouwtoneel is waarvoor iedere dag het doek opnieuw wordt
+opgehaald.
+
+Tegen deze ambitie klinken doorgaans twee bezwaren. Het eerste is dat dit
+allemaal voortvloeit uit nostalgie. Oude schoolmeesters zouden een
+achterhaald verlangen koesteren naar de overzichtelijkheid van de
+`nationalistische en etnocentrische geschiedschrijving van onze blanke
+voorvaderen'. Dit klinkt al erg genoeg, maar gewoonlijk volgt dan nog dat
+we nu eenmaal in een `postmoderne wereld' leven. De fragmentatie van
+mens en samenleving is niet langer in een consistent verhaal te vatten.
+`Laat duizend bloemen bloeien' en het komt vanzelf wel goed.
+
+Het tweede bezwaar is dat historisch besef op zichzelf, als een manier om
+naar de werkelijkheid te kijken, een tijdelijk verschijnsel is. Het is aan
+het eind van de achttiende eeuw opgekomen, beleefde zijn bloeitijd in de
+negentiende eeuw en zal nu ten onder gaan. We leven in een
+`posthistorische wereld'. Dit bezwaar versterkt de gedachte\,---\,die ook
+bij enkele belangrijke historici leeft\,---\,dat de strijd al is verloren en
+dat het geschiedenisonderwijs maar beter helemaal kan worden afgeschaft.
+Belangstelling voor geschiedenis is op z'n best een oude-mannenkwaal.
+
+En zo mogen we kiezen uit tuchteloosheid of vruchteloosheid. Het gevolg van
+deze verwarring is de opmerkelijke dictatuur van het nu en hier, het
+zogenaamde presentisme. Bijna tien jaar geleden merkte Rudy Kousbroek al
+eens op dat in Nederland, in tegenstelling tot allerlei andere landen,
+vooral de gedachte leeft dat weinig uit het verleden nog interessant of
+waardevol kan zijn: ``Dat is wat in dit land dat eigenaardige gevoel geeft
+dat er een dimensie ontbreekt.'' In het openbare debat is de
+continu\"iteit met het verleden nagenoeg afwezig.
+
+\del{Een dergelijke }\rep{c}{C}ontinu\"iteit wordt \rep{doorgaans}{veelal} gevonden in een canon: een
+geheel aan kennis en inzichten, aan ordening en interpretatie van het
+verleden. Daaraan dienen we meteen toe te voegen dat een dergelijk geheel
+niet onveranderlijk is. Integendeel, een canon mag en kan niet worden
+gecanoniseerd. Essentieel is juist dat deze voortdurend onderwerp is van
+reflectie. Wie en wat verdienen een plek in de canon en waarom? Micha\"el
+Zeeman zei hierover eens: ``De canon leert geen vaststaande grootheden, de
+canon onderwijst lezen, kijken en luisteren, dat is kritisch
+oordelen.'' De canon nodigt uit tot kritiek, tot aanvulling en in ieder
+geval tot gebruik.
+
+We hebben geprobeerd\com{a comment without highlighting} een beknopte canon te formuleren voor de
+`Nederlandse' geschiedenis. Bij de samenstelling hebben drie criteria
+een rol gespeeld. Hoe heeft het huidige Nederland zich gevormd? Welk
+politiek-bestuurlijk systeem was in dit gebied overheersend? Welke
+ontwikkelingen hebben de Nederlandse samenleving sterk hebben be\"invloed?
+
+Aan deze proeve van een canon zouden we een motto willen meegeven dat aan
+\hilite[fill=red, draw=blue,opacity=.5,line width=3pt]{Willem van Oranje}
+is toegeschreven: `Hoop is niet vereist om ergens aan
+te beginnen, succes niet nodig om te volharden.'
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.hd b/Master/texmf-dist/doc/latex/proofread/proofread.hd
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proofread/proofread.hd
diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.pdf b/Master/texmf-dist/doc/latex/proofread/proofread.pdf
new file mode 100644
index 00000000000..f68acc2f58d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proofread/proofread.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proofread/vimrc b/Master/texmf-dist/doc/latex/proofread/vimrc
new file mode 100644
index 00000000000..b06596ed2ea
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/proofread/vimrc
@@ -0,0 +1,6 @@
+" escape sequences for package proofread.sty
+map <Esc>d s\del{}<Esc>hp
+map <Esc>y s\yel[]{}<Esc>PF[li
+map <Esc>a a\add{}<Esc>i
+map <Esc>r s\rep{}{}<Esc>2F{plla
+map <Esc>c a\com{}<Esc>i
diff --git a/Master/texmf-dist/source/latex/proofread/proofread.dtx b/Master/texmf-dist/source/latex/proofread/proofread.dtx
new file mode 100644
index 00000000000..c92c2ce4195
--- /dev/null
+++ b/Master/texmf-dist/source/latex/proofread/proofread.dtx
@@ -0,0 +1,397 @@
+% \iffalse meta-comment
+% vim: textwidth=75
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+|
+---------:| ---------------------------------------------------------------
+proofread:| Commands for inserting annotations
+ Author:| Wybo Dekker
+ E-mail:| wybo@dekkerdocumenten.nl
+ License:| Released under the LaTeX Project Public License v1.3c or later
+ See:| http://www.latex-project.org/lppl.txt
+
+Short description:
+The proofread package defines a few LaTeX commands that are useful
+when you proofread a latex document. These allow you to easily highlight
+text and add comments in the margin. Vim escape sequences are provided
+for inserting these LaTeX commands in the source. The package is based
+on code for a text highlighting command that was published by Antal S-Z
+in http://tex.stackexchange.com/questions/5959.
+The main file, proofread.dtx, is self-extracting, so you can generate the
+style file by compiling proofread.dtx with pdflatex.
+
+%</readme>
+%<*internal>
+\fi
+\def\nameofplainTeX{plain}
+\ifx\fmtname\nameofplainTeX\else
+ \expandafter\begingroup
+\fi
+%</internal>
+%<*install>
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+---------:| ---------------------------------------------------------------
+proofread:| Commands for inserting annotations
+ Author:| Wybo Dekker
+ E-mail:| wybo@dekkerdocumenten.nl
+ License:| Released under the LaTeX Project Public License v1.3c or later
+ See:| http://www.latex-project.org/lppl.txt
+
+\endpreamble
+\postamble
+
+Copyright (C) 2015 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
+version 1.3c of this license or (at your option) any later
+version. The latest version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+Wybo Dekker.
+
+This work consists of the file proofread.dtx and a Makefile.
+Running "make" generates the derived files README, proofread.pdf and
+proofread.sty.
+Running "make inst" installs the files in the user's TeX tree.
+Running "make install" installs the files in the local TeX tree.
+
+\endpostamble
+
+\usedir{tex/latex/proofread}
+\generate{
+ \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+%</install>
+%<install>\endbatchfile
+%<*internal>
+\usedir{source/latex/proofread}
+\generate{
+ \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\nopreamble\nopostamble
+\usedir{doc/latex/proofread}
+\generate{
+ \file{README.txt}{\from{\jobname.dtx}{readme}}
+}
+\ifx\fmtname\nameofplainTeX
+ \expandafter\endbatchfile
+\else
+ \expandafter\endgroup
+\fi
+%</internal>
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{proofread.dtx}
+%</driver>
+%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<package>\ProvidesPackage{proofread}
+%<*package>
+ [2015/09/06 v1.00 Commands for inserting annotations]
+%</package>
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry}
+\usepackage[numbered]{hypdoc}
+\usepackage{microtype}
+\usepackage{\jobname}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\parindent0pt\parskip2ex
+\makeatletter
+\def\com#1{\relax}
+\begin{document}
+ \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \GetFileInfo{\jobname.dtx}
+% \DoNotIndex{\newcommand, \DeclareRobustCommand, \RequirePackage, \add,
+% \advance, \begin, \bgroup, \coordinate, \def, \del, \discretionary,
+% \egroup, \end, \endinput, \endpgfextra, \fi, \fill, \footnotesize,
+% \global, \hbox, \hilite, \ifdef, \ifdim, \marginpar, \marginparmargin,
+% \marginparpush, \mbox, \newbox, \newcount, \newdimen, \p, \path,
+% \pgfextra, \rep, \sbox, \st, \the, \tikz, \tikzset, \usebox,
+% \usetikzlibrary, \y, \yel
+% }
+%
+%\title{\textsf{proofread} --- Commands for inserting annotations\thanks{This file
+% describes version \fileversion, last revised \filedate.}
+%}
+%\author{Wybo Dekker\thanks{E-mail: wybo@dekkerdocumenten.nl}}
+%\date{Released \filedate}
+%
+%\maketitle
+%
+%\changes{v1.00}{2015/09/06}{First public release}
+%
+% \begin{abstract}\noindent
+% The |proofread| package defines a few \LaTeX\ commands that are useful
+% when you proofread a latex document. These allow you to easily highlight
+% text and add comments in the margin. Vim escape sequences are provided
+% for inserting these \LaTeX\ commands in the source. The package is based
+% on code for a text highlighting command that was published by Antal S-Z
+% in \href{http://tex.stackexchange.com/questions/5959}{StackExchange}.
+% \end{abstract}
+%
+% \section{Usage}
+% The commands described below display a highlighted phrase in your
+% compiled document and place a comment in the margin, prefixed with a
+% counter, which is indicated with \textit{n} in the following. This
+% counter is useful in the communication with the author of the document.
+%
+% \DescribeMacro{\del}
+% |\del{phrase}| displays \del{phrase} and places \textit{n}:Delete in the
+% margin. In the |vim| editor, you can generate this code by selecting the
+% phrase and typing |<escape>d| if you add the following line to your
+% |.vimrc| file:\footnote{If you made sequences or commands for your own
+% editor, please inform the author; he will include those in this
+% document.}
+%
+% |map <Esc>d s\del{}<Esc>hp|
+%
+% After typing this escape sequence, you will be in normal mode, behind the
+% closing brace.
+%
+% \DescribeMacro{\yel}
+% |\yel[comment]{phrase}| displays \yel{phrase} and places
+% \textit{n}:comment in the margin. In the |vim| editor, you can generate
+% this code by selecting the phrase and typing |<escape>y| if you add the
+% following line to your |.vimrc| file:
+%
+% |map <Esc>y s\yel[]{}<Esc>PF[li|
+%
+% After typing this escape sequence, you will be in insert mode between the
+% square bracket pair, ready to insert the \textit{comment}.
+%
+% \DescribeMacro{\add}
+% |\add{phrase}| displays \add{phrase} and places \textit{n}:Add in the
+% margin. In the |vim| editor, you can generate this code by typing
+% |<escape>a| if you add the following line to your |.vimrc| file:
+%
+% |map <Esc>a a\add{}<Esc>i|
+%
+% After typing this escape sequence, you will be in insert mode between the
+% braces pair, ready to type what should be added.
+%
+% \DescribeMacro{\rep}
+% |\rep{phrase}{replacement}| displays \rep{phrase}{replacement} and places
+% \textit{n}:was:phrase in the margin. In the |vim| editor, you can
+% generate this code by selecting the phrase and typing |<escape>r| if you
+% add the following line to your |.vimrc| file:
+%
+% |map <Esc>r s\rep{}{}<Esc>2F{plla|
+%
+% After typing this escape sequence, you will be in normal mode between
+% the second pair of braces, ready to edit the new content.
+%
+% \DescribeMacro{\com}
+% |\com{comment}| is used by |\del|, |\yel|, |\add|, and |\rep| to place
+% \textit{n}:comment in the margin. You can use it to place comment in the
+% margin without text highlighting. In the |vim| editor, you can insert the
+% command by typing |<escape>c| if you add the following line to your
+% |.vimrc| file:
+%
+% |map <Esc>c a\com{}<Esc>i|
+%
+% After typing this escape sequence, you will be in insert mode between the
+% braces pair, ready to type your comment.
+%
+% \DescribeMacro{\hilite}
+% |\hilite[options]{phrase}| is the command on which the above commands are
+% based. It was published by Antal S-Z in
+% \href{http://tex.stackexchange.com/questions/5959}{StackExchange}.
+% It highlights the phrase with the default colour, yellow, using the
+% default fill opacity, 0.25; but using the options, you can change this.
+% For example,
+% \hilite[fill=blue,draw=yellow,opacity=.5,line width=3pt]{this phrase}
+% was highlighted with blue, with a 3pt width line in yellow around it,
+% with the command:
+%
+% |\hilite[fill=blue,draw=yellow,opacity=.5,line width=3pt}|
+%
+% Both the fill color and the draw color get 50\% opacity, but you can set
+% each individually with the |fill opacity| and |draw opacity| options.
+% See the documentation of the tikz package for more options.
+%
+%\StopEventually{^^A
+% \PrintChanges
+% \PrintIndex
+%}
+%
+% \section{Implementation}
+%
+% \begin{macrocode}
+%<*package>
+% \end{macrocode}
+
+% The following code for a text highlighting command (here renamed to
+% |\hilite| was published by Antal S-Z in
+% \href{http://tex.stackexchange.com/questions/5959}{StackExchange}.
+% \begin{macrocode}
+\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}}%
+}
+
+\PR@defhiliter{yellow}{.25}
+
+\newcommand{\PR@hilite@Dohilite}{
+ \fill [ decoration = {random steps, amplitude=1pt, segment length=15pt}
+ , outer sep = -15pt, inner sep = 0pt, decorate
+ , every hiliter, this hiliter ]
+ ($(begin hilite)+(0,8pt)$) rectangle ($(end hilite)+(0,-3pt)$) ;
+}
+
+\newcommand{\PR@hilite@Beginhilite}{
+ \coordinate (begin hilite) at (0,0) ;
+}
+
+\newcommand{\PR@hilite@Endhilite}{
+ \coordinate (end hilite) at (0,0) ;
+}
+
+\newdimen\PR@hilite@previous
+\newdimen\PR@hilite@current
+% \end{macrocode}
+
+% \begin{macro}{\hilite}
+% \begin{macrocode}
+\DeclareRobustCommand*\hilite[1][]{%
+ \tikzset{this hiliter/.style={#1}}%
+ \SOUL@setup
+ %
+ \def\SOUL@preamble{%
+ \begin{tikzpicture}[overlay, remember picture]
+ \PR@hilite@Beginhilite
+ \PR@hilite@Endhilite
+ \end{tikzpicture}%
+ }%
+ %
+ \def\SOUL@postamble{%
+ \begin{tikzpicture}[overlay, remember picture]
+ \PR@hilite@Endhilite
+ \PR@hilite@Dohilite
+ \end{tikzpicture}%
+ }%
+ %
+ \def\SOUL@everyhyphen{%
+ \discretionary{%
+ \SOUL@setkern\SOUL@hyphkern
+ \SOUL@sethyphenchar
+ \tikz[overlay, remember picture] \PR@hilite@Endhilite ;%
+ }{%
+ }{%
+ \SOUL@setkern\SOUL@charkern
+ }%
+ }%
+ %
+ \def\SOUL@everyexhyphen##1{%
+ \SOUL@setkern\SOUL@hyphkern
+ \hbox{##1}%
+ \discretionary{%
+ \tikz[overlay, remember picture] \PR@hilite@Endhilite ;%
+ }{%
+ }{%
+ \SOUL@setkern\SOUL@charkern
+ }%
+ }%
+ %
+ \def\SOUL@everysyllable{%
+ \begin{tikzpicture}[overlay, remember picture]
+ \path let \p0 = (begin hilite), \p1 = (0,0) in \pgfextra
+ \global\PR@hilite@previous=\y0
+ \global\PR@hilite@current =\y1
+ \endpgfextra (0,0) ;
+ \ifdim\PR@hilite@current < \PR@hilite@previous
+ \PR@hilite@Dohilite
+ \PR@hilite@Beginhilite
+ \fi
+ \end{tikzpicture}%
+ \the\SOUL@syllable
+ \tikz[overlay, remember picture] \PR@hilite@Endhilite ;%
+ }%
+ \SOUL@
+}
+% \end{macrocode}
+% \end{macro}
+% Reduce minimum vertical space between margin paragraphs; if the memoir
+% class is active, use the outer margin:
+% \begin{macrocode}
+\AtEndPreamble{\marginparpush2pt}
+\ifdef{\marginparmargin}{\marginparmargin{outer}}{}
+% \end{macrocode}
+% We need a save box and a counter for prefixing the margin paragraphs:
+% \begin{macrocode}
+\newbox\PR@soulbox
+\newcount\PR@markerno\PR@markerno=1
+% \end{macrocode}
+% \begin{macro}{\com}
+% Make a margin paragraph, in footnote fontsize, prefixed with the counter
+% plus a colon:
+% \begin{macrocode}
+\newcommand{\com}[1]{%
+ \marginpar{%
+ \footnotesize%
+ \the\PR@markerno:#1%
+ }%
+ \advance\PR@markerno1%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\del}
+% \begin{macrocode}
+\newcommand{\del}[1]{%
+ \com{delete}%
+ \sbox\PR@soulbox{\st{#1}}%
+ \hilite[red]{{\usebox\PR@soulbox}}%
+ \bgroup\egroup%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\yel}
+% \begin{macrocode}
+\newcommand{\yel}[2][\mbox{}]{%
+ \com{#1}%
+ \hilite[yellow]{#2}%
+ \bgroup\egroup%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\add}
+% \begin{macrocode}
+\newcommand{\add}[1]{%
+ \com{add}%
+ \hilite[green,draw=blue]{#1}%
+ \bgroup\egroup%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\rep}
+% \begin{macrocode}
+\newcommand{\rep}[2]{%
+ \com{was:#1}%
+ \hilite[blue]{#2}%
+ \bgroup\egroup%
+}
+\endinput
+%</package>
+% \end{macrocode}
+% \end{macro}
+%\Finale
diff --git a/Master/texmf-dist/source/latex/proofread/proofread.ins b/Master/texmf-dist/source/latex/proofread/proofread.ins
new file mode 100644
index 00000000000..0f4b9006540
--- /dev/null
+++ b/Master/texmf-dist/source/latex/proofread/proofread.ins
@@ -0,0 +1,74 @@
+%%
+%% This is file `proofread.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% proofread.dtx (with options: `install')
+%% ---------:| ---------------------------------------------------------------
+%% proofread:| Commands for inserting annotations
+%% Author:| Wybo Dekker
+%% E-mail:| wybo@dekkerdocumenten.nl
+%% License:| Released under the LaTeX Project Public License v1.3c or later
+%% See:| http://www.latex-project.org/lppl.txt
+%%
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+---------:| ---------------------------------------------------------------
+proofread:| Commands for inserting annotations
+ Author:| Wybo Dekker
+ E-mail:| wybo@dekkerdocumenten.nl
+ License:| Released under the LaTeX Project Public License v1.3c or later
+ See:| http://www.latex-project.org/lppl.txt
+
+\endpreamble
+\postamble
+
+Copyright (C) 2015 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
+version 1.3c of this license or (at your option) any later
+version. The latest version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+Wybo Dekker.
+
+This work consists of the file proofread.dtx and a Makefile.
+Running "make" generates the derived files README, proofread.pdf and
+proofread.sty.
+Running "make inst" installs the files in the user's TeX tree.
+Running "make install" installs the files in the local TeX tree.
+
+\endpostamble
+
+\usedir{tex/latex/proofread}
+\generate{
+ \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+\endbatchfile
+%%
+%% Copyright (C) 2015 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
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Wybo Dekker.
+%%
+%% This work consists of the file proofread.dtx and a Makefile.
+%% Running "make" generates the derived files README, proofread.pdf and
+%% proofread.sty.
+%% Running "make inst" installs the files in the user's TeX tree.
+%% Running "make install" installs the files in the local TeX tree.
+%%
+%%
+%% End of file `proofread.ins'.
diff --git a/Master/texmf-dist/tex/latex/proofread/proofread.sty b/Master/texmf-dist/tex/latex/proofread/proofread.sty
new file mode 100644
index 00000000000..0246719cc8a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/proofread/proofread.sty
@@ -0,0 +1,157 @@
+%%
+%% This is file `proofread.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% proofread.dtx (with options: `package')
+%% ---------:| ---------------------------------------------------------------
+%% proofread:| Commands for inserting annotations
+%% Author:| Wybo Dekker
+%% E-mail:| wybo@dekkerdocumenten.nl
+%% License:| Released under the LaTeX Project Public License v1.3c or later
+%% See:| http://www.latex-project.org/lppl.txt
+%%
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{proofread}
+ [2015/09/06 v1.00 Commands for inserting annotations]
+
+\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}}%
+}
+
+\PR@defhiliter{yellow}{.25}
+
+\newcommand{\PR@hilite@Dohilite}{
+ \fill [ decoration = {random steps, amplitude=1pt, segment length=15pt}
+ , outer sep = -15pt, inner sep = 0pt, decorate
+ , every hiliter, this hiliter ]
+ ($(begin hilite)+(0,8pt)$) rectangle ($(end hilite)+(0,-3pt)$) ;
+}
+
+\newcommand{\PR@hilite@Beginhilite}{
+ \coordinate (begin hilite) at (0,0) ;
+}
+
+\newcommand{\PR@hilite@Endhilite}{
+ \coordinate (end hilite) at (0,0) ;
+}
+
+\newdimen\PR@hilite@previous
+\newdimen\PR@hilite@current
+
+\DeclareRobustCommand*\hilite[1][]{%
+ \tikzset{this hiliter/.style={#1}}%
+ \SOUL@setup
+ %
+ \def\SOUL@preamble{%
+ \begin{tikzpicture}[overlay, remember picture]
+ \PR@hilite@Beginhilite
+ \PR@hilite@Endhilite
+ \end{tikzpicture}%
+ }%
+ %
+ \def\SOUL@postamble{%
+ \begin{tikzpicture}[overlay, remember picture]
+ \PR@hilite@Endhilite
+ \PR@hilite@Dohilite
+ \end{tikzpicture}%
+ }%
+ %
+ \def\SOUL@everyhyphen{%
+ \discretionary{%
+ \SOUL@setkern\SOUL@hyphkern
+ \SOUL@sethyphenchar
+ \tikz[overlay, remember picture] \PR@hilite@Endhilite ;%
+ }{%
+ }{%
+ \SOUL@setkern\SOUL@charkern
+ }%
+ }%
+ %
+ \def\SOUL@everyexhyphen##1{%
+ \SOUL@setkern\SOUL@hyphkern
+ \hbox{##1}%
+ \discretionary{%
+ \tikz[overlay, remember picture] \PR@hilite@Endhilite ;%
+ }{%
+ }{%
+ \SOUL@setkern\SOUL@charkern
+ }%
+ }%
+ %
+ \def\SOUL@everysyllable{%
+ \begin{tikzpicture}[overlay, remember picture]
+ \path let \p0 = (begin hilite), \p1 = (0,0) in \pgfextra
+ \global\PR@hilite@previous=\y0
+ \global\PR@hilite@current =\y1
+ \endpgfextra (0,0) ;
+ \ifdim\PR@hilite@current < \PR@hilite@previous
+ \PR@hilite@Dohilite
+ \PR@hilite@Beginhilite
+ \fi
+ \end{tikzpicture}%
+ \the\SOUL@syllable
+ \tikz[overlay, remember picture] \PR@hilite@Endhilite ;%
+ }%
+ \SOUL@
+}
+\AtEndPreamble{\marginparpush2pt}
+\ifdef{\marginparmargin}{\marginparmargin{outer}}{}
+\newbox\PR@soulbox
+\newcount\PR@markerno\PR@markerno=1
+\newcommand{\com}[1]{%
+ \marginpar{%
+ \footnotesize%
+ \the\PR@markerno:#1%
+ }%
+ \advance\PR@markerno1%
+}
+\newcommand{\del}[1]{%
+ \com{delete}%
+ \sbox\PR@soulbox{\st{#1}}%
+ \hilite[red]{{\usebox\PR@soulbox}}%
+ \bgroup\egroup%
+}
+\newcommand{\yel}[2][\mbox{}]{%
+ \com{#1}%
+ \hilite[yellow]{#2}%
+ \bgroup\egroup%
+}
+\newcommand{\add}[1]{%
+ \com{add}%
+ \hilite[green,draw=blue]{#1}%
+ \bgroup\egroup%
+}
+\newcommand{\rep}[2]{%
+ \com{was:#1}%
+ \hilite[blue]{#2}%
+ \bgroup\egroup%
+}
+%%
+%% Copyright (C) 2015 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
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Wybo Dekker.
+%%
+%% This work consists of the file proofread.dtx and a Makefile.
+%% Running "make" generates the derived files README, proofread.pdf and
+%% proofread.sty.
+%% Running "make inst" installs the files in the user's TeX tree.
+%% Running "make install" installs the files in the local TeX tree.
+%%
+%%
+%% End of file `proofread.sty'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 343862ec4ec..d7db3a0997a 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -436,7 +436,7 @@ my @TLP_working = qw(
ppr-prv pracjourn preprint prerex present presentations presentations-en
pressrelease prettyref preview prftree printlen proba probsoln procIAGssymp
prodint productbox program
- progress progressbar proposal properties
+ progress progressbar proofread proposal properties
prosper protex protocol przechlewski-book
psbao pseudocode psfrag psfrag-italian psfragx
psgo psizzl pslatex psnfss pspicture
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index a3e49183748..d1411ba3b44 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -758,6 +758,7 @@ depend probsoln
depend program
depend progress
depend progressbar
+depend proofread
depend properties
depend prosper
depend protex
diff --git a/Master/tlpkg/tlpsrc/proofread.tlpsrc b/Master/tlpkg/tlpsrc/proofread.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/proofread.tlpsrc