summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-09 21:26:05 +0000
committerKarl Berry <karl@freefriends.org>2019-05-09 21:26:05 +0000
commit2b2fcc2b3f7e57fe0474bd0215311c5dc60c0322 (patch)
tree3e56765a4a5f040a8772abe90c36e4fa7f500699 /Master
parent77f661c409d3236073d4796d376ecf1ad412be49 (diff)
olsak-misc (9may19)
git-svn-id: svn://tug.org/texlive/trunk@51063 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/olsak-misc/README1
-rw-r--r--Master/texmf-dist/tex/generic/olsak-misc/qrcode.tex11
2 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/generic/olsak-misc/README b/Master/texmf-dist/doc/generic/olsak-misc/README
index e2119d941c9..821a7b7d401 100644
--- a/Master/texmf-dist/doc/generic/olsak-misc/README
+++ b/Master/texmf-dist/doc/generic/olsak-misc/README
@@ -22,6 +22,7 @@ History:
1996--2016 ... files are created and released at
http://petr.olsak.net/ftp/olsak/makra/
<Jun. 2016> ver.1 ... files contributed to CTAN as one "bundle" olsak-misc
+<May 2019> ... qrcode: bug fixed
License:
-------
diff --git a/Master/texmf-dist/tex/generic/olsak-misc/qrcode.tex b/Master/texmf-dist/tex/generic/olsak-misc/qrcode.tex
index dd772736527..4385efb3e23 100644
--- a/Master/texmf-dist/tex/generic/olsak-misc/qrcode.tex
+++ b/Master/texmf-dist/tex/generic/olsak-misc/qrcode.tex
@@ -138,11 +138,10 @@
\fi
}
-
-\long\def\isnextchar#1#2#3{\def\tmpa{#2}\def\tmpb{#3}%
+\long\def\isnextchar#1#2#3{\begingroup\toks0={\endgroup#2}\toks1={\endgroup#3}%
\let\tmp=#1\futurelet\next\isnextcharA
}
-\def\isnextcharA{\ifx\tmp\next\expandafter\tmpa\else\expandafter\tmpb\fi}
+\def\isnextcharA{\the\toks\ifx\tmp\next0\else1\fi\space}
\long\def\xaddto#1#2{\expandafter\xdef\expandafter#1\expandafter{#1#2}}
\let\g@addto@macro=\xaddto
@@ -2759,7 +2758,7 @@
}
\def\qrrestoreB#1{\advance \qr@j by1
\ifx1#1\vrule height\qrmodulesize width\qrmodulesize\else \kern\qrmodulesize\fi
- \ifnum\qr@size=\qr@j \padd\egroup \advance\qr@i by1
+ \ifnum\qr@size=\qr@j \vrule height\qrmodulesize width 0pt \padd\egroup \advance\qr@i by1
\ifnum\qr@size=\qr@i \padd\egroup \let\next=\relax \else \hbox\bgroup\padd \fi
\fi \next
}
@@ -2866,5 +2865,7 @@ Problems:
History
-------
-Jun 2015 released
+Jun. 2015 released
Jul. 2015 \xprncodes=0space (bug fixed)
+Sep. 2018 \isnextchar processed in group
+May 2019 strut included for case of empty line (bug fixed)