Skip to content

Commit

Permalink
{,e}uptex: Copy {,e}ptex source files to clean up building environment
Browse files Browse the repository at this point in the history
git-svn-id: svn://tug.org/texlive/trunk/Build/source@69767 c570f23f-e606-0410-a88d-b1316a301751
  • Loading branch information
t-tk committed Feb 10, 2024
1 parent b701bcb commit c07a3f0
Show file tree
Hide file tree
Showing 21 changed files with 20,698 additions and 29 deletions.
26 changes: 13 additions & 13 deletions texk/web2c/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -3280,10 +3280,10 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
$(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
euptexdir/eptrip/eptrip.log euptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
euptexdir/pdfprimitive.test \
eptexdir/tests/pdfprimitive-test.tex \
euptexdir/tests/pdfprimitive-test.tex \
euptexdir/tests/pdfprimitive-euptex.log hitexdir/ChangeLog \
$(hitex_web) $(hitex_tests) hitexdir/tests/hello.tex \
hitexdir/tests/rule.tex pdftexdir/regex/COPYING.LIB \
Expand Down Expand Up @@ -4503,7 +4503,7 @@ nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h uptexdir/uptex_version.h

# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
uptex_prereq = uptexd.h ptexdir/ptex_version.h uptexdir/uptex_version.h
uptex_prereq = uptexd.h uptexdir/ptex_version.h uptexdir/uptex_version.h
uptex_web_srcs = \
tex.web \
tex.ch \
Expand All @@ -4512,7 +4512,7 @@ uptex_web_srcs = \
zlib-fmt.ch

uptex_ch_srcs = \
ptexdir/ptex-base.ch \
uptexdir/ptex-base.ch \
uptexdir/uptex-m.ch \
$(uptex_ch_synctex) \
tex-binpool.ch
Expand Down Expand Up @@ -4570,7 +4570,7 @@ dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \

# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h \
ptexdir/ptex_version.h eptexdir/eptex_version.h \
uptexdir/ptex_version.h euptexdir/eptex_version.h \
uptexdir/uptex_version.h $(am__append_146)
euptex_web_srcs = \
tex.web \
Expand All @@ -4584,20 +4584,20 @@ euptex_web_srcs = \
etexdir/tex.ech

euptex_ch_srcs = \
eptexdir/etex.ch0 \
ptexdir/ptex-base.ch \
euptexdir/etex.ch0 \
uptexdir/ptex-base.ch \
uptexdir/uptex-m.ch \
euptexdir/euptex.ch0 \
eptexdir/eptex.ech \
eptexdir/etex.ch1 \
euptexdir/eptex.ech \
euptexdir/etex.ch1 \
euptexdir/euptex.ch1 \
$(euptex_ch_synctex) \
eptexdir/fam256.ch \
euptexdir/fam256.ch \
euptexdir/pdfstrcmp-eup-pre.ch \
eptexdir/pdfutils.ch \
euptexdir/pdfutils.ch \
euptexdir/pdfstrcmp-eup-post.ch \
eptexdir/suppresserrors.ch \
eptexdir/char-warning-eptex.ch \
euptexdir/suppresserrors.ch \
euptexdir/char-warning-eptex.ch \
tex-binpool.ch


Expand Down
10 changes: 10 additions & 0 deletions texk/web2c/euptexdir/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2024-02-10 TANAKA Takuji <[email protected]>

* eptex_version.h, eptex.ech, etex.ch{0,1},
{char-warning-eptex,fam256,pdfutils,suppresserrors}.ch,
eptrip/eptrip.{diffs,log,tex}, eptrip/texmf.cnf,
tests/pdfprimitive-test.tex, am/euptex.am:
Copy eptex source files from ../eptexdir
to cleaning up building environment.
https://github.com/texjporg/tex-jp-build/issues/32

2023-12-24 TANAKA Takuji <[email protected]>

* wcfname{,0}.test:
Expand Down
26 changes: 13 additions & 13 deletions texk/web2c/euptexdir/am/euptex.am
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h

# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
eptexdir/eptex_version.h uptexdir/uptex_version.h
euptex_prereq = euptexd.h etexdir/etex_version.h uptexdir/ptex_version.h \
euptexdir/eptex_version.h uptexdir/uptex_version.h
$(euptex_OBJECTS): $(euptex_prereq)

$(euptex_c_h): euptex-web2c
Expand Down Expand Up @@ -69,20 +69,20 @@ euptex_web_srcs = \
euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
$(tie_c) euptex.web $(euptex_ch_srcs)
euptex_ch_srcs = \
eptexdir/etex.ch0 \
ptexdir/ptex-base.ch \
euptexdir/etex.ch0 \
uptexdir/ptex-base.ch \
uptexdir/uptex-m.ch \
euptexdir/euptex.ch0 \
eptexdir/eptex.ech \
eptexdir/etex.ch1 \
euptexdir/eptex.ech \
euptexdir/etex.ch1 \
euptexdir/euptex.ch1 \
$(euptex_ch_synctex) \
eptexdir/fam256.ch \
euptexdir/fam256.ch \
euptexdir/pdfstrcmp-eup-pre.ch \
eptexdir/pdfutils.ch \
euptexdir/pdfutils.ch \
euptexdir/pdfstrcmp-eup-post.ch \
eptexdir/suppresserrors.ch \
eptexdir/char-warning-eptex.ch \
euptexdir/suppresserrors.ch \
euptexdir/char-warning-eptex.ch \
tex-binpool.ch

EXTRA_DIST += $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines
Expand Down Expand Up @@ -123,8 +123,8 @@ endif EUPTEX
##
## euptexdir/euptriptest.test
EXTRA_DIST += \
eptexdir/eptrip/eptrip.log \
eptexdir/eptrip/eptrip.tex \
euptexdir/eptrip/eptrip.log \
euptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs \
euptexdir/euptrip/texmf.cnf
euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
Expand All @@ -136,7 +136,7 @@ DISTCLEANFILES += euptrip.diffs
## euptexdir/pdfprimitive.test
EXTRA_DIST += \
euptexdir/pdfprimitive.test \
eptexdir/tests/pdfprimitive-test.tex \
euptexdir/tests/pdfprimitive-test.tex \
euptexdir/tests/pdfprimitive-euptex.log
DISTCLEANFILES += pdfprimitive-euptex.*

Expand Down
101 changes: 101 additions & 0 deletions texk/web2c/euptexdir/char-warning-eptex.ch
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
% $Id$
% Public domain. See ../pdftexdir/char-warning-pdftex.ch for info.

@x [30] If \tracinglostchars > 2, then promote full errors.
@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
var @!l:0..255; {small indices or counters}
old_setting: integer; {saved value of |tracing_online|}
begin if tracing_lost_chars>0 then
begin old_setting:=tracing_online;
if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1;
begin begin_diagnostic;
print_nl("Missing character: There is no ");
@.Missing character@>
if (c<" ")or(c>"~") then
begin print_char("^"); print_char("^");
if c<64 then print_char(c+64)
else if c<128 then print_char(c-64)
else begin print_lc_hex(c div 16); print_lc_hex(c mod 16); end
end
else print_ASCII(c);
print(" in font ");
slow_print(font_name[f]); print_char("!"); end_diagnostic(false);
end;
tracing_online:=old_setting;
end;
end;
@y
@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits);
var @!l:0..255; {small indices or counters}
old_setting: integer; {saved value of |tracing_online|}
begin if tracing_lost_chars>0 then
begin old_setting:=tracing_online;
if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1;
if tracing_lost_chars > 2 then
print_err("Missing character: There is no ")
else begin
begin_diagnostic;
print_nl("Missing character: There is no ")
end;
@.Missing character@>
if (c<" ")or(c>"~") then begin
print_char("^"); print_char("^");
if c<64 then print_char(c+64)
else if c<128 then print_char(c-64)
else begin print_lc_hex(c div 16); print_lc_hex(c mod 16); end
end
else print_ASCII(c);
if tracing_lost_chars > 2 then begin
print(" (");
print_hex(c);
print(")");
end;
print(" in font ");
slow_print(font_name[f]);
if tracing_lost_chars < 3 then print_char("!");
tracing_online:=old_setting;
if tracing_lost_chars > 2 then begin
help0;
error;
end else end_diagnostic(false);
end; {of |tracing_lost_chars>0|}
end; {of procedure}
@z

