texlive[61852] Build/source/texk/web2c: [CWEB] Reshuffle '\.pdfURL'

[commits+ascherer at tug.org]

Revision: 61852
          http://tug.org/svn/texlive?view=revision&revision=61852
Author:   ascherer
Date:     2022-02-02 10:48:27 +0100 (Wed, 02 Feb 2022)
Log Message:
-----------
[CWEB] Reshuffle '\.pdfURL' for HiTeX.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex
    trunk/Build/source/texk/web2c/man/ChangeLog
    trunk/Build/source/texk/web2c/man/ctwill.man
    trunk/Build/source/texk/web2c/man/cweb.man

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2022-02-02 09:48:23 UTC (rev 61851)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2022-02-02 09:48:27 UTC (rev 61852)
@@ -1,3 +1,7 @@
+2022-02-02  Andreas Scherer  <https://ascherer.github.io>
+
+	* cwebmac.tex: Reshuffle '\pdfURL' macro for HiTeX.
+
 2022-01-29  Andreas Scherer  <https://ascherer.github.io>
 
 	* Makefile,

Modified: trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex	2022-02-02 09:48:23 UTC (rev 61851)
+++ trunk/Build/source/texk/web2c/cwebdir/cwebmac.tex	2022-02-02 09:48:27 UTC (rev 61852)
@@ -151,16 +151,6 @@
     \special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
       depth \thedepth << /Type /Annot /Subtype /Link
       /Border [0 0 0] /A << /S /GoTo /D (#2) >> >>}\box0\relax}\fi
-\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
-  attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
-      << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
-  \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
-    \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
-      \space depth \thedepth\space << /Border [0 0 0]
-      /Type /Action /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}%
-  \else #1 ({\tt#2})\fi\fi}
-{\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL
-{\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL
 \def\sanitizecommand#1#2{\addtokens\usersanitizer
        {\noexpand\dosanitizecommand\noexpand#1{#2}}}
 \def\dosanitizecommand#1#2{\ifx\nxt#1\addF{#2}\fi}
@@ -304,6 +294,17 @@
 \def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \fi % End of common macros
 
+\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
+  attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
+      << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
+  \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
+    \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
+      \space depth \thedepth\space << /Border [0 0 0]
+      /Type /Action /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}%
+  \else #1 ({\tt#2})\fi\fi}
+{\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL
+{\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL
+
 \def\lapstar{\rlap{*}}
 \def\stsec{\rightskip=0pt % get out of C mode (cf. \B)
   \sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50

Modified: trunk/Build/source/texk/web2c/man/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/man/ChangeLog	2022-02-02 09:48:23 UTC (rev 61851)
+++ trunk/Build/source/texk/web2c/man/ChangeLog	2022-02-02 09:48:27 UTC (rev 61852)
@@ -1,3 +1,8 @@
+2022-02-02  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctwill.man,
+	* cweb.man: Pandoc (2.17.1) added some code.
+
 2022-01-10  Karl Berry  <karl at freefriends.org>
 
 	* Makefile.am: copyright 2022.

Modified: trunk/Build/source/texk/web2c/man/ctwill.man
===================================================================
--- trunk/Build/source/texk/web2c/man/ctwill.man	2022-02-02 09:48:23 UTC (rev 61851)
+++ trunk/Build/source/texk/web2c/man/ctwill.man	2022-02-02 09:48:27 UTC (rev 61852)
@@ -1,5 +1,19 @@
 .\" Automatically generated by Pandoc
 .\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
 .TH "CTWILL" "1" "December 25, 2021" "Web2c @VERSION@" "General Commands Manual"
 .hy
 .SH NAME

Modified: trunk/Build/source/texk/web2c/man/cweb.man
===================================================================
--- trunk/Build/source/texk/web2c/man/cweb.man	2022-02-02 09:48:23 UTC (rev 61851)
+++ trunk/Build/source/texk/web2c/man/cweb.man	2022-02-02 09:48:27 UTC (rev 61852)
@@ -1,5 +1,19 @@
 .\" Automatically generated by Pandoc
 .\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
 .TH "CWEB" "1" "July 27, 2021" "Web2c @VERSION@" "General Commands Manual"
 .hy
 .SH NAME