summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-04 21:12:58 +0000
committerKarl Berry <karl@freefriends.org>2024-02-04 21:12:58 +0000
commit6a6e958edadb4a9649e0204f533b89f2ee9dd55b (patch)
treeb7b55310bbf73ae3e5057ec5e47a4c647c5fe059 /Master/texmf-dist
parentc193f439008eeb0fec40a9777c270cc96161a693 (diff)
hvqrurl (4feb24)
git-svn-id: svn://tug.org/texlive/trunk@69705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/hvqrurl/Changes1
-rw-r--r--Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdfbin113856 -> 115679 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex10
-rw-r--r--Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty17
4 files changed, 22 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/hvqrurl/Changes b/Master/texmf-dist/doc/latex/hvqrurl/Changes
index a14d35f255a..e7b6ca476c6 100644
--- a/Master/texmf-dist/doc/latex/hvqrurl/Changes
+++ b/Master/texmf-dist/doc/latex/hvqrurl/Changes
@@ -1,4 +1,5 @@
hvqrurl.sty:
+0.06 2024-02-03 - fix for introduced bug with linktext
0.05a 2024-02-02 - modified documentation
0.05 2024-01-28 - added optional argument for alternative link text
0.04 2024-01-18 - fix for wrong text
diff --git a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf
index 0ea564f2d73..b5103b9d164 100644
--- a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf
+++ b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex
index 5b0e10dc065..79c2c395ea3 100644
--- a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex
+++ b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex
@@ -1,4 +1,4 @@
-%% $Id: hvqrurl.tex 867 2024-02-02 09:03:16Z herbert $
+%% $Id: hvqrurl.tex 870 2024-02-03 20:38:44Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside=on,usegeometry]{scrartcl}
@@ -82,6 +82,8 @@ QR codes not as a link when using \LPack{hyperref}:
\subsection{No link with \LPack{hyperref}}
+This needs package hyperref, which is loaded by default. With the optional argument
+\Lkeyword{nohyperref} you can prevent the loading of this package.
\begin{lstlisting}
With qrlink=nolink the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}.
@@ -89,7 +91,11 @@ The default setting is qrlink=link.
\end{lstlisting}
With \Lkeyset{qrlink=nolink} the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}.
The default setting is \Lkeyset{qrlink=link}. Without using \LPack{hyperref} this optional argument
-has no meaning.
+has no meaning. The optional argument \Lkeyword{linktext} is also only valid, if hyperref is aktive.
+
+
+
+
\subsection{Color of the QR code}
Without using \LPack{hyperref} the default color is \Lkeyval{black}. It can be changed by
diff --git a/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty b/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty
index 9786732d943..36f90a2638b 100644
--- a/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty
+++ b/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty
@@ -1,4 +1,4 @@
-%% $Id: hvqrurl.sty 867 2024-02-02 09:03:16Z herbert $
+%% $Id: hvqrurl.sty 870 2024-02-03 20:38:44Z herbert $
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -7,7 +7,7 @@
% Copyright 2019,21,23,24 Herbert Voss hvoss@tug.org
%%
\ProvidesPackage{hvqrurl}[%
- 2024/02/02 v.0.05a (Herbert Voss) Supports qr images into the margin (hv)]
+ 2024/02/03 v.0.06 (Herbert Voss) Supports qr images into the margin (hv)]
%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{url}
@@ -16,6 +16,12 @@
\RequirePackage{qrcode}
\RequirePackage{xkeyval}
+\newif\if@no@hyperref \@no@hyperreffalse
+\DeclareOption{nohyperref}{\@no@hyperreftrue}
+\ProcessOptions
+
+\if@no@hyperref\else\RequirePackage{hyperref}\fi
+
\newlength\qr@url@qrheight
\newlength\qr@url@qradjust
@@ -36,19 +42,22 @@
\def\hvqr@url*{\hvqr@@url}
+
\newcommand*\hvqr@@url[2][]{%
\begingroup
\providecommand*\qr@blank{0}%
\ifx\relax#1\relax \else\hvqrset{#1}\fi
+ % Set options for package qrcode
\expandafter\qrset\expandafter{\qr@url@qrlink,height=\qr@url@qrheight,level=\qr@url@qrlevel}%
\ifhv@qrreverse\reversemarginpar\fi
\if@tempswa
- \ifx\relax\qr@url@linktext\relax % alternative link text??
+ \ifx\@empty\qr@url@linktext % alternative link text
\edef\hv@foo{\detokenize\expandafter{#2}}%
+ \url{\hv@foo}%
\else
\edef\hv@foo{\detokenize\expandafter{\qr@url@linktext}}%
+ \href{#2}{\hv@foo}%
\fi
- \expandafter\url\expandafter{\hv@foo}%
\fi
\edef\reserved@a{\noexpand\marginnote{\noexpand\color{qr@url@qrcolor}\noexpand\qrcode{%
\detokenize\expandafter{#2}}}[\qr@url@qradjust]}%