diff options
author | Norbert Preining <norbert@preining.info> | 2019-09-25 03:00:48 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-09-25 03:00:48 +0000 |
commit | d232e1107d60e7689e706bee9705f26745ae8b9e (patch) | |
tree | f9ac3303fdb36c2eca1872286615c0931d952476 /macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying | |
parent | 94c2e367c3690be2a3c715b4577c81200652ad81 (diff) |
CTAN sync 201909250300
Diffstat (limited to 'macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying')
4 files changed, 75 insertions, 122 deletions
diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm index 177ff0431b..1ad3bfc48d 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying-l2h_cache.pm @@ -3,16 +3,15 @@ $l2h_cache_key = q/$$ 2 a = \dot{\phi} $$/; $l2h_cache{$l2h_cache_key} = q|<BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} 2 a = \dot{\phi} \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_2.png" +<IMG STYLE="" + SRC="tex_in_copying_2.svg" ALT="\begin{displaymath} 2 a = \dot{\phi} \end{displaymath}"> @@ -26,16 +25,15 @@ a = \phi $$/; $l2h_cache{$l2h_cache_key} = q|From @ someone <> ! <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} a = \phi \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_1.png" +<IMG STYLE="" + SRC="tex_in_copying_1.svg" ALT="\begin{displaymath} a = \phi \end{displaymath}"> diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html index c819cc1655..ca7e4a0b72 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying.html @@ -9,6 +9,7 @@ $$ --> <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> <head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Top node</title> <meta name="description" content="Top node"> @@ -16,32 +17,21 @@ $$ <meta name="resource-type" content="document"> <meta name="distribution" content="global"> <meta name="Generator" content="texi2any"> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <style type="text/css"> <!-- a.summary-letter {text-decoration: none} -blockquote.smallquotation {font-size: smaller} +blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.indentedblock {margin-left: 3.2em} div.lisp {margin-left: 3.2em} -div.smalldisplay {margin-left: 3.2em} -div.smallexample {margin-left: 3.2em} -div.smallindentedblock {margin-left: 3.2em; font-size: smaller} -div.smalllisp {margin-left: 3.2em} -kbd {font-style:oblique} +kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} pre.menu-comment {font-family: serif} pre.menu-preformatted {font-family: serif} -pre.smalldisplay {font-family: inherit; font-size: smaller} -pre.smallexample {font-size: smaller} -pre.smallformat {font-family: inherit; font-size: smaller} -pre.smalllisp {font-size: smaller} -span.nocodebreak {white-space:nowrap} -span.nolinebreak {white-space:nowrap} -span.roman {font-family:serif; font-weight:normal} -span.sansserif {font-family:sans-serif; font-weight:normal} +span.nolinebreak {white-space: nowrap} +span.roman {font-family: initial; font-weight: normal} +span.sansserif {font-family: sans-serif; font-weight: normal} ul.no-bullet {list-style: none} --> </style> @@ -49,12 +39,11 @@ ul.no-bullet {list-style: none} </head> -<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000"> +<body lang="en"> -<a name="Top"></a> -<table class="header" cellpadding="1" cellspacing="1" border="0"> +<span id="Top"></span><table class="header" cellpadding="1" cellspacing="1" border="0"> <tr><td valign="middle" align="left">[ < ]</td> <td valign="middle" align="left">[<a href="#chapter" title="Next section in reading order"> > </a>]</td> <td valign="middle" align="left"> </td> @@ -62,23 +51,21 @@ ul.no-bullet {list-style: none} <td valign="middle" align="left">[Index]</td> <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<a name="Top-node"></a> -<h1 class="top">Top node</h1> +<span id="Top-node"></span><h1 class="top">Top node</h1> <p>Some equation is indeed needed to understand the copyright of that file From @ someone <> ! <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} a = \phi \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_1.png" +<IMG STYLE="" + SRC="tex_in_copying_1.svg" ALT="\begin{displaymath} a = \phi \end{displaymath}"> @@ -87,7 +74,6 @@ a = \phi <P></P> </p> - <table class="menu" border="0" cellspacing="0"> <tr><td align="left" valign="top"><a href="#chapter">1 chapter</a></td><td> </td><td align="left" valign="top"> </td></tr> @@ -97,16 +83,15 @@ a = \phi that file From @ someone <> ! <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} a = \phi \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_1.png" +<IMG STYLE="" + SRC="tex_in_copying_1.svg" ALT="\begin{displaymath} a = \phi \end{displaymath}"> @@ -115,10 +100,8 @@ a = \phi <P></P> </p> - <hr size="6"> -<a name="chapter"></a> -<table class="header" cellpadding="1" cellspacing="1" border="0"> +<span id="chapter"></span><table class="header" cellpadding="1" cellspacing="1" border="0"> <tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this chapter or previous chapter"> << </a>]</td> <td valign="middle" align="left">[<a href="#Top" title="Previous section in reading order"> < </a>]</td> <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up </a>]</td> @@ -133,21 +116,19 @@ a = \phi <td valign="middle" align="left">[Index]</td> <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<a name="chapter-1"></a> -<h1 class="chapter">1 chapter</h1> +<span id="chapter-1"></span><h1 class="chapter">1 chapter</h1> <p>The fundamental equation is <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} 2 a = \dot{\phi} \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_2.png" +<IMG STYLE="" + SRC="tex_in_copying_2.svg" ALT="\begin{displaymath} 2 a = \dot{\phi} \end{displaymath}"> @@ -159,16 +140,15 @@ a = \phi that file From @ someone <> ! <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} a = \phi \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_1.png" +<IMG STYLE="" + SRC="tex_in_copying_1.svg" ALT="\begin{displaymath} a = \phi \end{displaymath}"> @@ -178,9 +158,8 @@ a = \phi </p> - <hr size="6"> -<a name="SEC_About"></a> +<span id="SEC_About"></span> <table class="header" cellpadding="1" cellspacing="1" border="0"> <tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of document">Top</a>]</td> <td valign="middle" align="left">[Contents]</td> diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html index 7c73bf49fd..c1dcbd92ff 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h.html @@ -1,11 +1,7 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<!DOCTYPE HTML> <!--Converted with LaTeX2HTML -original version by: Nikos Drakos, CBLU, University of Leeds -* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan -* with significant contributions from: - Jens Lippmann, Marek Rouchal, Martin Wilck and others --> -<HTML> +<HTML lang="EN"> <HEAD> <TITLE>tex_in_copying_l2h</TITLE> <META NAME="description" CONTENT="tex_in_copying_l2h"> @@ -13,8 +9,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds <META NAME="resource-type" CONTENT="document"> <META NAME="distribution" CONTENT="global"> +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8"> +<META NAME="viewport" CONTENT="width=device-width, initial-scale=1.0"> <META NAME="Generator" CONTENT="LaTeX2HTML"> -<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css"> <LINK REL="STYLESHEET" HREF="tex_in_copying_l2h.css"> @@ -25,16 +22,15 @@ original version by: Nikos Drakos, CBLU, University of Leeds <!-- l2h_begin tex_in_copying_l2h 1 --> From @ someone <> ! <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} a = \phi \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_l2h_img1.png" +<IMG STYLE="" + SRC="tex_in_copying_l2h_img1.svg" ALT="\begin{displaymath} a = \phi \end{displaymath}"> @@ -46,16 +42,15 @@ a = \phi <!-- l2h_begin tex_in_copying_l2h 2 --> <BR><P></P> -<DIV ALIGN="CENTER" CLASS="mathdisplay"> +<DIV CLASS="mathdisplay"> <!-- MATH \begin{displaymath} 2 a = \dot{\phi} \end{displaymath} --> -<IMG - WIDTH="100" HEIGHT="20" BORDER="0" - SRC="tex_in_copying_l2h_img2.png" +<IMG STYLE="" + SRC="tex_in_copying_l2h_img2.svg" ALT="\begin{displaymath} 2 a = \dot{\phi} \end{displaymath}"> diff --git a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex index 9df60ec613..e7b5750208 100644 --- a/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex +++ b/macros/texinfo/texinfo/tp/tests/tex_html/res_parser/tex_in_copying/tex_in_copying_l2h_images.tex @@ -7,10 +7,7 @@ \usepackage{html} -\usepackage[dvips]{color} - - -\pagecolor[gray]{.7} +\usepackage{xcolor} \usepackage[]{inputenc} @@ -56,56 +53,40 @@ \parindent=0pt\abovedisplayskip=0pt\belowdisplayskip=0pt}% \def\phantompar{\csname par\endcsname}\normalsize}% \def\lthtmltypeout#1{{\let\protect\string \immediate\write\lthtmlwrite{#1}}}% -\newcommand\lthtmlhboxmathA{\adjustnormalsize\setbox\sizebox=\hbox\bgroup\kern.05em }% -\newcommand\lthtmlhboxmathB{\adjustnormalsize\setbox\sizebox=\hbox to\hsize\bgroup\hfill }% -\newcommand\lthtmlvboxmathA{\adjustnormalsize\setbox\sizebox=\vbox\bgroup % - \let\ifinner=\iffalse \let\)\liih@math }% -\newcommand\lthtmlboxmathZ{\@next\next\@currlist{}{\def\next{\voidb@x}}% - \expandafter\box\next\egroup}% -\newcommand\lthtmlmathtype[1]{\gdef\lthtmlmathenv{#1}}% -\newcommand\lthtmllogmath{\dimen0\ht\sizebox \advance\dimen0\dp\sizebox - \ifdim\dimen0>.95\vsize - \lthtmltypeout{% -*** image for \lthtmlmathenv\space is too tall at \the\dimen0, reducing to .95 vsize ***}% - \ht\sizebox.95\vsize \dp\sizebox\z@ \fi - \lthtmltypeout{l2hSize % -:\lthtmlmathenv:\the\ht\sizebox::\the\dp\sizebox::\the\wd\sizebox.\preveqno}}% -\newcommand\lthtmlfigureA[1]{\let\@savefreelist\@freelist - \lthtmlmathtype{#1}\lthtmlvboxmathA}% -\newcommand\lthtmlpictureA{\bgroup\catcode`\_=8 \lthtmlpictureB}% -\newcommand\lthtmlpictureB[1]{\lthtmlmathtype{#1}\egroup - \let\@savefreelist\@freelist \lthtmlhboxmathB}% -\newcommand\lthtmlpictureZ[1]{\hfill\lthtmlfigureZ}% -\newcommand\lthtmlfigureZ{\lthtmlboxmathZ\lthtmllogmath\copy\sizebox - \global\let\@freelist\@savefreelist}% -\newcommand\lthtmldisplayA{\bgroup\catcode`\_=8 \lthtmldisplayAi}% -\newcommand\lthtmldisplayAi[1]{\lthtmlmathtype{#1}\egroup\lthtmlvboxmathA}% -\newcommand\lthtmldisplayB[1]{\edef\preveqno{(\theequation)}% - \lthtmldisplayA{#1}\let\@eqnnum\relax}% -\newcommand\lthtmldisplayZ{\lthtmlboxmathZ\lthtmllogmath\lthtmlsetmath}% -\newcommand\lthtmlinlinemathA{\bgroup\catcode`\_=8 \lthtmlinlinemathB} -\newcommand\lthtmlinlinemathB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA - \vrule height1.5ex width0pt }% -\newcommand\lthtmlinlineA{\bgroup\catcode`\_=8 \lthtmlinlineB}% -\newcommand\lthtmlinlineB[1]{\lthtmlmathtype{#1}\egroup\lthtmlhboxmathA}% -\newcommand\lthtmlinlineZ{\egroup\expandafter\ifdim\dp\sizebox>0pt % - \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetinline} -\newcommand\lthtmlinlinemathZ{\egroup\expandafter\ifdim\dp\sizebox>0pt % - \expandafter\centerinlinemath\fi\lthtmllogmath\lthtmlsetmath} -\newcommand\lthtmlindisplaymathZ{\egroup % - \centerinlinemath\lthtmllogmath\lthtmlsetmath} -\def\lthtmlsetinline{\hbox{\vrule width.1em \vtop{\vbox{% - \kern.1em\copy\sizebox}\ifdim\dp\sizebox>0pt\kern.1em\else\kern.3pt\fi - \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}} -\def\lthtmlsetmath{\hbox{\vrule width.1em\kern-.05em\vtop{\vbox{% - \kern.1em\kern0.75 pt\hbox{\hglue.17em\copy\sizebox\hglue0.75 pt}}\kern.3pt% - \ifdim\dp\sizebox>0pt\kern.1em\fi \kern0.75 pt% - \ifdim\hsize>\wd\sizebox \hrule depth1pt\fi}}} -\def\centerinlinemath{% - \dimen1=\ifdim\ht\sizebox<\dp\sizebox \dp\sizebox\else\ht\sizebox\fi - \advance\dimen1by.5pt \vrule width0pt height\dimen1 depth\dimen1 - \dp\sizebox=\dimen1\ht\sizebox=\dimen1\relax} - +\usepackage[tightpage,active]{preview} +\newbox\lthtmlPageBox +\newdimen\lthtmlCropMarkHeight +\newdimen\lthtmlCropMarkDepth +\long\def\lthtmlTightVBox#1#2{% + \setbox\lthtmlPageBox\vbox{\hbox{\catcode`\_=8 #2}}% + \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt + \lthtmlCropMarkDepth=\dp\lthtmlPageBox + \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}% + \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}% + \begin{preview}\copy\lthtmlPageBox\end{preview}}}% +\long\def\lthtmlTightFBox#1#2{% + \adjustnormalsize\setbox\lthtmlPageBox=\vbox\bgroup % + \let\ifinner=\iffalse \let\)\liih@math % + {\catcode`\_=8 #2}% + \@next\next\@currlist{}{\def\next{\voidb@x}}% + \expandafter\box\next\egroup % + \lthtmlCropMarkHeight=\ht\lthtmlPageBox \advance \lthtmlCropMarkHeight 6pt + \lthtmlCropMarkDepth=\dp\lthtmlPageBox + \lthtmltypeout{^^J:#1:lthtmlCropMarkHeight:=\the\lthtmlCropMarkHeight}% + \lthtmltypeout{^^J:#1:lthtmlCropMarkDepth:=\the\lthtmlCropMarkDepth:1ex:=\the \dimexpr 1ex}% + \begin{preview}\copy\lthtmlPageBox\end{preview}}% + \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}} + \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}} + \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}} + \long\def\lthtmlinlinemathA#1#2\lthtmlindisplaymathZ{\lthtmlTightVBox{#1}{#2}} + \def\lthtmlinlineA#1#2\lthtmlinlineZ{\lthtmlTightVBox{#1}{#2}} + \long\def\lthtmldisplayA#1#2\lthtmldisplayZ{\lthtmlTightVBox{#1}{#2}} + \long\def\lthtmldisplayB#1#2\lthtmldisplayZ{\\edef\preveqno{(\theequation)}% + \lthtmlTightVBox{#1}{\let\@eqnnum\relax#2}} + \long\def\lthtmlfigureA#1#2\lthtmlfigureZ{\let\@savefreelist\@freelist + \lthtmlTightFBox{#1}{#2}\global\let\@freelist\@savefreelist} + \long\def\lthtmlpictureA#1#2\lthtmlpictureZ{\let\@savefreelist\@freelist + \lthtmlTightVBox{#1}{#2}\global\let\@freelist\@savefreelist} \def\lthtmlcheckvsize{\ifdim\ht\sizebox<\vsize \ifdim\wd\sizebox<\hsize\expandafter\hfill\fi \expandafter\vfill \else\expandafter\vss\fi}% |