summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorMartin Ruckert <martin.ruckert@hm.edu>2022-02-25 13:43:37 +0000
committerMartin Ruckert <martin.ruckert@hm.edu>2022-02-25 13:43:37 +0000
commitd57fc63a2cb82c2e25db58c2633fdb3c23474ddd (patch)
tree9492b53526229aa80aca8c87870d78bd10d305d4 /Build
parent7659f2084664ec6c136036cb16014dbefe6c231f (diff)
HiTeX: fixing basineskips after images
git-svn-id: svn://tug.org/texlive/trunk@62172 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/hitexdir/hiformat.hntbin1113717 -> 1113687 bytes
-rw-r--r--Build/source/texk/web2c/hitexdir/hiformat.pdfbin1255630 -> 1598558 bytes
-rw-r--r--Build/source/texk/web2c/hitexdir/hiformat.w4
-rw-r--r--Build/source/texk/web2c/hitexdir/hintview/src/main.c2
-rw-r--r--Build/source/texk/web2c/hitexdir/hiparser.h2
-rw-r--r--Build/source/texk/web2c/hitexdir/hitex.w16
-rw-r--r--Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex53
7 files changed, 68 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.hnt b/Build/source/texk/web2c/hitexdir/hiformat.hnt
index ba0c2339c25..1ea5e988198 100644
--- a/Build/source/texk/web2c/hitexdir/hiformat.hnt
+++ b/Build/source/texk/web2c/hitexdir/hiformat.hnt
Binary files differ
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.pdf b/Build/source/texk/web2c/hitexdir/hiformat.pdf
index 2529196d9cd..c4254ca4be1 100644
--- a/Build/source/texk/web2c/hitexdir/hiformat.pdf
+++ b/Build/source/texk/web2c/hitexdir/hiformat.pdf
Binary files differ
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.w b/Build/source/texk/web2c/hitexdir/hiformat.w
index 90a63411ebc..1a764d0b2ca 100644
--- a/Build/source/texk/web2c/hitexdir/hiformat.w
+++ b/Build/source/texk/web2c/hitexdir/hiformat.w
@@ -47,9 +47,9 @@
\def\setrevision$#1: #2 ${\gdef\lastrevision{#2}}
-\setrevision$Revision: 2696 $
+\setrevision$Revision: 2699 $
\def\setdate$#1(#2) ${\gdef\lastdate{#2}}
-\setdate$Date: 2022-02-24 10:59:11 +0100 (Thu, 24 Feb 2022) $
+\setdate$Date: 2022-02-25 10:21:04 +0100 (Fri, 25 Feb 2022) $
\null
diff --git a/Build/source/texk/web2c/hitexdir/hintview/src/main.c b/Build/source/texk/web2c/hitexdir/hintview/src/main.c
index 8ae36b33e95..7e413e2f3f0 100644
--- a/Build/source/texk/web2c/hitexdir/hintview/src/main.c
+++ b/Build/source/texk/web2c/hitexdir/hintview/src/main.c
@@ -39,7 +39,7 @@
#include <GLFW/glfw3.h>
#define VERSION 1
-#define REVISION 0
+#define REVISION 3
#define PATCHLEVEL 0
#if 0
diff --git a/Build/source/texk/web2c/hitexdir/hiparser.h b/Build/source/texk/web2c/hitexdir/hiparser.h
index 153535ca2a6..4e9e3fcc29e 100644
--- a/Build/source/texk/web2c/hitexdir/hiparser.h
+++ b/Build/source/texk/web2c/hitexdir/hiparser.h
@@ -39,7 +39,7 @@
# define YY_YY_PARSER_H_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
-# define YYDEBUG 1
+# define YYDEBUG 0
#endif
#if YYDEBUG
extern int yydebug;
diff --git a/Build/source/texk/web2c/hitexdir/hitex.w b/Build/source/texk/web2c/hitexdir/hitex.w
index c026b5fed49..e037b7f847b 100644
--- a/Build/source/texk/web2c/hitexdir/hitex.w
+++ b/Build/source/texk/web2c/hitexdir/hitex.w
@@ -13847,12 +13847,15 @@ baselineskip calculation is handled by the |append_to_vlist| routine.
link(tail)= p;tail= p;
}
link(tail)=b;tail=b;
- if (height_known ||
- (type(b)==whatsit_node &&
- (subtype(b)==hpack_node || subtype(b)==vpack_node)))
- prev_depth=depth(b); /* then also depth is (probably) known */
+ if (height_known)
+ prev_depth=depth(b);
+ else if (type(b)==whatsit_node &&
+ (subtype(b)==hpack_node || subtype(b)==vpack_node))
+ prev_depth=depth(b); /* then also depth is (probably) known */
+ else if (type(b)==whatsit_node && subtype(b)==image_node)
+ prev_depth=0;
else
- prev_depth=unknown_depth;
+ prev_depth=unknown_depth;
}
@* Data structures for math mode.
@@ -25688,7 +25691,10 @@ case image_node:@/
break;
}
if (abs(mode)==vmode)
+ { prev_depth=ignore_depth; /* this could be deleted if baseline nodes treat
+ images as boxes in the viewer */
append_to_vlist(p); /* image nodes have height, width, and depth like boxes */
+ }
else
tail_append(p);
break;
diff --git a/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex b/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex
new file mode 100644
index 00000000000..7868f6a681a
--- /dev/null
+++ b/Build/source/texk/web2c/hitexdir/tex/hiltxpage.tex
@@ -0,0 +1,53 @@
+\ifhint
+\textwidth=\hsize
+\textheight=\vsize
+\newinsert\topins
+\skip\topins=0pt % no space added when a topinsert is present
+\count\topins=1000 % magnification factor (1 to 1)
+\dimen\topins=\maxdimen % no limit per page
+\def\topinsert{\bgroup\setbox0\vbox\bgroup}
+\def\endinsert{\egroup
+ \insert\topins{%
+ \penalty100\splittopskip0pt\floatingpenalty0\box0\nobreak\bigskip\egroup}}
+\dimen0=1.25\hsize
+\advance\dimen0 by -9pt
+\dimen1=1.25\vsize
+\advance\dimen1 by -9pt
+\HINTsetpage1 = basic
+ priority 10
+ width \dimen0
+ height \dimen1
+{%
+ \maxdepth=4pt
+ \topskip=10pt
+ \HINTstream\topins %topinsert
+ \HINTstream0 %main text
+ \HINTstream\footins
+ \HINTsetstream\topins = %topinsert
+ prefered 0
+ {%
+ \HINTafter = {}
+ }
+ \HINTsetstream\footins =%footnotes
+ prefered 255
+ ratio 0
+ {%
+ \hsize=300pt
+ \count\footins=1000 % the magnification factor
+ \skip\footins=\bigskipamount % the extra space needed
+ \dimen\footins=\vsize % maximum height on the page
+ \HINTbefore =
+ {\vskip\skip\footins
+ \footnoterule}
+ \HINTafter = {}
+ }
+}% end page template
+\fi
+
+% the footins had this:
+% \before =
+% {\vskip 0pt plus 1filll\vskip 9pt plus 4pt minus 2pt
+% \kern -3pt
+% \hrule width 5em
+% \kern 2.6pt}
+% }