4 files changed, 23 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/hvqrurl/Changes b/Master/texmf-dist/doc/latex/hvqrurl/Changes
index e56ba4a1689..d9bf68a6b3a 100644
--- a/Master/texmf-dist/doc/latex/hvqrurl/Changes
+++ b/Master/texmf-dist/doc/latex/hvqrurl/Changes
@@ -1,4 +1,5 @@
 hvqrurl.sty:    
+0.03  2023-10-29  - fix for # in an url
 0.02  2021-05-18  - added optional argument qrreverse to the set
                     the qr code in the opposite margin
 0.01a 2019-12-01  - fixes to the documentation
diff --git a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf
index c2d85e3b270..69e8e5fa77f 100644
--- a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf
+++ b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.pdf
diff --git a/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex b/Master/texmf-dist/doc/latex/hvqrurl/hvqrurl.tex
index 6f9d96953fa..c3639f6609a 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 1123 2019-12-01 09:16:34Z herbert $
+%% $Id: hvqrurl.tex 790 2023-10-29 15:33:17Z herbert $
 \listfiles
 \errorcontextlines=100
 \documentclass[twoside,usegeometry]{scrartcl}
@@ -11,7 +11,8 @@
 
 \usepackage[showframe=false]{geometry}
 \usepackage{listings}
-\usepackage{makeidx}\makeindex
+\usepackage[imakeidx]{xindex}
+\makeindex
 %
 \lstset{%
     language=[LaTeX]TeX,%
@@ -30,7 +31,6 @@
 
 \usepackage{ragged2e}
 \usepackage{hvqrurl}
-\usepackage{xindex}
 
 \usepackage{hvdoctools}
 
@@ -89,12 +89,12 @@ has no meaning.
 
 \subsection{Color of the QR code}
 Without using \LPack{hyperref} the default color is \Lkeyval{black}. It can be changed by
-the optional argument \Lkeyword{qrcolor}. The package \LPack{xcolor}\hvqrurl*[qrlink=nolink,qrcolor=red!40!white]{http://mirror.ctan.org/pkg/xcolor}
+the optional argument \Lkeyword{qrcolor}. The package \LPack{xcolor}\hvqrurl*[qrlink=nolink,qrcolor=red!40!white]{https://mirror.ctan.org/pkg/xcolor}
  is loaded by default, 
 the reason why an extended color definition is possible. For this example we used
 
 \begin{lstlisting}
-The package xcolor\hvqrurl*[qrcolor=red!40!white]{http://mirror.ctan.org/pkg/xcolor}
+The package xcolor\hvqrurl*[qrcolor=red!40!white]{https://mirror.ctan.org/pkg/xcolor}
  is loaded by default, ...
 \end{lstlisting}
 
@@ -102,13 +102,16 @@ The package xcolor\hvqrurl*[qrcolor=red!40!white]{http://mirror.ctan.org/pkg/xco
 By default the baseline of the QR code is nearly at the same height as the baseline of the textline.
 However, when changing the size of the QR code it may be nessesary to move up or down the QR code.
 The default value of \Lkeyword{qradjust} is \verb|-1.5\normalbaselineskip|. Setting the value
-to 0pt the QR code \hvqrurl*[qrlink=nolink,qradjust=0pt]{http://ctan.org/} is moved down which is the default
+to 0pt the QR code 
+\hvqrurl[qrlink=nolink,qradjust=0pt]{https://latex.texnik.de/tutorials/packages/#header-footer} 
+is moved down which is the default
 setting without a vertical adjustment.
 
 \begin{lstlisting}
 The default value of qradjust is \verb|-1.5\normalbaselineskip|. Setting the value
-to 0pt the QR code \hvqrurl*[qradjust=0pt]{http://ctan.org/} is moved down which is the default
-setting without a vertical adjustment.
+to 0pt the QR code 
+\hvqrurl[qradjust=0pt]{https://latex.texnik.de/tutorials/packages/#header-footer} 
+is moved down which is the default setting without a vertical adjustment.
 \end{lstlisting}
 
 
@@ -147,14 +150,14 @@ controlled internally by the package.
 
 \subsection{Inner or outer margin for  the QR code}
 By default the QR code is set in the right (oneside document) or outer margin (twoside) of the
-document. This one (\hvqrurl{http://hvoss.org}) is at the default position.
+document. This one (\hvqrurl{https://hvoss.org}) is at the default position.
 With the optional argument \Lkeyword{qrreverse} it can be placed in the left or inner margin.
-This one (\hvqrurl[qrreverse]{http://latex.texnik.de}) is in the other margin.
+This one (\hvqrurl[qrreverse]{https://latex.texnik.de}) is in the other margin.
 
 \begin{lstlisting}
-This one (\hvqrurl{http://hvoss.org}) is at the default position.
+This one (\hvqrurl{https://hvoss.org}) is at the default position.
 With the optional argument \Lkeyword{qrreverse} it can be placed in the left or inner margin.
-This one (\hvqrurl[qrreverse]{http://latex.texnik.de}) is in the other margin.
+This one (\hvqrurl[qrreverse]{https://latex.texnik.de}) is in the other margin.
 \end{lstlisting}
 
 
diff --git a/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty b/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty
index 64bc0ead4a7..fa73a30854c 100644
--- a/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty
+++ b/Master/texmf-dist/tex/latex/hvqrurl/hvqrurl.sty
@@ -1,13 +1,13 @@
-%% $Id: hvqrurl.sty 1123 2019-12-01 09:16:34Z herbert $
+%% $Id: hvqrurl.sty 790 2023-10-29 15:33:17Z herbert $
 %%
 %% This file is distributed under the terms of the LaTeX Project Public
 %% License from CTAN archives in directory  macros/latex/base/lppl.txt.
 %% Either version 1.3 or, at your option, any later version.
 %%
-% Copyright 2019,21 Herbert Voss hvoss@tug.org
+% Copyright 2019,21,23 Herbert Voss hvoss@tug.org
 %%
 \ProvidesPackage{hvqrurl}[%
-  2021/05/18 v.0.02 (Herbert Voss) Supports qr images into the margin (hv)] 
+  2023/10/29 v.0.03 (Herbert Voss) Supports qr images into the margin (hv)] 
 %
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{url}
@@ -40,7 +40,10 @@
   \ifx\relax#1\relax \else\hvqrset{#1}\fi
   \expandafter\qrset\expandafter{\qr@url@qrlink,height=\qr@url@qrheight,level=\qr@url@qrlevel}%
   \ifhv@qrreverse\reversemarginpar\fi
-  \if@tempswa\url{#2}\fi
+  \if@tempswa
+    \edef\hv@foo{\detokenize\expandafter{#2}}%
+    \url{\hv@foo}
+  \fi
   \edef\reserved@a{\noexpand\marginnote{\noexpand\color{qr@url@qrcolor}\noexpand\qrcode{%
      \detokenize\expandafter{#2}}}[\qr@url@qradjust]}%
   \reserved@a