@x [30] Another warning for (u)pTeX.
@p procedure char_warning_jis(@!f:internal_font_number;@!jc:KANJI_code);
begin if tracing_lost_chars>0 then
begin begin_diagnostic;
print_nl("Character "); print_kanji(jc); print(" (");
print_hex(jc); print(") cannot be typeset in JIS-encoded JFM ");
slow_print(font_name[f]);
print_char(","); print_nl("so I use .notdef glyph instead.");
end_diagnostic(false);
end;
end;
@y
@p procedure char_warning_jis(@!f:internal_font_number;@!jc:KANJI_code);
var old_setting: integer; {saved value of |tracing_online|}
begin if tracing_lost_chars>0 then
begin old_setting:=tracing_online;
if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1;
if tracing_lost_chars > 2 then
print_err("Character ")
else begin
begin_diagnostic;
print_nl("Character ")
end;
print_kanji(jc); print(" (");
print_hex(jc); print(") cannot be typeset in JIS-encoded JFM ");
slow_print(font_name[f]);
print_char(",");
if tracing_lost_chars > 2 then
begin print_nl(" so I use .notdef glyph instead");
help0; error; end
else
begin print_nl("so I use .notdef glyph instead.");
end_diagnostic(false); end;
tracing_online:=old_setting;
end; {of |tracing_lost_chars>0|}
end; {of procedure}
@z
Loading

0 comments on commit c07a3f0

Please sign in to comment.