From fce3abdfd43404b920cfc76afb8faef4fa5e815c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 31 Jul 2018 20:54:36 +0000 Subject: proofread (31jul18) git-svn-id: svn://tug.org/texlive/trunk@48322 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/proofread/README | 1 + Master/texmf-dist/doc/latex/proofread/README.txt | 1 + Master/texmf-dist/doc/latex/proofread/example.pdf | Bin 67896 -> 29722 bytes Master/texmf-dist/doc/latex/proofread/example.tex | 13 +++++++++++++ .../texmf-dist/doc/latex/proofread/proofread.pdf | Bin 243122 -> 244342 bytes .../texmf-dist/doc/latex/proofread/proofread.vmb | 12 ++++++------ .../source/latex/proofread/proofread.dtx | 11 ++++++++--- .../source/latex/proofread/proofread.ins | 1 + .../texmf-dist/tex/latex/proofread/proofread.sty | 3 ++- 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/latex/proofread/README b/Master/texmf-dist/doc/latex/proofread/README index d368fe06abc..140f0a9624a 100644 --- a/Master/texmf-dist/doc/latex/proofread/README +++ b/Master/texmf-dist/doc/latex/proofread/README @@ -15,3 +15,4 @@ on code for a text highlighting command that was published by Antal Spector-Zabusky 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 index d368fe06abc..140f0a9624a 100644 --- a/Master/texmf-dist/doc/latex/proofread/README.txt +++ b/Master/texmf-dist/doc/latex/proofread/README.txt @@ -15,3 +15,4 @@ on code for a text highlighting command that was published by Antal Spector-Zabusky 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.pdf b/Master/texmf-dist/doc/latex/proofread/example.pdf index 97a542f9155..df15aae0061 100644 Binary files a/Master/texmf-dist/doc/latex/proofread/example.pdf and b/Master/texmf-dist/doc/latex/proofread/example.pdf differ diff --git a/Master/texmf-dist/doc/latex/proofread/example.tex b/Master/texmf-dist/doc/latex/proofread/example.tex index 1844a1dfc36..b289dc535ad 100644 --- a/Master/texmf-dist/doc/latex/proofread/example.tex +++ b/Master/texmf-dist/doc/latex/proofread/example.tex @@ -1,3 +1,4 @@ +%!lualatex \documentclass[12pt]{memoir} \usepackage[dutch]{babel} \usepackage[ @@ -9,7 +10,12 @@ ]{proofread} \usepackage{ctable} \marginparwidth=35mm +\parindent0pt \begin{document} +Note: Accented characters like in \yel[accents]{café} generate an error if compiled +with pdflatex, because the limitations of the soul package; use xelatex or +lualatex instead. + Een canon van het Nederlands verleden. Iedere tijd\footnote{Dit is een voetnoot waarin ik een verbetering @@ -117,5 +123,12 @@ Aan deze proeve van een canon zouden we een motto willen meegeven dat aan toegeschreven: `Hoop is niet vereist om ergens aan te beginnen, succes niet nodig om te volharden.' +\rep{One, +Two, +Three}{ +Four +Five +Six} + \end{document} vim: syntax=proofread diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.pdf b/Master/texmf-dist/doc/latex/proofread/proofread.pdf index ded9f94da3a..03258e52fcd 100644 Binary files a/Master/texmf-dist/doc/latex/proofread/proofread.pdf and b/Master/texmf-dist/doc/latex/proofread/proofread.pdf differ diff --git a/Master/texmf-dist/doc/latex/proofread/proofread.vmb b/Master/texmf-dist/doc/latex/proofread/proofread.vmb index bb27453b3b0..6e6a8580b74 100644 --- a/Master/texmf-dist/doc/latex/proofread/proofread.vmb +++ b/Master/texmf-dist/doc/latex/proofread/proofread.vmb @@ -1265,13 +1265,13 @@ map i i\add{}i map r s\rep{}{}2F{plla map c a\com{}i map n /\\\(add\\|del\\|com\\|hilite\\|rep\\|yel\)//eh -map u ?\\\(\(\(hilite\\|yel\)\(\[[^\]]*\]\)\{0,1}\)\\|\(rep{\_[^}]\{-}}\)\\|\(com\\|del\\|add\)\){\_.\{-}}m`v//e:B !proofread undo0f→xXx`` -map h ?\\\(\(\(hilite\\|yel\)\(\[[^\]]*\]\)\{0,1}\)\\|\(rep{\_[^}]\{-}}\)\\|\(com\\|del\\|add\)\){\_.\{-}}m`v//e:B !proofread honor0f→xXx`` +map u ?\\\(\(\(hilite\\|yel\)\(\[\_[^\]]*\]\)\{0,1}\)\\|\(rep{\_[^}]\{-}}\)\\|\(com\\|del\\|add\)\){\_.\{-}}m`v//e:B !proofread undo0f→xXx`` +map h ?\\\(\(\(hilite\\|yel\)\(\[\_[^\]]*\]\)\{0,1}\)\\|\(rep{\_[^}]\{-}}\)\\|\(com\\|del\\|add\)\){\_.\{-}}m`v//e:B !proofread honor0f→xXx`` -" ?\\\(\(\(hilite\\|yel\)\(\[[^\]]*\]\)\{0,1}\)\\|\(rep{\_[^}]*}\)\\|\(com\\|del\\|add\)\){\_[^}]*} ^ ^ ^ -" < < <--hilite/yel-> <--[...]----> > <--\rep{...}--> <--com/del/add---> ><--{...}--> | | | -" | |_____________________________________| | save position remove ruby scripts' marker back to position -" |__________________________________________________________________________________| +" ?\\\(\(\(hilite\\|yel\)\(\[\_[^\]]*\]\)\{0,1}\)\\|\(rep{\_[^}]*}\)\\|\(com\\|del\\|add\)\){\_[^}]*} ^ ^ ^ +" < < <--hilite/yel-> <--[.....]----> > <--\rep{...}--> <--com/del/add---> ><--{...}--> | | | +" | |_______________________________________| | save position remove ruby scripts' marker back to position +" |____________________________________________________________________________________| set syntax=tex ../bin/proofread [[[1 diff --git a/Master/texmf-dist/source/latex/proofread/proofread.dtx b/Master/texmf-dist/source/latex/proofread/proofread.dtx index 64130fa45ca..11161c71294 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. %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{proofread} %<*package> - [2017/02/28 v1.02 Commands for inserting annotations] + [2018/07/31 v1.03 Commands for inserting annotations] % %<*driver> \documentclass{ltxdoc} @@ -142,8 +142,9 @@ Running "make install" installs the files in the local TeX tree. % - package options doublespacing, onehalfspacing added\\ % - skp command for manual moving down marginnotes\\ % - vim commands are provided for removing notes,\\ -% either honoring or undoing the correction. -% } +% either honoring or undoing the correction.} +%\changes{v1.03}{2018/07/31}{added warning to use xetex or luatex for non-ASCII +% source} % % \begin{abstract}\noindent % The |proofread| package defines a few \LaTeX\ commands that are useful when @@ -159,6 +160,10 @@ Running "make install" installs the files in the local TeX tree. % \end{abstract} % % \section{Usage} +% Note: this package is based on the |soul| package, so if you plan to +% highlight non-ASCII characters, you must compile your source with either +% |xetex|- or |luatex|-based compilers. + % 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 |n| in the following. This diff --git a/Master/texmf-dist/source/latex/proofread/proofread.ins b/Master/texmf-dist/source/latex/proofread/proofread.ins index b730a26705a..37e9b1f730e 100644 --- a/Master/texmf-dist/source/latex/proofread/proofread.ins +++ b/Master/texmf-dist/source/latex/proofread/proofread.ins @@ -51,6 +51,7 @@ Running "make install" installs the files in the local TeX tree. \file{\jobname.sty}{\from{\jobname.dtx}{package}} } \endbatchfile + %% %% Copyright (C) 2017 by Wybo Dekker %% diff --git a/Master/texmf-dist/tex/latex/proofread/proofread.sty b/Master/texmf-dist/tex/latex/proofread/proofread.sty index b853a83637e..554650ef294 100644 --- a/Master/texmf-dist/tex/latex/proofread/proofread.sty +++ b/Master/texmf-dist/tex/latex/proofread/proofread.sty @@ -14,7 +14,8 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{proofread} - [2017/02/28 v1.02 Commands for inserting annotations] + [2018/07/31 v1.03 Commands for inserting annotations] + \RequirePackage{marginnote} \ifx\undefined\DoubleSpacing \RequirePackage{setspace} -- cgit v1.2.3