summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-23 20:14:53 +0000
committerKarl Berry <karl@freefriends.org>2021-09-23 20:14:53 +0000
commit951f0adfbf70bead76e686bdd9b6c189170442fb (patch)
tree2c6fb2aeb5d8d25b89e2eff44ea135970efb8d3e
parent7a6a9e901f80753b749e8efbcc14098d0f7c1038 (diff)
xmpincl (23sep21)
git-svn-id: svn://tug.org/texlive/trunk@60593 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx18
-rw-r--r--Master/texmf-dist/source/latex/xmpincl/xmpincl.ins4
-rw-r--r--Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty6
3 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx b/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx
index 2b9b8744cd1..7d9acbd5982 100644
--- a/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx
+++ b/Master/texmf-dist/source/latex/xmpincl/xmpincl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2004 by Maarten Sneep <sneep@nat.vu.nl>
+% Copyright (C) 2004 by Maarten Sneep
% -----------------------------------------------------
%
% This work is licensed under the CC-GNU GPL, the human readable license
@@ -20,7 +20,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{xmpincl}
%<*package>
- [2021/08/31 v2.3 Include XMP data in pdflatex]
+ [2021/09/22 v2.4 Include XMP data in pdflatex]
%</package>
%
%<*driver>
@@ -29,7 +29,7 @@
\usepackage{url}
\usepackage{xmpincl}
\hypersetup{colorlinks=true, pdftitle={Including XMP in pdflatex},
- pdfauthor={Maarten Sneep <sneep@nat.vu.nl>},
+ pdfauthor={Maarten Sneep},
pdfsubject={pdflatex and XMP inclusions.}, pdfkeywords={XMP, Creative Commons},
pdfview={FitH}, pdfstartview={FitH}, pdfstartpage={1}, plainpages=false}
\includexmp{license}
@@ -79,6 +79,8 @@
% characters in the xmpi file.}
% \changes{v2.3}{2021/08/31}{Replaced \cs{if}\cs{par} with \cs{ifx}\cs{par}
% because the former caused an error with the new definition of \cs{par}.}
+% \changes{v2.4}{2021/09/22}{Replaced \cs{ifx}\cs{par} with \cs{if}\cs{endline}
+% because the former caused pdf/a validation errors.}
%
% \GetFileInfo{xmpincl.dtx}
%
@@ -90,7 +92,7 @@
%
% \title{The \textsf{XMP} inclusion package\thanks{This document
% corresponds to \textsf{xmpincl.dtx}~\fileversion, dated \filedate.}}
-% \author{Maarten Sneep \\ \href{mailto:sneep@nat.vu.nl}{sneep@nat.vu.nl}}
+% \author{Maarten Sneep}
% \date{\filedate}
%
% \maketitle
@@ -151,7 +153,7 @@
% package. This new release (version 2.0) does add the |<?xpacket ?>|
% tags, if they are \emph{not} present in the |xmp| file.
%
-% \subsection{New in the current release (\fileversion)}
+% \subsection{New in the release v2.1}
%
% There used to be a clash between the Memoir document class and the |ifpdf| package.
% As of version 2005/03/23 v3.9 of |mempatch.sty|, this clash has been removed, and
@@ -289,8 +291,8 @@
}%
% \end{macrocode}
% Start the |\loop|, and read a line. Check if it is equal to the end tag
-% or to |\par|, and if it isn't, write it out to the |.xmpi| file. The
-% check against |\par| ensures that empty lines are skipped, and not
+% or to |\endline|, and if it isn't, write it out to the |.xmpi| file. The
+% check against |\endline| ensures that empty lines are skipped, and not
% replaced by |\par|.
%
% The |\ifeof| test checks whether we've reached the end of the original
@@ -302,7 +304,7 @@
\equal{\mcs@xmpinclEnd}{\xmpinclReadln}%
}{% Note: no if.
}{%
- \ifx\par\xmpinclReadln\else%
+ \if\endline\xmpinclReadln\else%
\immediate\write\xmpinclWrite{\xmpinclReadln}%
\fi%
}%
diff --git a/Master/texmf-dist/source/latex/xmpincl/xmpincl.ins b/Master/texmf-dist/source/latex/xmpincl/xmpincl.ins
index 27915835cf8..fab6a301bcc 100644
--- a/Master/texmf-dist/source/latex/xmpincl/xmpincl.ins
+++ b/Master/texmf-dist/source/latex/xmpincl/xmpincl.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2005 by Maarten Sneep <sneep@nat.vu.nl>
+%% Copyright (C) 2005 by Maarten Sneep
%%
%% This work is licensed under the CC-GNU GPL, the human readable license
%% can be found here, with a link to the full text on this page.
@@ -15,7 +15,7 @@
This is a generated file.
-Copyright (C) 2005 by Maarten Sneep <sneep@nat.vu.nl>
+Copyright (C) 2005 by Maarten Sneep
This work is licensed under the CC-GNU GPL, the human readable license
can be found here, with a link to the full text on this page.
diff --git a/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty b/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty
index 2a0978b54a9..f8cce9d0325 100644
--- a/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty
+++ b/Master/texmf-dist/tex/latex/xmpincl/xmpincl.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2005 by Maarten Sneep <sneep@nat.vu.nl>
+%% Copyright (C) 2005 by Maarten Sneep
%%
%% This work is licensed under the CC-GNU GPL, the human readable license
%% can be found here, with a link to the full text on this page.
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{xmpincl}
- [2021/08/31 v2.3 Include XMP data in pdflatex]
+ [2021/09/22 v2.4 Include XMP data in pdflatex]
\RequirePackage{ifpdf}
\ifpdf\else
\PackageWarningNoLine{xmpincl}%
@@ -66,7 +66,7 @@
\equal{\mcs@xmpinclEnd}{\xmpinclReadln}%
}{% Note: no if.
}{%
- \ifx\par\xmpinclReadln\else%
+ \if\endline\xmpinclReadln\else%
\immediate\write\xmpinclWrite{\xmpinclReadln}%
\fi%
}%