summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-02 22:36:57 +0000
committerKarl Berry <karl@freefriends.org>2019-05-02 22:36:57 +0000
commit7e07f181cd206a7cd6bd8a5af0e81b7b710a1976 (patch)
tree2a1331196aaa9de7e3fa5b08449df83eb053f71a
parentbf8dedec03ea810ec4a50f1f1993134a47729640 (diff)
proofread (26apr19)
git-svn-id: svn://tug.org/texlive/trunk@50938 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/proofread/example.pdfbin29722 -> 32432 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proofread/example.tex4
-rw-r--r--Master/texmf-dist/doc/latex/proofread/proofread.hd0
-rw-r--r--Master/texmf-dist/doc/latex/proofread/proofread.pdfbin244342 -> 244494 bytes
-rw-r--r--Master/texmf-dist/doc/latex/proofread/proofread.vmb10
-rw-r--r--Master/texmf-dist/source/latex/proofread/proofread.dtx10
-rw-r--r--Master/texmf-dist/tex/latex/proofread/proofread.sty6
7 files changed, 14 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/proofread/example.pdf b/Master/texmf-dist/doc/latex/proofread/example.pdf
index df15aae0061..4ce3621998c 100644
--- a/Master/texmf-dist/doc/latex/proofread/example.pdf
+++ b/Master/texmf-dist/doc/latex/proofread/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proofread/example.tex b/Master/texmf-dist/doc/latex/proofread/example.tex
index b289dc535ad..856d3bc7e65 100644
--- a/Master/texmf-dist/doc/latex/proofread/example.tex
+++ b/Master/texmf-dist/doc/latex/proofread/example.tex
@@ -107,10 +107,10 @@ 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
+reflectie. Wie en wat verdienen een plek in de canon en waarom? \del{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.
+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
diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.hd b/Master/texmf-dist/doc/latex/proofread/proofread.hd
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/doc/latex/proofread/proofread.hd
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.pdf b/Master/texmf-dist/doc/latex/proofread/proofread.pdf
index 03258e52fcd..7bb903df4e1 100644
--- a/Master/texmf-dist/doc/latex/proofread/proofread.pdf
+++ b/Master/texmf-dist/doc/latex/proofread/proofread.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.vmb b/Master/texmf-dist/doc/latex/proofread/proofread.vmb
index 6e6a8580b74..afa4f820266 100644
--- a/Master/texmf-dist/doc/latex/proofread/proofread.vmb
+++ b/Master/texmf-dist/doc/latex/proofread/proofread.vmb
@@ -1,7 +1,7 @@
" Vimball Archiver by Charles E. Campbell, Jr., Ph.D.
UseVimball
finish
-plugin/visPlugin.vim [[[1
+vis/plugin/visPlugin.vim [[[1
60
" vis.vim:
" Function: Perform an Ex command on a visual highlighted block (CTRL-V).
@@ -63,7 +63,7 @@ unlet s:keepcpo
" ---------------------------------------------------------------------
" Modelines: {{{1
" vim: fdm=marker
-autoload/vis.vim [[[1
+vis/autoload/vis.vim [[[1
339
" vis.vim:
" Function: Perform an Ex command on a visual highlighted block (CTRL-V).
@@ -404,7 +404,7 @@ unlet s:keepcpo
" ------------------------------------------------------------------------------
" Modelines: {{{1
" vim: fdm=marker
-plugin/cecutil.vim [[[1
+vis/plugin/cecutil.vim [[[1
600
" cecutil.vim : save/restore window position
" save/restore mark position
@@ -1006,7 +1006,7 @@ unlet s:keepcpo
" Modelines: {{{1
" ================
" vim: ts=4 fdm=marker
-doc/vis.txt [[[1
+vis/doc/vis.txt [[[1
247
*vis.txt* The Visual Block Tool Sep 07, 2016
@@ -1255,7 +1255,7 @@ Copyright: (c) 2004-2016 by Charles E. Campbell *vis-copyright*
==============================================================================
Modelines: {{{1
vim:tw=78:ts=8:ft=help:fdm=marker
-syntax/proofread.vim [[[1
+proofread/syntax/proofread.vim [[[1
17
" escape sequences for package proofread.sty
map <Esc>d s\del{}<Esc>hp
diff --git a/Master/texmf-dist/source/latex/proofread/proofread.dtx b/Master/texmf-dist/source/latex/proofread/proofread.dtx
index 11161c71294..76fda4d2c8e 100644
--- a/Master/texmf-dist/source/latex/proofread/proofread.dtx
+++ b/Master/texmf-dist/source/latex/proofread/proofread.dtx
@@ -95,7 +95,7 @@ Running "make install" installs the files in the local TeX tree.
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{proofread}
%<*package>
- [2018/07/31 v1.03 Commands for inserting annotations]
+ [2019/04/25 v1.04 Commands for inserting annotations]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -144,7 +144,9 @@ Running "make install" installs the files in the local TeX tree.
% - vim commands are provided for removing notes,\\
% either honoring or undoing the correction.}
%\changes{v1.03}{2018/07/31}{added warning to use xetex or luatex for non-ASCII
-% source}
+% source.}
+%\changes{v1.04}{2019/04/25}{removed overstriking in the \del command, as
+% it forces the text on a single line.}
%
% \begin{abstract}\noindent
% The |proofread| package defines a few \LaTeX\ commands that are useful when
@@ -454,7 +456,6 @@ Running "make install" installs the files in the local TeX tree.
% \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}
@@ -485,8 +486,7 @@ Running "make install" installs the files in the local TeX tree.
% \begin{macrocode}
\newcommand{\del}[1]{%
\com{delete}%
- \sbox\PR@soulbox{\st{#1}}%
- \hilite[red]{{\usebox\PR@soulbox}}%
+ \hilite[red]{#1}%
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/tex/latex/proofread/proofread.sty b/Master/texmf-dist/tex/latex/proofread/proofread.sty
index 554650ef294..f8e6c3e593d 100644
--- a/Master/texmf-dist/tex/latex/proofread/proofread.sty
+++ b/Master/texmf-dist/tex/latex/proofread/proofread.sty
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{proofread}
- [2018/07/31 v1.03 Commands for inserting annotations]
+ [2019/04/25 v1.04 Commands for inserting annotations]
\RequirePackage{marginnote}
\ifx\undefined\DoubleSpacing
@@ -127,7 +127,6 @@
}
\AtBeginDocument{\marginparpush2pt}
\ifx\undefined\marginparmargin\else\marginparmargin{outer}\fi
-\newbox\PR@soulbox
\newcount\PR@markerno\PR@markerno=1
\newcommand{\com}[1]{%
\marginnote{%
@@ -145,8 +144,7 @@
}
\newcommand{\del}[1]{%
\com{delete}%
- \sbox\PR@soulbox{\st{#1}}%
- \hilite[red]{{\usebox\PR@soulbox}}%
+ \hilite[red]{#1}%
}
\newcommand{\yel}[2][]{%
\com{#1}%