diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-04 08:50:20 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-04 08:50:20 +0000 |
| commit | 2300ccb10e93ce75ca3e3dcf2b26bd4600761a47 (patch) | |
| tree | 37a33bbefeac5a45bf01648b1e27c91c000902c9 | |
| parent | d99cbbf7e8cc585a93ea5db4531c0da771c1f0ee (diff) | |
misc cleanup
git-svn-id: svn://tug.org/texlive/trunk@18715 c570f23f-e606-0410-a88d-b1316a301751
34 files changed, 151 insertions, 8384 deletions
diff --git a/Build/source/Build b/Build/source/Build index 111c17f4b0e..71580f43aa0 100755 --- a/Build/source/Build +++ b/Build/source/Build @@ -65,9 +65,6 @@ cd $TL_WORKDIR || exit 1 # allow override of configure location, just in case. : ${TL_CONFIGURE=../configure} -# banner for TeX et al. -: ${TL_CONF_BANNER=--with-tex-banner='"TeX Live 2010/pretest"'} - # longinteger and off_t declarations are still inconsistent, do not # enable this unless you are testing. : ${TL_CONF_LARGEFILE=--disable-largefile} @@ -82,7 +79,7 @@ cd $TL_WORKDIR || exit 1 : ${TL_CONF_XDVI_TOOLKIT=--with-xdvi-x-toolkit=xaw} # allow adding arbitrary other configure args, such as -# --with-tex-banner='TeX Live 2009/SomeDistro'. +# --with-banner-add='/SomeDistro'. : ${TL_CONFIGURE_ARGS=} # allow override of make target. diff --git a/Build/source/README.config b/Build/source/README.config index 555becc1f23..4de2c19b838 100644 --- a/Build/source/README.config +++ b/Build/source/README.config @@ -111,14 +111,11 @@ its requirement for clisp et al.). 2.3. Configure options for texk/web2c/ -------------------------------------- -2.3.1. --with-tex-banner=STR -Specify the version string STR appended to banner lines, replacing the -default `Web2C YYYY'; the string STR must contain the current Web2C -version, that is, the YYYY (currently 2010/dev). - -The Build script for a native TL build currently specifies -`--with-tex-banner="TeX Live 2010/dev"', whereas a distro build should alter -this to, e.g., `--with-tex-banner="TeX Live 2010/dev/Debian"'. +2.3.1. --with-banner-add=STR +Add STR to the default version string ('TeX Live YEAR' or 'Web2C YEAR') +appended to banner lines. The Build script for a native TL build doesn't +use this option, but distro builds should specify this as, e.g., +'/SomeDistro'. 2.3.1. --with-editor=CMD Specify the command CMD to invoke from the `e' option, replacing the default diff --git a/Build/source/configure b/Build/source/configure index 1fec0e31ad8..1d92d0c2a88 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -904,7 +904,7 @@ with_xindy_recode enable_xindy_old enable_xpdfopen enable_web2c -with_tex_banner +with_banner_add with_editor enable_auto_core enable_dump_share @@ -1802,7 +1802,7 @@ Optional Packages: [default: no] --with-xindy-recode For `xindy': use `recode' instead of `iconv' (default is NO) - --with-tex-banner=STR version string appended to banner lines [Web2C YEAR] + --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -4255,9 +4255,9 @@ test "x$enable_web2c" = xno || { ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF -# Check whether --with-tex-banner was given. -if test "${with_tex_banner+set}" = set; then : - withval=$with_tex_banner; +# Check whether --with-banner-add was given. +if test "${with_banner_add+set}" = set; then : + withval=$with_banner_add; fi # Check whether --with-editor was given. diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 33a5e9486eb..daac35cde60 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -677,7 +677,7 @@ with_xindy_recode enable_xindy_old enable_xpdfopen enable_web2c -with_tex_banner +with_banner_add with_editor enable_auto_core enable_dump_share @@ -1555,7 +1555,7 @@ Optional Packages: [default: no] --with-xindy-recode For `xindy': use `recode' instead of `iconv' (default is NO) - --with-tex-banner=STR version string appended to banner lines [Web2C YEAR] + --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -3450,9 +3450,9 @@ test "x$enable_web2c" = xno || { ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF -# Check whether --with-tex-banner was given. -if test "${with_tex_banner+set}" = set; then : - withval=$with_tex_banner; +# Check whether --with-banner-add was given. +if test "${with_banner_add+set}" = set; then : + withval=$with_banner_add; fi # Check whether --with-editor was given. diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 53f973bc350..f2d3f76b5a7 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -677,7 +677,7 @@ with_xindy_recode enable_xindy_old enable_xpdfopen enable_web2c -with_tex_banner +with_banner_add with_editor enable_auto_core enable_dump_share @@ -1576,7 +1576,7 @@ Optional Packages: [default: no] --with-xindy-recode For `xindy': use `recode' instead of `iconv' (default is NO) - --with-tex-banner=STR version string appended to banner lines [Web2C YEAR] + --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -3471,9 +3471,9 @@ test "x$enable_web2c" = xno || { ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF -# Check whether --with-tex-banner was given. -if test "${with_tex_banner+set}" = set; then : - withval=$with_tex_banner; +# Check whether --with-banner-add was given. +if test "${with_banner_add+set}" = set; then : + withval=$with_banner_add; fi # Check whether --with-editor was given. diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL index de57a930de3..33cd2cf3db4 100644 --- a/Build/source/texk/ptexenc/ChangeLog.TL +++ b/Build/source/texk/ptexenc/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: TeX Live (TL) changes for ptexenc =============================================== +2010-05-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (nobase_nodist_include_HEADERS): Removed, + don't install ptexenc/c-auto.h. + 2010-05-20 Peter Breitenlohner <peb@mppmu.mpg.de> Moved headers (except jisx0208.h) to ptexenc/, removed patches/. diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index cbd9e7765ce..200653e4db0 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -30,9 +30,6 @@ libptexenc_la_SOURCES = \ ## Rebuild libkpathsea @KPATHSEA_RULE@ -nobase_nodist_include_HEADERS = \ - ptexenc/c-auto.h - nobase_include_HEADERS = \ ptexenc/kanjicnv.h \ ptexenc/ptexenc.h \ diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 531b8e4d5ff..140dc928eca 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -88,8 +88,7 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libptexenc_la_LIBADD = am_libptexenc_la_OBJECTS = libptexenc_la-kanjicnv.lo \ @@ -114,7 +113,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libptexenc_la_SOURCES) DIST_SOURCES = $(libptexenc_la_SOURCES) -HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS) +HEADERS = $(nobase_include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -264,9 +263,6 @@ libptexenc_la_SOURCES = \ unicode-jp.c \ unicode.c -nobase_nodist_include_HEADERS = \ - ptexenc/c-auto.h - nobase_include_HEADERS = \ ptexenc/kanjicnv.h \ ptexenc/ptexenc.h \ @@ -454,29 +450,6 @@ uninstall-nobase_includeHEADERS: test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(includedir)" && rm -f $$files -install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ - $(am__nobase_list) | while read dir files; do \ - xfiles=; for file in $$files; do \ - if test -f "$$file"; then xfiles="$$xfiles $$file"; \ - else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ - test -z "$$xfiles" || { \ - test "x$$dir" = x. || { \ - echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ - $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \ - echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \ - $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \ - done - -uninstall-nobase_nodist_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ - $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -681,7 +654,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -733,8 +706,7 @@ info: info-am info-am: -install-data-am: install-nobase_includeHEADERS \ - install-nobase_nodist_includeHEADERS +install-data-am: install-nobase_includeHEADERS install-dvi: install-dvi-am @@ -782,8 +754,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \ - uninstall-nobase_nodist_includeHEADERS +uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS .MAKE: install-am install-strip @@ -797,15 +768,13 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-libLTLIBRARIES \ - install-man install-nobase_includeHEADERS \ - install-nobase_nodist_includeHEADERS install-pdf \ + install-man install-nobase_includeHEADERS install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-nobase_includeHEADERS \ - uninstall-nobase_nodist_includeHEADERS + uninstall-nobase_includeHEADERS # Rebuild diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index fc10ebb81a0..dc634372c4b 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -7,6 +7,17 @@ * synctex.c [__attribute__]: #define __attribute__ away if it is not defined. tlbuild mail, 28 May 2010 14:34:53. +2010-05-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ac/web2c.ac, configure.ac: Use '--with-banner-add' instead of + '--with-tex-banner'. + +2010-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (EXTRA_DIST): Remove metapost.mk. + * am/texmf.am (EXTRA_DIST): Remove tmf-pool.h. + * metapost.mk, tmf-pool.h (removed): Obsolete. + 2010-05-24 Karl Berry <karl@tug.org> * tex.ch (sup_font_mem_size): increase from 4,000,000 diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 9da3593352f..a587531d2d5 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -196,5 +196,5 @@ include $(srcdir)/libmd5/am/md5.am ## Eventually delete these files ## -EXTRA_DIST += Makefile.in.orig configure.in.orig metapost.mk +EXTRA_DIST += Makefile.in.orig configure.in.orig diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index b203af932f4..3508316039c 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -1192,29 +1192,29 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \ tests/translate tests/uno.dos tests/xampl.bib ctiedir tiedir \ lib/mfmpi386.asm lib/mfmpw32.c lib/texmfmp.c texmfmem.h \ texmfmp-help.h texmfmp.h $(tex_ch_srcs) lib/texmfmp.c \ - tmf-pool.h $(tex_tests) tests/write18-quote.tex mf.web \ - mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h \ - $(mf_tests) triptrap/README triptrap/mftrap.diffs \ - triptrap/mftrap.fot triptrap/mftrap.log triptrap/mftrap.pl \ - triptrap/mftrap1.in triptrap/mftrap2.in triptrap/mftrapin.log \ - triptrap/mptrap.diffs triptrap/mptrap.fot triptrap/mptrap.log \ - triptrap/mptrap.pl triptrap/mptrap.readme triptrap/mptrap1.in \ - triptrap/mptrap2.in triptrap/mptrapin.log triptrap/mtrap.0 \ - triptrap/mtrap.1 triptrap/mtrap.log triptrap/mtrap.mp \ - triptrap/texmf.cnf triptrap/trap.148 triptrap/trap.149 \ - triptrap/trap.150 triptrap/trap.151 triptrap/trap.197 \ - triptrap/trap.200 triptrap/trap.5 triptrap/trap.6 \ - triptrap/trap.mf triptrap/trap.mp triptrap/trap.mpx \ - triptrap/trap.typ triptrap/trapf.pl triptrap/trapman.tex \ - triptrap/trip.diffs triptrap/trip.fot triptrap/trip.log \ - triptrap/trip.pl triptrap/trip.tex triptrap/trip.typ \ - triptrap/trip1.in triptrap/trip2.in triptrap/tripin.log \ - triptrap/tripman.tex triptrap/tripos.tex triptrap/writeo \ - triptrap/writeo.2 tmf-pool.h mplibdir/ChangeLog $(mpost_web) \ - $(mp_tests) $(libmplib_web) mplibdir/lmplib.c $(etex_web_srcs) \ - $(etex_ch_srcs) etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \ - etexdir/ChangeLog etexdir/INSTALL etexdir/README \ - etexdir/etex_gen.tex $(etex_tests) etexdir/etrip/etrip.diffs \ + $(tex_tests) tests/write18-quote.tex $(mf_ch_src) mftalk.h \ + lib/texmfmp.c $(mf_tests) triptrap/README \ + triptrap/mftrap.diffs triptrap/mftrap.fot triptrap/mftrap.log \ + triptrap/mftrap.pl triptrap/mftrap1.in triptrap/mftrap2.in \ + triptrap/mftrapin.log triptrap/mptrap.diffs \ + triptrap/mptrap.fot triptrap/mptrap.log triptrap/mptrap.pl \ + triptrap/mptrap.readme triptrap/mptrap1.in triptrap/mptrap2.in \ + triptrap/mptrapin.log triptrap/mtrap.0 triptrap/mtrap.1 \ + triptrap/mtrap.log triptrap/mtrap.mp triptrap/texmf.cnf \ + triptrap/trap.148 triptrap/trap.149 triptrap/trap.150 \ + triptrap/trap.151 triptrap/trap.197 triptrap/trap.200 \ + triptrap/trap.5 triptrap/trap.6 triptrap/trap.mf \ + triptrap/trap.mp triptrap/trap.mpx triptrap/trap.typ \ + triptrap/trapf.pl triptrap/trapman.tex triptrap/trip.diffs \ + triptrap/trip.fot triptrap/trip.log triptrap/trip.pl \ + triptrap/trip.tex triptrap/trip.typ triptrap/trip1.in \ + triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \ + triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \ + mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \ + mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \ + etexdir/etexextra.in lib/texmfmp.c etexdir/ChangeLog \ + etexdir/INSTALL etexdir/README etexdir/etex_gen.tex \ + $(etex_tests) etexdir/etrip/etrip.diffs \ etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \ etexdir/etrip/etrip.out etexdir/etrip/etrip.pl \ etexdir/etrip/etrip.tex etexdir/etrip/etrip.typ \ @@ -1224,19 +1224,16 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \ etexdir/etrip/trip2.in etexdir/etex.mak etexdir/etex.mk \ $(ptex_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \ ptexdir/ptexextra.in ptexdir/ptex.defines lib/texmfmp.c \ - tmf-pool.h ptexdir/pbibtex.ch web2c/cvtbib.sed \ - ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \ - ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \ - ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \ + ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \ + ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \ + ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \ + ptexdir/INSTALL.txt ptexdir/README.txt \ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \ ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \ tests/memdata3.bst ptexdir/tests/goth10.tfm \ ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \ ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \ - ptexdir/tests/tmin10.tfm ptexdir/ptrip.diffs ptexdir/Files \ - ptexdir/pbibtex.defines ptexdir/ptex.mk \ - ptexdir/ptex-base.ch.orig ptexdir/ptex-include.ch \ - ptexdir/ptexhelp.h ptexdir/reautoconf $(pdftex_ch_srcs) \ + ptexdir/tests/tmin10.tfm ptexdir/ptrip.diffs $(pdftex_ch_srcs) \ etexdir/etex.ch pdftexdir/pdftex.defines pdftexdir/pdftex.h \ pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \ pdftexdir/README pdftexdir/change-files.txt \ @@ -1384,7 +1381,7 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h triptrap-sh \ synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \ synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \ synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \ - libmd5/md5.test Makefile.in.orig configure.in.orig metapost.mk + libmd5/md5.test Makefile.in.orig configure.in.orig DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ tangle-web2c tangleboot.c tangleboot.h tangleboot.p \ tangleboot-web2c ctangle.c cweb.c cweb.h ctangle-ctangle \ @@ -1562,8 +1559,12 @@ windowlib = window/libwindow.a # Metafont C sources mf_c_h = mfini.c mf0.c mfcoerce.h mfd.h nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c -libmf_a_CPPFLAGS = -DMETA_FONT libmf_a_CFLAGS = $(WARNING_CFLAGS) +mf_ch_src = \ + mf.web \ + mf.ch \ + mf-binpool.ch + # Metafont tests # @@ -6311,46 +6312,46 @@ libmd5_a-md5.obj: libmd5/md5.c @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(libmd5_a_CFLAGS) $(CFLAGS) -c -o libmd5_a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi` libmf_a-mfini.o: mfini.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mfini.o -MD -MP -MF $(DEPDIR)/libmf_a-mfini.Tpo -c -o libmf_a-mfini.o `test -f 'mfini.c' || echo '$(srcdir)/'`mfini.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mfini.o -MD -MP -MF $(DEPDIR)/libmf_a-mfini.Tpo -c -o libmf_a-mfini.o `test -f 'mfini.c' || echo '$(srcdir)/'`mfini.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmf_a-mfini.Tpo $(DEPDIR)/libmf_a-mfini.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mfini.c' object='libmf_a-mfini.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mfini.o `test -f 'mfini.c' || echo '$(srcdir)/'`mfini.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mfini.o `test -f 'mfini.c' || echo '$(srcdir)/'`mfini.c libmf_a-mfini.obj: mfini.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mfini.obj -MD -MP -MF $(DEPDIR)/libmf_a-mfini.Tpo -c -o libmf_a-mfini.obj `if test -f 'mfini.c'; then $(CYGPATH_W) 'mfini.c'; else $(CYGPATH_W) '$(srcdir)/mfini.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mfini.obj -MD -MP -MF $(DEPDIR)/libmf_a-mfini.Tpo -c -o libmf_a-mfini.obj `if test -f 'mfini.c'; then $(CYGPATH_W) 'mfini.c'; else $(CYGPATH_W) '$(srcdir)/mfini.c'; fi` @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmf_a-mfini.Tpo $(DEPDIR)/libmf_a-mfini.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mfini.c' object='libmf_a-mfini.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mfini.obj `if test -f 'mfini.c'; then $(CYGPATH_W) 'mfini.c'; else $(CYGPATH_W) '$(srcdir)/mfini.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mfini.obj `if test -f 'mfini.c'; then $(CYGPATH_W) 'mfini.c'; else $(CYGPATH_W) '$(srcdir)/mfini.c'; fi` libmf_a-mf0.o: mf0.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf0.o -MD -MP -MF $(DEPDIR)/libmf_a-mf0.Tpo -c -o libmf_a-mf0.o `test -f 'mf0.c' || echo '$(srcdir)/'`mf0.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf0.o -MD -MP -MF $(DEPDIR)/libmf_a-mf0.Tpo -c -o libmf_a-mf0.o `test -f 'mf0.c' || echo '$(srcdir)/'`mf0.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmf_a-mf0.Tpo $(DEPDIR)/libmf_a-mf0.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mf0.c' object='libmf_a-mf0.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf0.o `test -f 'mf0.c' || echo '$(srcdir)/'`mf0.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf0.o `test -f 'mf0.c' || echo '$(srcdir)/'`mf0.c libmf_a-mf0.obj: mf0.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf0.obj -MD -MP -MF $(DEPDIR)/libmf_a-mf0.Tpo -c -o libmf_a-mf0.obj `if test -f 'mf0.c'; then $(CYGPATH_W) 'mf0.c'; else $(CYGPATH_W) '$(srcdir)/mf0.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf0.obj -MD -MP -MF $(DEPDIR)/libmf_a-mf0.Tpo -c -o libmf_a-mf0.obj `if test -f 'mf0.c'; then $(CYGPATH_W) 'mf0.c'; else $(CYGPATH_W) '$(srcdir)/mf0.c'; fi` @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmf_a-mf0.Tpo $(DEPDIR)/libmf_a-mf0.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mf0.c' object='libmf_a-mf0.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf0.obj `if test -f 'mf0.c'; then $(CYGPATH_W) 'mf0.c'; else $(CYGPATH_W) '$(srcdir)/mf0.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf0.obj `if test -f 'mf0.c'; then $(CYGPATH_W) 'mf0.c'; else $(CYGPATH_W) '$(srcdir)/mf0.c'; fi` libmf_a-mf-pool.o: mf-pool.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf-pool.o -MD -MP -MF $(DEPDIR)/libmf_a-mf-pool.Tpo -c -o libmf_a-mf-pool.o `test -f 'mf-pool.c' || echo '$(srcdir)/'`mf-pool.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf-pool.o -MD -MP -MF $(DEPDIR)/libmf_a-mf-pool.Tpo -c -o libmf_a-mf-pool.o `test -f 'mf-pool.c' || echo '$(srcdir)/'`mf-pool.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmf_a-mf-pool.Tpo $(DEPDIR)/libmf_a-mf-pool.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mf-pool.c' object='libmf_a-mf-pool.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf-pool.o `test -f 'mf-pool.c' || echo '$(srcdir)/'`mf-pool.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf-pool.o `test -f 'mf-pool.c' || echo '$(srcdir)/'`mf-pool.c libmf_a-mf-pool.obj: mf-pool.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf-pool.obj -MD -MP -MF $(DEPDIR)/libmf_a-mf-pool.Tpo -c -o libmf_a-mf-pool.obj `if test -f 'mf-pool.c'; then $(CYGPATH_W) 'mf-pool.c'; else $(CYGPATH_W) '$(srcdir)/mf-pool.c'; fi` +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -MT libmf_a-mf-pool.obj -MD -MP -MF $(DEPDIR)/libmf_a-mf-pool.Tpo -c -o libmf_a-mf-pool.obj `if test -f 'mf-pool.c'; then $(CYGPATH_W) 'mf-pool.c'; else $(CYGPATH_W) '$(srcdir)/mf-pool.c'; fi` @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmf_a-mf-pool.Tpo $(DEPDIR)/libmf_a-mf-pool.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mf-pool.c' object='libmf_a-mf-pool.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf-pool.obj `if test -f 'mf-pool.c'; then $(CYGPATH_W) 'mf-pool.c'; else $(CYGPATH_W) '$(srcdir)/mf-pool.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmf_a_CFLAGS) $(CFLAGS) -c -o libmf_a-mf-pool.obj `if test -f 'mf-pool.c'; then $(CYGPATH_W) 'mf-pool.c'; else $(CYGPATH_W) '$(srcdir)/mf-pool.c'; fi` libmplib_a-avl.o: mplibdir/avl.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(libmplib_a_CFLAGS) $(CFLAGS) -MT libmplib_a-avl.o -MD -MP -MF $(DEPDIR)/libmplib_a-avl.Tpo -c -o libmplib_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c @@ -8867,8 +8868,8 @@ mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh @$(texmf_tangle) mf mf-final # Generate mf-final.ch -mf-final.ch: tie$(EXEEXT) mf.web mf.ch mf-binpool.ch - $(tie) -c $@ mf.web mf.ch mf-binpool.ch +mf-final.ch: tie$(EXEEXT) $(mf_ch_src) + $(tie) -c $@ $(mf_ch_src) .PHONY: trap-clean clean-local:: trap-clean diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index 6d227edd64d..5d25ddc6665 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -5,9 +5,9 @@ dnl You may freely use, modify and/or distribute this file. dnl ## configure options for TeX and MF m4_define_default([kpse_indent_26], [26])[]dnl -AC_ARG_WITH([tex-banner], - AS_HELP_STRING([--with-tex-banner=STR], - [version string appended to banner lines @<:@Web2C YEAR@:>@]))[]dnl +AC_ARG_WITH([banner-add], + AS_HELP_STRING([--with-banner-add=STR], + [add STR to version string appended to banner lines]))[]dnl AC_ARG_WITH([editor], AS_HELP_STRING([--with-editor=CMD], [invoke CMD from the `e' option @<:@vi +%d %s@:>@]))[]dnl diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 9219c17ff06..b88acb3707e 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -59,7 +59,7 @@ tex_ch_srcs = \ $(tex_ch_synctex) \ tex-binpool.ch ## -EXTRA_DIST += $(tex_ch_srcs) lib/texmfmp.c tmf-pool.h +EXTRA_DIST += $(tex_ch_srcs) lib/texmfmp.c DISTCLEANFILES += $(nodist_tex_SOURCES) tex-final.ch tex-web2c \ tex.p tex.pool tex-tangle @@ -129,7 +129,6 @@ EXTRA_LIBRARIES += libmf.a # Metafont C sources mf_c_h = mfini.c mf0.c mfcoerce.h mfd.h nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c -libmf_a_CPPFLAGS = -DMETA_FONT libmf_a_CFLAGS = $(WARNING_CFLAGS) # We must create mfd.h before building the libmf_a_OBJECTS. @@ -153,10 +152,14 @@ mf-tangle: tangle$(EXEEXT) mf.web mf-final.ch tangle-sh @$(texmf_tangle) mf mf-final # Generate mf-final.ch -mf-final.ch: tie$(EXEEXT) mf.web mf.ch mf-binpool.ch - $(tie) -c $@ mf.web mf.ch mf-binpool.ch +mf-final.ch: tie$(EXEEXT) $(mf_ch_src) + $(tie) -c $@ $(mf_ch_src) +mf_ch_src = \ + mf.web \ + mf.ch \ + mf-binpool.ch ## -EXTRA_DIST += mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c tmf-pool.h +EXTRA_DIST += $(mf_ch_src) mftalk.h lib/texmfmp.c DISTCLEANFILES += $(nodist_libmf_a_SOURCES) mfextra.c mf-final.ch mf-web2c \ mf.p mf.pool mf-tangle @@ -231,7 +234,3 @@ EXTRA_DIST += \ triptrap/writeo \ triptrap/writeo.2 -## Eventually delete these files -## -EXTRA_DIST += tmf-pool.h - diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 393ff2264b9..7c7def7100b 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1010,7 +1010,7 @@ enable_largefile enable_compiler_warnings enable_cxx_runtime_hack enable_libtool_hack -with_tex_banner +with_banner_add with_editor enable_auto_core enable_dump_share @@ -1750,7 +1750,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-tex-banner=STR version string appended to banner lines [Web2C YEAR] + --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-fontconfig-includes=DIR @@ -16636,9 +16636,9 @@ fi ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF -# Check whether --with-tex-banner was given. -if test "${with_tex_banner+set}" = set; then : - withval=$with_tex_banner; +# Check whether --with-banner-add was given. +if test "${with_banner_add+set}" = set; then : + withval=$with_banner_add; fi # Check whether --with-editor was given. @@ -16816,16 +16816,13 @@ if test "${enable_web_progs+set}" = set; then : fi -case $with_tex_banner in #( - ''|yes|no) : - with_tex_banner="Web2C $WEB2CVERSION" ;; #( - *) : - if echo "$with_tex_banner" | grep -v "$WEB2CVERSION" >/dev/null; then : - as_fn_error "Bad \`--with-tex-banner=$with_tex_banner' version string (must contain \` $WEB2CVERSION')" "$LINENO" 5 -fi ;; -esac +if test "x$enable_texlive_build" = xyes; then : + banner_pre='TeX Live' +else + banner_pre='Web2C' +fi cat >>confdefs.h <<_ACEOF -#define WEB2CVERSION " ($with_tex_banner)" +#define WEB2CVERSION " ($banner_pre $WEB2CVERSION$with_banner_add)" _ACEOF diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 3a16b950319..c149c13c170 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -46,11 +46,11 @@ dnl Include additional code for web2c. KPSE_WEB2C_PREPARE m4_include([ac/web2c.ac]) -AS_CASE([$with_tex_banner], - [''|yes|no], [with_tex_banner="Web2C $WEB2CVERSION"], - [AS_IF([echo "$with_tex_banner" | grep -v "$WEB2CVERSION" >/dev/null], - [AC_MSG_ERROR([Bad `--with-tex-banner=$with_tex_banner' version string (must contain ` $WEB2CVERSION')])])]) -AC_DEFINE_UNQUOTED([WEB2CVERSION], [" ($with_tex_banner)"]) +AS_IF([test "x$enable_texlive_build" = xyes], + [banner_pre='TeX Live'], + [banner_pre='Web2C']) +AC_DEFINE_UNQUOTED([WEB2CVERSION], + [" ($banner_pre $WEB2CVERSION$with_banner_add)"]) dnl For tests AC_CHECK_PROGS([KPSEWHICH], [kpsewhich], [false]) diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index e8f8210116e..d2456663b40 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2010-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am (EXTRA_DIST): Remove tmf-pool.h. + 2010-05-18 Peter Breitenlohner <peb@mppmu.mpg.de> * etex.ch: More error message with \protected, from Heiko. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 135061c9a73..993f6bb411b 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -71,7 +71,7 @@ etex_ch_srcs = \ tex-binpool.ch ## EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \ - lib/texmfmp.c tmf-pool.h + lib/texmfmp.c DISTCLEANFILES += $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c \ etex.p etex.pool etex-tangle etexdir/etex.version diff --git a/Build/source/texk/web2c/metapost.mk b/Build/source/texk/web2c/metapost.mk deleted file mode 100644 index 5ae51d805ae..00000000000 --- a/Build/source/texk/web2c/metapost.mk +++ /dev/null @@ -1,107 +0,0 @@ -# Makefile fragment for MetaPost. -# $Id: metapost.mk,v 1.15 2005/07/04 07:51:41 taco Exp $ -# -# Public domain. -# -# This facilitates a separate development track for MetaPost. - -Makefile: metapost.mk - -mpost = mpost -metapost = $(mpost) dvitomp -mpostdir = mpdir - -# mpware is the subdirectory. -mpware = mpware -mpware_programs = mpware/dmp mpware/makempx mpware/mpto mpware/newer -mpware_sources = mpware/dmp.c mpware/makempx.in mpware/mpto.c mpware/newer.c - -# mpost - -mp_c = mpini.c mp0.c mp1.c mp2.c -mp_o = mpini.o mp0.o mp1.o mp2.o mpextra.o mp-loadpool.o - -mp-loadpool.c: mp.pool $(makecpool) - $(makecpool) mp.pool mpdir/mplib.h >$@ || rm -f $@ -# mpostlibsdep also includes makecpool -mpost: $(mp_o) $(mpostlibsdep) - $(kpathsea_link) $(mp_o) $(mpostlibs) $(LOADLIBES) -$(mp_c) mpcoerce.h mpd.h: mp.p $(web2c_texmf) $(srcdir)/$(mpostdir)/mp.defines web2c/cvtmf1.sed web2c/cvtmf2.sed - $(web2c) mp -mpextra.c: lib/texmfmp.c - sed s/TEX-OR-MF-OR-MP/mp/ $(srcdir)/lib/texmfmp.c >$@ -mp.p mp.pool: tie tangle mp.web mp.ch - $(tangle) $(srcdir)/mp.web $(srcdir)/mp.ch -check: mpost-check -mpost-check: mptrap mpost.mem $(mpware) - ./mpost --progname=mpost '&./mpost \tracingstats:=1; end.' - TEXMFCNF=../kpathsea \ - MAKEMPX_BINDIR=`pwd`:`pwd`/mpware MPXCOMMAND=mpware/makempx \ - ./mpost --progname=mpost $(srcdir)/tests/mptest - ./mpost --progname=mpost $(srcdir)/tests/one.two - ./mpost --progname=mpost $(srcdir)/tests/uno.dos -clean:: mpost-clean -mpost-clean: mptrap-clean - $(LIBTOOL) --mode=clean rm -f mpost - rm -f $(mp_o) $(mp_c) mpextra.c mpcoerce.h mpd.h mp.p mp.pool - rm -f mpost.mem mpost.log - rm -f mpout.log mptest.log one.two.log uno.log - -# Can't run trap and mptrap in parallel, because both write trap.{log,tfm}. -mptrap: mpost pltotf tftopl mptrap-clean - @echo ">>> See $(testdir)/mptrap.diffs for example of acceptable diffs." >&2 - $(LN) $(testdir)/mtrap.mp . # get same filename in log - ./pltotf $(testdir)/trapf.pl trapf.tfm - -$(SHELL) -c '$(testenv) ./mpost --progname=inimpost mtrap' - -diff $(testdir)/mtrap.log mtrap.log - -diff $(testdir)/mtrap.0 mtrap.0 - -diff $(testdir)/mtrap.1 mtrap.1 - -diff $(testdir)/writeo writeo - -diff $(testdir)/writeo.2 writeo.2 - $(LN) $(testdir)/trap.mp . - $(LN) $(testdir)/trap.mpx . - -$(SHELL) -c '$(testenv) ./mpost --progname=inimpost <$(testdir)/mptrap1.in >mptrapin.fot' - mv trap.log mptrapin.log - -diff $(testdir)/mptrapin.log mptrapin.log -# Must run inimp or font_name[null_font] is not initialized, leading to diffs. - -$(SHELL) -c '$(testenv) ./mpost --progname=inimpost <$(testdir)/mptrap2.in >mptrap.fot' - mv trap.log mptrap.log - mv trap.tfm mptrap.tfm - -diff $(testdir)/mptrap.fot mptrap.fot - -diff $(testdir)/mptrap.log mptrap.log - -diff $(testdir)/trap.5 trap.5 - -diff $(testdir)/trap.6 trap.6 - -diff $(testdir)/trap.148 trap.148 - -diff $(testdir)/trap.149 trap.149 - -diff $(testdir)/trap.150 trap.150 - -diff $(testdir)/trap.151 trap.151 - -diff $(testdir)/trap.197 trap.197 - -diff $(testdir)/trap.200 trap.200 - ./tftopl ./mptrap.tfm mptrap.pl - -diff $(testdir)/mptrap.pl mptrap.pl - -mptrap-clean: - rm -f mtrap.mp mtrap.mem trapf.tfm - rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2 - rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log - rm -f mptrap.fot mptrap.log mptrap.tfm - rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97 - rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104 - rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148 - rm -f trap.149 trap.150 trap.151 trap.197 trap.200 - rm -f mptrap.pl - - -# mpware - -# We put mpware (written directly in C) in a subdirectory. -$(mpware): $(mpware_programs) - -$(mpware_programs): $(mpware_sources) - cd $(mpware) && $(MAKE) $(common_makeargs) - -install-programs: install-mpware-programs -install-mpware-programs: $(mpware_programs) - cd $(mpware) && $(MAKE) $(install_makeargs) install-exec - -mp-programs: $(metapost) $(mpware) diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 01502678fae..c99b9ac35e1 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,6 +1,12 @@ -2010-05-30 Vladimir Volovich <vvv@vsu.ru> +2010-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> - * dvipng.test: use `...` not $(...). + * Files, pbibtex.defines, ptex.mk, ptex-base.ch.orig, + ptex-include.ch, ptexhelp.h, reautoconf (removed): Unused files. + * am/ptex.am (EXTRA_DIST): Adjust. + +2010-05-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/ptex.am (EXTRA_DIST): Remove tmf-pool.h. 2010-05-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp> diff --git a/Build/source/texk/web2c/ptexdir/Files b/Build/source/texk/web2c/ptexdir/Files deleted file mode 100644 index ac7a1dff916..00000000000 --- a/Build/source/texk/web2c/ptexdir/Files +++ /dev/null @@ -1,27 +0,0 @@ -COPYRIGHT -COPYRIGHT.jis -Changes.txt -Files -INSTALL.txt -Makefile.in -README.txt -configure -jbibd.sed -jbibextra.c -jbibextra.h -jbibtex.ch -jbibtex.defines -kanji.c -kanji.defines -kanji.h.in -mkconf -pconvert -pdvitype.ch -pltotf.ch -ptex-base.ch -ptexextra.c -ptexextra.h -ptexhelp.h -tftopl.ch -usage.c -version.c diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index dfb8f285593..95470f82a63 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -98,7 +98,7 @@ ptex_ch_srcs = \ tex-binpool.ch EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptexextra.in \ - ptexdir/ptex.defines lib/texmfmp.c tmf-pool.h + ptexdir/ptex.defines lib/texmfmp.c DISTCLEANFILES += $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c \ ptex.p ptex.pool ptex-tangle ptexdir/ptex.version @@ -224,13 +224,3 @@ ptrip-clean: rm -rf tfm DISTCLEANFILES += ptrip.diffs -## Eventually delete these files -## -EXTRA_DIST += \ - ptexdir/Files \ - ptexdir/pbibtex.defines \ - ptexdir/ptex.mk \ - ptexdir/ptex-base.ch.orig \ - ptexdir/ptex-include.ch \ - ptexdir/ptexhelp.h \ - ptexdir/reautoconf diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.defines b/Build/source/texk/web2c/ptexdir/pbibtex.defines deleted file mode 100644 index 9a83ef32721..00000000000 --- a/Build/source/texk/web2c/ptexdir/pbibtex.defines +++ /dev/null @@ -1,4 +0,0 @@ -@define function inputline3(); -@define const PBIBTEXHELP; -@define function getencstring; -@define function setencstring (); diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch.orig b/Build/source/texk/web2c/ptexdir/ptex-base.ch.orig deleted file mode 100644 index 3f4236ada93..00000000000 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch.orig +++ /dev/null @@ -1,7682 +0,0 @@ -% This is a change file for pTeX 3.1.11 -% By Sadayuki Tanaka and ASCII MEDIA WORKS. -% -% Thanks for : -% Ryoichi Kurasawa (us009185@interramp.com), -% Hisato Hamano, -% Hiroto Kagotani (kagotani@in.it.okayama-u.ac.jp), -% Takashi Kakiuchi (kakiuchi@sy6.isl.mei.co.jp), -% Yoichi Kawabata (kawabata@canon.co.jp), -% Makoto Kobayashi (makoto@lloem.fujidenki.co.jp), -% Yoshihiro Aoki (aoki@tokyo-shoseki-ptg.co.jp), -% Akira Kakuto (kakuto@fsci.fuk.kindai.ac.jp). -% Koich Inoue (inoue@ma.ns.musashi-tech.ac.jp). -% -% (??/??/87) RKS jTeX 2.9 -- j1.0 -% (??/??/89) RKS jTeX 2.93 -- j1.3 -% (12/ 9/89) H_2 pTeX 2.93 j1.3 p1.0.1 -% (12/??/89) RKS jTeX 2.95 -- j1.5 -% (12/??/89) RKS jTeX 2.99 -- j1.5 -% (02/02/90) RKS jTeX 2.99 -- j1.6 -% (04/16/90) H_2 pTeX 2.99 j1.6 p1.0.3 -% (09/14/90) H_2 pTeX 2.99 j1.6 p1.0.9 -- pre-release -% (10/29/90) H_2 Bug fix (p1.0.9a) -% (01/21/92) H_2 jTeX 2.99 - j1.7 -% (01/21/92) H_2 pTeX 2.99 j1.7 p1.0.9F -% (03/09/92) H_2 pTeX 2.99 j1.7 p1.0.9G jflag BUG -% (03/20/95) KN pTeX p2.0 (based on 3.1415) -% (09/08/95) KN pTeX p2.1 -% (09/20/95) KN pTeX p2.1.1 -% (11/21/95) KN pTeX p2.1.4 -% (08/27/97) KN pTeX p2.1.5 (based on 3.14159) -% (02/26/98) KN pTeX p2.1.6 -% (03/19/98) KN pTeX p2.1.7 -% (03/26/98) KN pTeX p2.1.8 (Web2c 7.2) -% (02/21/2000) KN pTeX p2.1.9 (Web2c 7.3.1) -% (11/13/2000) KN pTeX p2.1.10 -% (05/22/2001) KN pTeX p2.1.11 -% (03/10/2001) KN pTeX p3.0 (modified BSD licence) -% (09/02/2004) ST pTeX p3.1.4 -% (11/29/2004) KN pTeX p3.1.5 -% (12/13/2004) KN pTeX p3.1.8 -% (10/17/2005) ST pTeX p3.1.9 -% (07/18/2006) ST pTeX p3.1.10 -% (08/17/2009) ST pTeX p3.1.11 -% -@x [1.2] l.195 - pTeX: -@d TeX_banner_k=='This is TeXk, Version 3.141592' {printed when \TeX\ starts} -@d TeX_banner=='This is TeX, Version 3.141592' {printed when \TeX\ starts} -@y -@d TeX_banner_k=='This is pTeXk, Version 3.141592-p3.1.11' {printed when p\TeX\ starts} -@d TeX_banner=='This is pTeX, Version 3.141592-p3.1.11' {printed when p\TeX\ starts} -@z - -@x [2.??] l.586 - pTeX: -@!ASCII_code=0..255; {eight-bit numbers} -@y -@!ASCII_code=0..255; {eight-bit numbers} -@!KANJI_code=0..65535; {sixteen-bit numbers} -@z - -@x l.632 - pTeX -mubyte_read: array [ASCII_code] of pointer; - { non zero iff character begins the multi byte code } -mubyte_write: array [ASCII_code] of str_number; - { non zero iff character expands to multi bytes in log and write files } -mubyte_cswrite: array [0..127] of pointer; - { non null iff cs mod 128 expands to multi bytes in log and write files } -mubyte_skip: integer; { the number of bytes to skip in |buffer| } -mubyte_keep: integer; { the number of chars we need to keep unchanged } -mubyte_skeep: integer; { saved |mubyte_keep| } -mubyte_prefix: integer; { the type of mubyte prefix } -mubyte_tablein: boolean; { the input side of table will be updated } -mubyte_tableout: boolean; { the output side of table will be updated } -mubyte_relax: boolean; { the relax prefix is used } -mubyte_start: boolean; { we are making the token at the start of the line } -mubyte_sstart: boolean; { saved |mubyte_start| } -mubyte_token: pointer; { the token returned by |read_buffer| } -mubyte_stoken: pointer; { saved first token in mubyte primitive } -mubyte_sout: integer; { saved value of |mubyte_out| } -mubyte_slog: integer; { saved value of |mubyte_log| } -spec_sout: integer; { saved value of |spec_out| } -no_convert: boolean; { conversion supressed by noconvert primitive } -active_noconvert: boolean; { true if noconvert primitive is active } -write_noexpanding: boolean; { true only if we need not write expansion } -cs_converting: boolean; { true only if we need csname converting } -special_printing: boolean; { true only if we need converting in special } -message_printing: boolean; { true if message or errmessage prints to string } -@y -@z - -@x l.803 - pTeX -{Initialize enc\TeX\ data.} -for i:=0 to 255 do mubyte_read[i]:=null; -for i:=0 to 255 do mubyte_write[i]:=0; -for i:=0 to 128 do mubyte_cswrite[i]:=null; -mubyte_keep := 0; mubyte_start := false; -write_noexpanding := false; cs_converting := false; -special_printing := false; message_printing := false; -no_convert := false; active_noconvert := false; -@y -@z - - -@x [4.??] l.870 - pTeX: -@!eight_bits=0..255; {unsigned one-byte quantity} -@y -@!eight_bits=0..255; {unsigned one-byte quantity} -@!sixteen_bits=0..65535; {unsigned two-bytes quantity} -@z - -@x [3.??] l.891 - pTeX: -@ All of the file opening functions are defined in C. -@y -@ All of the file opening functions are defined in C. - -@ Kanji code handling. - -@d jis_enc=0 {denotes JIS X 2022 kanji encoding} -@d euc_enc=1 {denotes EUC kanji encoding} -@d sjis_enc=2 {denotes Shift JIS kanji encoding} - -@<Glob...@>= -@!proc_kanji_code:jis_enc..sjis_enc; -@z - -@x [4.47] l.1325 - pTeX: -@!init function get_strings_started:boolean; {initializes the string pool, - but returns |false| if something goes wrong} -label done,exit; -var k,@!l:0..255; {small indices or counters} -@y -@!init function get_strings_started:boolean; {initializes the string pool, - but returns |false| if something goes wrong} -label done,exit; -var k,@!l:KANJI_code; {small indices or counters} -@z - -@x [4.49] l.1384 - pTeX: -@<Character |k| cannot be printed@>= - (k<" ")or(k>"~") -@y -@<Character |k| cannot be printed@>= - not (iskanji1(k) or iskanji2(k) or xprn[k]) -@z - -@x [5.54] l.1514 - pTeX: Global variables -@!trick_buf:array[0..ssup_error_line] of ASCII_code; {circular buffer for - pseudoprinting} -@y -@!trick_buf:array[0..ssup_error_line] of ASCII_code; {circular buffer for - pseudoprinting} -@!trick_buf2:array[0..ssup_error_line] of 0..2; {pTeX: buffer for KANJI} -@!kcode_pos: 0..2; {pTeX: denotes whether first byte or second byte of KANJI} -@z - -@x [5.55] l.1519 - pTeX: Initialize the kcode_pos -@ @<Initialize the output routines@>= -selector:=term_only; tally:=0; term_offset:=0; file_offset:=0; -@y -@ @<Initialize the output routines@>= -selector:=term_only; tally:=0; term_offset:=0; file_offset:=0; -kcode_pos:=0; -@z - -@x [5.57] l.1538 - pTeX: kcode_pos -procedure print_ln; {prints an end-of-line} -begin case selector of -term_and_log: begin wterm_cr; wlog_cr; - term_offset:=0; file_offset:=0; - end; -log_only: begin wlog_cr; file_offset:=0; - end; -term_only: begin wterm_cr; term_offset:=0; - end; -no_print,pseudo,new_string: do_nothing; -othercases write_ln(write_file[selector]) -endcases;@/ -@y -procedure print_ln; {prints an end-of-line} -begin case selector of -term_and_log: begin - if kcode_pos=1 then begin wterm(' '); wlog(' '); end; - wterm_cr; wlog_cr; term_offset:=0; file_offset:=0; - end; -log_only: begin if kcode_pos=1 then wlog(' '); - wlog_cr; file_offset:=0; - end; -term_only: begin if kcode_pos=1 then wterm(' '); - wterm_cr; term_offset:=0; - end; -no_print,pseudo,new_string: do_nothing; -othercases write_ln(write_file[selector]) -endcases;@/ -kcode_pos:=0; -@z - -@x [5.58] l.1557 - pTeX: kcode_pos, trick_buf2 -procedure print_char(@!s:ASCII_code); {prints a single character} -label exit; -begin if @<Character |s| is the current new-line character@> then - if selector<pseudo then - begin print_ln; return; - end; -case selector of -term_and_log: begin wterm(xchr[s]); wlog(xchr[s]); - incr(term_offset); incr(file_offset); - if term_offset=max_print_line then - begin wterm_cr; term_offset:=0; - end; - if file_offset=max_print_line then - begin wlog_cr; file_offset:=0; - end; - end; -log_only: begin wlog(xchr[s]); incr(file_offset); - if file_offset=max_print_line then print_ln; - end; -term_only: begin wterm(xchr[s]); incr(term_offset); - if term_offset=max_print_line then print_ln; - end; -no_print: do_nothing; -pseudo: if tally<trick_count then trick_buf[tally mod error_line]:=s; -@y -procedure print_char(@!s:ASCII_code); {prints a single character} -label exit; {label is not used but nonetheless kept (for other changes?)} -begin if @<Character |s| is the current new-line character@> then - if selector<pseudo then - begin print_ln; return; - end; -if kcode_pos=1 then kcode_pos:=2 -else if iskanji1(xchr[s]) then - begin kcode_pos:=1; - if (selector=term_and_log)or(selector=log_only) then - if file_offset>=max_print_line-1 then - begin wlog_cr; file_offset:=0; - end; - if (selector=term_and_log)or(selector=term_only) then - if term_offset>=max_print_line-1 then - begin wterm_cr; term_offset:=0; - end; - end -else kcode_pos:=0; -case selector of -term_and_log: begin wterm(xchr[s]); incr(term_offset); - if term_offset=max_print_line then - begin wterm_cr; term_offset:=0; - end; - wlog(xchr[s]); incr(file_offset); - if file_offset=max_print_line then - begin wlog_cr; file_offset:=0; - end; - end; -log_only: begin wlog(xchr[s]); incr(file_offset); - if file_offset=max_print_line then print_ln; - end; -term_only: begin wterm(xchr[s]); incr(term_offset); - if term_offset=max_print_line then print_ln; - end; -no_print: do_nothing; -pseudo: if tally<trick_count then - begin trick_buf[tally mod error_line]:=s; - trick_buf2[tally mod error_line]:=kcode_pos; - end; -@z - -@x l.1603 - pTeX -procedure print(@!s:integer); {prints string |s|} -label exit; -var j:pool_pointer; {current character code position} -@!nl:integer; {new-line character to restore} -begin if s>=str_ptr then s:="???" {this can't happen} -@.???@> -else if s<256 then - if s<0 then s:="???" {can't happen} - else begin if (selector>pseudo) and (not special_printing) - and (not message_printing) then - begin print_char(s); return; {internal strings are not expanded} - end; - if (@<Character |s| is the current new-line character@>) then - if selector<pseudo then - begin print_ln; no_convert := false; return; - end - else if message_printing then - begin print_char(s); no_convert := false; return; - end; - if (mubyte_log>0) and (not no_convert) and (mubyte_write[s]>0) then - s := mubyte_write[s] - else if xprn[s] or special_printing then - begin print_char(s); no_convert := false; return; end; - no_convert := false; - nl:=new_line_char; new_line_char:=-1; - {temporarily disable new-line character} - j:=str_start[s]; - while j<str_start[s+1] do - begin print_char(so(str_pool[j])); incr(j); - end; - new_line_char:=nl; return; - end; -j:=str_start[s]; -while j<str_start[s+1] do - begin print_char(so(str_pool[j])); incr(j); - end; -exit:end; -@y -procedure print(@!s:integer); {prints string |s|} -label exit; -var j:pool_pointer; {current character code position} -@!nl:integer; {new-line character to restore} -begin if s>=str_ptr then s:="???" {this can't happen} -@.???@> -else if s<256 then - if s<0 then s:="???" {can't happen} - else begin if selector>pseudo then - begin print_char(s); return; {internal strings are not expanded} - end; - if (@<Character |s| is the current new-line character@>) then - if selector<pseudo then - begin print_ln; return; - end; - nl:=new_line_char; new_line_char:=-1; - {temporarily disable new-line character} - j:=str_start[s]; - while j<str_start[s+1] do - begin print_char(so(str_pool[j])); incr(j); - end; - new_line_char:=nl; return; - end; -j:=str_start[s]; -while j<str_start[s+1] do - begin print_char(so(str_pool[j])); incr(j); - end; -exit:end; -@z - -@x [5.61] l.1656 - pTeX: -@<Initialize the output...@>= -if src_specials_p or file_line_error_style_p or parse_first_line_p then - wterm(banner_k) -else - wterm(banner); -@y -@<Initialize the output...@>= -if src_specials_p or file_line_error_style_p or parse_first_line_p then - wterm(banner_k) -else - wterm(banner); -wterm(' ('); -case proc_kanji_code of - jis_enc: wterm('jis'); - euc_enc: wterm('euc'); - sjis_enc: wterm('sjis'); - othercases wterm('?'); -endcases; -wterm(')'); -@z - -@x l.1820 - pTeX -k:=first; while k < last do begin print_buffer(k) end; -@y -if last<>first then for k:=first to last-1 do print(buffer[k]); -@z - -@x [8.112] l.2588 - pTeX: -@d ho(#)==# {to take a sixteen-bit item from a halfword} -@y -@d ho(#)==# {to take a sixteen-bit item from a halfword} -@d KANJI(#)==# {pTeX: to output an KANJI code into a halfword} -@d tokanji(#)==# {pTeX: to take an KANJI code into a halfword} -@d tonum(#)==# {pTeX: to put an KANJI code into a halfword} -@z - -@x [10.135] l.3008 - pTeX: box_dir, space_ptr, xspace_ptr -@d hlist_node=0 {|type| of hlist nodes} -@d box_node_size=7 {number of words to allocate for a box node} -@d width_offset=1 {position of |width| field in a box node} -@d depth_offset=2 {position of |depth| field in a box node} -@d height_offset=3 {position of |height| field in a box node} -@d width(#) == mem[#+width_offset].sc {width of the box, in sp} -@d depth(#) == mem[#+depth_offset].sc {depth of the box, in sp} -@d height(#) == mem[#+height_offset].sc {height of the box, in sp} -@d shift_amount(#) == mem[#+4].sc {repositioning distance, in sp} -@d list_offset=5 {position of |list_ptr| field in a box node} -@d list_ptr(#) == link(#+list_offset) {beginning of the list inside the box} -@d glue_order(#) == subtype(#+list_offset) {applicable order of infinity} -@d glue_sign(#) == type(#+list_offset) {stretching or shrinking} -@d normal=0 {the most common case when several cases are named} -@d stretching = 1 {glue setting applies to the stretch components} -@d shrinking = 2 {glue setting applies to the shrink components} -@d glue_offset = 6 {position of |glue_set| in a box node} -@d glue_set(#) == mem[#+glue_offset].gr - {a word of type |glue_ratio| for glue setting} -@y -@d hlist_node=0 {|type| of hlist nodes} -@d box_node_size=8 {number of words to allocate for a box node} -@# -@d box_dir(#) == subtype(#) {direction mode of a box} -@d dir_default == qi(0) {direction of the box, default Left to Right} -@d dir_dtou == qi(1) {direction of the box, Bottom to Top} -@d dir_tate == qi(3) {direction of the box, Top to Bottom} -@d dir_yoko == qi(4) {direction of the box, equal default} -@d any_dir == dir_yoko,dir_tate,dir_dtou -@# -@d width_offset=1 {position of |width| field in a box node} -@d depth_offset=2 {position of |depth| field in a box node} -@d height_offset=3 {position of |height| field in a box node} -@d width(#) == mem[#+width_offset].sc {width of the box, in sp} -@d depth(#) == mem[#+depth_offset].sc {depth of the box, in sp} -@d height(#) == mem[#+height_offset].sc {height of the box, in sp} -@d shift_amount(#) == mem[#+4].sc {repositioning distance, in sp} -@d list_offset=5 {position of |list_ptr| field in a box node} -@d list_ptr(#) == link(#+list_offset) {beginning of the list inside the box} -@d glue_order(#) == subtype(#+list_offset) {applicable order of infinity} -@d glue_sign(#) == type(#+list_offset) {stretching or shrinking} -@d normal=0 {the most common case when several cases are named} -@d stretching = 1 {glue setting applies to the stretch components} -@d shrinking = 2 {glue setting applies to the shrink components} -@d glue_offset = 6 {position of |glue_set| in a box node} -@d glue_set(#) == mem[#+glue_offset].gr - {a word of type |glue_ratio| for glue setting} -@d space_offset = 7 {position of |glue_set| in a box node} -@d space_ptr(#) == link(#+space_offset) -@d xspace_ptr(#) == info(#+space_offset) -@z - -@x [10.136] l.3037 - pTeX: space_ptr, xspace_ptr -width(p):=0; depth(p):=0; height(p):=0; shift_amount(p):=0; list_ptr(p):=null; -glue_sign(p):=normal; glue_order(p):=normal; set_glue_ratio_zero(glue_set(p)); -@y -width(p):=0; depth(p):=0; height(p):=0; shift_amount(p):=0; list_ptr(p):=null; -glue_sign(p):=normal; glue_order(p):=normal; set_glue_ratio_zero(glue_set(p)); -space_ptr(p):=zero_glue; xspace_ptr(p):=zero_glue; -add_glue_ref(zero_glue); add_glue_ref(zero_glue); -@z - -@x [10.137] l.3045 - pTeX: direction change node -@d vlist_node=1 {|type| of vlist nodes} -@y -@d vlist_node=1 {|type| of vlist nodes} - -@ A |dir_node| stands for direction change. - -@d dir_node=2 {|type| of dir nodes} - -@p function new_dir_node(b:pointer; dir:eight_bits):pointer; -var p:pointer; {the new node} -begin if type(b)>vlist_node then confusion("new_dir_node:not box"); -p:=new_null_box; type(p):=dir_node; box_dir(p):=dir; -case box_dir(b) of - dir_yoko: @<Yoko to other direction@>; - dir_tate: @<Tate to other direction@>; - dir_dtou: @<DtoU to other direction@>; - othercases confusion("new_dir_node:illegal dir"); -endcases; -link(b):=null; list_ptr(p):=b; -new_dir_node:=p; -end; - -@ @<Yoko to other direction@>= - case dir of - dir_tate: begin width(p):=height(b)+depth(b); - depth(p):=width(b)/2; height(p):=width(b)-depth(p); - end; - dir_dtou: begin width(p):=height(b)+depth(b); - depth(p):=0; height(p):=width(b); - end; - othercases confusion("new_dir_node:y->?"); - endcases - -@ @<Tate to other direction@>= - case dir of - dir_yoko: begin width(p):=height(b)+depth(b); - depth(p):=0; height(p):=width(b); - end; - dir_dtou: begin width(p):=width(b); - depth(p):=height(b); height(p):=depth(b); - end; - othercases confusion("new_dir_node:t->?"); - endcases - -@ @<DtoU to other direction@>= - case dir of - dir_yoko: begin width(p):=height(b)+depth(b); - depth(p):=0; height(p):=width(b); - end; - dir_tate: begin width(p):=width(b); - depth(p):=height(b); height(p):=depth(b); - end; - othercases confusion("new_dir_node:d->?"); - endcases -@z - -@x [10.138] l.3054 - pTeX: renumber rule_node -@d rule_node=2 {|type| of rule nodes} -@y -@d rule_node=3 {|type| of rule nodes} -@z - -@x [10.140] l.3083 - pTeX: renumber ins_node, add ins_dir field -@d ins_node=3 {|type| of insertion nodes} -@d ins_node_size=5 {number of words to allocate for an insertion} -@d float_cost(#)==mem[#+1].int {the |floating_penalty| to be used} -@d ins_ptr(#)==info(#+4) {the vertical list to be inserted} -@d split_top_ptr(#)==link(#+4) {the |split_top_skip| to be used} -@y -@d ins_node=4 {|type| of insertion nodes} -@d ins_node_size=6 {number of words to allocate for an insertion} -@d float_cost(#)==mem[#+1].int {the |floating_penalty| to be used} -@d ins_ptr(#)==info(#+4) {the vertical list to be inserted} -@d split_top_ptr(#)==link(#+4) {the |split_top_skip| to be used} -@d ins_dir(#)==subtype(#+5) {direction of |ins_node|} -@z - -@x [10.141] l.3089 - pTeX: disp_node -@ A |mark_node| has a |mark_ptr| field that points to the reference count -@y -@ A |disp_node| has a |disp_dimen| field that points to the displacement -distance of the baselineshift between Latin characters and Kanji chatacters. - -@d disp_node=5 {|type| of a displace node} -@d disp_dimen(#)==mem[#+1].sc - -@ A |mark_node| has a |mark_ptr| field that points to the reference count -@z - -@x [10.140] l.3095 - pTeX: renumber nodes -@d mark_node=4 {|type| of a mark node} -@y -@d mark_node=6 {|type| of a mark node} -@z - -@x [10.141] l.3105 - pTeX: renumber nodes -@d adjust_node=5 {|type| of an adjust node} -@y -@d adjust_node=7 {|type| of an adjust node} -@z - -@x [10.142] l.3122 - pTeX: renumber nodes -@d ligature_node=6 {|type| of a ligature node} -@y -@d ligature_node=8 {|type| of a ligature node} -@z - -@x [10.145] l.3163 - pTeX: renumber nodes -@d disc_node=7 {|type| of a discretionary node} -@y -@d disc_node=9 {|type| of a discretionary node} -@z - -@x [10.146] l.3191 - pTeX: renumber nodes -@d whatsit_node=8 {|type| of special extension nodes} -@y -@d whatsit_node=10 {|type| of special extension nodes} -@z - -@x [10.147] l.3198 - pTeX: renumber nodes -@d math_node=9 {|type| of a math node} -@y -@d math_node=11 {|type| of a math node} -@z - -@x [10.150] l.3244 - pTeX: renumber nodes -@d glue_node=10 {|type| of node that points to a glue specification} -@y -@d glue_node=12 {|type| of node that points to a glue specification} -@z - -@x [10.155] l.3342 - pTeX: renumber nodes -@d kern_node=11 {|type| of a kern node} -@d explicit=1 {|subtype| of kern nodes from \.{\\kern} and \.{\\/}} -@d acc_kern=2 {|subtype| of kern nodes from accents} -@y -@d kern_node=13 {|type| of a kern node} -@d explicit=1 {|subtype| of kern nodes from \.{\\kern}} -@d acc_kern=2 {|subtype| of kern nodes from accents} -@d ita_kern=3 {|subtype| of kern nodes from \.{\\/}} -@z - -@x [10.157] l.3363 - pTeX: renumber nodes -@d penalty_node=12 {|type| of a penalty node} -@y -@d penalty_node=14 {|type| of a penalty node} -@d widow_pena=1 {|subtype| of penalty nodes from \.{\\jchrwidowpenalty}} -@d kinsoku_pena=2 {|subtype| of penalty nodes from kinsoku} -@z - -@x [10.159] l.3392 - pTeX: renumber nodes -@d unset_node=13 {|type| for an unset node} -@y -@d unset_node=15 {|type| for an unset node} -@z - -@x [10.160] l.3397 - pTeX: renumber nodes -@ In fact, there are still more types coming. When we get to math formula -processing we will see that a |style_node| has |type=14|; and a number -of larger type codes will also be defined, for use in math mode only. -@y -@ In fact, there are still more types coming. When we get to math formula -processing we will see that a |style_node| has |type=16|; and a number -of larger type codes will also be defined, for use in math mode only. -@z - -@x [12.174] l.3662 - pTeX: print KANJI - print_ASCII(qo(character(p))); -@y - if font_dir[font(p)]<>dir_default then - begin p:=link(p); print_kanji(info(p)); - end - else print_ASCII(qo(character(p))); -@z - -@x [12.175] l.3672 - pTeX: Print a short indication of dir_nodes. -hlist_node,vlist_node,ins_node,whatsit_node,mark_node,adjust_node, - unset_node: print("[]"); -@y -hlist_node,vlist_node,dir_node,ins_node,whatsit_node, - mark_node,adjust_node,unset_node: print("[]"); -@z - -@x [12.176] l.3698 - pTeX: print KANJI. - print_char(" "); print_ASCII(qo(character(p))); -@y - print_char(" "); - if font_dir[font(p)]<>dir_default then - begin p:=link(p); print_kanji(info(p)); - end - else print_ASCII(qo(character(p))); -@z - -@x [12.183] l.3815 - pTeX: display char_node and disp_node. -if is_char_node(p) then print_font_and_char(p) -else case type(p) of - hlist_node,vlist_node,unset_node: @<Display box |p|@>; - rule_node: @<Display rule |p|@>; - ins_node: @<Display insertion |p|@>; - whatsit_node: @<Display the whatsit node |p|@>; -@y -if is_char_node(p) then - begin print_font_and_char(p); - if font_dir[font(p)]<>dir_default then p:=link(p) - end -else case type(p) of - hlist_node,vlist_node,dir_node,unset_node: @<Display box |p|@>; - rule_node: @<Display rule |p|@>; - ins_node: @<Display insertion |p|@>; - whatsit_node: @<Display the whatsit node |p|@>; - disp_node: begin print_esc("displace "); print_scaled(disp_dimen(p)); - end; -@z - -@x [12.184] l.3833 - pTeX: display dir_node. -@ @<Display box |p|@>= -begin if type(p)=hlist_node then print_esc("h") -else if type(p)=vlist_node then print_esc("v") -else print_esc("unset"); -@y -@ @<Display box |p|@>= -begin case type(p) of - hlist_node: print_esc("h"); - vlist_node: print_esc("v"); - dir_node: print_esc("dir"); - othercases print_esc("unset") - endcases@/; -@z -@x [12.184] l.3842 - pTeX: display dir_node. - if shift_amount(p)<>0 then - begin print(", shifted "); print_scaled(shift_amount(p)); - end; -@y - if shift_amount(p)<>0 then - begin print(", shifted "); print_scaled(shift_amount(p)); - end; - if box_dir(p)<>dir_default then - begin print(", "); print_direction(box_dir(p)); - end; -@z - -@x [12.188] l.3896 - pTeX: Display insertion and ins_dir. -@ @<Display insertion |p|@>= -begin print_esc("insert"); print_int(qo(subtype(p))); -print(", natural size "); print_scaled(height(p)); -@y -@ @<Display insertion |p|@>= -begin print_esc("insert"); print_int(qo(subtype(p))); -print_dir(ins_dir(p)); -print(", natural size "); print_scaled(height(p)); -@z - -@x [12.194] l.3961 - pTeX: Display penalty usage -@ @<Display penalty |p|@>= -begin print_esc("penalty "); print_int(penalty(p)); -end -@y -@ @<Display penalty |p|@>= -begin print_esc("penalty "); print_int(penalty(p)); -if subtype(p)=widow_pena then print("(for \jchrwidowpenalty)") -else if subtype(p)=kinsoku_pena then print("(for kinsoku)"); -end -@z - -@x [13.202] l.4043 - pTeX: dir_node, disp_node - hlist_node,vlist_node,unset_node: begin flush_node_list(list_ptr(p)); - free_node(p,box_node_size); goto done; - end; -@y - hlist_node,vlist_node,dir_node,unset_node: - begin flush_node_list(list_ptr(p)); - fast_delete_glue_ref(space_ptr(p)); - fast_delete_glue_ref(xspace_ptr(p)); - free_node(p,box_node_size); goto done; - end; -@z - -@x [13.202] l.4056 - pTeX: - kern_node,math_node,penalty_node: do_nothing; -@y - kern_node,disp_node,math_node,penalty_node: do_nothing; -@z - -@x [14.206] l.4121 - pTeX: space_ptr, xspace_ptr, dir_node, disp_node -@ @<Case statement to copy...@>= -case type(p) of -hlist_node,vlist_node,unset_node: begin r:=get_node(box_node_size); - mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words} - list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|} - words:=5; - end; -rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size; - end; -ins_node: begin r:=get_node(ins_node_size); mem[r+4]:=mem[p+4]; - add_glue_ref(split_top_ptr(p)); - ins_ptr(r):=copy_node_list(ins_ptr(p)); {this affects |mem[r+4]|} - words:=ins_node_size-1; - end; -@y -@ @<Case statement to copy...@>= -case type(p) of -hlist_node,vlist_node,dir_node,unset_node: - begin r:=get_node(box_node_size); - mem[r+7]:=mem[p+7]; - mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last three words} - add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r)); - list_ptr(r):=copy_node_list(list_ptr(p)); {this affects |mem[r+5]|} - words:=5; - end; -rule_node: begin r:=get_node(rule_node_size); words:=rule_node_size; - end; -ins_node: begin r:=get_node(ins_node_size); - mem[r+5]:=mem[p+5]; mem[r+4]:=mem[p+4]; - add_glue_ref(split_top_ptr(p)); - ins_ptr(r):=copy_node_list(ins_ptr(p)); {this affects |mem[r+4]|} - words:=ins_node_size-2; - end; -@z - -@x [14.206] l.4140 - pTeX: disp_node -kern_node,math_node,penalty_node: begin r:=get_node(small_node_size); - words:=small_node_size; - end; -@y -kern_node,disp_node,math_node,penalty_node: - begin r:=get_node(small_node_size); words:=small_node_size; - end; -@z - -@x [15.207] l.4201 - pTeX: Add kanji, kana, other_kchar category codes. -@d max_char_code=15 {largest catcode for individual characters} -@y -@d kanji=16 {kanji} -@d kana=17 {hiragana, katakana, alphabet} -@d other_kchar=18 {kanji codes} -@d max_char_code=18 {largest catcode for individual characters} -@z - -@x [15.208] l.4207 - pTeX: Add inhibit_glue, chg_dir. -@d char_num=16 {character specified numerically ( \.{\\char} )} -@d math_char_num=17 {explicit math code ( \.{\\mathchar} )} -@d mark=18 {mark definition ( \.{\\mark} )} -@d xray=19 {peek inside of \TeX\ ( \.{\\show}, \.{\\showbox}, etc.~)} -@d make_box=20 {make a box ( \.{\\box}, \.{\\copy}, \.{\\hbox}, etc.~)} -@d hmove=21 {horizontal motion ( \.{\\moveleft}, \.{\\moveright} )} -@d vmove=22 {vertical motion ( \.{\\raise}, \.{\\lower} )} -@d un_hbox=23 {unglue a box ( \.{\\unhbox}, \.{\\unhcopy} )} -@d un_vbox=24 {unglue a box ( \.{\\unvbox}, \.{\\unvcopy} )} -@d remove_item=25 {nullify last item ( \.{\\unpenalty}, - \.{\\unkern}, \.{\\unskip} )} -@d hskip=26 {horizontal glue ( \.{\\hskip}, \.{\\hfil}, etc.~)} -@d vskip=27 {vertical glue ( \.{\\vskip}, \.{\\vfil}, etc.~)} -@d mskip=28 {math glue ( \.{\\mskip} )} -@d kern=29 {fixed space ( \.{\\kern})} -@d mkern=30 {math kern ( \.{\\mkern} )} -@d leader_ship=31 {use a box ( \.{\\shipout}, \.{\\leaders}, etc.~)} -@d halign=32 {horizontal table alignment ( \.{\\halign} )} -@d valign=33 {vertical table alignment ( \.{\\valign} )} -@d no_align=34 {temporary escape from alignment ( \.{\\noalign} )} -@d vrule=35 {vertical rule ( \.{\\vrule} )} -@d hrule=36 {horizontal rule ( \.{\\hrule} )} -@d insert=37 {vlist inserted in box ( \.{\\insert} )} -@d vadjust=38 {vlist inserted in enclosing paragraph ( \.{\\vadjust} )} -@d ignore_spaces=39 {gobble |spacer| tokens ( \.{\\ignorespaces} )} -@d after_assignment=40 {save till assignment is done ( \.{\\afterassignment} )} -@d after_group=41 {save till group is done ( \.{\\aftergroup} )} -@d break_penalty=42 {additional badness ( \.{\\penalty} )} -@d start_par=43 {begin paragraph ( \.{\\indent}, \.{\\noindent} )} -@d ital_corr=44 {italic correction ( \.{\\/} )} -@d accent=45 {attach accent in text ( \.{\\accent} )} -@d math_accent=46 {attach accent in math ( \.{\\mathaccent} )} -@d discretionary=47 {discretionary texts ( \.{\\-}, \.{\\discretionary} )} -@d eq_no=48 {equation number ( \.{\\eqno}, \.{\\leqno} )} -@d left_right=49 {variable delimiter ( \.{\\left}, \.{\\right} )} -@d math_comp=50 {component of formula ( \.{\\mathbin}, etc.~)} -@d limit_switch=51 {diddle limit conventions ( \.{\\displaylimits}, etc.~)} -@d above=52 {generalized fraction ( \.{\\above}, \.{\\atop}, etc.~)} -@d math_style=53 {style specification ( \.{\\displaystyle}, etc.~)} -@d math_choice=54 {choice specification ( \.{\\mathchoice} )} -@d non_script=55 {conditional math glue ( \.{\\nonscript} )} -@d vcenter=56 {vertically center a vbox ( \.{\\vcenter} )} -@d case_shift=57 {force specific case ( \.{\\lowercase}, \.{\\uppercase}~)} -@d message=58 {send to user ( \.{\\message}, \.{\\errmessage} )} -@d extension=59 {extensions to \TeX\ ( \.{\\write}, \.{\\special}, etc.~)} -@d in_stream=60 {files for reading ( \.{\\openin}, \.{\\closein} )} -@d begin_group=61 {begin local grouping ( \.{\\begingroup} )} -@d end_group=62 {end local grouping ( \.{\\endgroup} )} -@d omit=63 {omit alignment template ( \.{\\omit} )} -@d ex_space=64 {explicit space ( \.{\\\ } )} -@d no_boundary=65 {suppress boundary ligatures ( \.{\\noboundary} )} -@d radical=66 {square root and similar signs ( \.{\\radical} )} -@d end_cs_name=67 {end control sequence ( \.{\\endcsname} )} -@d min_internal=68 {the smallest code that can follow \.{\\the}} -@d char_given=68 {character code defined by \.{\\chardef}} -@d math_given=69 {math code defined by \.{\\mathchardef}} -@d last_item=70 {most recent item ( \.{\\lastpenalty}, - \.{\\lastkern}, \.{\\lastskip} )} -@d max_non_prefixed_command=70 {largest command code that can't be \.{\\global}} -@y -@d char_num=max_char_code+1 {character specified numerically ( \.{\\char} )} -@d math_char_num=char_num+1 {explicit math code ( \.{\\mathchar} )} -@d mark=math_char_num+1 {mark definition ( \.{\\mark} )} -@d xray=mark+1 {peek inside of \TeX\ ( \.{\\show}, \.{\\showbox}, etc.~)} -@d make_box=xray+1 {make a box ( \.{\\box}, \.{\\copy}, \.{\\hbox}, etc.~)} -@d hmove=make_box+1 {horizontal motion ( \.{\\moveleft}, \.{\\moveright} )} -@d vmove=hmove+1 {vertical motion ( \.{\\raise}, \.{\\lower} )} -@d un_hbox=vmove+1 {unglue a box ( \.{\\unhbox}, \.{\\unhcopy} )} -@d un_vbox=un_hbox+1 {unglue a box ( \.{\\unvbox}, \.{\\unvcopy} )} -@d remove_item=un_vbox+1 {nullify last item ( \.{\\unpenalty}, - \.{\\unkern}, \.{\\unskip} )} -@d hskip=remove_item+1 {horizontal glue ( \.{\\hskip}, \.{\\hfil}, etc.~)} -@d vskip=hskip+1 {vertical glue ( \.{\\vskip}, \.{\\vfil}, etc.~)} -@d mskip=vskip+1 {math glue ( \.{\\mskip} )} -@d kern=mskip+1 {fixed space ( \.{\\kern})} -@d mkern=kern+1 {math kern ( \.{\\mkern} )} -@d leader_ship=mkern+1 {use a box ( \.{\\shipout}, \.{\\leaders}, etc.~)} -@d halign=leader_ship+1 {horizontal table alignment ( \.{\\halign} )} -@d valign=halign+1 {vertical table alignment ( \.{\\valign} )} -@d no_align=valign+1 {temporary escape from alignment ( \.{\\noalign} )} -@d vrule=no_align+1 {vertical rule ( \.{\\vrule} )} -@d hrule=vrule+1 {horizontal rule ( \.{\\hrule} )} -@d insert=hrule+1 {vlist inserted in box ( \.{\\insert} )} -@d vadjust=insert+1 {vlist inserted in enclosing paragraph ( \.{\\vadjust} )} -@d ignore_spaces=vadjust+1 {gobble |spacer| tokens ( \.{\\ignorespaces} )} -@d after_assignment=ignore_spaces+1 {save till assignment is done ( \.{\\afterassignment} )} -@d after_group=after_assignment+1 {save till group is done ( \.{\\aftergroup} )} -@d break_penalty=after_group+1 {additional badness ( \.{\\penalty} )} -@d start_par=break_penalty+1 {begin paragraph ( \.{\\indent}, \.{\\noindent} )} -@d ital_corr=start_par+1 {italic correction ( \.{\\/} )} -@d accent=ital_corr+1 {attach accent in text ( \.{\\accent} )} -@d math_accent=accent+1 {attach accent in math ( \.{\\mathaccent} )} -@d discretionary=math_accent+1 {discretionary texts ( \.{\\-}, \.{\\discretionary} )} -@d eq_no=discretionary+1 {equation number ( \.{\\eqno}, \.{\\leqno} )} -@d left_right=eq_no+1 {variable delimiter ( \.{\\left}, \.{\\right} )} -@d math_comp=left_right+1 {component of formula ( \.{\\mathbin}, etc.~)} -@d limit_switch=math_comp+1 {diddle limit conventions ( \.{\\displaylimits}, etc.~)} -@d above=limit_switch+1 {generalized fraction ( \.{\\above}, \.{\\atop}, etc.~)} -@d math_style=above+1 {style specification ( \.{\\displaystyle}, etc.~)} -@d math_choice=math_style+1 {choice specification ( \.{\\mathchoice} )} -@d non_script=math_choice+1 {conditional math glue ( \.{\\nonscript} )} -@d vcenter=non_script+1 {vertically center a vbox ( \.{\\vcenter} )} -@d case_shift=vcenter+1 {force specific case ( \.{\\lowercase}, \.{\\uppercase}~)} -@d message=case_shift+1 {send to user ( \.{\\message}, \.{\\errmessage} )} -@d extension=message+1 {extensions to \TeX\ ( \.{\\write}, \.{\\special}, etc.~)} -@d in_stream=extension+1 {files for reading ( \.{\\openin}, \.{\\closein} )} -@d begin_group=in_stream+1 {begin local grouping ( \.{\\begingroup} )} -@d end_group=begin_group+1 {end local grouping ( \.{\\endgroup} )} -@d omit=end_group+1 {omit alignment template ( \.{\\omit} )} -@d ex_space=omit+1 {explicit space ( \.{\\\ } )} -@d no_boundary=ex_space+1 {suppress boundary ligatures ( \.{\\noboundary} )} -@d radical=no_boundary+1 {square root and similar signs ( \.{\\radical} )} -@d end_cs_name=radical+1 {end control sequence ( \.{\\endcsname} )} -@d min_internal=end_cs_name+1 {the smallest code that can follow \.{\\the}} -@d char_given=min_internal {character code defined by \.{\\chardef}} -@d math_given=char_given+1 {math code defined by \.{\\mathchardef}} -@d last_item=math_given+1 {most recent item ( \.{\\lastpenalty}, - \.{\\lastkern}, \.{\\lastskip} )} -@d inhibit_glue=last_item+1 {inhibit adjust glue ( \.{\\inhibitglue} )} -@d chg_dir=inhibit_glue+1 {change dir mode by \.{\\tate}, \.{\\yoko}} -@d max_non_prefixed_command=chg_dir {largest command code that can't be \.{\\global}} -@z - -@x [15.209] l.4272 - pTeX: def_jfont, def_tfont, set_auto_spacing -@d toks_register=71 {token list register ( \.{\\toks} )} -@d assign_toks=72 {special token list ( \.{\\output}, \.{\\everypar}, etc.~)} -@d assign_int=73 {user-defined integer ( \.{\\tolerance}, \.{\\day}, etc.~)} -@d assign_dimen=74 {user-defined length ( \.{\\hsize}, etc.~)} -@d assign_glue=75 {user-defined glue ( \.{\\baselineskip}, etc.~)} -@d assign_mu_glue=76 {user-defined muglue ( \.{\\thinmuskip}, etc.~)} -@d assign_font_dimen=77 {user-defined font dimension ( \.{\\fontdimen} )} -@d assign_font_int=78 {user-defined font integer ( \.{\\hyphenchar}, - \.{\\skewchar} )} -@d set_aux=79 {specify state info ( \.{\\spacefactor}, \.{\\prevdepth} )} -@d set_prev_graf=80 {specify state info ( \.{\\prevgraf} )} -@d set_page_dimen=81 {specify state info ( \.{\\pagegoal}, etc.~)} -@d set_page_int=82 {specify state info ( \.{\\deadcycles}, - \.{\\insertpenalties} )} -@d set_box_dimen=83 {change dimension of box ( \.{\\wd}, \.{\\ht}, \.{\\dp} )} -@d set_shape=84 {specify fancy paragraph shape ( \.{\\parshape} )} -@d def_code=85 {define a character code ( \.{\\catcode}, etc.~)} -@d def_family=86 {declare math fonts ( \.{\\textfont}, etc.~)} -@d set_font=87 {set current font ( font identifiers )} -@d def_font=88 {define a font file ( \.{\\font} )} -@d register=89 {internal register ( \.{\\count}, \.{\\dimen}, etc.~)} -@d max_internal=89 {the largest code that can follow \.{\\the}} -@d advance=90 {advance a register or parameter ( \.{\\advance} )} -@d multiply=91 {multiply a register or parameter ( \.{\\multiply} )} -@d divide=92 {divide a register or parameter ( \.{\\divide} )} -@d prefix=93 {qualify a definition ( \.{\\global}, \.{\\long}, \.{\\outer} )} -@d let=94 {assign a command code ( \.{\\let}, \.{\\futurelet} )} -@d shorthand_def=95 {code definition ( \.{\\chardef}, \.{\\countdef}, etc.~)} - {or \.{\\charsubdef}} -@d read_to_cs=96 {read into a control sequence ( \.{\\read} )} -@d def=97 {macro definition ( \.{\\def}, \.{\\gdef}, \.{\\xdef}, \.{\\edef} )} -@d set_box=98 {set a box ( \.{\\setbox} )} -@d hyph_data=99 {hyphenation data ( \.{\\hyphenation}, \.{\\patterns} )} -@d set_interaction=100 {define level of interaction ( \.{\\batchmode}, etc.~)} -@d max_command=100 {the largest command code seen at |big_switch|} -@y -@d toks_register=max_non_prefixed_command+1 {token list register ( \.{\\toks} )} -@d assign_toks=toks_register+1 - {special token list ( \.{\\output}, \.{\\everypar}, etc.~)} -@d assign_int=assign_toks+1 - {user-defined integer ( \.{\\tolerance}, \.{\\day}, etc.~)} -@d assign_dimen=assign_int+1 {user-defined length ( \.{\\hsize}, etc.~)} -@d assign_glue=assign_dimen+1 {user-defined glue ( \.{\\baselineskip}, etc.~)} -@d assign_mu_glue=assign_glue+1 {user-defined muglue ( \.{\\thinmuskip}, etc.~)} -@d assign_font_dimen=assign_mu_glue+1 - {user-defined font dimension ( \.{\\fontdimen} )} -@d assign_font_int=assign_font_dimen+1 - {user-defined font integer ( \.{\\hyphenchar}, \.{\\skewchar} )} -@d assign_kinsoku=assign_font_int+1 - {user-defined kinsoku character ( \.{\\prebreakpenalty}, - \.{\\postbreakpenalty} )} -@d assign_inhibit_xsp_code=assign_kinsoku+1 - {user-defined inhibit xsp character ( \.{\\inhibitxspcode} )} -@d set_kansuji_char=assign_inhibit_xsp_code+1 - {user-defined kansuji character ( \.{\\kansujichar} )} -@d set_aux=set_kansuji_char+1 - {specify state info ( \.{\\spacefactor}, \.{\\prevdepth} )} -@d set_prev_graf=set_aux+1 {specify state info ( \.{\\prevgraf} )} -@d set_page_dimen=set_prev_graf+1 {specify state info ( \.{\\pagegoal}, etc.~)} -@d set_page_int=set_page_dimen+1 {specify state info ( \.{\\deadcycles}, - \.{\\insertpenalties} )} -@d set_box_dimen=set_page_int+1 {change dimension of box ( \.{\\wd}, \.{\\ht}, \.{\\dp} )} -@d set_shape=set_box_dimen+1 {specify fancy paragraph shape ( \.{\\parshape} )} -@d def_code=set_shape+1 {define a character code ( \.{\\catcode}, etc.~)} -@d def_family=def_code+1 {declare math fonts ( \.{\\textfont}, etc.~)} -@d set_font=def_family+1 {set current font ( font identifiers )} -@d def_font=set_font+1 {define a font file ( \.{\\font} )} -@d def_jfont=def_font+1 {define a font file ( \.{\\jfont} )} -@d def_tfont=def_jfont+1 {define a font file ( \.{\\tfont} )} -@d register=def_tfont+1 {internal register ( \.{\\count}, \.{\\dimen}, etc.~)} -@d max_internal=register {the largest code that can follow \.{\\the}} -@d advance=max_internal+1 {advance a register or parameter ( \.{\\advance} )} -@d multiply=advance+1 {multiply a register or parameter ( \.{\\multiply} )} -@d divide=multiply+1 {divide a register or parameter ( \.{\\divide} )} -@d prefix=divide+1 {qualify a definition ( \.{\\global}, \.{\\long}, \.{\\outer} )} -@d let=prefix+1 {assign a command code ( \.{\\let}, \.{\\futurelet} )} -@d shorthand_def=let+1 {code definition ( \.{\\chardef}, \.{\\countdef}, etc.~)} -@d read_to_cs=shorthand_def+1 {read into a control sequence ( \.{\\read} )} -@d def=read_to_cs+1 {macro definition ( \.{\\def}, \.{\\gdef}, \.{\\xdef}, \.{\\edef} )} -@d set_box=def+1 {set a box ( \.{\\setbox} )} -@d hyph_data=set_box+1 {hyphenation data ( \.{\\hyphenation}, \.{\\patterns} )} -@d set_interaction=hyph_data+1 {define level of interaction ( \.{\\batchmode}, etc.~)} -@d set_auto_spacing=set_interaction+1 {set auto spaceing mode - ( \.{\\autospacing}, \.{\\noautospacing}, ( \.{\\autospacing}, \.{\\noautospacing} )} -@d max_command=set_auto_spacing {the largest command code seen at |big_switch|} -@z - -@x [16.212] l.4437 - pTeX: last_jchr, direction, adjust direction -@<Types...@>= -@!list_state_record=record@!mode_field:-mmode..mmode;@+ - @!head_field,@!tail_field: pointer; -@y -@<Types...@>= -@!list_state_record=record@!mode_field:-mmode..mmode;@+ - @!dir_field,@!adj_dir_field: -dir_dtou..dir_dtou; - @!pdisp_field: scaled; - @!head_field,@!tail_field,@!pnode_field,@!last_jchr_field: pointer; -@z - -@x [16.213] l.4445 - pTeX: last_jchr, direction, adjust_dir, prev_{node,disp} -@d head==cur_list.head_field {header node of current list} -@d tail==cur_list.tail_field {final node on current list} -@y -@d direction==cur_list.dir_field {current direction} -@d adjust_dir==cur_list.adj_dir_field {current adjust direction} -@d head==cur_list.head_field {header node of current list} -@d tail==cur_list.tail_field {final node on current list} -@d prev_node==cur_list.pnode_field {previous to last |disp_node|} -@d prev_disp==cur_list.pdisp_field {displacemant at |prev_node|} -@d last_jchr==cur_list.last_jchr_field {final jchar node on current list} -@z - -@x [16.214] l.4464 - pTeX: prev_append: disp_node -@d tail_append(#)==begin link(tail):=#; tail:=link(tail); - end -@y -@d tail_append(#)==begin link(tail):=#; tail:=link(tail); - end -@d prev_append(#)==begin link(prev_node):=#; - link(link(prev_node)):=tail; prev_node:=link(prev_node); - end -@z - -@x [16.215] l.4477 - pTeX: last_jchar, direction, adjust_dir, prev_node -mode:=vmode; head:=contrib_head; tail:=contrib_head; -@y -mode:=vmode; head:=contrib_head; tail:=contrib_head; prev_node:=tail; -direction:=dir_yoko; adjust_dir:=direction; prev_disp:=0; last_jchr:=null; -@z - -@x [16.216] l.4496 - pTeX: last_jchr, displacement. -incr(nest_ptr); head:=get_avail; tail:=head; prev_graf:=0; mode_line:=line; -@y -incr(nest_ptr); head:=new_null_box; tail:=head; prev_node:=tail; -prev_graf:=0; prev_disp:=0; last_jchr:=null; mode_line:=line; -@z - -@x [16.217] l.4504 - pTeX: pop_nest last_jchr -@p procedure pop_nest; {leave a semantic level, re-enter the old} -begin free_avail(head); decr(nest_ptr); cur_list:=nest[nest_ptr]; -end; -@y -@p procedure pop_nest; {leave a semantic level, re-enter the old} -begin -fast_delete_glue_ref(space_ptr(head)); fast_delete_glue_ref(xspace_ptr(head)); -free_node(head,box_node_size); decr(nest_ptr); cur_list:=nest[nest_ptr]; -end; -@z - -@x [16.218] l.4521 - pTeX: show_activities : direction - print_nl("### "); print_mode(m); -@y - print_nl("### "); print_direction(nest[p].dir_field); - print(", "); print_mode(m); -@z - -@x [17.224] l.4711 - pTeX: kanji_skip_code xkanji_skip_code, jfm_skip -@d thin_mu_skip_code=15 {thin space in math formula} -@d med_mu_skip_code=16 {medium space in math formula} -@d thick_mu_skip_code=17 {thick space in math formula} -@d glue_pars=18 {total number of glue parameters} -@y -@d kanji_skip_code=15 {between kanji-kanji space} -@d xkanji_skip_code=16 {between latin-kanji or kanji-latin space} -@d thin_mu_skip_code=17 {thin space in math formula} -@d med_mu_skip_code=18 {medium space in math formula} -@d thick_mu_skip_code=19 {thick space in math formula} -@d jfm_skip=20 {space refer from JFM} -@d glue_pars=21 {total number of glue parameters} -@z - -@x [17.224] l.4739 - kanji_skip, xkanji_skip -@d thick_mu_skip==glue_par(thick_mu_skip_code) -@y -@d thick_mu_skip==glue_par(thick_mu_skip_code) -@d kanji_skip==glue_par(kanji_skip_code) -@d xkanji_skip==glue_par(xkanji_skip_code) -@z - -@x [17.225] l.4767 - pTeX: kanji_skip_code xkanji_skip_code -thick_mu_skip_code: print_esc("thickmuskip"); -othercases print("[unknown glue parameter!]") -@y -thick_mu_skip_code: print_esc("thickmuskip"); -kanji_skip_code: print_esc("kanjiskip"); -xkanji_skip_code: print_esc("xkanjiskip"); -jfm_skip: print("refer from jfm"); -othercases print("[unknown glue parameter!]") -@z - -@x [17.226] l.4813 - pTeX: kanji_skip_code xkanji_skip_code -primitive("thickmuskip",assign_mu_glue,glue_base+thick_mu_skip_code);@/ -@!@:thick_mu_skip_}{\.{\\thickmuskip} primitive@> -@y -primitive("thickmuskip",assign_mu_glue,glue_base+thick_mu_skip_code);@/ -@!@:thick_mu_skip_}{\.{\\thickmuskip} primitive@> -primitive("kanjiskip",assign_glue,glue_base+kanji_skip_code);@/ -@!@:kanji_skip_}{\.{\\kanjiskip} primitive@> -primitive("xkanjiskip",assign_glue,glue_base+xkanji_skip_code);@/ -@!@:xkanji_skip_}{\.{\\xkanjiskip} primitive@> -@z - -@x [17.230] l.4867 - pTeX: cat_code_size, cur_jfont_loc, auto_spacing, auto_xspacing, inhibit_xsp_code, cur_tfont_loc -@d xord_code_base=cur_font_loc+1 -@d xchr_code_base=xord_code_base+1 -@d xprn_code_base=xchr_code_base+1 -@d math_font_base=xprn_code_base+1 -@d cat_code_base=math_font_base+48 - {table of 256 command codes (the ``catcodes'')} -@d lc_code_base=cat_code_base+256 {table of 256 lowercase mappings} -@y -@d math_font_base=cur_font_loc+1 {table of 48 math font numbers} -@d cur_jfont_loc=math_font_base+48 -@d cur_tfont_loc=cur_jfont_loc+1 -@d auto_spacing_code=cur_tfont_loc+1 -@d auto_xspacing_code=auto_spacing_code+1 -@d cat_code_base=auto_xspacing_code+1 - {table of 256 command codes (the ``catcodes'')} -@d kcat_code_base=cat_code_base+256 - {table of 256 command codes for the wchar's catcodes } -@d auto_xsp_code_base=kcat_code_base+256 {table of 256 auto spacer flag} -@d inhibit_xsp_code_base=auto_xsp_code_base+256 -@d kinsoku_base=inhibit_xsp_code_base+256 {table of 256 kinsoku mappings} -@d kansuji_base=kinsoku_base+256 {table of 10 kansuji mappings} -@d lc_code_base=kansuji_base+10 {table of 256 lowercase mappings} -@z - -@x [17.230] l.4900 - pTeX: -@d char_sub_code(#)==equiv(char_sub_code_base+#) - {Note: |char_sub_code(c)| is the true substitution info plus |min_halfword|} -@y -@d char_sub_code(#)==equiv(char_sub_code_base+#) - {Note: |char_sub_code(c)| is the true substitution info plus |min_halfword|} -@# -@d cur_jfont==equiv(cur_jfont_loc) {pTeX: } -@d cur_tfont==equiv(cur_tfont_loc) -@d auto_spacing==equiv(auto_spacing_code) -@d auto_xspacing==equiv(auto_xspacing_code) -@d kcat_code(#)==equiv(kcat_code_base+#) -@d auto_xsp_code(#)==equiv(auto_xsp_code_base+#) -@d inhibit_xsp_type(#)==eq_type(inhibit_xsp_code_base+#) -@d inhibit_xsp_code(#)==equiv(inhibit_xsp_code_base+#) -@d kinsoku_type(#)==eq_type(kinsoku_base+#) -@d kinsoku_code(#)==equiv(kinsoku_base+#) -@d kansuji_char(#)==equiv(kansuji_base+#) -@z - -@x [17.232] l.4959 - pTeX: initialize cat_code, cur_jfont, cur_tfont -cur_font:=null_font; eq_type(cur_font_loc):=data; -eq_level(cur_font_loc):=level_one;@/ -@y -cur_font:=null_font; eq_type(cur_font_loc):=data; -eq_level(cur_font_loc):=level_one;@/ -cur_jfont:=null_font; eq_type(cur_jfont_loc):=data; -eq_level(cur_jfont_loc):=level_one;@/ -cur_tfont:=null_font; eq_type(cur_tfont_loc):=data; -eq_level(cur_tfont_loc):=level_one;@/ -@z - -@x [17.232] l.4965 - pTeX: initialize cat_code, cur_jfont, cur_tfont -for k:=0 to 255 do - begin cat_code(k):=other_char; math_code(k):=hi(k); sf_code(k):=1000; - end; -@y -eqtb[auto_spacing_code]:=eqtb[cat_code_base]; -eqtb[auto_xspacing_code]:=eqtb[cat_code_base]; -for k:=0 to 255 do - begin cat_code(k):=other_char; kcat_code(k):=other_kchar; - math_code(k):=hi(k); sf_code(k):=1000; - auto_xsp_code(k):=0; inhibit_xsp_code(k):=0; inhibit_xsp_type(k):=0; - kinsoku_code(k):=0; kinsoku_type(k):=0; - end; -@z -@x [17.232] l.4971 - pTeX: initialize cat_code, cur_jfont, cur_tfont -for k:="0" to "9" do math_code(k):=hi(k+var_code); -for k:="A" to "Z" do - begin cat_code(k):=letter; cat_code(k+"a"-"A"):=letter;@/ - math_code(k):=hi(k+var_code+@"100); - math_code(k+"a"-"A"):=hi(k+"a"-"A"+var_code+@"100);@/ - lc_code(k):=k+"a"-"A"; lc_code(k+"a"-"A"):=k+"a"-"A";@/ - uc_code(k):=k; uc_code(k+"a"-"A"):=k;@/ - sf_code(k):=999; - end; -@y -for k:="0" to "9" do - begin math_code(k):=hi(k+var_code); - auto_xsp_code(k):=3; - end; -kansuji_char(0):=@"213B; -kansuji_char(1):=@"306C; -kansuji_char(2):=@"4673; -kansuji_char(3):=@"3B30; -kansuji_char(4):=@"3B4D; -kansuji_char(5):=@"385E; -kansuji_char(6):=@"4F3B; -kansuji_char(7):=@"3C37; -kansuji_char(8):=@"482C; -kansuji_char(9):=@"3665; -for k:="A" to "Z" do - begin cat_code(k):=letter; cat_code(k+"a"-"A"):=letter;@/ - math_code(k):=hi(k+var_code+@"100); - math_code(k+"a"-"A"):=hi(k+"a"-"A"+var_code+@"100);@/ - lc_code(k):=k+"a"-"A"; lc_code(k+"a"-"A"):=k+"a"-"A";@/ - uc_code(k):=k; uc_code(k+"a"-"A"):=k;@/ - auto_xsp_code(k):=3; auto_xsp_code(k+"a"-"A"):=3;@/ - sf_code(k):=999; - end; -if (proc_kanji_code=sjis_enc) then begin - @t\hskip10pt@>kcat_code(129):=other_kchar; - @t\hskip10pt@>kcat_code(130):=kana; - @t\hskip10pt@>kcat_code(131):=kana; - @t\hskip10pt@>kcat_code(132):=other_kchar; - @+@t\1@>for k:=136 to 159 do kcat_code(k):=kanji; - @+@t\1@>for k:=224 to 234 do kcat_code(k):=kanji; -end else begin - @t\hskip10pt@>kcat_code(161):=other_kchar; {1 ku} - @t\hskip10pt@>kcat_code(162):=other_kchar; {2 ku} - @t\hskip10pt@>kcat_code(163):=kana; {3 ku} - @t\hskip10pt@>kcat_code(164):=kana; {4 ku} - @t\hskip10pt@>kcat_code(165):=kana; {5 ku} - @t\hskip10pt@>kcat_code(166):=kana; {6 ku} - @t\hskip10pt@>kcat_code(167):=other_kchar; {7 ku} - @t\hskip10pt@>kcat_code(168):=other_kchar; {8 ku} - @+@t\1@>for k:=176 to 244 do kcat_code(k):=kanji; {16 ku ... 84 ku} -end; -@z - -@x [17.236] l.5092 - pTeX: cur_jfam_code, jchr_widow_penalty -@d cur_fam_code=44 {current family} -@d escape_char_code=45 {escape character for token output} -@d default_hyphen_char_code=46 {value of \.{\\hyphenchar} when a font is loaded} -@d default_skew_char_code=47 {value of \.{\\skewchar} when a font is loaded} -@d end_line_char_code=48 {character placed at the right end of the buffer} -@d new_line_char_code=49 {character that prints as |print_ln|} -@d language_code=50 {current hyphenation table} -@d left_hyphen_min_code=51 {minimum left hyphenation fragment size} -@d right_hyphen_min_code=52 {minimum right hyphenation fragment size} -@d holding_inserts_code=53 {do not remove insertion nodes from \.{\\box255}} -@d error_context_lines_code=54 {maximum intermediate line pairs shown} -@d tex_int_pars=55 {total number of \TeX's integer parameters} -@# -@d web2c_int_base=tex_int_pars {base for web2c's integer parameters} -@d char_sub_def_min_code=web2c_int_base {smallest value in the charsubdef list} -@d char_sub_def_max_code=web2c_int_base+1 {largest value in the charsubdef list} -@d tracing_char_sub_def_code=web2c_int_base+2 {traces changes to a charsubdef def} -@d mubyte_in_code=web2c_int_base+3 {if positive then reading mubytes is active} -@d mubyte_out_code=web2c_int_base+4 {if positive then printing mubytes is active} -@d mubyte_log_code=web2c_int_base+5 {if positive then print mubytes to log and terminal} -@d spec_out_code=web2c_int_base+6 {if positive then print specials by mubytes} -@d web2c_int_pars=web2c_int_base+7 {total number of web2c's integer parameters} -@# -@d int_pars=web2c_int_pars {total number of integer parameters} -@d count_base=int_base+int_pars {256 user \.{\\count} registers} -@y -@d cur_fam_code=44 {current family} -@d cur_jfam_code=45 {current kanji family} -@d escape_char_code=46 {escape character for token output} -@d default_hyphen_char_code=47 {value of \.{\\hyphenchar} when a font is loaded} -@d default_skew_char_code=48 {value of \.{\\skewchar} when a font is loaded} -@d end_line_char_code=49 {character placed at the right end of the buffer} -@d new_line_char_code=50 {character that prints as |print_ln|} -@d language_code=51 {current hyphenation table} -@d left_hyphen_min_code=52 {minimum left hyphenation fragment size} -@d right_hyphen_min_code=53 {minimum right hyphenation fragment size} -@d holding_inserts_code=54 {do not remove insertion nodes from \.{\\box255}} -@d error_context_lines_code=55 {maximum intermediate line pairs shown} -@d jchr_widow_penalty_code=56 - {penalty for creating a widow KANJI character line} -@d char_sub_def_min_code=57 {smallest value in the charsubdef list} -@d char_sub_def_max_code=58 {largest value in the charsubdef list} -@d tracing_char_sub_def_code=59 {traces changes to a charsubdef def} -@d int_pars=60 {total number of integer parameters} -@d count_base=int_base+int_pars {256 user \.{\\count} registers} -@z - -@x [17.236] l.5167 - pTeX: cur_jfam, |jchr_widow_penalty| -@d cur_fam==int_par(cur_fam_code) -@d escape_char==int_par(escape_char_code) -@y -@d cur_fam==int_par(cur_fam_code) -@d cur_jfam==int_par(cur_jfam_code) -@d escape_char==int_par(escape_char_code) -@d jchr_widow_penalty==int_par(jchr_widow_penalty_code) -@z - -@x l.5181 - pTeX -@d tracing_char_sub_def==int_par(tracing_char_sub_def_code) -@d mubyte_in==int_par(mubyte_in_code) -@d mubyte_out==int_par(mubyte_out_code) -@d mubyte_log==int_par(mubyte_log_code) -@d spec_out==int_par(spec_out_code) -@y -@d tracing_char_sub_def==int_par(tracing_char_sub_def_code) -@z - -@x [17.237] l.5244 - pTeX: cur_jfam_code, jchr_window_penalty_code -new_line_char_code:print_esc("newlinechar"); -@y -new_line_char_code:print_esc("newlinechar"); -cur_jfam_code:print_esc("jfam"); -jchr_widow_penalty_code:print_esc("jcharwidowpenalty"); -@z - -@x l.5252 - pTeX -tracing_char_sub_def_code:print_esc("tracingcharsubdef"); -mubyte_in_code:print_esc("mubytein"); -mubyte_out_code:print_esc("mubyteout"); -mubyte_log_code:print_esc("mubytelog"); -spec_out_code:print_esc("specialout"); -@y -tracing_char_sub_def_code:print_esc("tracingcharsubdef"); -@z - -@x [17.238] l.5365 - pTeX: cur_jfam_code, jchr_window_penalty_code -primitive("newlinechar",assign_int,int_base+new_line_char_code);@/ -@!@:new_line_char_}{\.{\\newlinechar} primitive@> -@y -primitive("newlinechar",assign_int,int_base+new_line_char_code);@/ -@!@:new_line_char_}{\.{\\newlinechar} primitive@> -primitive("jfam",assign_int,int_base+cur_jfam_code);@/ -@!@:cur_jfam_}{\.{\\jfam} primitive@> -primitive("jcharwidowpenalty",assign_int,int_base+jchr_widow_penalty_code);@/ -@!@:jchr_widow_penalty}{\.{\\jcharwidowpenalty} primitive@> -@z - -@x l.5387 - pTeX -if enctex_p then - begin enctex_enabled_p:=true; - primitive("mubytein",assign_int,int_base+mubyte_in_code);@/ -@!@:mubyte_in_}{\.{\\mubytein} primitive@> - primitive("mubyteout",assign_int,int_base+mubyte_out_code);@/ -@!@:mubyte_out_}{\.{\\mubyteout} primitive@> - primitive("mubytelog",assign_int,int_base+mubyte_log_code);@/ -@!@:mubyte_log_}{\.{\\mubytelog} primitive@> - primitive("specialout",assign_int,int_base+spec_out_code);@/ -@!@:spec_out_}{\.{\\specialout} primitive@> -end; -@y -@z - -@x [17.247] l.5490 - pTeX: kinsoku, t_baseline_shift, y_baseline_shift -@d h_offset_code=18 {amount of horizontal offset when shipping pages out} -@d v_offset_code=19 {amount of vertical offset when shipping pages out} -@d emergency_stretch_code=20 {reduces badnesses on final pass of line-breaking} -@d dimen_pars=21 {total number of dimension parameters} -@d scaled_base=dimen_base+dimen_pars - {table of 256 user-defined \.{\\dimen} registers} -@d eqtb_size=scaled_base+255 {largest subscript of |eqtb|} -@y -@d h_offset_code=18 {amount of horizontal offset when shipping pages out} -@d v_offset_code=19 {amount of vertical offset when shipping pages out} -@d emergency_stretch_code=20 {reduces badnesses on final pass of line-breaking} -@d t_baseline_shift_code=21 {shift amount when mixing TATE-kumi and Alphabet} -@d y_baseline_shift_code=22 {shift amount when mixing YOKO-kumi and Alphabet} -@d dimen_pars=23 {total number of dimension parameters} -@d scaled_base=dimen_base+dimen_pars - {table of 256 user-defined \.{\\dimen} registers} -@d kinsoku_penalty_base=scaled_base+256 {table of 256 kinsoku registers} -@d eqtb_size=kinsoku_penalty_base+255 {largest subscript of |eqtb|} -@z - -@x l.5498 - pTeX: kinsoku, t_baseline_shift, y_baseline_shift -@d dimen(#)==eqtb[scaled_base+#].sc -@d dimen_par(#)==eqtb[dimen_base+#].sc {a scaled quantity} -@y -@d dimen(#)==eqtb[scaled_base+#].sc -@d dimen_par(#)==eqtb[dimen_base+#].sc {a scaled quantity} -@d kinsoku_penalty(#)==eqtb[kinsoku_penalty_base+#].int -@z - -@x l.5518 - pTeX: -@d h_offset==dimen_par(h_offset_code) -@d v_offset==dimen_par(v_offset_code) -@y -@d h_offset==dimen_par(h_offset_code) -@d v_offset==dimen_par(v_offset_code) -@d t_baseline_shift==dimen_par(t_baseline_shift_code) -@d y_baseline_shift==dimen_par(y_baseline_shift_code) -@z - -@x l.5542 - pTeX: -h_offset_code:print_esc("hoffset"); -v_offset_code:print_esc("voffset"); -emergency_stretch_code:print_esc("emergencystretch"); -othercases print("[unknown dimen parameter!]") -@y -h_offset_code:print_esc("hoffset"); -v_offset_code:print_esc("voffset"); -t_baseline_shift_code:print_esc("tbaselineshift"); -y_baseline_shift_code:print_esc("ybaselineshift"); -emergency_stretch_code:print_esc("emergencystretch"); -othercases print("[unknown dimen parameter!]") -@z - -@x [17.248] l.5588 - pTeX: rotate offset -primitive("hoffset",assign_dimen,dimen_base+h_offset_code);@/ -@!@:h_offset_}{\.{\\hoffset} primitive@> -primitive("voffset",assign_dimen,dimen_base+v_offset_code);@/ -@!@:v_offset_}{\.{\\voffset} primitive@> -@y -primitive("hoffset",assign_dimen,dimen_base+h_offset_code);@/ -@!@:h_offset_}{\.{\\hoffset} primitive@> -primitive("voffset",assign_dimen,dimen_base+v_offset_code);@/ -@!@:v_offset_}{\.{\\voffset} primitive@> -primitive("tbaselineshift",assign_dimen,dimen_base+t_baseline_shift_code);@/ -@!@:t_baseline_shift_}{\.{\\tbaselineshift} primitive@> -primitive("ybaselineshift",assign_dimen,dimen_base+y_baseline_shift_code);@/ -@!@:y_baseline_shift_}{\.{\\ybaselineshift} primitive@> -@z - -@x [17.252] l.5622 - pTeX: show eqtb -else if n<=eqtb_size then @<Show equivalent |n|, in region 6@> -else print_char("?"); {this can't happen either} -end; -tats -@y -else if n<kinsoku_penalty_base then @<Show equivalent |n|, in region 6@> -else if n<=eqtb_size then print("kinsoku") -else print_char("?"); {this can't happen either} -end; -tats -@z - -@x l.5777 - pTeX -The conversion from control sequence to byte sequence for enc\TeX is -implemented here. Of course, the simplest way is to implement an array -of string pointers with |hash_size| length, but we assume that only a -few control sequences will need to be converted. So |mubyte_cswrite|, -an array with only 128 items, is used. The items point to the token -lists. First token includes a csname number and the second points the -string to be output. The third token includes the number of another -csname and fourth token its pointer to the string etc. We need to do -the sequential searching in one of the 128 token lists. - -@y -@z - -@x l.5788 - pTeX -procedure print_cs(@!p:integer); {prints a purported control sequence} -var q: pointer; - s: str_number; -begin - if active_noconvert and (not no_convert) and - (eq_type(p) = let) and (equiv(p) = normal+11) then { noconvert } - begin - no_convert := true; - return; - end; - s := 0; - if cs_converting and (not no_convert) then - begin - q := mubyte_cswrite [p mod 128] ; - while q <> null do - if info (q) = p then - begin - s := info (link(q)); q := null; - end else q := link (link (q)); - end; - no_convert := false; - if s > 0 then print (s) - else if p<hash_base then {single character} -@y -procedure print_cs(@!p:integer); {prints a purported control sequence} -begin if p<hash_base then {single character} -@z - -@x l.5828 - pTeX -exit: end; -@y -end; -@z - -@x l.5893 - pTeX -if enctex_p then -begin - primitive("endmubyte",end_cs_name,10);@/ -@!@:end_mubyte_}{\.{\\endmubyte} primitive@> -end; -@y -@z - -@x [18.265] l.5903 - pTeX: \jfont \tfont -primitive("font",def_font,0);@/ -@!@:font_}{\.{\\font} primitive@> -@y -primitive("font",def_font,0);@/ -@!@:font_}{\.{\\font} primitive@> -primitive("jfont",def_jfont,0);@/ -@!@:jfont_}{\.{\\jfont} primitive@> -primitive("tfont",def_tfont,0);@/ -@!@:tfont_}{\.{\\tfont} primitive@> -@z - -@x [18.266] l.5979 - pTeX: \jfont, \tfont -def_font: print_esc("font"); -@y -def_font: print_esc("font"); -def_jfont: print_esc("jfont"); -def_tfont: print_esc("tfont"); -@z - -@x l.5982 - pTeX -end_cs_name: if chr_code = 10 then print_esc("endmubyte") - else print_esc("endcsname"); -@y -end_cs_name: print_esc("endcsname"); -@z - -@x [20.289] l.6387 - pTeX: cs_token_flag -@d cs_token_flag==@'7777 {amount added to the |eqtb| location in a - token that stands for a control sequence; is a multiple of~256, less~1} -@y -@d cs_token_flag==@"FFFF {amount added to the |eqtb| location in a -token that stands for a control sequence; is a multiple of~256, less~1} -@z - -@x [20.293] l.6496 - pTeX: show_token_list -@ @<Display token |p|...@>= -if (p<hi_mem_min) or (p>mem_end) then - begin print_esc("CLOBBERED."); return; -@.CLOBBERED@> - end; -if info(p)>=cs_token_flag then print_cs(info(p)-cs_token_flag) -else begin m:=info(p) div @'400; c:=info(p) mod @'400; - if info(p)<0 then print_esc("BAD.") -@.BAD@> - else @<Display the token $(|m|,|c|)$@>; - end -@y -@ @<Display token |p|...@>= -if (p<hi_mem_min) or (p>mem_end) then - begin print_esc("CLOBBERED."); return; -@.CLOBBERED@> - end; -if info(p)>=cs_token_flag then print_cs(info(p)-cs_token_flag) {wchar_token} -else begin - if check_kanji(info(p)) then {wchar_token} - begin m:=kcat_code(Hi(info(p))); c:=info(p); - end - else begin m:=info(p) div @'400; c:=info(p) mod @'400; - end; - if (m<kanji)and(c>256) then print_esc("BAD.") -@.BAD@> - else @<Display the token $(|m|,|c|)$@>; -end -@z - -@x [20.294] l.6512 - pTeX: show_token_list -@<Display the token ...@>= -case m of -left_brace,right_brace,math_shift,tab_mark,sup_mark,sub_mark,spacer, - letter,other_char: print(c); -@y -@<Display the token ...@>= -case m of -kanji,kana,other_kchar: print_kanji(KANJI(c)); -left_brace,right_brace,math_shift,tab_mark,sup_mark,sub_mark,spacer, - letter,other_char: print(c); -@z - -@x [21.298] l.6632 - pTeX: print KANJI -other_char: chr_cmd("the character "); -@y -other_char: chr_cmd("the character "); -kanji,kana,other_kchar: begin print("kanji character "); - print_kanji(KANJI(chr_code)); end; -@z - -@x [22.303] l.6726 - pTeX: state mid_kanji -1) |state=mid_line| is the normal state.\cr -2) |state=skip_blanks| is like |mid_line|, but blanks are ignored.\cr -3) |state=new_line| is the state at the beginning of a line.\cr}}$$ -@y -1) |state=mid_line| is the normal state.\cr -2) |state=mid_kanji| is like |mid_line|, and internal KANJI string.\cr -3) |state=skip_blanks| is like |mid_line|, but blanks are ignored.\cr -4) |state=new_line| is the state at the beginning of a line.\cr}}$$ -@z - -@x [22.303] l.6736 - pTeX: state mid_kanji -@d mid_line=1 {|state| code when scanning a line of characters} -@d skip_blanks=2+max_char_code {|state| code when ignoring blanks} -@d new_line=3+max_char_code+max_char_code {|state| code at start of line} -@y -@d mid_line=1 {|state| code when scanning a line of characters} -@d mid_kanji=2+max_char_code {|state| code when scanning a line of characters} -@d skip_blanks=3+max_char_code+max_char_code {|state| code when ignoring blanks} -@d new_line=4+max_char_code+max_char_code+max_char_code - {|state| code at start of line} -@z - -@x [22.311] l.6986 - pTeX: label -@p procedure show_context; {prints where the scanner is} -label done; -var old_setting:0..max_selector; {saved |selector| setting} -@y -@p procedure show_context; {prints where the scanner is} -label done, done1; -var old_setting:0..max_selector; {saved |selector| setting} -@!s: pointer; {temporary pointer} -@z - -@x [22.316] l.7110 - pTeX: init kcode_pos -@d begin_pseudoprint== - begin l:=tally; tally:=0; selector:=pseudo; - trick_count:=1000000; - end -@y -@d begin_pseudoprint== - begin l:=tally; tally:=0; selector:=pseudo; kcode_pos:=0; - trick_count:=1000000; - end -@z -@x [22.316] l.7114 - pTeX: kcode_pos -@d set_trick_count== - begin first_count:=tally; - trick_count:=tally+1+error_line-half_error_line; - if trick_count<error_line then trick_count:=error_line; - end -@y -@d set_trick_count== - begin first_count:=tally; - if (first_count>0)and(trick_buf2[(first_count-1)mod error_line]=1) then - incr(first_count); - trick_count:=first_count+1+error_line-half_error_line; - if trick_count<error_line then trick_count:=error_line; - end -@z - -@x [22.317] l.7133 - pTeX: adjust kanji code pos -for q:=p to first_count-1 do print_char(trick_buf[q mod error_line]); -print_ln; -for q:=1 to n do print_char(" "); {print |n| spaces to begin line~2} -if m+n<=error_line then p:=first_count+m else p:=first_count+(error_line-n-3); -@y -if trick_buf2[p mod error_line]=2 then - begin p:=p+1; n:=n-1; - end; -for q:=p to first_count-1 do print_char(trick_buf[q mod error_line]); -print_ln; -for q:=1 to n do print_char(" "); {print |n| spaces to begin line~2} -if m+n<=error_line then p:=first_count+m else p:=first_count+(error_line-n-3); -if trick_buf2[(p-1) mod error_line]=1 then p:=p-1; -@z - -@x l.7148 - pTeX -@<Pseudoprint the line@>= -begin_pseudoprint; -if buffer[limit]=end_line_char then j:=limit -else j:=limit+1; {determine the effective end of the line} -i := start; mubyte_skeep := mubyte_keep; -mubyte_sstart := mubyte_start; mubyte_start := false; -if j>0 then while i < j do -begin - if i=loc then set_trick_count; - print_buffer(i); -end; -mubyte_keep := mubyte_skeep; mubyte_start := mubyte_sstart -@y -@<Pseudoprint the line@>= -begin_pseudoprint; -if buffer[limit]=end_line_char then j:=limit -else j:=limit+1; {determine the effective end of the line} -if j>0 then for i:=start to j-1 do - begin if i=loc then set_trick_count; - print(buffer[i]); - end -@z - -@x [22.319] l.7157 - pTeX: adjust kanji code token -@ @<Pseudoprint the token list@>= -begin_pseudoprint; -if token_type<macro then show_token_list(start,loc,100000) -else show_token_list(link(start),loc,100000) {avoid reference count} -@y -@ @<Pseudoprint the token list@>= -begin_pseudoprint; -if token_type<macro then - begin if (token_type=backed_up)and(loc<>null) then - begin if (link(start)=null)and(check_kanji(info(start))) then {wchar_token} - begin cur_input:=input_stack[base_ptr-1]; - s:=get_avail; info(s):=(buffer[loc] mod @'400); - cur_input:=input_stack[base_ptr]; - link(start):=s; - show_token_list(start,loc,100000); - free_avail(s);link(start):=null; - goto done1; - end; - end; - show_token_list(start,loc,100000); - end -else show_token_list(link(start),loc,100000); {avoid reference count} -done1: -@z - -@x l.7354 - pTeX -Some additional routines used by the enc\TeX extension have to be -declared at this point. - -@p @t\4@>@<Declare additional routines for enc\TeX@>@/ - -@y -@z - -@x l.7476 - pTeX -@!i,@!j: 0..buf_size; {more indexes for encTeX} -@!mubyte_incs: boolean; {control sequence is converted by mubyte} -@!p:pointer; {for encTeX test if noexpanding} -@y -@z - -@x [24.341] l.7479 - pTeX: set last_chr -@!cat:0..15; {|cat_code(cur_chr)|, usually} -@y -@!cat:escape..max_char_code; {|cat_code(cur_chr)|, usually} -@!l:0..buf_size; {temporary index into |buffer|} -@z - -@x [24.343] l.7500 - pTeX: input external file -@ @<Input from external file, |goto restart| if no input found@>= -@^inner loop@> -begin switch: if loc<=limit then {current line not yet finished} - begin - { Use |k| instead of |loc| for type correctness. } - k := loc; - cur_chr := read_buffer (k); - loc := k; incr (loc); - if (mubyte_token > 0) then - begin - state := mid_line; - cur_cs := mubyte_token - cs_token_flag; - goto found; - end; - reswitch: cur_cmd:=cat_code(cur_chr); -@y -@ @<Input from external file, |goto restart| if no input found@>= -@^inner loop@> -begin switch: if loc<=limit then {current line not yet finished} - begin cur_chr:=buffer[loc]; incr(loc); - if (iskanji1(cur_chr))and(loc<=limit)and(iskanji2(buffer[loc])) then - begin cur_cmd:=kcat_code(cur_chr); cur_chr:=cur_chr*@'400+buffer[loc]; - incr(loc); - end - else reswitch: cur_cmd:=cat_code(cur_chr); -@z - -@x [24.344] l.7535 - pTeX: ASCII-KANJI space handling -@d any_state_plus(#) == mid_line+#,skip_blanks+#,new_line+# -@y -@d any_state_plus(#) == mid_line+#,mid_kanji+#,skip_blanks+#,new_line+# -@z - -@x [24.347] l.7569 - pTeX: scaner -@ @d add_delims_to(#)==#+math_shift,#+tab_mark,#+mac_param, - #+sub_mark,#+letter,#+other_char -@y -@ @d add_delims_to(#)==#+math_shift,#+tab_mark,#+mac_param, - #+sub_mark,#+letter,#+other_char -@d all_jcode(#)==#+kanji,#+kana,#+other_kchar -@z - -@x [24.347] l.7573 - pTeX: scaner -mid_line+spacer:@<Enter |skip_blanks| state, emit a space@>; -mid_line+car_ret:@<Finish line, emit a space@>; -skip_blanks+car_ret,any_state_plus(comment): - @<Finish line, |goto switch|@>; -new_line+car_ret:@<Finish line, emit a \.{\\par}@>; -mid_line+left_brace: incr(align_state); -skip_blanks+left_brace,new_line+left_brace: begin - state:=mid_line; incr(align_state); - end; -mid_line+right_brace: decr(align_state); -skip_blanks+right_brace,new_line+right_brace: begin - state:=mid_line; decr(align_state); - end; -add_delims_to(skip_blanks),add_delims_to(new_line): state:=mid_line; -@y -mid_kanji+spacer,mid_line+spacer:@<Enter |skip_blanks| state, emit a space@>; -mid_line+car_ret:@<Finish line, emit a space@>; -mid_kanji+car_ret: if skip_mode then @<Finish line, |goto switch|@> - else @<Finish line, emit a space@>; -skip_blanks+car_ret,any_state_plus(comment): - @<Finish line, |goto switch|@>; -new_line+car_ret:@<Finish line, emit a \.{\\par}@>; -mid_line+left_brace,mid_kanji+left_brace: incr(align_state); -skip_blanks+left_brace,new_line+left_brace: begin - state:=mid_line; incr(align_state); - end; -mid_line+right_brace,mid_kanji+right_brace: decr(align_state); -skip_blanks+right_brace,new_line+right_brace: begin - state:=mid_line; decr(align_state); - end; -add_delims_to(skip_blanks),add_delims_to(new_line),add_delims_to(mid_kanji): - state:=mid_line; -all_jcode(skip_blanks),all_jcode(new_line),all_jcode(mid_line): - state:=mid_kanji; - -@ @<Global...@>= -skip_mode:boolean; - -@ @<Set init...@>= -skip_mode:=true; -@z - -@x [24.354] l.7659 - pTeX: scan control sequence -@<Scan a control...@>= -begin if loc>limit then cur_cs:=null_cs {|state| is irrelevant in this case} -else begin start_cs: - mubyte_incs := false; k := loc; mubyte_skeep := mubyte_keep; - cur_chr := read_buffer (k); cat := cat_code (cur_chr); - if (mubyte_in>0) and (not mubyte_incs) and - ((mubyte_skip>0) or (cur_chr<>buffer[k])) then mubyte_incs := true; - incr (k); - if mubyte_token > 0 then - begin - state := mid_line; - cur_cs := mubyte_token - cs_token_flag; - goto found; - end; - if cat=letter then state:=skip_blanks - else if cat=spacer then state:=skip_blanks - else state:=mid_line; - if (cat=letter)and(k<=limit) then - @<Scan ahead in the buffer until finding a nonletter; - if an expanded code is encountered, reduce it - and |goto start_cs|; otherwise if a multiletter control - sequence is found, adjust |cur_cs| and |loc|, and - |goto found|@> - else @<If an expanded code is present, reduce it and |goto start_cs|@>; - mubyte_keep := mubyte_skeep; - cur_cs:=single_base + read_buffer(loc); incr(loc); - end; -found: cur_cmd:=eq_type(cur_cs); cur_chr:=equiv(cur_cs); -if cur_cmd>=outer_call then check_outer_validity; -if write_noexpanding then -begin - p := mubyte_cswrite [cur_cs mod 128]; - while p <> null do - if info (p) = cur_cs then - begin - cur_cmd := relax; cur_chr := 256; p := null; - end else p := link (link (p)); -end; -end -@y -@<Scan a control...@>= -begin if loc>limit then cur_cs:=null_cs {|state| is irrelevant in this case} -else begin k:=loc; cur_chr:=buffer[k]; incr(k); - if (iskanji1(cur_chr))and(k<=limit)and(iskanji2(buffer[k])) then - begin cat:=kcat_code(cur_chr); incr(k); - end - else cat:=cat_code(cur_chr); -start_cs: - if (cat=letter)or(cat=kanji)or(cat=kana) then state:=skip_blanks - else if cat=spacer then state:=skip_blanks - else state:=mid_line; - if cat=other_kchar then - begin cur_cs:=id_lookup(loc,k-loc); loc:=k; goto found; - end - else if ((cat=letter)or(cat=kanji)or(cat=kana))and(k<=limit) then - @<Scan ahead in the buffer until finding a nonletter; - if an expanded code is encountered, reduce it - and |goto start_cs|; otherwise if a multiletter control - sequence is found, adjust |cur_cs| and |loc|, and - |goto found|@> - else @<If an expanded code is present, reduce it and |goto start_cs|@>; - cur_cs:=single_base+buffer[loc]; incr(loc); - end; -found: cur_cmd:=eq_type(cur_cs); cur_chr:=equiv(cur_cs); -if cur_cmd>=outer_call then check_outer_validity; -end -@z - -@x -@<If an expanded...@>= -begin if buffer[k]=cur_chr then @+if cat=sup_mark then @+if k<limit then - begin c:=buffer[k+1]; @+if c<@'200 then {yes, one is indeed present} - begin d:=2; - if is_hex(c) then @+if k+2<=limit then - begin cc:=buffer[k+2]; @+if is_hex(cc) then incr(d); - end; - if d>2 then - begin hex_to_cur_chr; buffer[k-1]:=cur_chr; - end - else if c<@'100 then buffer[k-1]:=c+@'100 - else buffer[k-1]:=c-@'100; - limit:=limit-d; first:=first-d; - while k<=limit do - begin buffer[k]:=buffer[k+d]; incr(k); - end; - goto start_cs; - end; - end; -end -@y -@<If an expanded...@>= -begin if buffer[k]=cur_chr then @+if cat=sup_mark then @+if k<limit then - begin c:=buffer[k+1]; @+if c<@'200 then {yes, one is indeed present} - begin d:=2; - if is_hex(c) then @+if k+2<=limit then - begin cc:=buffer[k+2]; @+if is_hex(cc) then incr(d); - end; - if d>2 then - begin hex_to_cur_chr; buffer[k-1]:=cur_chr; - end - else if c<@'100 then buffer[k-1]:=c+@'100 - else buffer[k-1]:=c-@'100; - limit:=limit-d; first:=first-d; - l:=k; cur_chr:=buffer[k-1]; cat:=cat_code(cur_chr); - while l<=limit do - begin buffer[l]:=buffer[l+d]; incr(l); - end; - goto start_cs; - end; - end; -end -@z - -@x [24.356] l.7727 - pTeX: scan control sequence (cont) -@ @<Scan ahead in the buffer...@>= -begin - repeat cur_chr := read_buffer (k); cat := cat_code (cur_chr); - if mubyte_token>0 then cat := escape; - if (mubyte_in>0) and (not mubyte_incs) and (cat=letter) and - ((mubyte_skip>0) or (cur_chr<>buffer[k])) then mubyte_incs := true; - incr (k); - until (cat <> letter) or (k > limit); - @<If an expanded...@>; - if cat <> letter then - begin - decr (k); k := k - mubyte_skip; - end; - if k > loc + 1 then { multiletter control sequence has been scanned } - begin - if mubyte_incs then { multibyte in csname occurrs } - begin - i := loc; j := first; mubyte_keep := mubyte_skeep; - if j - loc + k > max_buf_stack then - begin - max_buf_stack := j - loc + k; - if max_buf_stack >= buf_size then - begin - max_buf_stack := buf_size; - overflow ("buffer size", buf_size); - end; - end; - while i < k do - begin - buffer [j] := read_buffer (i); - incr (i); incr (j); - end; - if j = first+1 then - cur_cs := single_base + buffer [first] - else - cur_cs := id_lookup (first, j-first); - end else cur_cs := id_lookup (loc, k-loc) ; - loc := k; - goto found; - end; -end -@y -@ @<Scan ahead in the buffer...@>= -begin repeat cur_chr:=buffer[k]; incr(k); - if (iskanji1(cur_chr))and(k<=limit)and(iskanji2(buffer[k])) then - begin cat:=kcat_code(cur_chr); incr(k); - end - else cat:=cat_code(cur_chr); - while (buffer[k]=cur_chr)and(cat=sup_mark)and(k<limit) do - begin c:=buffer[k+1]; @+if c<@'200 then {yes, one is indeed present} - begin d:=2; - if is_hex(c) then @+if k+2<=limit then - begin cc:=buffer[k+2]; @+if is_hex(cc) then incr(d); - end; - if d>2 then - begin hex_to_cur_chr; - end - else if c<@'100 then cur_chr:=c+@'100 - else cur_chr:=c-@'100; - cat:=cat_code(cur_chr); - if (cat=letter)or(cat=sup_mark) then - begin buffer[k-1]:=cur_chr; - limit:=limit-d; first:=first-d; - l:=k; - while l<=limit do - begin buffer[l]:=buffer[l+d]; incr(l); - end; - end; - end; - end; -until not((cat=letter)or(cat=kanji)or(cat=kana))or(k>limit); -{@@<If an expanded...@@>;} -if not((cat=letter)or(cat=kanji)or(cat=kana)) then decr(k); -if cat=other_kchar then decr(k); {now |k| points to first nonletter} -if k>loc+1 then {multiletter control sequence has been scanned} - begin cur_cs:=id_lookup(loc,k-loc); loc:=k; goto found; - end; -end -@z - -@x [24.357] l.7771 - pTeX: input from token list -@<Input from token list, |goto restart| if end of list or - if a parameter needs to be expanded@>= -if loc<>null then {list not exhausted} -@^inner loop@> - begin t:=info(loc); loc:=link(loc); {move to next} - if t>=cs_token_flag then {a control sequence token} - begin cur_cs:=t-cs_token_flag; - cur_cmd:=eq_type(cur_cs); cur_chr:=equiv(cur_cs); - if cur_cmd>=outer_call then - if cur_cmd=dont_expand then - @<Get the next token, suppressing expansion@> - else check_outer_validity; - if write_noexpanding then - begin - p := mubyte_cswrite [cur_cs mod 128]; - while p <> null do - if info (p) = cur_cs then - begin - cur_cmd := relax; cur_chr := 256; p := null; - end else p := link (link (p)); - end; - end - else begin cur_cmd:=t div @'400; cur_chr:=t mod @'400; - case cur_cmd of - left_brace: incr(align_state); - right_brace: decr(align_state); - out_param: @<Insert macro parameter and |goto restart|@>; - othercases do_nothing - endcases; - end; - end -else begin {we are done with this token list} - end_token_list; goto restart; {resume previous level} - end -@y -@<Input from token list, |goto restart| if end of list or - if a parameter needs to be expanded@>= -if loc<>null then {list not exhausted} -@^inner loop@> - begin t:=info(loc); loc:=link(loc); {move to next} - if t>=cs_token_flag then {a control sequence token} - begin cur_cs:=t-cs_token_flag; - cur_cmd:=eq_type(cur_cs); cur_chr:=equiv(cur_cs); - if cur_cmd>=outer_call then - if cur_cmd=dont_expand then - @<Get the next token, suppressing expansion@> - else check_outer_validity; - end - else if check_kanji(t) then {wchar_token} - begin cur_chr:=t; cur_cmd:=kcat_code(Hi(t)); - end - else - begin cur_cmd:=t div @'400; cur_chr:=t mod @'400; - case cur_cmd of - left_brace: incr(align_state); - right_brace: decr(align_state); - out_param: @<Insert macro parameter and |goto restart|@>; - othercases do_nothing - endcases; - end; - end -else begin {we are done with this token list} - end_token_list; goto restart; {resume previous level} - end -@z - -@x l.7898 - pTeX - k := start; - while k < limit do begin print_buffer(k) end; -@y - if start<limit then for k:=start to limit-1 do print(buffer[k]); -@z - -@x [24.365] l.7935 - pTeX: get_token -@p procedure get_token; {sets |cur_cmd|, |cur_chr|, |cur_tok|} -begin no_new_control_sequence:=false; get_next; no_new_control_sequence:=true; -@^inner loop@> -if cur_cs=0 then cur_tok:=(cur_cmd*@'400)+cur_chr -else cur_tok:=cs_token_flag+cur_cs; -end; -@y -@p procedure get_token; {sets |cur_cmd|, |cur_chr|, |cur_tok|} -begin no_new_control_sequence:=false; get_next; no_new_control_sequence:=true; -@^inner loop@> -if cur_cs=0 then - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {wchar_token} - cur_tok:=cur_chr - else cur_tok:=(cur_cmd*@'400)+cur_chr -else cur_tok:=cs_token_flag+cur_cs; -end; -@z - -%@x [25.367] l.8019 - pTeX: expand -%@<Suppress expansion...@>= -%begin save_scanner_status:=scanner_status; scanner_status:=normal; -%get_token; scanner_status:=save_scanner_status; t:=cur_tok; -%back_input; {now |start| and |loc| point to the backed-up token |t|} -%if t>=cs_token_flag then -% begin p:=get_avail; info(p):=cs_token_flag+frozen_dont_expand; -% link(p):=loc; start:=p; loc:=p; -% end; -%end -%@y -%@<Suppress expansion...@>= -%begin save_scanner_status:=scanner_status; scanner_status:=normal; -%get_token; scanner_status:=save_scanner_status; t:=cur_tok; -%back_input; {now |start| and |loc| point to the backed-up token |t|} -%if t>=cs_token_flag then -% begin p:=get_avail; info(p):=cs_token_flag+frozen_dont_expand; -% link(p):=loc; start:=p; loc:=p; -% end; -%end -%@z - -@x [25.374] l.8073 - pTeX: get_chr -@ @<Look up the characters of list |r| in the hash table...@>= -j:=first; p:=link(r); -while p<>null do - begin if j>=max_buf_stack then - begin max_buf_stack:=j+1; - if max_buf_stack=buf_size then - overflow("buffer size",buf_size); -@:TeX capacity exceeded buffer size}{\quad buffer size@> - end; - buffer[j]:=info(p) mod @'400; incr(j); p:=link(p); - end; -@y -@ @<Look up the characters of list |r| in the hash table...@>= -j:=first; p:=link(r); -while p<>null do - begin if j>=max_buf_stack then - begin max_buf_stack:=j+1; - if max_buf_stack=buf_size then - overflow("buffer size",buf_size); -@:TeX capacity exceeded buffer size}{\quad buffer size@> - end; - if check_kanji(info(p)) then {wchar_token} - begin buffer[j]:=Hi(info(p)); incr(j); - buffer[j]:=Lo(info(p)); incr(j); p:=link(p); - end - else - begin buffer[j]:=info(p) mod @'400; incr(j); p:=link(p); - end; - end; -@z - -@x [25.380] l.8221 - pTeX: get_x_token -@p procedure get_x_token; {sets |cur_cmd|, |cur_chr|, |cur_tok|, - and expands macros} -label restart,done; -begin restart: get_next; -@^inner loop@> -if cur_cmd<=max_command then goto done; -if cur_cmd>=call then - if cur_cmd<end_template then macro_call - else begin cur_cs:=frozen_endv; cur_cmd:=endv; - goto done; {|cur_chr=null_list|} - end -else expand; -goto restart; -done: if cur_cs=0 then cur_tok:=(cur_cmd*@'400)+cur_chr -else cur_tok:=cs_token_flag+cur_cs; -end; -@y -@p procedure get_x_token; {sets |cur_cmd|, |cur_chr|, |cur_tok|, - and expands macros} -label restart,done; -begin restart: get_next; -@^inner loop@> -if cur_cmd<=max_command then goto done; -if cur_cmd>=call then - if cur_cmd<end_template then macro_call - else begin cur_cs:=frozen_endv; cur_cmd:=endv; - goto done; {|cur_chr=null_list|} - end -else expand; -goto restart; -done: if cur_cs=0 then - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - cur_tok:=cur_chr - else cur_tok:=(cur_cmd*@'400)+cur_chr -else cur_tok:=cs_token_flag+cur_cs; -end; -@z - -@x [25.381] l.8151 - pTeX: x_token -@p procedure x_token; {|get_x_token| without the initial |get_next|} -begin while cur_cmd>max_command do - begin expand; - get_next; - end; -if cur_cs=0 then cur_tok:=(cur_cmd*@'400)+cur_chr -else cur_tok:=cs_token_flag+cur_cs; -@y -@p procedure x_token; {|get_x_token| without the initial |get_next|} -begin while cur_cmd>max_command do - begin expand; - get_next; - end; -if cur_cs=0 then - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - cur_tok:=cur_chr - else cur_tok:=(cur_cmd*@'400)+cur_chr -else cur_tok:=cs_token_flag+cur_cs; -@z - -@x [26.413] l.8659 - pTeX: scan_somthing_internal -@p procedure scan_something_internal(@!level:small_number;@!negative:boolean); - {fetch an internal parameter} -var m:halfword; {|chr_code| part of the operand token} -@!p:0..nest_size; {index into |nest|} -begin m:=cur_chr; -case cur_cmd of -def_code: @<Fetch a character code from some table@>; -toks_register,assign_toks,def_family,set_font,def_font: @<Fetch a token list or - font identifier, provided that |level=tok_val|@>; -@y -@p @t\4@>@<Declare procedures needed in |scan_something|@>@t@>@/ -procedure scan_something_internal(@!level:small_number;@!negative:boolean); - {fetch an internal parameter} -var m:halfword; {|chr_code| part of the operand token} -@!p:0..nest_size; {index into |nest|} -@!q:pointer; -begin m:=cur_chr; -case cur_cmd of -assign_kinsoku: @<Fetch breaking penalty from some table@>; -assign_inhibit_xsp_code: @<Fetch inhibit type from some table@>; -def_code: @<Fetch a character code from some table@>; -toks_register,assign_toks,def_family,set_font,def_font,def_jfont,def_tfont: - @<Fetch a token list or font identifier, provided that |level=tok_val|@>; -@z - -@x [26.414] l.8693 - pTeX: -if m=xord_code_base then scanned_result(xord[cur_val])(int_val) -else if m=xchr_code_base then scanned_result(xchr[cur_val])(int_val) -else if m=xprn_code_base then scanned_result(xprn[cur_val])(int_val) -else if m=math_code_base then scanned_result(ho(math_code(cur_val)))(int_val) -else if m<math_code_base then scanned_result(equiv(m+cur_val))(int_val) -else scanned_result(eqtb[m+cur_val].int)(int_val); -@y -if m=math_code_base then scanned_result(ho(math_code(cur_val)))(int_val) -else if m=kcat_code_base then scanned_result(equiv(m+Hi(cur_val)))(int_val) -else if m<math_code_base then - begin if check_kanji(cur_val)>0 then - scanned_result(equiv(m+Hi(cur_val)))(int_val) - else scanned_result(equiv(m+cur_val))(int_val) - end -else scanned_result(eqtb[m+cur_val].int)(int_val); -@z - -@x [26.420] l.8799 - pTeX: Fetch a box dimension: dir_node -if box(cur_val)=null then cur_val:=0 @+else cur_val:=mem[box(cur_val)+m].sc; -@y -if box(cur_val)=null then cur_val:=0 -else - begin q:=box(cur_val); - while (q<>null)and(box_dir(q)<>abs(direction)) do q:=link(q); - if q=null then - begin q:=new_dir_node(box(cur_val),abs(direction)); - cur_val:=mem[q+m].sc; - delete_glue_ref(space_ptr(q)); delete_glue_ref(xspace_ptr(q)); - free_node(q,box_node_size); - end - else cur_val:=mem[q+m].sc; - end; -@z - -@x [26.435] l.8940 - pTeX: scan_char_num -procedure scan_char_num; -begin scan_int; -if (cur_val<0)or(cur_val>255) then - begin print_err("Bad character code"); -@.Bad character code@> - help2("A character number must be between 0 and 255.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@y -procedure scan_char_num; -begin scan_int; -if ((cur_val<0)or(cur_val>255))and(not check_kanji(cur_val)) then {wchar_token} - begin print_err("Bad character code"); -@.Bad character code@> - help2("A character number must be between 0 and 255, or KANJI code.")@/ - ("I changed this one to zero."); int_error(cur_val); cur_val:=0; - end; -end; -@z - -@x [26.442] l.9045 - pTeX: KANJI character scanning -@<Scan an alphabetic character code into |cur_val|@>= -begin get_token; {suppress macro expansion} -if cur_tok<cs_token_flag then - begin cur_val:=cur_chr; - if cur_cmd<=right_brace then - if cur_cmd=right_brace then incr(align_state) - else decr(align_state); - end -else if cur_tok<cs_token_flag+single_base then - cur_val:=cur_tok-cs_token_flag-active_base -else cur_val:=cur_tok-cs_token_flag-single_base; -if cur_val>255 then - begin print_err("Improper alphabetic constant"); -@.Improper alphabetic constant@> - help2("A one-character control sequence belongs after a ` mark.")@/ - ("So I'm essentially inserting \0 here."); - cur_val:="0"; back_error; - end -else @<Scan an optional space@>; -end -@y -@<Scan an alphabetic character code into |cur_val|@>= -begin get_token; {suppress macro expansion} -if cur_tok<cs_token_flag then - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {wchar_token} - begin skip_mode:=false; cur_val:=tonum(cur_chr); - end - else begin cur_val:=cur_chr; - if cur_cmd<=right_brace then - if cur_cmd=right_brace then incr(align_state) - else decr(align_state); - end -else if cur_tok<cs_token_flag+single_base then - cur_val:=cur_tok-cs_token_flag-active_base -else cur_val:=cur_tok-cs_token_flag-single_base; -if (cur_val>255)and(cur_cmd<kanji) then - begin print_err("Improper alphabetic or KANJI constant"); -@.Improper alphabetic constant@> - help2("A one-character control sequence belongs after a ` mark.")@/ - ("So I'm essentially inserting \0 here."); - cur_val:="0"; back_error; - end -else @<Scan an optional space@>; -skip_mode:=true; -end -@z - -@x [26.455] l.9288 - pTeX: zw, zh: zenkaku width & height -if scan_keyword("em") then v:=(@<The em width for |cur_font|@>) -@.em@> -else if scan_keyword("ex") then v:=(@<The x-height for |cur_font|@>) -@.ex@> -else goto not_found; -@y -if scan_keyword("em") then v:=(@<The em width for |cur_font|@>) -@.em@> -else if scan_keyword("ex") then v:=(@<The x-height for |cur_font|@>) -@.ex@> -else if scan_keyword("zw") then @<The KANJI width for |cur_jfont|@> -@.ze@> -else if scan_keyword("zh") then @<The KANJI height for |cur_jfont|@> -@.zh@> -else goto not_found; -@z - -@x [26.458] l.9345 - pTeX: dimension unit: Q, H (1/4 mm) -else if scan_keyword("sp") then goto done -@.sp@> -@y -else if scan_keyword("H") then set_conversion(7227)(10160) -@.H@> -else if scan_keyword("Q") then set_conversion(7227)(10160) -@.Q@> -else if scan_keyword("sp") then goto done -@.sp@> -@z - -@x [27.464] l.9475 - pTeX: str_toks - if t=" " then t:=space_token - else t:=other_token+t; -@y - if (iskanji1(t))and(k+1<pool_ptr)and(iskanji2(str_pool[k+1])) then - begin t:=t*@'400+str_pool[k+1]; incr(k); - end - else if t=" " then t:=space_token - else t:=other_token+t; -@z - -@x [27.468] l.9531 - pTeX: convert KANJI code -@d number_code=0 {command code for \.{\\number}} -@d roman_numeral_code=1 {command code for \.{\\romannumeral}} -@d string_code=2 {command code for \.{\\string}} -@d meaning_code=3 {command code for \.{\\meaning}} -@d font_name_code=4 {command code for \.{\\fontname}} -@d job_name_code=5 {command code for \.{\\jobname}} -@y -@d number_code=0 {command code for \.{\\number}} -@d roman_numeral_code=1 {command code for \.{\\romannumeral}} -@d kansuji_code=2 {command code for \.{\\kansuji}} -@d string_code=3 {command code for \.{\\string}} -@d meaning_code=4 {command code for \.{\\meaning}} -@d font_name_code=5 {command code for \.{\\fontname}} -@d euc_code=6 {command code for \.{\\euc}} -@d sjis_code=7 {command code for \.{\\sjis}} -@d jis_code=8 {command code for \.{\\jis}} -@d kuten_code=9 {command code for \.{\\kuten}} -@d job_name_code=10 {command code for \.{\\jobname}} -@z - -@x [27.468] l.9547 - pTeX: -primitive("fontname",convert,font_name_code);@/ -@!@:font_name_}{\.{\\fontname} primitive@> -@y -primitive("fontname",convert,font_name_code);@/ -@!@:font_name_}{\.{\\fontname} primitive@> -primitive("kansuji",convert,kansuji_code); -@!@:kansuji_}{\.{\\kansuji} primitive@> -primitive("euc",convert,euc_code); -@!@:euc_}{\.{\\euc} primitive@> -primitive("sjis",convert,sjis_code); -@!@:sjis_}{\.{\\sjis} primitive@> -primitive("jis",convert,jis_code); -@!@:jis_}{\.{\\jis} primitive@> -primitive("kuten",convert,kuten_code); -@!@:kuten_}{\.{\\kuten} primitive@> -@z - -@x [27.469] l.9558 - pTeX: - font_name_code: print_esc("fontname"); -@y - font_name_code: print_esc("fontname"); - kansuji_code: print_esc("kansuji"); - euc_code:print_esc("euc"); - sjis_code:print_esc("sjis"); - jis_code:print_esc("jis"); - kuten_code:print_esc("kuten"); -@z - -@x [27.470] l.9566 - pTeX: convert KANJI code continue -@p procedure conv_toks; -var old_setting:0..max_selector; {holds |selector| setting} -@y -@p procedure conv_toks; -var old_setting:0..max_selector; {holds |selector| setting} -@!cx:KANJI_code; {temporary register for KANJI} -@z - -@x [27.471] l.9577 - pTeX: convert KANJI code continue -@ @<Scan the argument for command |c|@>= -case c of -number_code,roman_numeral_code: scan_int; -string_code, meaning_code: begin save_scanner_status:=scanner_status; - scanner_status:=normal; get_token; scanner_status:=save_scanner_status; - end; -@y -@ @<Scan the argument for command |c|@>= -KANJI(cx):=0; -case c of -number_code,roman_numeral_code, -kansuji_code,euc_code,sjis_code,jis_code,kuten_code: scan_int; -string_code, meaning_code: begin save_scanner_status:=scanner_status; - scanner_status:=normal; get_token; - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {wchar_token} - KANJI(cx):=cur_tok; - scanner_status:=save_scanner_status; - end; -@z - -@x [27.471] l.9587 - pTeX: convert KANJI code continue -@ @<Print the result of command |c|@>= -case c of -number_code: print_int(cur_val); -roman_numeral_code: print_roman_int(cur_val); -string_code:if cur_cs<>0 then sprint_cs(cur_cs) - else print_char(cur_chr); -@y -@ @<Print the result of command |c|@>= -case c of -number_code: print_int(cur_val); -roman_numeral_code: print_roman_int(cur_val); -jis_code: begin - if (proc_kanji_code=sjis_enc) then cur_val:=JIStoSJIS(cur_val) - else cur_val:=JIStoEUC(cur_val); - print_int(cur_val); end; -euc_code: begin - if (proc_kanji_code=sjis_enc) then cur_val:=EUCtoSJIS(cur_val) - else do_nothing; - print_int(cur_val); end; -sjis_code: begin - if (proc_kanji_code=sjis_enc) then do_nothing - else cur_val:=SJIStoEUC(cur_val); - print_int(cur_val); end; -kuten_code: begin - if (proc_kanji_code=sjis_enc) then cur_val:=KUTENtoSJIS(cur_val) - else cur_val:=KUTENtoEUC(cur_val); - print_int(cur_val); end; -kansuji_code: print_kansuji(cur_val); -string_code:if cur_cs<>0 then sprint_cs(cur_cs) - else if KANJI(cx)=0 then print_char(cur_chr) - else print_kanji(cx); -@z - -@x [28.487] l.9852 - pTeX: iftdir, ifydir, iftbox, ifybox -@d if_case_code=16 { `\.{\\ifcase}' } -@y -@d if_case_code=16 { `\.{\\ifcase}' } -@d if_tdir_code=17 { `\.{\\iftdir}' } -@d if_ydir_code=18 { `\.{\\ifydir}' } -@d if_mdir_code=19 { `\.{\\ifmdir}' } -@d if_tbox_code=20 { `\.{\\iftbox}' } -@d if_ybox_code=21 { `\.{\\ifybox}' } -@z - -@x [28.487] l.9887 - pTeX: iftdir, ifydir, iftbox, ifybox -primitive("ifcase",if_test,if_case_code); -@!@:if_case_}{\.{\\ifcase} primitive@> -@y -primitive("ifcase",if_test,if_case_code); -@!@:if_case_}{\.{\\ifcase} primitive@> -primitive("iftdir",if_test,if_tdir_code); -@!@:if_tdir_}{\.{\\iftdir} primitive@> -primitive("ifydir",if_test,if_ydir_code); -@!@:if_ydir_}{\.{\\ifydir} primitive@> -primitive("ifmdir",if_test,if_mdir_code); -@!@:if_mdir_}{\.{\\ifmdir} primitive@> -primitive("iftbox",if_test,if_tbox_code); -@!@:if_tbox_}{\.{\\iftbox} primitive@> -primitive("ifybox",if_test,if_ybox_code); -@!@:if_ybox_}{\.{\\ifybox} primitive@> -@z - -@x [28.488] l.9907 - pTeX: iftdir, ifydir, iftbox, ifybox - if_case_code:print_esc("ifcase"); -@y - if_case_code:print_esc("ifcase"); - if_tdir_code:print_esc("iftdir"); - if_ydir_code:print_esc("ifydir"); - if_mdir_code:print_esc("ifmdir"); - if_tbox_code:print_esc("iftbox"); - if_ybox_code:print_esc("ifybox"); -@z - -@x [28.501] l.10073 - pTeX: iftdir, ifydir, iftbox, ifybox -if_void_code, if_hbox_code, if_vbox_code: @<Test box register status@>; -@y -if_tdir_code: b:=(abs(direction)=dir_tate); -if_ydir_code: b:=(abs(direction)=dir_yoko); -if_mdir_code: b:=(direction<0); -if_void_code, if_hbox_code, if_vbox_code, if_tbox_code, if_ybox_code: - @<Test box register status@>; -@z - -@x [28.505] l.10118 - pTeX: Test box register status : iftbox, ifybox -if this_if=if_void_code then b:=(p=null) -else if p=null then b:=false -else if this_if=if_hbox_code then b:=(type(p)=hlist_node) -else b:=(type(p)=vlist_node); -@y -if this_if=if_void_code then b:=(p=null) -else if p=null then b:=false -else begin - if type(p)=dir_node then p:=list_ptr(p); - if this_if=if_hbox_code then b:=(type(p)=hlist_node) - else if this_if=if_vbox_code then b:=(type(p)=vlist_node) - else if this_if=if_tbox_code then b:=(box_dir(p)=dir_tate) - else b:=(box_dir(p)=dir_yoko); - end -@z - -@x [28.502] l.10138 - pTeX: ifx : Test character : KANJI character -if (cur_cmd>active_char)or(cur_chr>255) then {not a character} - begin m:=relax; n:=256; - end -else begin m:=cur_cmd; n:=cur_chr; - end; -get_x_token_or_active_char; -if (cur_cmd>active_char)or(cur_chr>255) then - begin cur_cmd:=relax; cur_chr:=256; - end; -@y -if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - begin m:=cur_cmd; n:=cur_chr; - end -else if (cur_cmd>active_char)or(cur_chr>255) then - begin m:=relax; n:=256; - end -else begin m:=cur_cmd; n:=cur_chr; - end; -get_x_token_or_active_char; -if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - begin cur_cmd:=cur_cmd; - end {dummy} -else if (cur_cmd>active_char)or(cur_chr>255) then - begin cur_cmd:=relax; cur_chr:=256; - end; -@z - -@x [29.523] l.10571 - pTeX: xord -for j:=1 to n do append_to_name(xord[TEX_format_default[j]]); -for j:=a to b do append_to_name(buffer[j]); -for j:=format_default_length-format_ext_length+1 to format_default_length do - append_to_name(xord[TEX_format_default[j]]); -@y -if name_of_file then libc_free (name_of_file); -name_of_file := xmalloc (1 + n + (b - a + 1) + format_ext_length + 1); -for j:=1 to n do append_to_name(xord[TEX_format_default[j]]); -for j:=a to b do append_to_name(buffer[j]); -for j:=format_default_length-format_ext_length+1 to format_default_length do - append_to_name(xord[TEX_format_default[j]]); -@z - -@x [29.526] l.10668 - pTeX: scan file name -loop@+begin if (cur_cmd>other_char)or(cur_chr>255) then {not a character} - begin back_input; goto done; - end; - {If |cur_chr| is a space and we're not scanning a token list, check - whether we're at the end of the buffer. Otherwise we end up adding - spurious spaces to file names in some cases.} - if (cur_chr=" ") and (state<>token_list) and (loc>limit) then goto done; - if not more_name(cur_chr) then goto done; - get_x_token; - end; -done: end_name; name_in_progress:=false; -@y -skip_mode:=false; -loop@+begin - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {is kanji} - begin str_room(2); - append_char(cur_chr div 256); {kanji upper byte} - append_char(cur_chr mod 256); {kanji lower byte} - end - else if (cur_cmd>other_char)or(cur_chr>255) then {not a alphabet} - begin back_input; goto done; - end - {If |cur_chr| is a space and we're not scanning a token list, check - whether we're at the end of the buffer. Otherwise we end up adding - spurious spaces to file names in some cases.} - else if ((cur_chr=" ") and (state<>token_list) and (loc>limit)) or not more_name(cur_chr) then goto done; - get_x_token; - end; -done: end_name; name_in_progress:=false; -skip_mode:=true; -@z - -@x l.10797 - pTeX -if enctex_enabled_p then - begin wlog_cr; wlog(encTeX_banner); wlog(', reencoding enabled'); - if translate_filename then - begin wlog_cr; - wlog(' (\xordcode, \xchrcode, \xprncode overridden by TCX)'); - end; - end; -@y -@z - -@x [29.536] l.10834 - pTeX: -begin -if src_specials_p or file_line_error_style_p or parse_first_line_p -then - wlog(banner_k) -else - wlog(banner); -@y -begin -if src_specials_p or file_line_error_style_p or parse_first_line_p -then - wlog(banner_k) -else - wlog(banner); -wlog(' ('); -case proc_kanji_code of - jis_enc: wlog('jis'); - euc_enc: wlog('euc'); - sjis_enc: wlog('sjis'); - othercases wterm('?'); -endcases; -wlog(')'); -@z - -@x [30.560] l.10968 - pTeX: -This is called BigEndian order. -@!@^BigEndian order@> -@y -This is called BigEndian order. -@!@^BigEndian order@> - -We use to get \TeX\ knowledge about KANJI fonts from \.{JFM} files. -The \.{JFM} format holds more two 16-bit integers ,|id| and |nt|, -at the top of the file. -$$\vbox{\halign{\hfil#&$\null=\null$#\hfil\cr -|id|&identification code of the file;\cr -|nt|&number of words in the |char_type| table;\cr}}$$ -The identification byte, |id| equals~11 or~9. When \TeX read a font file, -the |id| equals~11 or~9 then the font is the \.{JFM}, othercases it is -the \.{TFM} file. The \.{TFM} holds |lf| at the same postion of |id|, -usually it take a larger number than~9 or~11. -The |nt| is nonngative and less than $2^{15}$. - -We must have |ec=0|, -$$\hbox{|lf=7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np|.}$$ - -@d yoko_jfm_id=11 {for `yoko-kumi' fonts} -@d tate_jfm_id=9 {for `tate-kumi' fonts} -@z - -@x [30.544] l.11085 - pTeX: gk_tag -operation looks for both |list_tag| and |ext_tag|. -@y -operation looks for both |list_tag| and |ext_tag|. - -If the \.{JFM}, the |lig_tag| is called |gk_tag|. The |gk_tag| means that -this character has a glue/kerning program starting at position |remainder| -in the |glue_kern| array. And a \.{JFM} not used |tag=2| and |tag=3|. -@z - -@x [30.544] l.11088 - pTeX: gk_tag -@d lig_tag=1 {character has a ligature/kerning program} -@y -@d lig_tag=1 {character has a ligature/kerning program} -@d gk_tag=1 {character has a glue/kerning program} -@z - -@x [30.549] l.11228 - pTeX: -@<Glob...@>= -@!font_info: ^fmemory_word; -@y -@<Glob...@>= -@!font_info: ^memory_word; {pTeX: use halfword for |char_type| table.} -@!font_dir: ^eight_bits; - {pTeX: direction of fonts, 0 is default, 1 is Yoko, 2 is Tate} -@!font_num_ext: ^integer; - {pTeX: number of the |char_type| table.} -@z - -@x [30.550] l.11270 - pTeX: -@!char_base: ^integer; - {base addresses for |char_info|} -@y -@!char_base: ^integer; - {base addresses for |char_info|} -@!ctype_base: ^integer; - {pTeX: base addresses for KANJI character type parameters} -@z - -@x [30.554] l.11373 - pTeX: -@d orig_char_info_end(#)==#].qqqq -@d orig_char_info(#)==font_info[char_base[#]+orig_char_info_end -@y -@d orig_char_info_end(#)==#].qqqq -@d orig_char_info(#)==font_info[char_base[#]+orig_char_info_end -@# -@d kchar_code_end(#)==#].hh.rh -@d kchar_code(#)==font_info[ctype_base[#]+kchar_code_end -@d kchar_type_end(#)==#].hh.lhfield -@d kchar_type(#)==font_info[ctype_base[#]+kchar_type_end -@z - -@x [30.557] l.11413 - pTeX: glue_kern_start -@d lig_kern_start(#)==lig_kern_base[#]+rem_byte {beginning of lig/kern program} -@y -@d lig_kern_start(#)==lig_kern_base[#]+rem_byte {beginning of lig/kern program} -@d glue_kern_start(#)==lig_kern_base[#]+rem_byte - {beginning of glue/kern program} -@z - -@x [30.560] l.11457 - pTeX: jfm_flag, jfm_id, nt, cx -var k:font_index; {index into |font_info|} -@y -var k:font_index; {index into |font_info|} -@!jfm_flag:dir_default..dir_tate; {direction of the \.{JFM}} -@!nt:halfword; {number of the |char_type| tables} -@!cx:KANJI_code; {kanji code} -@z - -@x [30.565] l.11548 - pTeX: read tfm size -@ @<Read the {\.{TFM}} size fields@>= -begin read_sixteen(lf); -fget; read_sixteen(lh); -fget; read_sixteen(bc); -fget; read_sixteen(ec); -if (bc>ec+1)or(ec>255) then abort; -if bc>255 then {|bc=256| and |ec=255|} - begin bc:=1; ec:=0; - end; -fget; read_sixteen(nw); -fget; read_sixteen(nh); -fget; read_sixteen(nd); -fget; read_sixteen(ni); -fget; read_sixteen(nl); -fget; read_sixteen(nk); -fget; read_sixteen(ne); -fget; read_sixteen(np); -if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort; -end -@y -@ @<Read the {\.{TFM}} size fields@>= -begin read_sixteen(lf); -fget; read_sixteen(lh); -if lf=yoko_jfm_id then - begin jfm_flag:=dir_yoko; nt:=lh; - fget; read_sixteen(lf); - fget; read_sixteen(lh); - end -else if lf=tate_jfm_id then - begin jfm_flag:=dir_tate; nt:=lh; - fget; read_sixteen(lf); - fget; read_sixteen(lh); - end -else begin jfm_flag:=dir_default; nt:=0; - end; -fget; read_sixteen(bc); -fget; read_sixteen(ec); -if (bc>ec+1)or(ec>255) then abort; -if bc>255 then {|bc=256| and |ec=255|} - begin bc:=1; ec:=0; - end; -fget; read_sixteen(nw); -fget; read_sixteen(nh); -fget; read_sixteen(nd); -fget; read_sixteen(ni); -fget; read_sixteen(nl); -fget; read_sixteen(nk); -fget; read_sixteen(ne); -fget; read_sixteen(np); -if jfm_flag<>dir_default then - begin if lf<>7+lh+nt+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort - end -else - begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort - end -end -@z - -@x [30.566] l.11574 - pTeX: set font_dir & font_num_ext -@<Use size fields to allocate font information@>= -lf:=lf-6-lh; {|lf| words should be loaded into |font_info|} -if np<7 then lf:=lf+7-np; {at least seven parameters will appear} -if (font_ptr=font_max)or(fmem_ptr+lf>font_mem_size) then - @<Apologize for not loading the font, |goto done|@>; -f:=font_ptr+1; -char_base[f]:=fmem_ptr-bc; -width_base[f]:=char_base[f]+ec+1; -height_base[f]:=width_base[f]+nw; -depth_base[f]:=height_base[f]+nh; -italic_base[f]:=depth_base[f]+nd; -lig_kern_base[f]:=italic_base[f]+ni; -kern_base[f]:=lig_kern_base[f]+nl-kern_base_offset; -exten_base[f]:=kern_base[f]+kern_base_offset+nk; -param_base[f]:=exten_base[f]+ne -@y -@<Use size fields to allocate font information@>= -if jfm_flag<>dir_default then - lf:=lf-7-lh {If \.{JFM}, |lf| holds more two-16bit records than \.{TFM}} -else - lf:=lf-6-lh; {|lf| words should be loaded into |font_info|} -if np<7 then lf:=lf+7-np; {at least seven parameters will appear} -if (font_ptr=font_max)or(fmem_ptr+lf>font_mem_size) then - @<Apologize for not loading the font, |goto done|@>; -f:=font_ptr+1; -font_dir[f]:=jfm_flag; -font_num_ext[f]:=nt; -ctype_base[f]:=fmem_ptr; -char_base[f]:=ctype_base[f]+nt-bc; -width_base[f]:=char_base[f]+ec+1; -height_base[f]:=width_base[f]+nw; -depth_base[f]:=height_base[f]+nh; -italic_base[f]:=depth_base[f]+nd; -lig_kern_base[f]:=italic_base[f]+ni; -kern_base[f]:=lig_kern_base[f]+nl-kern_base_offset; -exten_base[f]:=kern_base[f]+kern_base_offset+nk; -param_base[f]:=exten_base[f]+ne; -@z - -@x [30.569] l.11619 - pTeX: read char_type -@ @<Read character data@>= -for k:=fmem_ptr to width_base[f]-1 do - begin store_four_quarters(font_info[k].qqqq); -@y -@ @<Read character data@>= -if jfm_flag<>dir_default then - for k:=ctype_base[f] to ctype_base[f]+nt-1 do - begin - fget; read_sixteen(cx); font_info[k].hh.rh:=tokanji(cx); {|kchar_code|} - fget; read_sixteen(cx); font_info[k].hh.lhfield:=tonum(cx); {|kchar_type|} - end; -for k:=char_base[f]+bc to width_base[f]-1 do - begin store_four_quarters(font_info[k].qqqq); -@z - -@x [30.570] l.11638 - pTeX: -@d current_character_being_worked_on==k+bc-fmem_ptr -@y -@d current_character_being_worked_on==k-char_base[f] -@z - -@x [30.573] l.11704 - pTeX: jfm - if a>128 then - begin if 256*c+d>=nl then abort; - if a=255 then if k=lig_kern_base[f] then bchar:=b; - end - else begin if b<>bchar then check_existence(b); - if c<128 then check_existence(d) {check ligature} - else if 256*(c-128)+d>=nk then abort; {check kern} - if a<128 then if k-lig_kern_base[f]+a+1>=nl then abort; - end; - end; -@y - if a>128 then - begin if 256*c+d>=nl then abort; - if a=255 then if k=lig_kern_base[f] then bchar:=b; - end - else begin if b<>bchar then check_existence(b); - if c<128 then begin - if jfm_flag<>dir_default then begin if d>=ne then abort; end - else check_existence(d); {check ligature} - end else if 256*(c-128)+d>=nk then abort; {check kern} - if a<128 then if k-lig_kern_base[f]+a+1>=nl then abort; - end; - end; -@z - -@x [30.574] l.11720 - pTeX: read jfm exten -for k:=exten_base[f] to param_base[f]-1 do - begin store_four_quarters(font_info[k].qqqq); -@y -if jfm_flag<>dir_default then - for k:=exten_base[f] to param_base[f]-1 do - store_scaled(font_info[k].sc) {NOTE: this area subst for glue program} -else for k:=exten_base[f] to param_base[f]-1 do - begin store_four_quarters(font_info[k].qqqq); -@z - -@x [30.576] l.11765 - pTeX: adjust ctype_base -adjust(char_base); adjust(width_base); adjust(lig_kern_base); -@y -adjust(ctype_base); -adjust(char_base); adjust(width_base); adjust(lig_kern_base); -@z - -@x [30.577] l.11778 - pTeX: jfont, tfont -if cur_cmd=def_font then f:=cur_font -@y -if cur_cmd=def_jfont then f:=cur_jfont -else if cur_cmd=def_tfont then f:=cur_tfont -else if cur_cmd=def_font then f:=cur_font -@z - -@x -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -begin if tracing_lost_chars>0 then - begin begin_diagnostic; - print_nl("Missing character: There is no "); -@.Missing character@> - print_ASCII(c); print(" in font "); - slow_print(font_name[f]); print_char("!"); end_diagnostic(false); - end; -end; -@y -@d print_lc_hex(#)==l:=#; - if l<10 then print_char(l+"0")@+else print_char(l-10+"a") - -@p procedure char_warning(@!f:internal_font_number;@!c:eight_bits); -var @!l:0..255; {small indices or counters} -begin if tracing_lost_chars>0 then - 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; -end; -@z - -@x [31.586] l.12189 - pTeX: define set2 -@d set1=128 {typeset a character and move right} -@y -@d set1=128 {typeset a character and move right} -@d set2=129 {typeset a character and move right} -@z -@x [31.586] l.12214 - pTeX: define dirchg -@d post_post=249 {postamble ending} -@y -@d post_post=249 {postamble ending} -@d dirchg=255 {direction change} -@z - -@x [31.587] l.12246 - pTeX: ex_id_byte -@d id_byte=2 {identifies the kind of \.{DVI} files described here} -@y -@d id_byte=2 {identifies the kind of \.{DVI} files described here} -@d ex_id_byte=3 {identifies the kind of extended \.{DVI} files} -@z - -@x [32.590] l.12329 - pTeX: ex_id_byte: This dvi is extended! -@ The last part of the postamble, following the |post_post| byte that -signifies the end of the font definitions, contains |q|, a pointer to the -|post| command that started the postamble. An identification byte, |i|, -comes next; this currently equals~2, as in the preamble. -@y -@ The last part of the postamble, following the |post_post| byte that -signifies the end of the font definitions, contains |q|, a pointer to the -|post| command that started the postamble. An identification byte, |i|, -comes next; this equals~2 or~3. If not used p\TeX primitives then the -identification byte equals~2, othercase this is set to~3. -@z - -@x [32.592] l.12405 - pTeX: - {character and font in current |char_node|} -@!c:quarterword; -@!f:internal_font_number; -@y - {character and font in current |char_node|} -@!c:quarterword; -@!f:internal_font_number; -@!dir_used:boolean; {Is this dvi extended?} -@z - -@x [32.593] l.12414 - pTeX: dir_used: Is this dvi extended? -doing_leaders:=false; dead_cycles:=0; cur_s:=-1; -@y -doing_leaders:=false; dead_cycles:=0; cur_s:=-1; dir_used:=false; -@z - -@x [32.617] l.12846 - pTeX: Initialize dvi_dir as shipout begins -dvi_h:=0; dvi_v:=0; cur_h:=h_offset; dvi_f:=null_font; -@y -dvi_h:=0; dvi_v:=0; cur_h:=h_offset; dvi_f:=null_font; -dvi_dir:=dir_yoko; cur_dir:=dvi_dir; -@z - -@x [32.619] l.12892 - pTeX: hlist_out Kanji, disp_node -procedure hlist_out; {output an |hlist_node| box} -label reswitch, move_past, fin_rule, next_p, continue, found; -var base_line: scaled; {the baseline coordinate for this box} -@y -procedure hlist_out; {output an |hlist_node| box} -label reswitch, move_past, fin_rule, next_p, continue, found; -var base_line: scaled; {the baseline coordinate for this box} -@!disp: scaled; {displacement} -@!save_dir:eight_bits; {what |dvi_dir| should pop to} -@!jc:KANJI_code; {temporary register for KANJI codes} -@!ksp_ptr:pointer; {position of |auto_spacing_glue| in the hlist} -@z -@x [32.619] l.12913 - pTeX: hlist_out Kanji, disp_node -incr(cur_s); -if cur_s>0 then dvi_out(push); -if cur_s>max_push then max_push:=cur_s; -save_loc:=dvi_offset+dvi_ptr; base_line:=cur_v; left_edge:=cur_h; -@y -ksp_ptr:=space_ptr(this_box); -incr(cur_s); -if cur_s>0 then dvi_out(push); -if cur_s>max_push then max_push:=cur_s; -save_loc:=dvi_offset+dvi_ptr; -synch_dir; -base_line:=cur_v; left_edge:=cur_h; disp:=0; -@z - -@x [32.622] l.12945 - pTeX: chain -@<Output node |p| for |hlist_out|...@>= -reswitch: if is_char_node(p) then - begin synch_h; synch_v; - repeat f:=font(p); c:=character(p); - if f<>dvi_f then @<Change font |dvi_f| to |f|@>; - if font_ec[f]>=qo(c) then if font_bc[f]<=qo(c) then - if char_exists(orig_char_info(f)(c)) then {N.B.: not |char_info|} - begin if c>=qi(128) then dvi_out(set1); - dvi_out(qo(c));@/ - cur_h:=cur_h+char_width(f)(orig_char_info(f)(c)); - goto continue; - end; - if mltex_enabled_p then - @<Output a substitution, |goto continue| if not possible@>; -continue: - p:=link(p); - until not is_char_node(p); - dvi_h:=cur_h; - end -else @<Output the non-|char_node| |p| for |hlist_out| - and move to the next node@> -@y -@<Output node |p| for |hlist_out|...@>= -reswitch: if is_char_node(p) then - begin synch_h; synch_v; - chain:=false; - repeat f:=font(p); c:=character(p); - if f<>dvi_f then @<Change font |dvi_f| to |f|@>; - if font_dir[f]=dir_default then - begin chain:=false; - if font_ec[f]>=qo(c) then if font_bc[f]<=qo(c) then - if char_exists(orig_char_info(f)(c)) then {N.B.: not |char_info|} - begin if c>=qi(128) then dvi_out(set1); - dvi_out(qo(c));@/ - cur_h:=cur_h+char_width(f)(orig_char_info(f)(c)); - goto continue; - end; - if mltex_enabled_p then - @<Output a substitution, |goto continue| if not possible@>; -continue: - end - else - begin if chain=false then chain:=true - else begin cur_h:=cur_h+width(ksp_ptr); - if g_sign<>normal then - begin if g_sign=stretching then - begin if stretch_order(ksp_ptr)=g_order then - cur_h:=cur_h+round(float(glue_set(this_box))*stretch(ksp_ptr)); -@^real multiplication@> - end - else - begin if shrink_order(ksp_ptr)=g_order then - cur_h:=cur_h-round(float(glue_set(this_box))*shrink(ksp_ptr)); -@^real multiplication@> - end; - end; - synch_h; - end; - p:=link(p); - if (proc_kanji_code=sjis_enc) then jc:=SJIStoJIS(KANJI(info(p))) - else jc:=EUCtoJIS(KANJI(info(p))); - dvi_out(set2); dvi_out(Hi(jc)); dvi_out(Lo(jc)); - cur_h:=cur_h+char_width(f)(orig_char_info(f)(c)); {not |jc|} - end; - dvi_h:=cur_h; p:=link(p); - until not is_char_node(p); - chain:=false; - end -else @<Output the non-|char_node| |p| for |hlist_out| - and move to the next node@> -@z - -@x [32.623] l.12982 - pTeX: disp_node, dir_node -@ @<Output the non-|char_node| |p| for |hlist_out|...@>= -begin case type(p) of -hlist_node,vlist_node:@<Output a box in an hlist@>; -rule_node: begin rule_ht:=height(p); rule_dp:=depth(p); rule_wd:=width(p); - goto fin_rule; - end; -whatsit_node: @<Output the whatsit node |p| in an hlist@>; -@y -@ @<Output the non-|char_node| |p| for |hlist_out|...@>= -begin case type(p) of -hlist_node,vlist_node,dir_node:@<Output a box in an hlist@>; -rule_node: begin rule_ht:=height(p); rule_dp:=depth(p); rule_wd:=width(p); - goto fin_rule; - end; -whatsit_node: @<Output the whatsit node |p| in an hlist@>; -disp_node: begin disp:=disp_dimen(p); cur_v:=base_line+disp; end; -@z - -@x [32.624] l.13000 - pTeX: output a box(and dir_node) with disp -@ @<Output a box in an hlist@>= -if list_ptr(p)=null then cur_h:=cur_h+width(p) -else begin save_h:=dvi_h; save_v:=dvi_v; - cur_v:=base_line+shift_amount(p); {shift the box down} - temp_ptr:=p; edge:=cur_h; - if type(p)=vlist_node then vlist_out@+else hlist_out; - dvi_h:=save_h; dvi_v:=save_v; - cur_h:=edge+width(p); cur_v:=base_line; - end -@y -@ @<Output a box in an hlist@>= -if list_ptr(p)=null then cur_h:=cur_h+width(p) -else begin save_h:=dvi_h; save_v:=dvi_v; save_dir:=dvi_dir; - cur_v:=base_line+disp+shift_amount(p); {shift the box down} - temp_ptr:=p; edge:=cur_h; - case type(p) of - hlist_node:hlist_out; - vlist_node:vlist_out; - dir_node:dir_out; - endcases; - dvi_h:=save_h; dvi_v:=save_v; dvi_dir:=save_dir; - cur_h:=edge+width(p); cur_v:=base_line+disp; cur_dir:=save_dir; - end -@z - -@x [32.625] l.13010 - pTeX: Output a rule with disp -@ @<Output a rule in an hlist@>= -if is_running(rule_ht) then rule_ht:=height(this_box); -if is_running(rule_dp) then rule_dp:=depth(this_box); -@y -@ @<Output a rule in an hlist@>= -if is_running(rule_ht) then rule_ht:=height(this_box)+disp; -if is_running(rule_dp) then rule_dp:=depth(this_box)-disp; -@z - -@x [32.629] l.13103 - pTeX: Output a leader box(and dir_node) with disp -@<Output a leader box at |cur_h|, ...@>= -begin cur_v:=base_line+shift_amount(leader_box); synch_v; save_v:=dvi_v;@/ -synch_h; save_h:=dvi_h; temp_ptr:=leader_box; -outer_doing_leaders:=doing_leaders; doing_leaders:=true; -if type(leader_box)=vlist_node then vlist_out@+else hlist_out; -doing_leaders:=outer_doing_leaders; -dvi_v:=save_v; dvi_h:=save_h; cur_v:=base_line; -cur_h:=save_h+leader_wd+lx; -end -@y -@<Output a leader box at |cur_h|, ...@>= -begin cur_v:=base_line+disp+shift_amount(leader_box); synch_v; save_v:=dvi_v;@/ -synch_h; save_h:=dvi_h; save_dir:=dvi_dir; temp_ptr:=leader_box; -outer_doing_leaders:=doing_leaders; doing_leaders:=true; -case type(leader_box) of - hlist_node:hlist_out; - vlist_node:vlist_out; - dir_node:dir_out; -endcases; -doing_leaders:=outer_doing_leaders; -dvi_v:=save_v; dvi_h:=save_h; dvi_dir:=save_dir; -cur_v:=base_line; cur_h:=save_h+leader_wd+lx; cur_dir:=save_dir; -end -@z - -@x [32.630] l.13133 - pTeX: vlist_out -begin cur_g:=0; cur_glue:=float_constant(0); -this_box:=temp_ptr; g_order:=glue_order(this_box); -g_sign:=glue_sign(this_box); p:=list_ptr(this_box); -incr(cur_s); -if cur_s>0 then dvi_out(push); -if cur_s>max_push then max_push:=cur_s; -save_loc:=dvi_offset+dvi_ptr; left_edge:=cur_h; cur_v:=cur_v-height(this_box); -@y -@!save_dir:integer; {what |dvi_dir| should pop to} -begin cur_g:=0; cur_glue:=float_constant(0); -this_box:=temp_ptr; g_order:=glue_order(this_box); -g_sign:=glue_sign(this_box); p:=list_ptr(this_box); -incr(cur_s); -if cur_s>0 then dvi_out(push); -if cur_s>max_push then max_push:=cur_s; -save_loc:=dvi_offset+dvi_ptr; -synch_dir; -left_edge:=cur_h; cur_v:=cur_v-height(this_box); -@z - -@x [32.632] l.13155 - pTeX: output non-char-node -@ @<Output the non-|char_node| |p| for |vlist_out|@>= -begin case type(p) of -hlist_node,vlist_node:@<Output a box in a vlist@>; -rule_node: begin rule_ht:=height(p); rule_dp:=depth(p); rule_wd:=width(p); - goto fin_rule; - end; -@y -@ @<Output the non-|char_node| |p| for |vlist_out|@>= -begin case type(p) of -hlist_node,vlist_node,dir_node: @<Output a box in a vlist@>; -rule_node: begin rule_ht:=height(p); rule_dp:=depth(p); rule_wd:=width(p); - goto fin_rule; - end; -@z - -@x [32.633] l.13175 - pTeX: Output a box in a vlist -@<Output a box in a vlist@>= -if list_ptr(p)=null then cur_v:=cur_v+height(p)+depth(p) -else begin cur_v:=cur_v+height(p); synch_v; - save_h:=dvi_h; save_v:=dvi_v; - cur_h:=left_edge+shift_amount(p); {shift the box right} - temp_ptr:=p; - if type(p)=vlist_node then vlist_out@+else hlist_out; - dvi_h:=save_h; dvi_v:=save_v; - cur_v:=save_v+depth(p); cur_h:=left_edge; - end -@y -@<Output a box in a vlist@>= -if list_ptr(p)=null then cur_v:=cur_v+height(p)+depth(p) -else begin cur_v:=cur_v+height(p); synch_v; - save_h:=dvi_h; save_v:=dvi_v; save_dir:=dvi_dir; - cur_h:=left_edge+shift_amount(p); {shift the box right} - temp_ptr:=p; - case type(p) of - hlist_node:hlist_out; - vlist_node:vlist_out; - dir_node:dir_out; - endcases; - dvi_h:=save_h; dvi_v:=save_v; dvi_dir:=save_dir; - cur_v:=save_v+depth(p); cur_h:=left_edge; cur_dir:=save_dir; - end -@z - -@x [32.637] l.13256 - pTeX: Output a leader in a vlist -@<Output a leader box at |cur_v|, ...@>= -begin cur_h:=left_edge+shift_amount(leader_box); synch_h; save_h:=dvi_h;@/ -cur_v:=cur_v+height(leader_box); synch_v; save_v:=dvi_v; -temp_ptr:=leader_box; -outer_doing_leaders:=doing_leaders; doing_leaders:=true; -if type(leader_box)=vlist_node then vlist_out@+else hlist_out; -doing_leaders:=outer_doing_leaders; -dvi_v:=save_v; dvi_h:=save_h; cur_h:=left_edge; -cur_v:=save_v-height(leader_box)+leader_ht+lx; -end -@y -@<Output a leader box at |cur_v|, ...@>= -begin cur_h:=left_edge+shift_amount(leader_box); synch_h; save_h:=dvi_h;@/ -cur_v:=cur_v+height(leader_box); synch_v; save_v:=dvi_v; save_dir:=dvi_dir; -temp_ptr:=leader_box; -outer_doing_leaders:=doing_leaders; doing_leaders:=true; -case type(leader_box) of - hlist_node:hlist_out; - vlist_node:vlist_out; - dir_node:dir_out; -endcases; -doing_leaders:=outer_doing_leaders; -dvi_v:=save_v; dvi_h:=save_h; dvi_dir:=save_dir; -cur_h:=left_edge; cur_v:=save_v-height(leader_box)+leader_ht+lx; -cur_dir:=save_dir; -end -@z - -@x [32.638] l.13270 - pTeX: ship out -@p procedure ship_out(@!p:pointer); {output the box |p|} -label done; -var page_loc:integer; {location of the current |bop|} -@y -@p procedure ship_out(@!p:pointer); {output the box |p|} -label done; -var page_loc:integer; {location of the current |bop|} -@!del_node:pointer; {used when delete the |dir_node| continued box} -@z -@x [32.640] l.13294 - pTeX: ship out -@<Ship box |p| out@>; -@y -if type(p)=dir_node then - begin del_node:=p; p:=list_ptr(p); - delete_glue_ref(space_ptr(del_node)); - delete_glue_ref(xspace_ptr(del_node)); - free_node(del_node,box_node_size); - end; -flush_node_list(link(p)); link(p):=null; -if box_dir(p)<>dir_yoko then p:=new_dir_node(p,dir_yoko); -@<Ship box |p| out@>; -@z - -@x [32.641] l.13327 - pTeX: dir_node -if type(p)=vlist_node then vlist_out@+else hlist_out; -@y -case type(p) of - hlist_node:hlist_out; - vlist_node:vlist_out; - dir_node:dir_out; -endcases; -@z - -@x [33.642] l.13394 - pTeX: postamble's id_byte - @<Output the font definitions for all fonts that were used@>; - dvi_out(post_post); dvi_four(last_bop); dvi_out(id_byte);@/ -@y - @<Output the font definitions for all fonts that were used@>; - dvi_out(post_post); dvi_four(last_bop); - if dir_used then dvi_out(ex_id_byte) else dvi_out(id_byte);@/ -@z - -@x [33.647] l.13515 - pTeX: cur_kanji_skip, cur_xkanji_skip, last_disp -@< Glob...@>= -@!adjust_tail:pointer; {tail of adjustment list} -@y -@< Glob...@>= -@!adjust_tail:pointer; {tail of adjustment list} -@!last_disp:scaled; {displacement at end of list} -@!cur_kanji_skip:pointer; -@!cur_xkanji_skip:pointer; -@z - -@x [33.648] l.13518 - pTeX: cur_kanji_skip, cur_xkanji_skip -@ @<Set init...@>=adjust_tail:=null; last_badness:=0; -@y -@ @<Set init...@>=adjust_tail:=null; last_badness:=0; - cur_kanji_skip:=zero_glue; cur_xkanji_skip:=zero_glue; -{ koko - |incr(glue_ref_count(cur_kanji_skip));| - |incr(glue_ref_count(cur_xkanji_skip));| -} -@z - -@x [33.649] l.13522 - pTeX: hpack -@p function hpack(@!p:pointer;@!w:scaled;@!m:small_number):pointer; -label reswitch, common_ending, exit; -var r:pointer; {the box node that will be returned} -@y -@p function hpack(@!p:pointer;@!w:scaled;@!m:small_number):pointer; -label reswitch, common_ending, exit; -var r:pointer; {the box node that will be returned} -@!k:pointer; {points to a |kanji_space| specification} -@!disp:scaled; {displacement} -@z - -@x [33.649] l.13533 - pTeX: hpack -begin last_badness:=0; r:=get_node(box_node_size); type(r):=hlist_node; -subtype(r):=min_quarterword; shift_amount(r):=0; -q:=r+list_offset; link(q):=p;@/ -h:=0; @<Clear dimensions to zero@>; -while p<>null do @<Examine node |p| in the hlist, taking account of its effect - on the dimensions of the new box, or moving it to the adjustment list; - then advance |p| to the next node@>; -if adjust_tail<>null then link(adjust_tail):=null; -height(r):=h; depth(r):=d;@/ -@<Determine the value of |width(r)| and the appropriate glue setting; - then |return| or |goto common_ending|@>; -common_ending: @<Finish issuing a diagnostic message - for an overfull or underfull hbox@>; -exit: hpack:=r; -end; -@y -begin last_badness:=0; r:=get_node(box_node_size); type(r):=hlist_node; -subtype(r):=min_quarterword; shift_amount(r):=0; -space_ptr(r):=cur_kanji_skip; xspace_ptr(r):=cur_xkanji_skip; -add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); -k:=cur_kanji_skip; -q:=r+list_offset; link(q):=p;@/ -h:=0; @<Clear dimensions to zero@>; -disp:=0; -while p<>null do @<Examine node |p| in the hlist, taking account of its effect - on the dimensions of the new box, or moving it to the adjustment list; - then advance |p| to the next node@>; -if adjust_tail<>null then link(adjust_tail):=null; -height(r):=h; depth(r):=d;@/ -@<Determine the value of |width(r)| and the appropriate glue setting; - then |return| or |goto common_ending|@>; -common_ending: - @<Finish issuing a diagnostic message for an overfull or underfull hbox@>; -exit: last_disp:=disp; hpack:=r; -end; -@z - -@x [33.651] l.13556 - pTeX: dir_node, disp_node, reset chain -@ @<Examine node |p| in the hlist, taking account of its effect...@>= -@^inner loop@> -begin reswitch: while is_char_node(p) do - @<Incorporate character dimensions into the dimensions of - the hbox that will contain~it, then move to the next node@>; -if p<>null then - begin case type(p) of - hlist_node,vlist_node,rule_node,unset_node: - @<Incorporate box dimensions into the dimensions of - the hbox that will contain~it@>; - ins_node,mark_node,adjust_node: if adjust_tail<>null then - @<Transfer node |p| to the adjustment list@>; - whatsit_node:@<Incorporate a whatsit node into an hbox@>; - glue_node:@<Incorporate glue into the horizontal totals@>; - kern_node,math_node: x:=x+width(p); - ligature_node: @<Make node |p| look like a |char_node| - and |goto reswitch|@>; - othercases do_nothing - endcases;@/ - p:=link(p); - end; -end -@y -@ @<Examine node |p| in the hlist, taking account of its effect...@>= -@^inner loop@> -begin reswitch: chain:=false; -while is_char_node(p) do - @<Incorporate character dimensions into the dimensions of - the hbox that will contain~it, then move to the next node@>; -if p<>null then - begin case type(p) of - hlist_node,vlist_node,dir_node,rule_node,unset_node: - @<Incorporate box dimensions into the dimensions of - the hbox that will contain~it@>; - ins_node,mark_node,adjust_node: - if adjust_tail<>null then @<Transfer node |p| to the adjustment list@>; - whatsit_node:@<Incorporate a whatsit node into an hbox@>; - disp_node:disp:=disp_dimen(p); - glue_node:@<Incorporate glue into the horizontal totals@>; - kern_node,math_node:x:=x+width(p); - ligature_node:@<Make node |p| look like a |char_node| and |goto reswitch|@>; - othercases do_nothing - endcases;@/ - p:=link(p); - end; -end -@z - -@x [33.653] l.13589 - pTeX: displacement -@<Incorporate box dimensions into the dimensions of the hbox...@>= -begin x:=x+width(p); -if type(p)>=rule_node then s:=0 @+else s:=shift_amount(p); -if height(p)-s>h then h:=height(p)-s; -if depth(p)+s>d then d:=depth(p)+s; -end -@y -@<Incorporate box dimensions into the dimensions of the hbox...@>= -begin x:=x+width(p); -if type(p)>=rule_node then s:=disp @+else s:=shift_amount(p)+disp; -if height(p)-s>h then h:=height(p)-s; -if depth(p)+s>d then d:=depth(p)+s; -end -@z - -@x [33.654] l.13601 - pTeX: auto spacing, displacement -@<Incorporate character dimensions into the dimensions of the hbox...@>= -begin f:=font(p); i:=char_info(f)(character(p)); hd:=height_depth(i); -x:=x+char_width(f)(i);@/ -s:=char_height(f)(hd);@+if s>h then h:=s; -s:=char_depth(f)(hd);@+if s>d then d:=s; -p:=link(p); -end -@y -@<Incorporate character dimensions into the dimensions of the hbox...@>= -begin f:=font(p); i:=char_info(f)(character(p)); hd:=height_depth(i); -x:=x+char_width(f)(i);@/ -s:=char_height(f)(hd)-disp; if s>h then h:=s; -s:=char_depth(f)(hd)+disp; if s>d then d:=s; -if font_dir[f]<>dir_default then - begin p:=link(p); - if chain then - begin x:=x+width(k);@/ - o:=stretch_order(k); total_stretch[o]:=total_stretch[o]+stretch(k); - o:=shrink_order(k); total_shrink[o]:=total_shrink[o]+shrink(k); - end - else chain:=true; - end -else chain:=false; -p:=link(p); -end -@z - -@x [33.668] l.13779 - pTeX: vpackage -begin last_badness:=0; r:=get_node(box_node_size); type(r):=vlist_node; -subtype(r):=min_quarterword; shift_amount(r):=0; -@y -begin last_badness:=0; r:=get_node(box_node_size); type(r):=vlist_node; -subtype(r):=min_quarterword; shift_amount(r):=0; -space_ptr(r):=zero_glue; xspace_ptr(r):=zero_glue; -add_glue_ref(zero_glue); add_glue_ref(zero_glue); -@z - -@x [33.669] l.13797 - pTeX: dir_node -@ @<Examine node |p| in the vlist, taking account of its effect...@>= -begin if is_char_node(p) then confusion("vpack") -@:this can't happen vpack}{\quad vpack@> -else case type(p) of - hlist_node,vlist_node,rule_node,unset_node: - @<Incorporate box dimensions into the dimensions of - the vbox that will contain~it@>; -@y -@ @<Examine node |p| in the vlist, taking account of its effect...@>= -begin if is_char_node(p) then confusion("vpack") -@:this can't happen vpack}{\quad vpack@> -else case type(p) of - hlist_node,vlist_node,dir_node,rule_node,unset_node: - @<Incorporate box dimensions into the dimensions of - the vbox that will contain~it@>; -@z - -@x [34.681] l.14026 - pTeX: math noad -@d noad_size=4 {number of words in a normal noad} -@d nucleus(#)==#+1 {the |nucleus| field of a noad} -@d supscr(#)==#+2 {the |supscr| field of a noad} -@d subscr(#)==#+3 {the |subscr| field of a noad} -@y -\yskip\hang In Japanese, |math_type(q)=math_jchar| means that |fam(q)| -refers to one of the sixteen kanji font families, and |KANJI(q)| is the -internal kanji code number. -@^Japanese extentions@> - -@d noad_size=5 {number of words in a normal noad} -@d nucleus(#)==#+1 {the |nucleus| field of a noad} -@d supscr(#)==#+2 {the |supscr| field of a noad} -@d subscr(#)==#+3 {the |subscr| field of a noad} -@d kcode_noad(#)==#+4 -@d math_kcode(#)==info(#+4) {the |kanji character| field of a noad} -@d kcode_noad_nucleus(#)==#+3 -@d math_kcode_nucleus(#)==info(#+3) - {the |kanji character| field offset from nucleus} -@# -@d math_jchar=5 -@d math_text_jchar=6 -@z - -@x [34.686] l.14129 - pTeX: new_noad -mem[supscr(p)].hh:=empty_field; -new_noad:=p; -@y -mem[supscr(p)].hh:=empty_field; -mem[kcode_noad(p)].hh:=empty_field; -new_noad:=p; -@z - -@x [34.691] l.14236 - pTeX: print_fam_and_char -procedure print_fam_and_char(@!p:pointer); {prints family and character} -begin print_esc("fam"); print_int(fam(p)); print_char(" "); -print_ASCII(qo(character(p))); -@y -procedure print_fam_and_char(@!p:pointer;@!t:small_number); - {prints family and character} -var @!cx:KANJI_code; {temporary register for KANJI} -begin print_esc("fam"); print_int(fam(p)); print_char(" "); -if t=math_char then print_ASCII(qo(character(p))) -else begin KANJI(cx):=math_kcode_nucleus(p); print_kanji(cx); - end; -@z - -@x [34.692] l.14266 - pTeX: print_subsidiary_data - math_char: begin print_ln; print_current_string; print_fam_and_char(p); -@y - math_char, math_jchar: begin print_ln; print_current_string; - print_fam_and_char(p,math_type(p)); -@z - -@x [34.696] l.14327 - pTeX: print_fam_and_char -accent_noad: begin print_esc("accent"); print_fam_and_char(accent_chr(p)); -@y -accent_noad: begin print_esc("accent"); - print_fam_and_char(accent_chr(p),math_char); -@z - -@x [35.715] l.14687 - pTeX: rebox - begin if type(b)=vlist_node then b:=hpack(b,natural); - p:=list_ptr(b); - if (is_char_node(p))and(link(p)=null) then - begin f:=font(p); v:=char_width(f)(char_info(f)(character(p))); - if v<>width(b) then link(p):=new_kern(width(b)-v); - end; -@y - begin if type(b)<>hlist_node then b:=hpack(b,natural); - p:=list_ptr(b); - if is_char_node(p) then - if font_dir[font(p)]<>dir_default then - begin if link(link(p))=null then - begin f:=font(p); v:=char_width(f)(orig_char_info(f)(character(p))); - if v<>width(b) then link(link(p)):=new_kern(width(b)-v); - end - end - else if link(p)=null then - begin f:=font(p); v:=char_width(f)(orig_char_info(f)(character(p))); - if v<>width(b) then link(p):=new_kern(width(b)-v); - end; - delete_glue_ref(space_ptr(b)); delete_glue_ref(xspace_ptr(b)); -@z - -@x [36.720] l.14783 - pTeX: clean_box -function clean_box(@!p:pointer;@!s:small_number):pointer; -@y -function clean_box(@!p:pointer;@!s:small_number;@!jc:halfword):pointer; -@z - -@x [36.720] l.14790 - pTeX: clean_box -math_char: begin cur_mlist:=new_noad; mem[nucleus(cur_mlist)]:=mem[p]; - end; -@y -math_char: begin cur_mlist:=new_noad; mem[nucleus(cur_mlist)]:=mem[p]; - end; -math_jchar: begin cur_mlist:=new_noad; mem[nucleus(cur_mlist)]:=mem[p]; - math_kcode(cur_mlist):=jc; - end; -@z - -@x [36.720] l.14802 - pTeX: clean_box -found: if is_char_node(q)or(q=null) then x:=hpack(q,natural) - else if (link(q)=null)and(type(q)<=vlist_node)and(shift_amount(q)=0) then - x:=q {it's already clean} - else x:=hpack(q,natural); -@y -found: if is_char_node(q)or(q=null) then x:=hpack(q,natural) - else if (link(q)=null)and(type(q)<=dir_node)and(shift_amount(q)=0) then - x:=q {it's already clean} - else x:=hpack(q,natural); -@z - -@x [36.721] l.14814 - pTeX: skip 2nd kanji node -if is_char_node(q) then - begin r:=link(q); -@y -if is_char_node(q) then - begin if font_dir[font(q)]<>dir_default then q:=link(q); - r:=link(q); -@z - -@x [36.722] l.14833 - pTeX: fetch -else begin if (qo(cur_c)>=font_bc[cur_f])and(qo(cur_c)<=font_ec[cur_f]) then - cur_i:=orig_char_info(cur_f)(cur_c) - else cur_i:=null_character; - if not(char_exists(cur_i)) then - begin char_warning(cur_f,qo(cur_c)); - math_type(a):=empty; - end; - end; -@y -else begin if font_dir[cur_f]<>dir_default then - cur_c:=qi(get_jfm_pos(KANJI(math_kcode_nucleus(a)),cur_f)); - if (qo(cur_c)>=font_bc[cur_f])and(qo(cur_c)<=font_ec[cur_f]) then - cur_i:=orig_char_info(cur_f)(cur_c) - else cur_i:=null_character; - if not(char_exists(cur_i)) then - begin char_warning(cur_f,qo(cur_c)); - math_type(a):=empty; - end; - end; -@z - -@x [36.726] l.14892 - pTeX: mlist_to_hlist -var mlist:pointer; {beginning of the given list} -@!penalties:boolean; {should penalty nodes be inserted?} -@!style:small_number; {the given style} -@y -var mlist:pointer; {beginning of the given list} -@!penalties:boolean; {should penalty nodes be inserted?} -@!style:small_number; {the given style} -@!u:pointer; {temporary register} -@z - -@x [36.726] l.14913 - pTeX: mlist_to_hlist -@<Make a second pass over the mlist, removing all noads and inserting the - proper spacing and penalties@>; -end; -@y -@<Make a second pass over the mlist, removing all noads and inserting the - proper spacing and penalties@>; -p:=new_null_box; link(p):=link(temp_head); -adjust_hlist(p,false); link(temp_head):=link(p); -delete_glue_ref(space_ptr(p)); delete_glue_ref(xspace_ptr(p)); -free_node(p,box_node_size); -end; -@z - -@x [36.727] l.14928 - pTeX: free box -free_node(z,box_node_size); -@y -delete_glue_ref(space_ptr(z)); delete_glue_ref(xspace_ptr(z)); -free_node(z,box_node_size); -@z - -@x [36.730] l.14976 - pTeX: free box: disp_node -kern_node: begin math_kern(q,cur_mu); goto done_with_node; - end; -@y -kern_node: begin math_kern(q,cur_mu); goto done_with_node; - end; -disp_node: goto done_with_node; -@z - -@x [36.734] l.15046 - pTeX: make_over:clean_box - overbar(clean_box(nucleus(q),cramped_style(cur_style)),@| -@y - overbar(clean_box(nucleus(q),cramped_style(cur_style),math_kcode(q)),@| -@z - -@x [36.735] l.15055 - pTeX: make_under:clean_box -begin x:=clean_box(nucleus(q),cur_style); -@y -begin x:=clean_box(nucleus(q),cur_style,math_kcode(q)); -@z - -@x [36.736] l.15069 - pTeX: make_under:clean_box -if type(v)<>vlist_node then confusion("vcenter"); -@y -if type(v)=dir_node then - begin if type(list_ptr(v))<>vlist_node then confusion("dircenter") - end -else begin if type(v)<>vlist_node then confusion("vcenter") - end; -@z - -@x [36.737] l.15089 - pTeX: make_radical:clean_box -begin x:=clean_box(nucleus(q),cramped_style(cur_style)); -@y -begin x:=clean_box(nucleus(q),cramped_style(cur_style),math_kcode(q)); -@z - -@x [36.738] l.15123 - pTeX: make_math_accent:clean_box - x:=clean_box(nucleus(q),cramped_style(cur_style)); w:=width(x); h:=height(x); -@y - x:=clean_box(nucleus(q),cramped_style(cur_style),math_kcode(q)); - w:=width(x); h:=height(x); -@z - -@x [36.742] l.15186 - pTeX: make_math_accent:clean_box -x:=clean_box(nucleus(q),cur_style); delta:=delta+height(x)-h; h:=height(x); -@y -x:=clean_box(nucleus(q),cur_style,math_kcode(q)); -delta:=delta+height(x)-h; h:=height(x); -@z - -@x [36.744] l.15211 - pTeX: make_fraction:clean_box -x:=clean_box(numerator(q),num_style(cur_style)); -z:=clean_box(denominator(q),denom_style(cur_style)); -@y -x:=clean_box(numerator(q),num_style(cur_style),math_kcode(q)); -z:=clean_box(denominator(q),denom_style(cur_style),math_kcode(q)); -@z - -@x [36.749] l.15304 - pTeX: make_op:clean_box - delta:=char_italic(cur_f)(cur_i); x:=clean_box(nucleus(q),cur_style); -@y - delta:=char_italic(cur_f)(cur_i); - x:=clean_box(nucleus(q),cur_style,math_kcode(q)); -@z - -@x [36.750] l.15321 - pTeX: make_op:clean_box -begin x:=clean_box(supscr(q),sup_style(cur_style)); -y:=clean_box(nucleus(q),cur_style); -z:=clean_box(subscr(q),sub_style(cur_style)); -@y -begin x:=clean_box(supscr(q),sup_style(cur_style),math_kcode(q)); -y:=clean_box(nucleus(q),cur_style,math_kcode(q)); -z:=clean_box(subscr(q),sub_style(cur_style),math_kcode(q)); -@z - -@x [36.751] l.15342 - pTeX: free box node - begin free_node(x,box_node_size); list_ptr(v):=y; - end -@y - begin - delete_glue_ref(space_ptr(x)); delete_glue_ref(xspace_ptr(x)); - free_node(x,box_node_size); list_ptr(v):=y; - end -@z - -@x [36.751] l.15350 - pTeX: free box node -if math_type(subscr(q))=empty then free_node(z,box_node_size) -@y -if math_type(subscr(q))=empty then begin - delete_glue_ref(space_ptr(z)); delete_glue_ref(xspace_ptr(z)); - free_node(z,box_node_size) -end -@z - -@x [36.752] l.15369 - pTeX: make_ord -procedure make_ord(@!q:pointer); -label restart,exit; -var a:integer; {address of lig/kern instruction} -@!p,@!r:pointer; {temporary registers for list manipulation} -begin restart:@t@>@;@/ -if math_type(subscr(q))=empty then if math_type(supscr(q))=empty then - if math_type(nucleus(q))=math_char then - begin p:=link(q); - if p<>null then if (type(p)>=ord_noad)and(type(p)<=punct_noad) then - if math_type(nucleus(p))=math_char then - if fam(nucleus(p))=fam(nucleus(q)) then - begin math_type(nucleus(q)):=math_text_char; - fetch(nucleus(q)); - if char_tag(cur_i)=lig_tag then - begin a:=lig_kern_start(cur_f)(cur_i); - cur_c:=character(nucleus(p)); - cur_i:=font_info[a].qqqq; - if skip_byte(cur_i)>stop_flag then - begin a:=lig_kern_restart(cur_f)(cur_i); - cur_i:=font_info[a].qqqq; - end; - loop@+ begin @<If instruction |cur_i| is a kern with |cur_c|, attach - the kern after~|q|; or if it is a ligature with |cur_c|, combine - noads |q| and~|p| appropriately; then |return| if the cursor has - moved past a noad, or |goto restart|@>; - if skip_byte(cur_i)>=stop_flag then return; - a:=a+qo(skip_byte(cur_i))+1; - cur_i:=font_info[a].qqqq; - end; - end; - end; - end; -exit:end; -@y -procedure make_ord(@!q:pointer); -label restart,exit; -var a:integer; {address of lig/kern instruction} -@!gp,@!gq,@!p,@!r:pointer; {temporary registers for list manipulation} -@!rr:halfword; -begin restart:@t@>@;@/ -if (math_type(subscr(q))=empty)and(math_type(supscr(q))=empty)and@| -((math_type(nucleus(q))=math_char)or(math_type(nucleus(q))=math_jchar)) then - begin p:=link(q); - if p<>null then if (type(p)>=ord_noad)and(type(p)<=punct_noad) then - if fam(nucleus(p))=fam(nucleus(q)) then - if math_type(nucleus(p))=math_char then - begin math_type(nucleus(q)):=math_text_char; - fetch(nucleus(q)); - if char_tag(cur_i)=lig_tag then - begin a:=lig_kern_start(cur_f)(cur_i); - cur_c:=character(nucleus(p)); - cur_i:=font_info[a].qqqq; - if skip_byte(cur_i)>stop_flag then - begin a:=lig_kern_restart(cur_f)(cur_i); - cur_i:=font_info[a].qqqq; - end; - loop@+ begin @<If instruction |cur_i| is a kern with |cur_c|, attach - the kern after~|q|; or if it is a ligature with |cur_c|, combine - noads |q| and~|p| appropriately; then |return| if the cursor has - moved past a noad, or |goto restart|@>; - if skip_byte(cur_i)>=stop_flag then return; - a:=a+qo(skip_byte(cur_i))+1; - cur_i:=font_info[a].qqqq; - end; - end; - end - else if math_type(nucleus(p))=math_jchar then - begin math_type(nucleus(q)):=math_text_jchar; - fetch(nucleus(p)); a:=cur_c; fetch(nucleus(q)); - if char_tag(cur_i)=gk_tag then - begin cur_c:=a; a:=glue_kern_start(cur_f)(cur_i); - {|cur_c|:=qi(|get_jfm_pos|(|math_kcode|(p), - |fam_fnt|(fam(nucleus(p))+|cur_size|)));} - repeat - cur_i:=font_info[a].qqqq; - if next_char(cur_i)=cur_c then - if op_byte(cur_i)<kern_flag then - begin gp:=font_glue[cur_f]; rr:=rem_byte(cur_i); - if gp<>null then begin - while((type(gp)<>rr)and(link(gp)<>null)) do begin gp:=link(gp); - end; - gq:=glue_ptr(gp); - end - else begin gp:=get_node(small_node_size); - font_glue[cur_f]:=gp; gq:=null; - end; - if gq=null then - begin type(gp):=rr; gq:=new_spec(zero_glue); glue_ptr(gp):=gq; - a:=exten_base[cur_f]+qi((qo(rr))*3); width(gq):=font_info[a].sc; - stretch(gq):=font_info[a+1].sc; shrink(gq):=font_info[a+2].sc; - add_glue_ref(gq); link(gp):=get_node(small_node_size); - gp:=link(gp); glue_ptr(gp):=null; link(gp):=null; - end; - p:=new_glue(gq); link(p):=link(q); link(q):=p; return; - end - else begin p:=new_kern(char_kern(cur_f)(cur_i)); - link(p):=link(q); link(q):=p; return; - end; - incr(a); - until skip_byte(cur_i)>=stop_flag; - end; - end; - end; -exit:end; -@z - -@x [36.754] l.15452 - pTeX: -math_char, math_text_char: -@y -math_char, math_text_char, math_jchar, math_text_jchar: -@z - -@x [36.755] l.15475 - pTeX: convert math text to KANJI char_node - begin delta:=char_italic(cur_f)(cur_i); p:=new_character(cur_f,qo(cur_c)); - if (math_type(nucleus(q))=math_text_char)and(space(cur_f)<>0) then - delta:=0; {no italic correction in mid-word of text font} - if (math_type(subscr(q))=empty)and(delta<>0) then - begin link(p):=new_kern(delta); delta:=0; -@y - begin delta:=char_italic(cur_f)(cur_i); p:=new_character(cur_f,qo(cur_c)); - u:=p; - if font_dir[cur_f]<>dir_default then begin - link(u):=get_avail; u:=link(u); info(u):=math_kcode(q); - end; - if ((math_type(nucleus(q))=math_text_char)or - (math_type(nucleus(q))=math_text_jchar))and(space(cur_f)<>0) then - delta:=0; {no italic correction in mid-word of text font} - if (math_type(subscr(q))=empty)and(delta<>0) then begin - link(u):=new_kern(delta); delta:=0; -@z - -@x [36.756] l.15505 - pTeX: free box - shift_down:=depth(z)+sub_drop(t); - free_node(z,box_node_size); - end; -@y - shift_down:=depth(z)+sub_drop(t); - delete_glue_ref(space_ptr(z)); delete_glue_ref(xspace_ptr(z)); - free_node(z,box_node_size); - end; -@z - -@x [36.757] l.15526 - pTeX: make_scripts:clean_box -begin x:=clean_box(subscr(q),sub_style(cur_style)); -@y -begin x:=clean_box(subscr(q),sub_style(cur_style),math_kcode(q)); -@z - -@x [36.758] l.15538 - pTeX: make_scripts:clean_box -begin x:=clean_box(supscr(q),sup_style(cur_style)); -@y -begin x:=clean_box(supscr(q),sup_style(cur_style),math_kcode(q)); -@z - -@x [36.758] l.15555 - pTeX: make_scripts:clean_box -begin y:=clean_box(subscr(q),sub_style(cur_style)); -@y -begin y:=clean_box(subscr(q),sub_style(cur_style),math_kcode(q)); -@z - -@x [36.760] l.15616 - pTeX: disp_node -othercases confusion("mlist3") -@y -disp_node: begin link(p):=q; p:=q; q:=link(q); link(p):=null; goto done; - end; -othercases confusion("mlist3") -@z - -@x [37.796] l.16276 - pTeX: call adjust_hlist - begin adjust_tail:=cur_tail; u:=hpack(link(head),natural); w:=width(u); -@y - begin adjust_tail:=cur_tail; adjust_hlist(head,false); - delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); - cur_kanji_skip:=space_ptr(head); cur_xkanji_skip:=xspace_ptr(head); - add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); - u:=hpack(link(head),natural); w:=width(u); -@z - -@x [37.799] l.16331 - pTeX: call adjust_hlist - begin p:=hpack(link(head),natural); -@y - begin adjust_hlist(head,false); - delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); - cur_kanji_skip:=space_ptr(head); cur_xkanji_skip:=xspace_ptr(head); - add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); - p:=hpack(link(head),natural); -@z - -@x [37.800] l.16353 - pTeX: call adjust_hlist -var @!p,@!q,@!r,@!s,@!u,@!v: pointer; {registers for the list operations} -@y -var @!p,@!q,@!r,@!s,@!u,@!v,@!z: pointer; {registers for the list operations} -@z - -@x [37.804] l.16456 - pTeX: call adjust_hlist - p:=hpack(preamble,saved(1),saved(0)); overfull_rule:=rule_save; -@y - z:=new_null_box; link(z):=preamble; - adjust_hlist(z,false); - delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); - cur_kanji_skip:=space_ptr(z); cur_xkanji_skip:=xspace_ptr(z); - add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); - p:=hpack(preamble,saved(1),saved(0)); overfull_rule:=rule_save; - delete_glue_ref(space_ptr(z)); delete_glue_ref(xspace_ptr(z)); - free_node(z,box_node_size); -@z - -@x [37.807] l.16499 - pTeX: unset box -> BOX -glue_order(q):=glue_order(p); glue_sign(q):=glue_sign(p); -glue_set(q):=glue_set(p); shift_amount(q):=o; -r:=link(list_ptr(q)); s:=link(list_ptr(p)); -@y -box_dir(q):=abs(direction); -glue_order(q):=glue_order(p); glue_sign(q):=glue_sign(p); -glue_set(q):=glue_set(p); shift_amount(q):=o; -r:=link(list_ptr(q)); s:=link(list_ptr(p)); -@z - -@x [37.809] l.16541 - pTeX: unset box -> BOX -s:=link(s); link(u):=new_null_box; u:=link(u); t:=t+width(s); -if mode=-vmode then width(u):=width(s)@+else - begin type(u):=vlist_node; height(u):=width(s); - end -@y -s:=link(s); link(u):=new_null_box; u:=link(u); t:=t+width(s); -if mode=-vmode then width(u):=width(s)@+else - begin type(u):=vlist_node; height(u):=width(s); - end; -box_dir(u):=abs(direction) -@z - -@x [37.810] l.16564 - pTeX: unset box -> BOX -width(r):=w; type(r):=hlist_node; -end -@y -width(r):=w; type(r):=hlist_node; -box_dir(r):=abs(direction); -end -@z - -@x [37.811] l.16585 - pTeX: unset box -> BOX -height(r):=w; type(r):=vlist_node; -@y -height(r):=w; type(r):=vlist_node; -box_dir(r):=abs(direction); -@z - -@x [38.816] l.16687 - pTeX: init chain, delete disp_node -link(temp_head):=link(head); -if is_char_node(tail) then tail_append(new_penalty(inf_penalty)) -else if type(tail)<>glue_node then tail_append(new_penalty(inf_penalty)) -@y -first_use:=true; chain:=false; -delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); -cur_kanji_skip:=space_ptr(head); cur_xkanji_skip:=xspace_ptr(head); -add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); -link(temp_head):=link(head); -if (not is_char_node(tail))and(type(tail)=disp_node) then - begin free_node(tail,small_node_size); tail:=prev_node; link(tail):=null - end; -if is_char_node(tail) then tail_append(new_penalty(inf_penalty)) -else if type(tail)<>glue_node then tail_append(new_penalty(inf_penalty)) -@z - -@x [38.828] l.16946 - pTeX: Global variable |chain| -@!cur_p:pointer; {the current breakpoint under consideration} -@y -@!cur_p:pointer; {the current breakpoint under consideration} -@!chain:boolean; {chain current line and next line?} -@z - -% chain ¤¬¿¿¤Î¾ì¹ç¡¢¸å¤í¤Ë cur_kanji_skip ¤¬ÁÞÆþ¤µ¤ì¤ë¤Î¤Ç¡¢¤³¤³¤Ç -% break_width ¤«¤é°ú¤¤¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£ -@x [38.837] l.17125 - pTeX: add kanji_skip width, ita_kern -begin no_break_yet:=false; do_all_six(set_break_width_to_background); -s:=cur_p; -if break_type>unhyphenated then if cur_p<>null then - @<Compute the discretionary |break_width| values@>; -while s<>null do - begin if is_char_node(s) then goto done; -@y -begin no_break_yet:=false; do_all_six(set_break_width_to_background); -s:=cur_p; -if break_type>unhyphenated then if cur_p<>null then - @<Compute the discretionary |break_width| values@>; -while s<>null do - begin if is_char_node(s) then - begin if chain then - begin break_width[1]:=break_width[1]-width(cur_kanji_skip); - break_width[2+stretch_order(cur_kanji_skip)]:= - break_width[2+stretch_order(cur_kanji_skip)]-stretch(cur_kanji_skip); - break_width[6]:=break_width[6]-shrink(cur_kanji_skip); - end; - goto done end; -@z - -@x [38.837] l.17135 - pTeX: - kern_node: if subtype(s)<>explicit then goto done - else break_width[1]:=break_width[1]-width(s); -@y - kern_node: if (subtype(s)<>explicit)and(subtype(s)<>ita_kern) then - goto done - else break_width[1]:=break_width[1]-width(s); -@z - -@x [38.841] l.17186 - pTeX: -if is_char_node(v) then - begin f:=font(v); - break_width[1]:=break_width[1]-char_width(f)(char_info(f)(character(v))); - end -else case type(v) of - ligature_node: begin f:=font(lig_char(v));@/ - break_width[1]:=@|break_width[1]- - char_width(f)(char_info(f)(character(lig_char(v)))); - end; - hlist_node,vlist_node,rule_node,kern_node: - break_width[1]:=break_width[1]-width(v); - othercases confusion("disc1") -@:this can't happen disc1}{\quad disc1@> - endcases -@y -if is_char_node(v) then - begin f:=font(v); - break_width[1]:=break_width[1]-char_width(f)(orig_char_info(f)(character(v))); - if font_dir[f]<>dir_default then v:=link(v); - end -else case type(v) of - ligature_node: begin f:=font(lig_char(v));@/ - break_width[1]:=@|break_width[1]- - char_width(f)(orig_char_info(f)(character(lig_char(v)))); - end; - hlist_node,vlist_node,dir_node,rule_node,kern_node: - break_width[1]:=break_width[1]-width(v); - disp_node: do_nothing; - othercases confusion("disc1") -@:this can't happen disc1}{\quad disc1@> - endcases -@z - -@x [38.842] l.17204 - pTeX: - break_width[1]:=@|break_width[1]+char_width(f)(char_info(f)(character(s))); - end -else case type(s) of - ligature_node: begin f:=font(lig_char(s)); - break_width[1]:=break_width[1]+ - char_width(f)(char_info(f)(character(lig_char(s)))); - end; - hlist_node,vlist_node,rule_node,kern_node: - break_width[1]:=break_width[1]+width(s); -@y - break_width[1]:=@|break_width[1]+char_width(f)(orig_char_info(f)(character(s))); - if font_dir[f]<>dir_default then s:=link(s); - end -else case type(s) of - ligature_node: begin f:=font(lig_char(s)); - break_width[1]:=break_width[1]+ - char_width(f)(orig_char_info(f)(character(lig_char(s)))); - end; - hlist_node,vlist_node,dir_node,rule_node,kern_node: - break_width[1]:=break_width[1]+width(s); - disp_node: do_nothing; -@z - -@x [38.856] l.17467 - pTeX: print symbolic feasibe node -if cur_p=null then print_esc("par") -else if type(cur_p)<>glue_node then - begin if type(cur_p)=penalty_node then print_esc("penalty") - else if type(cur_p)=disc_node then print_esc("discretionary") -@y -if cur_p=null then print_esc("par") -else if (type(cur_p)<>glue_node)and(not is_char_node(cur_p)) then - begin if type(cur_p)=penalty_node then print_esc("penalty") - else if type(cur_p)=disc_node then print_esc("discretionary") -@z - -@x [39.862] l.17584 - pTeX: local valiable for line breaking -@!auto_breaking:boolean; {is node |cur_p| outside a formula?} -@!prev_p:pointer; {helps to determine when glue nodes are breakpoints} -@!q,@!r,@!s,@!prev_s:pointer; {miscellaneous nodes of temporary interest} -@!f:internal_font_number; {used when calculating character widths} -@y -@!auto_breaking:boolean; {is node |cur_p| outside a formula?} -@!prev_p:pointer; {helps to determine when glue nodes are breakpoints} -@!q,@!r,@!s,@!prev_s:pointer; {miscellaneous nodes of temporary interest} -@!f,@!post_f:internal_font_number; {used when calculating character widths} -@!post_p:pointer; -@!cc:ASCII_code; -@!first_use:boolean; -@z - -@x [39.866] l.17677 - pTeX: dir_node, disp_node, ita_kern -case type(cur_p) of -hlist_node,vlist_node,rule_node: act_width:=act_width+width(cur_p); -@y -case type(cur_p) of -hlist_node,vlist_node,dir_node,rule_node: act_width:=act_width+width(cur_p); -@z - -@x [39.866] l.17685 - pTeX: -kern_node: if subtype(cur_p)=explicit then kern_break - else act_width:=act_width+width(cur_p); -@y -kern_node: if (subtype(cur_p)=explicit)or(subtype(cur_p)=ita_kern) then - kern_break - else act_width:=act_width+width(cur_p); -@z - -@x [39.866] l.17694 - pTeX: -mark_node,ins_node,adjust_node: do_nothing; -@y -disp_node,mark_node,ins_node,adjust_node: do_nothing; -@z - -% ¤³¤³¤Ç¡¢Ï¢Â³¤¹¤ë´Á»ú¥³¡¼¥É´Ö¤Ë cur_kanji_skip ¤òÁÞÆþ¤¹¤ë¡£ -% penalty_node ¤ä box_node ¤Ë¤Ï¡¢adjust_hlist ¥ë¡¼¥Á¥ó¤Ë¤è¤Ã¤Æ´û¤Ë¼ÂºÝ¤Î -% glue_node ¤¬ÁÞÆþ¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤È²¾Äꤷ¤Æ¤¤¤ë¡£ -% chain ¤Ï¡¢try_break ¤Ç cur_kanji_skip ¤Î¥¢¥¸¥ã¥¹¥È¤Î¤¿¤á¤Ë»È¤ï¤ì¤ë¡£ -@x [39.867] l.17708 - pTeX: add kanji char width -@<Advance \(c)|cur_p| to the node following the present string...@>= -begin prev_p:=cur_p; -repeat f:=font(cur_p); -act_width:=act_width+char_width(f)(char_info(f)(character(cur_p))); -cur_p:=link(cur_p); -until not is_char_node(cur_p); -end -@y -@<Advance \(c)|cur_p| to the node following the present string...@>= -begin chain:=false; -if is_char_node(cur_p) then - if font_dir[font(cur_p)]<>dir_default then - begin case type(prev_p) of - hlist_node,vlist_node,dir_node,rule_node, - ligature_node,disc_node,math_node: begin - cur_p:=prev_p; try_break(0,unhyphenated); cur_p:=link(cur_p); - end; - othercases do_nothing; - endcases; - end; - prev_p:=cur_p; post_p:=cur_p; post_f:=font(post_p); - repeat f:=post_f; cc:=character(cur_p); - act_width:=act_width+char_width(f)(orig_char_info(f)(cc)); - post_p:=link(cur_p); - if font_dir[f]<>dir_default then - begin prev_p:=cur_p; cur_p:=post_p; post_p:=link(post_p); - if is_char_node(post_p) then - begin post_f:=font(post_p); - if font_dir[post_f]<>dir_default then chain:=true else chain:=false; - try_break(0,unhyphenated); - end - else - begin chain:=false; - case type(post_p) of - hlist_node,vlist_node,dir_node,rule_node,ligature_node, - disc_node,math_node: try_break(0,unhyphenated); - othercases do_nothing; - endcases; - end; - if chain then - begin if first_use then - begin check_shrinkage(cur_kanji_skip); - first_use:=false; - end; - act_width:=act_width+width(cur_kanji_skip);@| - active_width[2+stretch_order(cur_kanji_skip)]:=@| - active_width[2+stretch_order(cur_kanji_skip)] - +stretch(cur_kanji_skip);@/ - active_width[6]:=active_width[6]+shrink(cur_kanji_skip); - end; - prev_p:=cur_p; - end - else if is_char_node(post_p) then - begin post_f:=font(post_p); chain:=false; - if font_dir[post_f]<>dir_default then try_break(0,unhyphenated); - end; - cur_p:=post_p; - until not is_char_node(cur_p); -chain:=false; -end -@z - -@x [39.868] l.17723 - pTeX: ita_kern - else if (type(prev_p)=kern_node)and(subtype(prev_p)<>explicit) then - try_break(0,unhyphenated); -@y - else if (type(prev_p)=kern_node) then - if (subtype(prev_p)<>explicit)and(subtype(prev_p)<>ita_kern) then - try_break(0,unhyphenated); -@z - -@x [39.871] l.17756 - pTeX: add kanji char width, dir_node width, disp_node - disc_width:=disc_width+char_width(f)(char_info(f)(character(s))); - end -else case type(s) of - ligature_node: begin f:=font(lig_char(s)); - disc_width:=disc_width+ - char_width(f)(char_info(f)(character(lig_char(s)))); - end; - hlist_node,vlist_node,rule_node,kern_node: - disc_width:=disc_width+width(s); -@y - disc_width:=disc_width+char_width(f)(orig_char_info(f)(character(s))); - if font_dir[f]<>dir_default then s:=link(s) - end -else case type(s) of - ligature_node: begin f:=font(lig_char(s)); - disc_width:=disc_width+ - char_width(f)(orig_char_info(f)(character(lig_char(s)))); - end; - hlist_node,vlist_node,dir_node,rule_node,kern_node: - disc_width:=disc_width+width(s); - disp_node: do_nothing; -@z - -@x [39.872] l.17772 - pTeX: add kanji char width, dir_node width, disp_node - act_width:=act_width+char_width(f)(char_info(f)(character(s))); - end -else case type(s) of - ligature_node: begin f:=font(lig_char(s)); - act_width:=act_width+ - char_width(f)(char_info(f)(character(lig_char(s)))); - end; - hlist_node,vlist_node,rule_node,kern_node: - act_width:=act_width+width(s); -@y - act_width:=act_width+char_width(f)(orig_char_info(f)(character(s))); - if font_dir[f]<>dir_default then s:=link(s) - end -else case type(s) of - ligature_node: begin f:=font(lig_char(s)); - act_width:=act_width+ - char_width(f)(orig_char_info(f)(character(lig_char(s)))); - end; - hlist_node,vlist_node,dir_node,rule_node,kern_node: - act_width:=act_width+width(s); - disp_node: do_nothing; -@z - -@x [39.877] l.17879 - pTeX: last_disp -cur_line:=prev_graf+1; -@y -cur_line:=prev_graf+1; last_disp:=0; -@z - -@x [39.879] l.17919 - pTeX: ita_kern - if type(q)=kern_node then if subtype(q)<>explicit then goto done1; -@y - if type(q)=kern_node then - if (subtype(q)<>explicit)and(subtype(q)<>ita_kern) then goto done1; -@z - -@x [39.881] l.17950 - pTeX: |q| may be a |char_node| -if q<>null then {|q| cannot be a |char_node|} - if type(q)=glue_node then - begin delete_glue_ref(glue_ptr(q)); - glue_ptr(q):=right_skip; - subtype(q):=right_skip_code+1; add_glue_ref(right_skip); - goto done; - end - else begin if type(q)=disc_node then - @<Change discretionary to compulsory and set - |disc_break:=true|@> - else if (type(q)=math_node)or(type(q)=kern_node) then width(q):=0; - end -@y -if q<>null then {|q| may be a |char_node|} - begin if not is_char_node(q) then - if type(q)=glue_node then - begin delete_glue_ref(glue_ptr(q)); - glue_ptr(q):=right_skip; - subtype(q):=right_skip_code+1; add_glue_ref(right_skip); - goto done; - end - else begin if type(q)=disc_node then - @<Change discretionary to compulsory and set - |disc_break:=true|@> - else if (type(q)=math_node)or(type(q)=kern_node) then width(q):=0; - end - end -@z - -@x [39.887] l.18014 - pTeX: disp_node at begin-of-line -r:=link(q); link(q):=null; q:=link(temp_head); link(temp_head):=r; -@y -r:=link(q); link(q):=null; q:=link(temp_head); link(temp_head):=r; -if last_disp<>0 then begin - r:=get_node(small_node_size); - type(r):=disp_node; disp_dimen(r):=last_disp; - link(r):=q; q:=r; - end; -@z - -@x [40.896] l.18177 - pTeX: hyphenation -loop@+ begin if is_char_node(s) then - begin c:=qo(character(s)); hf:=font(s); - end -@y -loop@+ begin if is_char_node(s) then - begin hf:=font(s); - if font_dir[hf]<>dir_default then - begin prev_s:=s; s:=link(prev_s); c:=info(s); goto continue; - end else c:=qo(character(s)); - end - else if type(s)=disp_node then goto continue - else if (type(s)=penalty_node)and(not subtype(s)=normal) then goto continue -@z - -@x [40.899] l.18248 - pTeX: disp_node - whatsit_node,glue_node,penalty_node,ins_node,adjust_node,mark_node: - goto done4; -@y - disp_node: do_nothing; - whatsit_node,glue_node,penalty_node,ins_node,adjust_node,mark_node: - goto done4; -@z - -@x [44.968] l.19535 - pTeX: dir_node - hlist_node,vlist_node,rule_node:@<Insert glue for |split_top_skip| - and set~|p:=null|@>; -@y - hlist_node,vlist_node,dir_node,rule_node: - @<Insert glue for |split_top_skip| and set~|p:=null|@>; -@z - -@x [44.973] l.19626 - pTeX: dir_node -hlist_node,vlist_node,rule_node: begin@t@>@;@/ - cur_height:=cur_height+prev_dp+height(p); prev_dp:=depth(p); -@y -hlist_node,vlist_node,dir_node,rule_node: begin@t@>@;@/ - cur_height:=cur_height+prev_dp+height(p); prev_dp:=depth(p); -@z - -@x [44.977] l.19710 - pTeX: free box node -var v:pointer; {the box to be split} -@y -var v:pointer; {the box to be split} -w:pointer; {|dir_node|} -@z - -@x [44.977] l.19722 - pTeX: free box node -q:=prune_page_top(q); p:=list_ptr(v); free_node(v,box_node_size); -if q=null then box(n):=null {the |eq_level| of the box stays the same} -else box(n):=vpack(q,natural); -vsplit:=vpackage(p,h,exactly,split_max_depth); -@y -q:=prune_page_top(q); p:=list_ptr(v); -if q=null then box(n):=null {the |eq_level| of the box stays the same} -else begin - box(n):=vpack(q,natural); box_dir(box(n)):=box_dir(v); - end; -q:=vpackage(p,h,exactly,split_max_depth); -box_dir(q):=box_dir(v); -delete_glue_ref(space_ptr(v)); delete_glue_ref(xspace_ptr(v)); -free_node(v,box_node_size); -vsplit:=q; -@z - -@x [44.978] l.19732 - pTeX: bad box for vsplit -if type(v)<>vlist_node then - begin print_err(""); print_esc("vsplit"); print(" needs a "); - print_esc("vbox"); -@:vsplit_}{\.{\\vsplit needs a \\vbox}@> - help2("The box you are trying to split is an \hbox.")@/ - ("I can't split such a box, so I'll leave it alone."); - error; vsplit:=null; return; - end -@y -if type(v)=dir_node then begin - w:=v; v:=list_ptr(v); - delete_glue_ref(space_ptr(w)); - delete_glue_ref(xspace_ptr(w)); - free_node(w,box_node_size); -end; -if type(v)<>vlist_node then begin - print_err(""); print_esc("vsplit"); print(" needs a "); - print_esc("vbox"); -@:vsplit_}{\.{\\vsplit needs a \\vbox}@> - help2("The box you are trying to split is an \hbox.")@/ - ("I can't split such a box, so I'll leave it alone."); - error; vsplit:=null; return; -end; -flush_node_list(link(v)); link(v):=null -@z - -@x [45.993] l.20053 - pTeX: ensure_vbox -begin p:=box(n); -if p<>null then if type(p)=hlist_node then - begin print_err("Insertions can only be added to a vbox"); -@y -begin p:=box(n); -if p<>null then if (type(p)=dir_node) then - begin p:=list_ptr(p); - delete_glue_ref(space_ptr(box(n))); - delete_glue_ref(xspace_ptr(box(n))); - free_node(box(n),box_node_size); - box(n):=p -end; -if p<>null then if type(p)<>vlist_node then begin - print_err("Insertions can only be added to a vbox"); -@z - -@x [45.1000] l.20146 - pTeX: dir_node -hlist_node,vlist_node,rule_node: if page_contents<box_there then - @<Initialize the current page, insert the \.{\\topskip} glue - ahead of |p|, and |goto continue|@> -@y -hlist_node,vlist_node,dir_node,rule_node: if page_contents<box_there then - @<Initialize the current page, insert the \.{\\topskip} glue - ahead of |p|, and |goto continue|@> -@z - -@x [45.1009] l.20291 - pTeX: ins_dir -if box(n)=null then height(r):=0 -else height(r):=height(box(n))+depth(box(n)); -@y -if box(n)=null then height(r):=0 -else - begin if ins_dir(p)<>box_dir(box(n)) then - begin print_err("Insertions can only be added to a same direction vbox"); -@.Insertions can only...@> - help3("Tut tut: You're trying to \insert into a")@/ - ("\box register that now have a different direction.")@/ - ("Proceed, and I'll discard its present contents."); - box_error(n) - end - else - height(r):=height(box(n))+depth(box(n)); - end; -@z - -@x [45.1017] l.20470 - pTeX: page dir -box(255):=vpackage(link(page_head),best_size,exactly,page_max_depth); -@y -box(255):=vpackage(link(page_head),best_size,exactly,page_max_depth); -box_dir(box(255)):=page_dir; -@z - -@x [45.1020] l.20513 - pTeX: check ins_dir -if best_ins_ptr(r)=null then wait:=true -else begin wait:=false; s:=last_ins_ptr(r); link(s):=ins_ptr(p); -@y -if best_ins_ptr(r)=null then wait:=true -else begin wait:=false; - n:=qo(subtype(p)); - case box_dir(box(n)) of - any_dir: - if ins_dir(p)<>box_dir(box(n)) then begin - print_err("Insertions can only be added to a same direction vbox"); -@.Insertions can only...@> - help3("Tut tut: You're trying to \insert into a")@/ - ("\box register that now have a different direction.")@/ - ("Proceed, and I'll discard its present contents."); - box_error(n); - box(n):=new_null_box; last_ins_ptr(r):=box(n)+list_offset; - end; - othercases - box_dir(box(n)):=ins_dir(p); - endcases; - s:=last_ins_ptr(r); link(s):=ins_ptr(p); -@z - -@x [45.1021] l.20537 - pTeX: free box node, ins_dir - free_node(temp_ptr,box_node_size); wait:=true; -@y - delete_glue_ref(space_ptr(temp_ptr)); - delete_glue_ref(xspace_ptr(temp_ptr)); - free_node(temp_ptr,box_node_size); wait:=true; -@z - -@x [45.1021] l.20543 - pTeX: free box node, ins_dir -free_node(box(n),box_node_size); -box(n):=vpack(temp_ptr,natural); -@y -delete_glue_ref(space_ptr(box(n))); -delete_glue_ref(xspace_ptr(box(n))); -flush_node_list(link(box(n))); -free_node(box(n),box_node_size); -box(n):=vpack(temp_ptr,natural); box_dir(box(n)):=ins_dir(p); -@z - -@x [46.1030] l.20687 - pTeX:main_control -@d append_normal_space=120 {go here to append a normal space between words} -@y -@d append_normal_space=120 {go here to append a normal space between words} -@d main_loop_j=130 {like |main_loop|, but |cur_chr| holds a KANJI code} -@d skip_loop=141 -@d again_2=150 -@z - -@x [46.1030] l.20691 - pTeX: main_control -procedure main_control; {governs \TeX's activities} -label big_switch,reswitch,main_loop,main_loop_wrapup, -@y -procedure main_control; {governs \TeX's activities} -label big_switch,reswitch,main_loop,main_loop_wrapup, - main_loop_j,main_loop_j+1,main_loop_j+3,skip_loop,again_2, -@z - -@x [46.1030] l.20697 - pTeX: main_control -var@!t:integer; {general-purpose temporary variable} -@y -var@!t:integer; {general-purpose temporary variable} -@!cx:KANJI_code; {kanji character} -@!kp:pointer; {kinsoku penalty register} -@!gp,gq:pointer; {temporary registers for list manipulation} -@!disp:scaled; {displacement register} -@!ins_kp:boolean; {whether insert kinsoku penalty} -@z - -@x [46.1030] l.20701 - pTeX: main_control -case abs(mode)+cur_cmd of -hmode+letter,hmode+other_char,hmode+char_given: goto main_loop; -hmode+char_num: begin scan_char_num; cur_chr:=cur_val; goto main_loop;@+end; -hmode+no_boundary: begin get_x_token; - if (cur_cmd=letter)or(cur_cmd=other_char)or(cur_cmd=char_given)or - (cur_cmd=char_num) then cancel_boundary:=true; - goto reswitch; - end; -@y -ins_kp:=false; -case abs(mode)+cur_cmd of -hmode+letter,hmode+other_char: goto main_loop; -hmode+kanji,hmode+kana,hmode+other_kchar: goto main_loop_j; -hmode+char_given: - if (cur_chr>=0)and(cur_chr<256) then goto main_loop else goto main_loop_j; -hmode+char_num: begin scan_char_num; cur_chr:=cur_val; - if (cur_chr>=0)and(cur_chr<256) then goto main_loop else goto main_loop_j; - end; -hmode+no_boundary: begin get_x_token; - if (cur_cmd=letter)or(cur_cmd=other_char)or - (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar)or - (cur_cmd=char_given)or(cur_cmd=char_num) then cancel_boundary:=true; - goto reswitch; - end; -@z - -@x [46.1030] l.20715 - pTeX: main_control -main_loop:@<Append character |cur_chr| and the following characters (if~any) - to the current hlist in the current font; |goto reswitch| when - a non-character has been fetched@>; -@y -main_loop_j:@<Append KANJI-character |cur_chr| - to the current hlist in the current font; |goto reswitch| when - a non-character has been fetched@>; -main_loop:@<Append character |cur_chr| and the following characters (if~any) - to the current hlist in the current font; |goto reswitch| when - a non-character has been fetched@>; -@z - -@x [46.1034] l.20788 - pTeX: disp_node -@<Append character |cur_chr|...@>= -if ((head=tail) and (mode>0)) then begin - if (insert_src_special_auto) then append_src_special; -end; -adjust_space_factor;@/ -@y -@<Append character |cur_chr|...@>= -if ((head=tail) and (mode>0)) then begin - if (insert_src_special_auto) then append_src_special; -end; -adjust_space_factor;@/ -if direction=dir_tate then disp:=t_baseline_shift else disp:=y_baseline_shift; -@<Append |disp_node| at begin of displace area@>; -@z - -%@x [46.1035] l.20850 - pTeX: kinsoku penalty -%@<Make a ligature node, if |ligature_present|;...@>= -%wrapup(rt_hit) -%@y -%@<Make a ligature node, if |ligature_present|;...@>= -%wrapup(rt_hit); -%if ins_kp=true then -% begin cx:=KANJI(cur_l); @<Insert kinsoku penalty@>; -% ins_kp:=false; -% end -%@z - -@x [46.1036] l.20854 - pTeX: disp_node -if lig_stack=null then goto reswitch; -@y -if lig_stack=null then - begin @<Append |disp_node| at end of displace area@>; - goto reswitch; - end; -@z - -@x [46.1037] l.20886 - pTeX: Look ahead for another character -@<Look ahead for another character...@>= -get_next; {set only |cur_cmd| and |cur_chr|, for speed} -if cur_cmd=letter then goto main_loop_lookahead+1; -if cur_cmd=other_char then goto main_loop_lookahead+1; -if cur_cmd=char_given then goto main_loop_lookahead+1; -x_token; {now expand and set |cur_cmd|, |cur_chr|, |cur_tok|} -if cur_cmd=letter then goto main_loop_lookahead+1; -if cur_cmd=other_char then goto main_loop_lookahead+1; -if cur_cmd=char_given then goto main_loop_lookahead+1; -if cur_cmd=char_num then - begin scan_char_num; cur_chr:=cur_val; goto main_loop_lookahead+1; - end; -if cur_cmd=no_boundary then bchar:=non_char; -cur_r:=bchar; lig_stack:=null; goto main_lig_loop; -main_loop_lookahead+1: adjust_space_factor; -fast_get_avail(lig_stack); font(lig_stack):=main_f; -cur_r:=qi(cur_chr); character(lig_stack):=cur_r; -if cur_r=false_bchar then cur_r:=non_char {this prevents spurious ligatures} -@y -@<Look ahead for another character...@>= -get_next; {set only |cur_cmd| and |cur_chr|, for speed} -if cur_cmd=letter then goto main_loop_lookahead+1; -if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - @<goto |main_lig_loop|@>; -if cur_cmd=other_char then goto main_loop_lookahead+1; -if cur_cmd=char_given then - begin if (cur_chr>=0)and(cur_chr<256) then goto main_loop_lookahead+1 - else @<goto |main_lig_loop|@>; - end; -x_token; {now expand and set |cur_cmd|, |cur_chr|, |cur_tok|} -if cur_cmd=letter then goto main_loop_lookahead+1; -if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - @<goto |main_lig_loop|@>; -if cur_cmd=other_char then goto main_loop_lookahead+1; -if cur_cmd=char_given then - begin if (cur_chr>=0)and(cur_chr<256) then goto main_loop_lookahead+1 - else @<goto |main_lig_loop|@>; - end; -if cur_cmd=char_num then - begin scan_char_num; cur_chr:=cur_val; - if (cur_chr>=0)and(cur_chr<256) then goto main_loop_lookahead+1 - else @<goto |main_lig_loop|@>; - end; -if cur_cmd=inhibit_glue then - begin inhibit_glue_flag:=true; goto main_loop_lookahead; - end; -if cur_cmd=no_boundary then bchar:=non_char; -cur_r:=bchar; lig_stack:=null; goto main_lig_loop; -main_loop_lookahead+1: adjust_space_factor; -fast_get_avail(lig_stack); font(lig_stack):=main_f; -cur_r:=qi(cur_chr); character(lig_stack):=cur_r; -if cur_r=false_bchar then cur_r:=non_char {this prevents spurious ligatures} - -@ @<goto |main_lig_loop|@>= -begin bchar:=non_char; cur_r:=bchar; lig_stack:=null; -if ligature_present then pack_lig(rt_hit); -if ins_kp=true then - begin cx:=cur_l; @<Insert kinsoku penalty@>; - end; -ins_kp:=false; -goto main_loop_j; -end -@z - -@x [46.1041] l.20999 - pTeX: disp_node -link(tail):=temp_ptr; tail:=temp_ptr; -@y -if (not is_char_node(tail))and(type(tail)=disp_node) then - begin link(prev_node):=temp_ptr; link(temp_ptr):=tail; prev_node:=temp_ptr; - end -else begin link(tail):=temp_ptr; tail:=temp_ptr; - end; -@z - -@x [46.1043] l.21029 - pTeX: disp_node -link(tail):=q; tail:=q; -@y -if (not is_char_node(tail))and(type(tail)=disp_node) then - begin link(prev_node):=q; link(q):=tail; prev_node:=q; - end -else begin link(tail):=q; tail:=q; - end -@z - -@x [47.1061] l.21277 - pTeX: append kern -begin s:=cur_chr; scan_dimen(s=mu_glue,false,false); -tail_append(new_kern(cur_val)); subtype(tail):=s; -end; -@y -begin s:=cur_chr; scan_dimen(s=mu_glue,false,false); -if (not is_char_node(tail))and(type(tail)=disp_node) then - begin prev_append(new_kern(cur_val)); subtype(prev_node):=s; - end -else - begin tail_append(new_kern(cur_val)); subtype(tail):=s; - end; -end; -@z - -@x [47.1068] l.21377 - pTeX: -var p,@!q:pointer; {for short-term use} -@y -var p,@!q:pointer; {for short-term use} -@!r:pointer; {temporaly} -@z - -@x [47.1071] l.21485 - pTeX: \tate, \yoko, \dtou -primitive("hbox",make_box,vtop_code+hmode);@/ -@!@:hbox_}{\.{\\hbox} primitive@> -@y -primitive("hbox",make_box,vtop_code+hmode);@/ -@!@:hbox_}{\.{\\hbox} primitive@> -primitive("tate",chg_dir,dir_tate);@/ -@!@:tate_}{\.{\\tate} primitive@> -primitive("yoko",chg_dir,dir_yoko);@/ -@!@:yoko_}{\.{\\yoko} primitive@> -primitive("dtou",chg_dir,dir_dtou);@/ -@!@:dtou_}{\.{\\dtou} primitive@> -@z - -@x [47.1072] l.21506 - pTeX: \tate, \yoko, \dtou - othercases print_esc("hbox") - endcases; -leader_ship: if chr_code=a_leaders then print_esc("leaders") -@y - othercases print_esc("hbox") - endcases; -chg_dir: - case chr_code of - dir_yoko: print_esc("yoko"); - dir_tate: print_esc("tate"); - dir_dtou: print_esc("dtou"); - endcases; -leader_ship: if chr_code=a_leaders then print_esc("leaders") -@z - -@x [47.1073] l.21523 - pTeX: \tate, \yoko -any_mode(make_box): begin_box(0); -@y -any_mode(make_box): begin_box(0); -any_mode(chg_dir): - begin if cur_group<>align_group then - if head=tail then - begin direction:=cur_chr; - if mode=vmode then page_dir:=cur_chr; - end - else begin print_err("Use `"); print_cmd_chr(cur_cmd,cur_chr); - print("' at top of list"); - help2("Direction change command is available only while") - ("current list is null."); error; - end - else begin print_err("You can't use `"); print_cmd_chr(cur_cmd,cur_chr); - print("' in an align"); - help2("To change direction in an align,") - ("you shold use \hbox or \vbox with \tate or \yoko."); error; - end - end; -@z - -@x [47.1075] l.21538 - pTeX: box_end -var p:pointer; {|ord_noad| for new box in math mode} -@y -var p:pointer; {|ord_noad| for new box in math mode} -q:pointer; -@z - -@x [47.1076] l.21553 - pTeX: box_dir adjust -begin if cur_box<>null then - begin shift_amount(cur_box):=box_context; - if abs(mode)=vmode then - begin append_to_vlist(cur_box); - if adjust_tail<>null then - begin if adjust_head<>adjust_tail then - begin link(tail):=link(adjust_head); tail:=adjust_tail; - end; - adjust_tail:=null; - end; - if mode>0 then build_page; - end - else begin if abs(mode)=hmode then space_factor:=1000 - else begin p:=new_noad; - math_type(nucleus(p)):=sub_box; - info(nucleus(p)):=cur_box; cur_box:=p; - end; - link(tail):=cur_box; tail:=cur_box; - end; - end; -end -@y -begin if cur_box<>null then - begin p:=link(cur_box); link(cur_box):=null; - while p<>null do begin - q:=p; p:=link(p); - if box_dir(q)=abs(direction) then - begin list_ptr(q):=cur_box; cur_box:=q; link(cur_box):=null; - end - else begin - delete_glue_ref(space_ptr(q)); - delete_glue_ref(xspace_ptr(q)); - free_node(q,box_node_size); - end; - end; - if box_dir(cur_box)<>abs(direction) then - cur_box:=new_dir_node(cur_box,abs(direction)); - shift_amount(cur_box):=box_context; - if abs(mode)=vmode then - begin append_to_vlist(cur_box); - if adjust_tail<>null then - begin if adjust_head<>adjust_tail then - begin link(tail):=link(adjust_head); tail:=adjust_tail; - end; - adjust_tail:=null; - end; - if mode>0 then build_page; - end - else begin - if abs(mode)=hmode then - space_factor:=1000 - else begin p:=new_noad; - math_type(nucleus(p)):=sub_box; - info(nucleus(p)):=cur_box; cur_box:=p; - end; - link(tail):=cur_box; tail:=cur_box; - end; -end; -end -@z - -@x [47.1078] l.21585 - pTeX: box_dir adjust - begin append_glue; subtype(tail):=box_context-(leader_flag-a_leaders); - leader_ptr(tail):=cur_box; - end -@y - begin append_glue; subtype(tail):=box_context-(leader_flag-a_leaders); - if type(cur_box)<=dir_node then - begin p:=link(cur_box); link(cur_box):=null; - while p<>null do - begin q:=p; p:=link(p); - if box_dir(q)=abs(direction) then - begin list_ptr(q):=cur_box; cur_box:=q; link(cur_box):=null; - end - else begin - delete_glue_ref(space_ptr(q)); - delete_glue_ref(xspace_ptr(q)); - free_node(q,box_node_size); - end; - end; - if box_dir(cur_box)<>abs(direction) then - cur_box:=new_dir_node(cur_box,abs(direction)); - end; - leader_ptr(tail):=cur_box; - end -@z - -@x [47.1079] l.21605 - pTeX: disp_node, adjust direction -var @!p,@!q:pointer; {run through the current list} -@!m:quarterword; {the length of a replacement list} -@!k:halfword; {0 or |vmode| or |hmode|} -@!n:eight_bits; {a box number} -@y -var @!p,@!q:pointer; {run through the current list} -@!m:quarterword; {the length of a replacement list} -@!k:halfword; {0 or |vmode| or |hmode|} -@!n:eight_bits; {a box number} -@!a_dir:eight_bits; {adjust direction} -@!d:pointer; {last |disp_node|} -@!disp,@!pdisp:scaled; {displacement} -@!pp,pnode:pointer; -@z - -@x [47.1080] l.21636 - pTeX: disp_node, check head=tail -else begin if not is_char_node(tail) then - if (type(tail)=hlist_node)or(type(tail)=vlist_node) then - @<Remove the last box, unless it's part of a discretionary@>; - end; -@y -else begin - if (not is_char_node(tail))and(type(tail)=disp_node) then - begin d:=tail; tail:=prev_node; - end - else d:=null; - if (not is_char_node(tail))and(head<>tail) then - if (type(tail)=hlist_node)or(type(tail)=vlist_node) - or(type(tail)=dir_node) then - @<Remove the last box, unless it's part of a discretionary@>; - if d<>null then - if (not is_char_node(tail))and(type(tail)=disp_node) then - begin prev_node:=pnode; prev_disp:=pdisp; - if prev_disp=disp_dimen(d) then free_node(tail,small_node_size) - else disp_dimen(tail):=disp_dimen(d); - free_node(d,small_node_size); - end - else tail_append(d); - end; -@z - -@x [47.1081] l.21642 - pTeX: disp_node -@ @<Remove the last box...@>= -begin q:=head; -repeat p:=q; -if not is_char_node(q) then if type(q)=disc_node then - begin for m:=1 to replace_count(q) do p:=link(p); - if p=tail then goto done; - end; -q:=link(p); -until q=tail; -cur_box:=tail; shift_amount(cur_box):=0; -tail:=p; link(p):=null; -done:end -@y -@ @<Remove the last box...@>= -begin q:=head; disp:=0; pdisp:=0; -repeat p:=q; -if not is_char_node(q) then - if type(q)=disc_node then - begin for m:=1 to replace_count(q) do p:=link(p); - if p=tail then goto done; - end - else if type(q)=disp_node then - begin pnode:=pp; pdisp:=disp; disp:=disp_dimen(q); - end; -pp:=q; q:=link(p); -until q=tail; -cur_box:=tail; shift_amount(cur_box):=0; -tail:=p; link(p):=null; -if type(cur_box)=dir_node then - begin link(list_ptr(cur_box)):=cur_box; - cur_box:=list_ptr(cur_box); - list_ptr(link(cur_box)):=null; - end -else - if box_dir(cur_box)=dir_default then box_dir(cur_box):=abs(direction); -done:end -@z - -@x [47.1083] l.21675 - pTeX: adjust_dir -if k=hmode then - if (box_context<box_flag)and(abs(mode)=vmode) then - scan_spec(adjusted_hbox_group,true) - else scan_spec(hbox_group,true) -else begin if k=vmode then scan_spec(vbox_group,true) - else begin scan_spec(vtop_group,true); k:=vmode; - end; - normal_paragraph; - end; -push_nest; mode:=-k; -@y -a_dir:=adjust_dir; -if k=hmode then - if (box_context<box_flag)and(abs(mode)=vmode) then - begin a_dir:=abs(direction); scan_spec(adjusted_hbox_group,true); - end - else scan_spec(hbox_group,true) -else begin if k=vmode then scan_spec(vbox_group,true) - else begin scan_spec(vtop_group,true); k:=vmode; - end; - normal_paragraph; - end; -push_nest; mode:=-k; adjust_dir:=a_dir; -@z - -@x [47.1085] l.21717 - pTeX: end of box, call adjust_hlist -hbox_group: package(0); -adjusted_hbox_group: begin adjust_tail:=adjust_head; package(0); - end; -@y -hbox_group: begin adjust_hlist(head,false); package(0); - end; -adjusted_hbox_group: begin adjust_hlist(head,false); - adjust_tail:=adjust_head; package(0); - end; -@z - -@x [47.1086] l.21730 - pTeX: set cur_kanji_skip, cur_xkanji_skip -begin d:=box_max_depth; unsave; save_ptr:=save_ptr-3; -if mode=-hmode then cur_box:=hpack(link(head),saved(2),saved(1)) -else begin cur_box:=vpackage(link(head),saved(2),saved(1),d); - if c=vtop_code then @<Readjust the height and depth of |cur_box|, - for \.{\\vtop}@>; - end; -pop_nest; box_end(saved(0)); -end; -@y -begin d:=box_max_depth; - delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); - if auto_spacing>0 then cur_kanji_skip:=kanji_skip - else cur_kanji_skip:=zero_glue; - if auto_xspacing>0 then cur_xkanji_skip:=xkanji_skip - else cur_xkanji_skip:=zero_glue; - add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); - unsave; save_ptr:=save_ptr-3; - if mode=-hmode then begin - cur_box:=hpack(link(head),saved(2),saved(1)); - box_dir(cur_box):=abs(direction); pop_nest; - end else begin - cur_box:=vpackage(link(head),saved(2),saved(1),d); - box_dir(cur_box):=abs(direction); pop_nest; - if c=vtop_code then - @<Readjust the height and depth of |cur_box|, for \.{\\vtop}@>; - end; - box_end(saved(0)); -end; -@z - -@x [47.1090] l.21765 - pTeX: apend vmode case -vmode+letter,vmode+other_char,vmode+char_num,vmode+char_given, - vmode+math_shift,vmode+un_hbox,vmode+vrule, - vmode+accent,vmode+discretionary,vmode+hskip,vmode+valign, - vmode+ex_space,vmode+no_boundary:@t@>@;@/ - begin back_input; new_graf(true); - end; -@y -vmode+letter,vmode+other_char,vmode+char_num,vmode+char_given, - vmode+math_shift,vmode+un_hbox,vmode+vrule, - vmode+accent,vmode+discretionary,vmode+hskip,vmode+valign, - vmode+kanji,vmode+kana,vmode+other_kchar, - vmode+ex_space,vmode+no_boundary:@t@>@;@/ - begin back_input; new_graf(true); - end; -@z - -@x [47.1091] l.21782 - pTeX: new_graf, adjust direction -push_nest; mode:=hmode; space_factor:=1000; set_cur_lang; clang:=cur_lang; -@y -push_nest; adjust_dir:=abs(direction); -mode:=hmode; space_factor:=1000; set_cur_lang; clang:=cur_lang; -@z - -@x [47.1096] l.21842 - pTeX: end_graf, call adjust_hlist - begin if head=tail then pop_nest {null paragraphs are ignored} - else line_break(widow_penalty); -@y - begin if head=tail then pop_nest {null paragraphs are ignored} - else begin adjust_hlist(head,true); line_break(widow_penalty) - end; -@z - -@x [47.1099] l.21871 - pTeX: insert and adjust -new_save_level(insert_group); scan_left_brace; normal_paragraph; -push_nest; mode:=-vmode; prev_depth:=ignore_depth; -@y -new_save_level(insert_group); scan_left_brace; normal_paragraph; -push_nest; mode:=-vmode; direction:=adjust_dir; prev_depth:=ignore_depth; -@z - -@x [47.1100] l.21876 - pTeX: free box node, ins_dir -insert_group: begin end_graf; q:=split_top_skip; add_glue_ref(q); - d:=split_max_depth; f:=floating_penalty; unsave; decr(save_ptr); - {now |saved(0)| is the insertion number, or 255 for |vadjust|} - p:=vpack(link(head),natural); pop_nest; - if saved(0)<255 then - begin tail_append(get_node(ins_node_size)); - type(tail):=ins_node; subtype(tail):=qi(saved(0)); - height(tail):=height(p)+depth(p); ins_ptr(tail):=list_ptr(p); - split_top_ptr(tail):=q; depth(tail):=d; float_cost(tail):=f; - end - else begin tail_append(get_node(small_node_size)); - type(tail):=adjust_node;@/ - subtype(tail):=0; {the |subtype| is not used} - adjust_ptr(tail):=list_ptr(p); delete_glue_ref(q); - end; - free_node(p,box_node_size); - if nest_ptr=0 then build_page; - end; -@y -insert_group: begin end_graf; q:=split_top_skip; add_glue_ref(q); - d:=split_max_depth; f:=floating_penalty; unsave; decr(save_ptr); - {now |saved(0)| is the insertion number, or 255 for |vadjust|} - p:=vpack(link(head),natural); box_dir(p):=abs(direction); pop_nest; - if saved(0)<255 then - begin r:=get_node(ins_node_size); - type(r):=ins_node; subtype(r):=qi(saved(0)); - height(r):=height(p)+depth(p); ins_ptr(r):=list_ptr(p); - split_top_ptr(r):=q; depth(r):=d; float_cost(r):=f; - ins_dir(r):=box_dir(p); - if (not is_char_node(tail))and(type(tail)=disp_node) then - prev_append(r) - else tail_append(r); - end - else begin - if box_dir(p)<>adjust_dir then - begin print_err("Direction Incompatible."); - help1("\vadjust's argument and outer vlist must have same direction."); - error; flush_node_list(list_ptr(p)); - end - else begin - r:=get_node(small_node_size); type(r):=adjust_node;@/ - adjust_ptr(r):=list_ptr(p); delete_glue_ref(q); - if (not is_char_node(tail))and(type(tail)=disp_node) then - prev_append(r) - else tail_append(r); - end; - end; - delete_glue_ref(space_ptr(p)); - delete_glue_ref(xspace_ptr(p)); - free_node(p,box_node_size); - if nest_ptr=0 then build_page; - end; -@z - -@x [47.1101] l.21901 - pTeX: mark_node, prev_append -mark_ptr(p):=def_ref; link(tail):=p; tail:=p; -@y -mark_ptr(p):=def_ref; -if (not is_char_node(tail))and(type(tail)=disp_node) then - prev_append(p) -else tail_append(p); -@z - -@x [47.1103] l.21911 - pTeX: penalty, prev_append -procedure append_penalty; -begin scan_int; tail_append(new_penalty(cur_val)); -if mode=vmode then build_page; -end; -@y -procedure append_penalty; -begin scan_int; - if (not is_char_node(tail))and(type(tail)=disp_node) then - prev_append(new_penalty(cur_val)) - else tail_append(new_penalty(cur_val)); - if mode=vmode then build_page; -end; -@z - -@x [47.1105] l.21932 - pTeX: delete_last: disp_node -var @!p,@!q:pointer; {run through the current list} -@!m:quarterword; {the length of a replacement list} -@y -var @!p,@!q:pointer; {run through the current list} -@!m:quarterword; {the length of a replacement list} -@!d:pointer; {last |disp_node|} -@!disp,@!pdisp:scaled; {displacement} -@!pp,pnode:pointer; -@z - -@x [47.1105] l.21937 - pTeX: delete_last: disp_node -else begin if not is_char_node(tail) then if type(tail)=cur_chr then - begin q:=head; - repeat p:=q; - if not is_char_node(q) then if type(q)=disc_node then - begin for m:=1 to replace_count(q) do p:=link(p); - if p=tail then return; - end; - q:=link(p); - until q=tail; - link(p):=null; flush_node_list(tail); tail:=p; - end; - end; -exit:end; -@y -else begin - if (not is_char_node(tail))and(type(tail)=disp_node) then - begin d:=tail; tail:=prev_node; link(tail):=null; - end - else d:=null; - if not is_char_node(tail) then if type(tail)=cur_chr then - begin q:=head; pp:=null; disp:=0; pdisp:=0; - repeat p:=q; - if not is_char_node(q) then - if type(q)=disc_node then - begin for m:=1 to replace_count(q) do p:=link(p); - if p=tail then - begin if d<>null then tail_append(d); - return; - end - end - else if type(q)=disp_node then - begin pnode:=pp; pdisp:=disp; disp:=disp_dimen(q); - end; - pp:=q; q:=link(p); - until q=tail; - link(p):=null; flush_node_list(tail); tail:=p; - end; - prev_node:=pnode; prev_disp:=pdisp; - if d<>null then - if (not is_char_node(tail))and(type(tail)=disp_node) then - begin if prev_disp=disp_dimen(d) then - free_node(tail,small_node_size) - else disp_dimen(tail):=disp_dimen(d); - free_node(d,small_node_size) - end - else - begin prev_node:=tail; prev_disp:=disp; tail_append(d) - end - end; -exit:end; -@z - -@x [47.1110] l.21997 -pTeX: free box node, delete kanji_skip -var p:pointer; {the box} -@!c:box_code..copy_code; {should we copy?} -@y -var p:pointer; {the box} -@!c:box_code..copy_code; {should we copy?} -@!disp:scaled; {displacement} -@z - -@x [47.1110] l.22001 - pTeX: free box node, delete kanji_skip -if (abs(mode)=mmode)or((abs(mode)=vmode)and(type(p)<>vlist_node))or@| - ((abs(mode)=hmode)and(type(p)<>hlist_node)) then - begin print_err("Incompatible list can't be unboxed"); -@.Incompatible list...@> - help3("Sorry, Pandora. (You sneaky devil.)")@/ - ("I refuse to unbox an \hbox in vertical mode or vice versa.")@/ - ("And I can't open any boxes in math mode.");@/ - error; return; - end; -if c=copy_code then link(tail):=copy_node_list(list_ptr(p)) -else begin link(tail):=list_ptr(p); box(cur_val):=null; - free_node(p,box_node_size); - end; -while link(tail)<>null do tail:=link(tail); -@y -if type(p)=dir_node then p:=list_ptr(p); -if (abs(mode)=mmode)or((abs(mode)=vmode)and(type(p)<>vlist_node))or@| - ((abs(mode)=hmode)and(type(p)<>hlist_node)) then - begin print_err("Incompatible list can't be unboxed"); -@.Incompatible list...@> - help3("Sorry, Pandora. (You sneaky devil.)")@/ - ("I refuse to unbox an \hbox in vertical mode or vice versa.")@/ - ("And I can't open any boxes in math mode.");@/ - error; return; -end; -case box_dir(p) of - any_dir: - if abs(direction)<>box_dir(p) then begin - print_err("Incompatible direction list can't be unboxed"); - help2("Sorry, Pandora. (You sneaky devil.)")@/ - ("I refuse to unbox a box in differrent direction.");@/ - error; return; - end; -endcases; -disp:=0; -if c=copy_code then link(tail):=copy_node_list(list_ptr(p)) -else - begin if type(box(cur_val))=dir_node then - begin delete_glue_ref(space_ptr(box(cur_val))); - delete_glue_ref(xspace_ptr(box(cur_val))); - free_node(box(cur_val),box_node_size); - end; - flush_node_list(link(p)); - link(tail):=list_ptr(p); box(cur_val):=null; - delete_glue_ref(space_ptr(p)); - delete_glue_ref(xspace_ptr(p)); - free_node(p,box_node_size); - end; -while link(tail)<>null do - begin p:=tail; tail:=link(tail); - if not is_char_node(tail) then - case type(tail) of - glue_node : - if (subtype(tail)=kanji_skip_code+1) - or(subtype(tail)=xkanji_skip_code+1) then - begin link(p):=link(tail); - delete_glue_ref(glue_ptr(tail)); - free_node(tail,small_node_size); tail:=p; - end; - penalty_node : - if subtype(tail)=widow_pena then - begin link(p):=link(tail); free_node(tail,small_node_size); - tail:=p; - end; - disp_node : - begin prev_disp:=disp; disp:=disp_dimen(tail); prev_node:=p; - end; - endcases; - end; -@z - -@x [47.1113] l.22028 - pTeX: italic correction, ita_kern -procedure append_italic_correction; -label exit; -var p:pointer; {|char_node| at the tail of the current list} -@!f:internal_font_number; {the font in the |char_node|} -begin if tail<>head then - begin if is_char_node(tail) then p:=tail - else if type(tail)=ligature_node then p:=lig_char(tail) - else return; - f:=font(p); - tail_append(new_kern(char_italic(f)(char_info(f)(character(p))))); - subtype(tail):=explicit; - end; -@y -procedure append_italic_correction; -label exit; -var p:pointer; {|char_node| at the tail of the current list} -@!f:internal_font_number; {the font in the |char_node|} -@!d:pointer; {|disp_node|} -begin if tail<>head then - begin - if (not is_char_node(tail))and(type(tail)=disp_node) then - begin d:=tail; tail:=prev_node; - end - else d:=null; - if (last_jchr<>null)and(link(last_jchr)=tail)and(is_char_node(tail)) then - p:=last_jchr - else if is_char_node(tail) then p:=tail - else if type(tail)=ligature_node then p:=lig_char(tail) - else return; - f:=font(p); - tail_append(new_kern(char_italic(f)(char_info(f)(character(p))))); - subtype(tail):=ita_kern; - if d<>null then - begin prev_node:=tail; tail_append(d); - end; - end; -@z - -@x [47.1120] l.22119 - pTeX: discretionary with disp_node -decr(save_ptr); return; -@y -decr(save_ptr); -prev_node:=tail; tail_append(get_node(small_node_size)); -type(tail):=disp_node; disp_dimen(tail):=0; prev_disp:=0; -return; -@z - -@x [47.1121] l.22127 - pTeX: discretionary with disp_node - begin if not is_char_node(p) then if type(p)>rule_node then - if type(p)<>kern_node then if type(p)<>ligature_node then - begin print_err("Improper discretionary list"); -@y - begin if not is_char_node(p) then - if (type(p)>rule_node)and(type(p)<>kern_node)and - (type(p)<>ligature_node)and(type(p)<>disp_node) then - if (type(p)=penalty_node)and(subtype(p)<>normal) then - begin link(q):=link(p); free_node(p,small_node_size); p:=q; - end - else - begin print_err("Improper discretionary list"); -@z - -@x [47.1123] l.22160 - pTeX: make_accent, Kanji, insert disp_node -var s,@!t: real; {amount of slant} -@y -var s,@!t: real; {amount of slant} -@!disp:scaled; {displacement} -@!cx:KANJI_code; {temporary register for KANJI} -@z - -@x [47.1123] l.22165 - pTeX: make_accent, Kanji, insert disp_node -begin scan_char_num; f:=cur_font; p:=new_character(f,cur_val); -@y -begin scan_char_num; -if (cur_val<0)or(cur_val>255) then - begin KANJI(cx):=cur_val; - if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - p:=new_character(f,get_jfm_pos(KANJI(cx),f)); - {DEBUG if p<>null then ...} - link(p):=get_avail; info(link(p)):=KANJI(cx); - end -else begin f:=cur_font; p:=new_character(f,cur_val); - end; -@z - -@x [47.1123] l.22175 - pTeX: make_accent, Kanji, insert disp_node - link(tail):=p; tail:=p; space_factor:=1000; -@y - link(tail):=p; - if link(p)<>null then tail:=link(p) else tail:=p; - @<Append |disp_node| at end of displace area@>; - space_factor:=1000; -@z - -@x [47.1124] l.22180 - pTeX: make_accent Kanji, insert disp_node -q:=null; f:=cur_font; -if (cur_cmd=letter)or(cur_cmd=other_char)or(cur_cmd=char_given) then - q:=new_character(f,cur_chr) -else if cur_cmd=char_num then - begin scan_char_num; q:=new_character(f,cur_val); - end -else back_input -@y -q:=null; f:=cur_font; KANJI(cx):=empty; -if (cur_cmd=letter)or(cur_cmd=other_char) then - q:=new_character(f,cur_chr) -else if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then - begin if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - cx:=cur_chr; - end -else if cur_cmd=char_given then - if (cur_chr>=0)and(cur_chr<256)then q:=new_character(f,cur_chr) - else begin - if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - KANJI(cx):=cur_chr - end - else if cur_cmd=char_num then - begin scan_char_num; - if (cur_chr>=0)and(cur_chr<256)then q:=new_character(f,cur_val) - else begin - if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - KANJI(cx):=cur_chr - end - end -else back_input; -if direction=dir_tate then - begin if font_dir[f]=dir_tate then disp:=0 - else if font_dir[f]=dir_yoko then disp:=t_baseline_shift-y_baseline_shift - else disp:=t_baseline_shift - end -else begin if font_dir[f]=dir_yoko then disp:=0 - else if font_dir[f]=dir_tate then disp:=y_baseline_shift-t_baseline_shift - else disp:=y_baseline_shift - end; -@<Append |disp_node| at begin of displace area@>; -if KANJI(cx)<>empty then - begin q:=new_character(f,get_jfm_pos(KANJI(cx),f)); - link(q):=get_avail; info(link(q)):=KANJI(cx); - end; -@z - -@x [47.1125] l.22200 - pTeX: make_accent Kanji -if h<>x then {the accent must be shifted up or down} - begin p:=hpack(p,natural); shift_amount(p):=x-h; - end; -@y -if h<>x then {the accent must be shifted up or down} - begin delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); - cur_kanji_skip:=zero_glue; cur_xkanji_skip:=zero_glue; - add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); - p:=hpack(p,natural); shift_amount(p):=x-h; - end; -@z - -@x l.22334 - pTeX -procedure cs_error; -begin -if cur_chr = 10 then -begin - print_err("Extra "); print_esc("endmubyte"); -@.Extra \\endmubyte@> - help1("I'm ignoring this, since I wasn't doing a \mubyte."); -end else begin - print_err("Extra "); print_esc("endcsname"); -@.Extra \\endcsname@> - help1("I'm ignoring this, since I wasn't doing a \csname."); -end; -@y -procedure cs_error; -begin print_err("Extra "); print_esc("endcsname"); -@.Extra \\endcsname@> -help1("I'm ignoring this, since I wasn't doing a \csname."); -@z - -@x [48.1138] l.22385 - pTeX: init math : direction < 0 ... math direction -if (cur_cmd=math_shift)and(mode>0) then @<Go into display math mode@> -else begin back_input; @<Go into ordinary math mode@>; - end; -@y -if (cur_cmd=math_shift)and(mode>0) then @<Go into display math mode@> -else begin back_input; @<Go into ordinary math mode@>; - end; -direction:=-abs(direction); -@z - -@x [48.1145] l.22435 - pTeX: Call adjust_hlist at begin of display -else begin line_break(display_widow_penalty);@/ -@y -else begin adjust_hlist(head,true); line_break(display_widow_penalty);@/ -@z - -@x [48.1147] l.22471 - pTeX: Skip kanji 2nd node, dir_node -reswitch: if is_char_node(p) then - begin f:=font(p); d:=char_width(f)(char_info(f)(character(p))); - goto found; - end; -case type(p) of -hlist_node,vlist_node,rule_node: begin d:=width(p); goto found; - end; -@y -reswitch: if is_char_node(p) then - begin f:=font(p); d:=char_width(f)(orig_char_info(f)(character(p))); - if font_dir[f]<>dir_default then p:=link(p); - goto found; - end; -case type(p) of -hlist_node,vlist_node,dir_node,rule_node: begin d:=width(p); goto found; - end; -@z - -@x [48.1150] l.22541 - pTeX: scan_math -mmode+left_brace: begin tail_append(new_noad); - back_input; scan_math(nucleus(tail)); - end; -@y -mmode+left_brace: begin tail_append(new_noad); - back_input; scan_math(nucleus(tail),kcode_noad(tail)); - end; -@z - -@x [48.1151] l.22555 - pTeX: scan_math: use Kanji in math_mode -procedure scan_math(@!p:pointer); -label restart,reswitch,exit; -var c:integer; {math character code} -begin restart:@<Get the next non-blank non-relax...@>; -reswitch:case cur_cmd of -letter,other_char,char_given: begin c:=ho(math_code(cur_chr)); - if c=@'100000 then - begin @<Treat |cur_chr| as an active character@>; - goto restart; - end; - end; -@y -procedure scan_math(@!p,@!q:pointer); -label restart,reswitch,exit; -var c:integer; {math character code} -cx:KANJI_code; {temporary register for KANJI} -begin KANJI(cx):=0; -restart: @<Get the next non-blank non-relax...@>; -reswitch:case cur_cmd of -letter,other_char,char_given: - if (cur_chr>=0)and(cur_chr<=256) then begin - c:=ho(math_code(cur_chr)); - if c=@'100000 then - begin @<Treat |cur_chr| as an active character@>; - goto restart; - end; - end - else - KANJI(cx):=cur_chr; -kanji,kana,other_kchar: cx:=cur_chr; -@z - -@x [48.1151] l.22576 - pTeX: scan_math: use Kanji in math_mode -math_type(p):=math_char; character(p):=qi(c mod 256); -if (c>=var_code)and fam_in_range then fam(p):=cur_fam -else fam(p):=(c div 256) mod 16; -@y -if KANJI(cx)=0 then - begin math_type(p):=math_char; character(p):=qi(c mod 256); - if (c>=var_code)and(fam_in_range) then fam(p):=cur_fam - else fam(p):=(c div 256) mod 16; - if font_dir[fam_fnt(fam(p)+cur_size)]<>dir_default then - begin print_err("Not one-byte family"); - help1("IGNORE.");@/ - error; - end - end -else begin - if q=null then - begin math_type(p):=sub_mlist; info(p):=new_noad; - p:=nucleus(info(p)); q:=kcode_noad_nucleus(p); - end; - math_type(p):=math_jchar; fam(p):=cur_jfam; character(p):=qi(0); - info(q):=KANJI(cx); - if font_dir[fam_fnt(fam(p)+cur_size)]=dir_default then - begin print_err("Not two-byte family"); - help1("IGNORE.");@/ - error; - end - end; -@z - -@x [48.1154] l.22605 - pTeX: math mode -mmode+letter,mmode+other_char,mmode+char_given: - set_math_char(ho(math_code(cur_chr))); -mmode+char_num: begin scan_char_num; cur_chr:=cur_val; - set_math_char(ho(math_code(cur_chr))); - end; -@y -mmode+letter,mmode+other_char,mmode+char_given: - if (cur_chr>=0)and(cur_chr<256) then - if cur_chr<128 then set_math_char(ho(math_code(cur_chr))) - else set_math_char(cur_chr) - else set_math_kchar(cur_chr); -mmode+kanji,mmode+kana,mmode+other_kchar: begin - cx:=cur_chr; set_math_kchar(KANJI(cx)); - end; -mmode+char_num: begin scan_char_num; cur_chr:=cur_val; - if (cur_chr>=0)and(cur_chr<256) then - if cur_chr<128 then set_math_char(ho(math_code(cur_chr))) - else set_math_char(cur_chr) - else set_math_kchar(cur_chr); - end; -@z - -@x [48.1155] l.22635 - pTeX: set_math_char - link(tail):=p; tail:=p; -@y - link(tail):=p; tail:=p; - if font_dir[fam_fnt(fam(nucleus(p))+cur_size)]<>dir_default then begin - print_err("Not one-byte family"); - help1("IGNORE.");@/ - error; - end -@z - -@x [48.1158] l.22690 - pTeX: scan_math - type(tail):=cur_chr; scan_math(nucleus(tail)); -@y - type(tail):=cur_chr; scan_math(nucleus(tail),kcode_noad(tail)); -@z - -@x [48.1163] l.22750 - pTeX: scan_math -scan_delimiter(left_delimiter(tail),true); scan_math(nucleus(tail)); -@y -scan_delimiter(left_delimiter(tail),true); -scan_math(nucleus(tail),kcode_noad(tail)); -@z - -@x [48.1164] l.22770 - pTeX: scan_math -scan_math(nucleus(tail)); -@y -scan_math(nucleus(tail),kcode_noad(tail)); -@z - -@x [48.1164] l.22790 - pTeX: vcenter : dir -vcenter_group: begin end_graf; unsave; save_ptr:=save_ptr-2; - p:=vpack(link(head),saved(1),saved(0)); pop_nest; - tail_append(new_noad); type(tail):=vcenter_noad; - math_type(nucleus(tail)):=sub_box; info(nucleus(tail)):=p; - end; -@y -vcenter_group: begin end_graf; unsave; save_ptr:=save_ptr-2; - p:=vpack(link(head),saved(1),saved(0)); - box_dir(p):=abs(direction); pop_nest; - if box_dir(p)<>abs(direction) then p:=new_dir_node(p,abs(direction)); - tail_append(new_noad); type(tail):=vcenter_noad; - math_type(nucleus(tail)):=sub_box; info(nucleus(tail)):=p; - end; -@z - -@x [48.1176] l.22864 - pTeX: scan_math -scan_math(p); -@y -scan_math(p,null); -@z - -@x [48.1186] l.23006 - pTeX: copy kanji code - if math_type(supscr(p))=empty then - begin mem[saved(0)].hh:=mem[nucleus(p)].hh; -@y - if ((math_type(supscr(p))=empty)and(math_kcode(p)=null)) then - begin mem[saved(0)].hh:=mem[nucleus(p)].hh; -@z - -@x [48.1194] l.23078 - pTeX: set cur_kanji_skip, cur_xkanji_skip -var l:boolean; {`\.{\\leqno}' instead of `\.{\\eqno}'} -@y -var l:boolean; {`\.{\\leqno}' instead of `\.{\\eqno}'} -@!disp:scaled; {displacement} -@z - -@x [48.1194] l.23087 - pTeX: set cur_kanji_skip, cur_xkanji_skip -m:=mode; l:=false; p:=fin_mlist(null); {this pops the nest} -@y -delete_glue_ref(cur_kanji_skip); delete_glue_ref(cur_xkanji_skip); -if auto_spacing>0 then cur_kanji_skip:=kanji_skip -else cur_kanji_skip:=zero_glue; -if auto_xspacing>0 then cur_xkanji_skip:=xkanji_skip -else cur_xkanji_skip:=zero_glue; -add_glue_ref(cur_kanji_skip); add_glue_ref(cur_xkanji_skip); -m:=mode; l:=false; p:=fin_mlist(null); {this pops the nest} -@z - -@x [48.1196] l.23134 - pTeX: insert disp_node -begin tail_append(new_math(math_surround,before)); -cur_mlist:=p; cur_style:=text_style; mlist_penalties:=(mode>0); mlist_to_hlist; -link(tail):=link(temp_head); -while link(tail)<>null do tail:=link(tail); -tail_append(new_math(math_surround,after)); -space_factor:=1000; unsave; -end -@y -begin if direction=dir_tate then disp:=t_baseline_shift - else disp:=y_baseline_shift; -@<Append |disp_node| at begin of displace area@>; -tail_append(new_math(math_surround,before)); -cur_mlist:=p; cur_style:=text_style; mlist_penalties:=(mode>0); mlist_to_hlist; -link(tail):=link(temp_head); -while link(tail)<>null do tail:=link(tail); -tail_append(new_math(math_surround,after)); -@<Append |disp_node| at end of displace area@>; -space_factor:=1000; unsave; -end -@z - -@x [48.1200] l.23203 - pTeX: adjust direction -push_nest; mode:=hmode; space_factor:=1000; set_cur_lang; clang:=cur_lang; -@y -push_nest; adjust_dir:=abs(direction); -mode:=hmode; space_factor:=1000; set_cur_lang; clang:=cur_lang; -@z - -@x [48.1201] l.23217 - pTeX: free box node - begin free_node(b,box_node_size); -@y - begin delete_glue_ref(space_ptr(b)); delete_glue_ref(xspace_ptr(b)); - free_node(b,box_node_size); -@z - -@x [48.1201] l.23222 - pTeX: free box node - begin free_node(b,box_node_size); -@y - begin delete_glue_ref(space_ptr(b)); delete_glue_ref(xspace_ptr(b)); - free_node(b,box_node_size); -@z - -@x [49.1210] l.23361 - pTeX: set_auto_spacing -any_mode(toks_register), -any_mode(assign_toks), -any_mode(assign_int), -@y -any_mode(assign_kinsoku), -any_mode(assign_inhibit_xsp_code), -any_mode(set_auto_spacing), -any_mode(set_kansuji_char), -any_mode(toks_register), -any_mode(assign_toks), -any_mode(assign_int), -any_mode(def_jfont), -any_mode(def_tfont), -@z - -@x [49.1211] l.23397 - pTeX: prefixed_command -procedure prefixed_command; -label done,exit; -var a:small_number; {accumulated prefix codes so far} -@y -procedure prefixed_command; -label done,exit; -var a:small_number; {accumulated prefix codes so far} -@!m:integer; {ditto} -@z - -@x l.23403 - pTeX -@!p,@!q,@!r:pointer; {for temporary short-term use} -@y -@!p,@!q:pointer; {for temporary short-term use} -@z - -@x [49.1217] l.23487 - pTeX: select cur font -set_font: define(cur_font_loc,data,cur_chr); -@y -set_font: begin - if font_dir[cur_chr]=dir_yoko then - define(cur_jfont_loc,data,cur_chr) - else if font_dir[cur_chr]=dir_tate then - define(cur_tfont_loc,data,cur_chr) - else - define(cur_font_loc,data,cur_chr) -end; -@z - -@x l.23504 - pTeX -primitive("futurelet",let,normal+1);@/ -@!@:future_let_}{\.{\\futurelet} primitive@> -if enctex_p then -begin - primitive("mubyte",let,normal+10);@/ -@!@:mubyte_}{\.{\\mubyte} primitive@> - primitive("noconvert",let,normal+11);@/ -@!@:noconvert_}{\.{\\noconvert} primitive@> -end; - -@ @<Cases of |print_cmd_chr|...@>= -let: if chr_code<>normal then - if chr_code = normal+10 then print_esc("mubyte") - else if chr_code = normal+11 then print_esc("noconvert") - else print_esc("futurelet") - else print_esc("let"); - -@ @<Assignments@>= -let: if cur_chr = normal+11 then do_nothing { noconvert primitive } - else if cur_chr = normal+10 then { mubyte primitive } - begin - selector:=term_and_log; - get_token; - mubyte_stoken := cur_tok; - if cur_tok <= cs_token_flag then mubyte_stoken := cur_tok mod 256; - mubyte_prefix := 60; mubyte_relax := false; - mubyte_tablein := true; mubyte_tableout := true; - get_x_token; - if cur_cmd = spacer then get_x_token; - if cur_cmd = sub_mark then - begin - mubyte_tableout := false; get_x_token; - if cur_cmd = sub_mark then - begin - mubyte_tableout := true; mubyte_tablein := false; - get_x_token; - end; - end else if (mubyte_stoken > cs_token_flag) and - (cur_cmd = mac_param) then - begin - mubyte_tableout := false; - scan_int; mubyte_prefix := cur_val; get_x_token; - if mubyte_prefix > 50 then mubyte_prefix := 52; - if mubyte_prefix <= 0 then mubyte_prefix := 51; - end - else if (mubyte_stoken > cs_token_flag) and (cur_cmd = relax) then - begin - mubyte_tableout := true; mubyte_tablein := false; - mubyte_relax := true; get_x_token; - end; - r := get_avail; p := r; - while cur_cs = 0 do begin store_new_token (cur_tok); get_x_token; end; - if (cur_cmd <> end_cs_name) or (cur_chr <> 10) then - begin - print_err("Missing "); print_esc("endmubyte"); print(" inserted"); - help2("The control sequence marked <to be read again> should")@/ -("not appear in <byte sequence> between \mubyte and \endmubyte."); - back_error; - end; - p := link(r); - if (p = null) and mubyte_tablein then - begin - print_err("The empty <byte sequence>, "); - print_esc("mubyte"); print(" ignored"); - help2("The <byte sequence> in")@/ -("\mubyte <token> <byte sequence>\endmubyte should not be empty."); - error; - end else begin - while p <> null do - begin - append_char (info(p) mod 256); - p := link (p); - end; - flush_list (r); - if (str_start [str_ptr] + 1 = pool_ptr) and - (str_pool [pool_ptr-1] = mubyte_stoken) then - begin - if mubyte_read [mubyte_stoken] <> null - and mubyte_tablein then { clearing data } - dispose_munode (mubyte_read [mubyte_stoken]); - if mubyte_tablein then mubyte_read [mubyte_stoken] := null; - if mubyte_tableout then mubyte_write [mubyte_stoken] := 0; - pool_ptr := str_start [str_ptr]; - end else begin - if mubyte_tablein then mubyte_update; { updating input side } - if mubyte_tableout then { updating output side } - begin - if mubyte_stoken > cs_token_flag then { control sequence } - begin - dispose_mutableout (mubyte_stoken-cs_token_flag); - if (str_start [str_ptr] < pool_ptr) or mubyte_relax then - begin { store data } - r := mubyte_cswrite[(mubyte_stoken-cs_token_flag) mod 128]; - p := get_avail; - mubyte_cswrite[(mubyte_stoken-cs_token_flag) mod 128] := p; - info (p) := mubyte_stoken-cs_token_flag; - link (p) := get_avail; - p := link (p); - if mubyte_relax then begin - info (p) := 0; pool_ptr := str_start [str_ptr]; - end else info (p) := slow_make_string; - link (p) := r; - end; - end else begin { single character } - if str_start [str_ptr] = pool_ptr then - mubyte_write [mubyte_stoken] := 0 - else - mubyte_write [mubyte_stoken] := slow_make_string; - end; - end else pool_ptr := str_start [str_ptr]; - end; - end; - end else begin { let primitive } - n:=cur_chr; -@y -primitive("futurelet",let,normal+1);@/ -@!@:future_let_}{\.{\\futurelet} primitive@> - -@ @<Cases of |print_cmd_chr|...@>= -let: if chr_code<>normal then print_esc("futurelet")@+else print_esc("let"); - -@ @<Assignments@>= -let: begin n:=cur_chr; -@z - -@x [49.1228] l.23785 - pTeX: assign jfam -assign_int: begin p:=cur_chr; scan_optional_equals; scan_int; - word_define(p,cur_val); - end; -@y -assign_int: begin p:=cur_chr; scan_optional_equals; scan_int; - if p=int_base+cur_fam_code then - begin if font_dir[fam_fnt(cur_val)]<>dir_default then - word_define(int_base+cur_jfam_code,cur_val) - else word_define(p,cur_val); - end - else word_define(p,cur_val); - end; -@z - -@x [49.1230] l.23812 - pTeX: xspcode, kcatcode -@<Put each...@>= -primitive("catcode",def_code,cat_code_base); -@!@:cat_code_}{\.{\\catcode} primitive@> -@y -@<Put each...@>= -primitive("catcode",def_code,cat_code_base); -@!@:cat_code_}{\.{\\catcode} primitive@> -primitive("kcatcode",def_code,kcat_code_base); -@!@:cat_code_}{\.{\\kcatcode} primitive@> -primitive("xspcode",def_code,auto_xsp_code_base); -@!@:auto_xsp_code_}{\.{\\xspcode} primitive@> -@z - -@x l.23815 - pTeX -if enctex_p then -begin - primitive("xordcode",def_code,xord_code_base); -@!@:xord_code_}{\.{\\xordcode} primitive@> - primitive("xchrcode",def_code,xchr_code_base); -@!@:xchr_code_}{\.{\\xchrcode} primitive@> - primitive("xprncode",def_code,xprn_code_base); -@!@:xprn_code_}{\.{\\xprncode} primitive@> -end; -@y -@z - -@x [49.1231] l.23842 - pTeX: xspcode, kcatcode -def_code: if chr_code=xord_code_base then print_esc("xordcode") - else if chr_code=xchr_code_base then print_esc("xchrcode") - else if chr_code=xprn_code_base then print_esc("xprncode") - else if chr_code=cat_code_base then print_esc("catcode") - else if chr_code=math_code_base then print_esc("mathcode") -@y -def_code: if chr_code=cat_code_base then print_esc("catcode") - else if chr_code=kcat_code_base then print_esc("kcatcode") - else if chr_code=auto_xsp_code_base then print_esc("xspcode") - else if chr_code=math_code_base then print_esc("mathcode") -@z - -@x [49.1232] l.23857 - pTeX: kcatcode -def_code: begin @<Let |n| be the largest legal code value, based on |cur_chr|@>; - p:=cur_chr; scan_char_num; - if p=xord_code_base then p:=cur_val - else if p=xchr_code_base then p:=cur_val+256 - else if p=xprn_code_base then p:=cur_val+512 - else p:=p+cur_val; - scan_optional_equals; - scan_int; - if ((cur_val<0)and(p<del_code_base))or(cur_val>n) then - begin print_err("Invalid code ("); print_int(cur_val); -@.Invalid code@> - if p<del_code_base then print("), should be in the range 0..") - else print("), should be at most "); - print_int(n); - help1("I'm going to use 0 instead of that illegal code value.");@/ - error; cur_val:=0; - end; - if p<256 then xord[p]:=cur_val - else if p<512 then xchr[p-256]:=cur_val - else if p<768 then xprn[p-512]:=cur_val - else if p<math_code_base then define(p,data,cur_val) - else if p<del_code_base then define(p,data,hi(cur_val)) - else word_define(p,cur_val); - end; -@y -def_code: begin - @<Let |m| be the minimal legal code value, based on |cur_chr|@>; - @<Let |n| be the largest legal code value, based on |cur_chr|@>; - p:=cur_chr; scan_char_num; - if p=kcat_code_base then p:=p+Hi(cur_val) else p:=p+cur_val; - scan_optional_equals; scan_int; - if ((cur_val<m)and(p<del_code_base))or(cur_val>n) then - begin print_err("Invalid code ("); print_int(cur_val); -@.Invalid code@> - if p<del_code_base then - begin print("), should be in the range "); print_int(m); print(".."); - end - else print("), should be at most "); - print_int(n); - if m=0 then - begin help1("I'm going to use 0 instead of that illegal code value.");@/ - error; - end - else - begin help1("I'm going to use 16 instead of that illegal code value.");@/ - error; - end; - cur_val:=m; - end; - if p<math_code_base then define(p,data,cur_val) - else if p<del_code_base then define(p,data,hi(cur_val)) - else word_define(p,cur_val); - end; -@z - -@x [49.1233] l.23882 - pTeX: kcatcode -@ @<Let |n| be the largest...@>= -if cur_chr=cat_code_base then n:=max_char_code -@y -@ @<Let |m| be the minimal...@>= -if cur_chr=kcat_code_base then m:=kanji else m:=0 - -@ @<Let |n| be the largest...@>= -if cur_chr=cat_code_base then n:=invalid_char {1byte |max_char_code|} -else if cur_chr=kcat_code_base then n:=max_char_code -@z - -@x [49.1247] l.24083 - pTeX: alter_box_dimen : box_dir -procedure alter_box_dimen; -var c:small_number; {|width_offset| or |height_offset| or |depth_offset|} -@!b:eight_bits; {box number} -begin c:=cur_chr; scan_eight_bit_int; b:=cur_val; scan_optional_equals; -scan_normal_dimen; -if box(b)<>null then mem[box(b)+c].sc:=cur_val; -end; -@y -procedure alter_box_dimen; -var c:small_number; {|width_offset| or |height_offset| or |depth_offset|} -@!b:eight_bits; {box number} -@!p,q:pointer; {temporary registers} -begin c:=cur_chr; scan_eight_bit_int; b:=cur_val; scan_optional_equals; -scan_normal_dimen; -if box(b)<>null then - begin q:=box(b); p:=link(q); - while p<>null do - begin if abs(direction)=box_dir(p) then q:=p; - p:=link(p); - end; - if box_dir(q)<>abs(direction) then - begin q:=new_dir_node(q,abs(direction)); list_ptr(q):=null; - link(q):=link(box(b)); link(box(b)):=q; - end; - mem[q+c].sc:=cur_val; - end; -end; -@z - -@x [49.1256] l.24163 - pTeX: def_tfont -def_font: new_font(a); -@y -def_tfont,def_jfont,def_font: new_font(a); -@z - -@x l.24369 - pTeX -message_printing := true; active_noconvert := true; -token_show(def_ref); -message_printing := false; active_noconvert := false; -selector:=old_setting; -@y -token_show(def_ref); selector:=old_setting; -@z - -@x [49.1292] l.24451 - pTeX: shift_case -@<Change the case of the token in |p|, if a change is appropriate@>= -t:=info(p); -if t<cs_token_flag+single_base then - begin c:=t mod 256; - if equiv(b+c)<>0 then info(p):=t-c+equiv(b+c); - end -@y -@<Change the case of the token in |p|, if a change is appropriate@>= -t:=info(p); -if (t<cs_token_flag+single_base)and(not check_kanji(t)) then - begin c:=t mod 256; - if equiv(b+c)<>0 then info(p):=t-c+equiv(b+c); - end -@z - -@x [49.1291] l.24467 - pTeX: show_mode -@d show_lists=3 { \.{\\showlists} } -@y -@d show_lists=3 { \.{\\showlists} } -@d show_mode=4 { \.{\\showmode} } -@z - -@x [49.1291] l.24476 - pTeX: show_mode -primitive("showlists",xray,show_lists); -@!@:show_lists_}{\.{\\showlists} primitive@> -@y -primitive("showlists",xray,show_lists); -@!@:show_lists_}{\.{\\showlists} primitive@> -primitive("showmode",xray,show_mode); -@!@:show_mode_}{\.{\\showmode} primitive@> -@z - -@x [49.1292] l.24483 - pTeX: show_mode - show_lists:print_esc("showlists"); - othercases print_esc("show") -@y - show_lists:print_esc("showlists"); - show_mode:print_esc("showmode"); - othercases print_esc("show") -@z - -@x [49.1293] l.24495 - pTeX: show_mode -show_code: @<Show the current meaning of a token, then |goto common_ending|@>; -@y -show_code: @<Show the current meaning of a token, then |goto common_ending|@>; -show_mode: @<Show the current japanese processing mode@>; -@z - -@x l.24597 - pTeX -@<Dump ML\TeX-specific data@>; -@<Dump enc\TeX-specific data@>; -@y -@<Dump ML\TeX-specific data@>; -@z - -@x l.24631 - pTeX -@<Undump ML\TeX-specific data@>; -@<Undump enc\TeX-specific data@>; -@y -@<Undump ML\TeX-specific data@>; -@z - -@x l.24982 -font_info:=xmalloc_array(fmemory_word, font_mem_size); -@y -font_info:=xmalloc_array(memory_word, font_mem_size); -@z - -@x [50.1320] l.24988 - pTeX: -@ @<Dump the array info for internal font number |k|@>= -begin -dump_things(font_check[null_font], font_ptr+1-null_font); -@y -@ @<Dump the array info for internal font number |k|@>= -begin -dump_things(font_dir[null_font], font_ptr+1-null_font); -dump_things(font_num_ext[null_font], font_ptr+1-null_font); -dump_things(font_check[null_font], font_ptr+1-null_font); -@z - -@x [50.1321] l.25000 - pTeX: -dump_things(char_base[null_font], font_ptr+1-null_font); -@y -dump_things(ctype_base[null_font], font_ptr+1-null_font); -dump_things(char_base[null_font], font_ptr+1-null_font); -@z - -@x [50.1322] l.25024 - pTeX: -@<Undump the array info for internal font number |k|@>= -begin {Allocate the font arrays} -@y -@<Undump the array info for internal font number |k|@>= -begin {Allocate the font arrays} -font_dir:=xmalloc_array(eight_bits, font_max); -font_num_ext:=xmalloc_array(integer, font_max); -@z - -@x [50.1322] l.25040 - pTeX: -char_base:=xmalloc_array(integer, font_max); -@y -ctype_base:=xmalloc_array(integer, font_max); -char_base:=xmalloc_array(integer, font_max); -@z - -@x [50.1322] l.25050 - pTeX: -undump_things(font_check[null_font], font_ptr+1-null_font); -@y -undump_things(font_dir[null_font], font_ptr+1-null_font); -undump_things(font_num_ext[null_font], font_ptr+1-null_font); -undump_things(font_check[null_font], font_ptr+1-null_font); -@z - -@x [50.1322] l.25064 - pTeX: -undump_things(char_base[null_font], font_ptr+1-null_font); -@y -undump_things(ctype_base[null_font], font_ptr+1-null_font); -undump_things(char_base[null_font], font_ptr+1-null_font); -@z - -@x l.25363 - pTeX - font_info:=xmalloc_array (fmemory_word, font_mem_size); -@y - font_info:=xmalloc_array (memory_word, font_mem_size); -@z - -@x l.25539 - pTeX -if enctex_enabled_p then - begin wterm(encTeX_banner); wterm_ln(', reencoding enabled.'); - if translate_filename then begin - wterm_ln(' (\xordcode, \xchrcode, \xprncode overridden by TCX)'); - end; - end; -@y -@z - -@x [51.1337] l.25563 - pTeX: - font_check:=xmalloc_array(four_quarters, font_max); -@y - font_dir:=xmalloc_array(eight_bits, font_max); - font_num_ext:=xmalloc_array(integer, font_max); - font_check:=xmalloc_array(four_quarters, font_max); -@z - -@x [51.1337] l.25577 - pTeX: - char_base:=xmalloc_array(integer, font_max); -@y - ctype_base:=xmalloc_array(integer, font_max); - char_base:=xmalloc_array(integer, font_max); -@z - -@x [51.1337] l.25587 - pTeX: - font_ptr:=null_font; fmem_ptr:=7; -@y - font_ptr:=null_font; fmem_ptr:=7; - font_dir[null_font]:=dir_default; - font_num_ext[null_font]:=0; -@z - -@x [51.1337] l.25594 - pTeX: - char_base[null_font]:=0; width_base[null_font]:=0; -@y - ctype_base[null_font]:=0; char_base[null_font]:=0; width_base[null_font]:=0; -@z - -@x l.25747 - pTeX -@d write_stream(#) == type(#+1) {stream number (0 to 17)} -@d mubyte_zero == 64 -@d write_mubyte(#) == subtype(#+1) {mubyte value + |mubyte_zero|} -@y -@d write_stream(#) == info(#+1) {stream number (0 to 17)} -@z - -@x l.25849 - pTeX - else if (cur_val>15) and (cur_val <> 18) then cur_val:=16; - end; -write_stream(tail):=cur_val; -if mubyte_out + mubyte_zero < 0 then write_mubyte(tail) := 0 -else if mubyte_out + mubyte_zero >= 2*mubyte_zero then - write_mubyte(tail) := 2*mubyte_zero - 1 - else write_mubyte(tail) := mubyte_out + mubyte_zero; -@y - else if (cur_val>15) and (cur_val <> 18) then cur_val:=16; - end; -write_stream(tail):=cur_val; -@z - -@x l.25881 - pTeX -begin new_whatsit(special_node,write_node_size); -if spec_out + mubyte_zero < 0 then write_stream(tail) := 0 -else if spec_out + mubyte_zero >= 2*mubyte_zero then - write_stream(tail) := 2*mubyte_zero - 1 - else write_stream(tail) := spec_out + mubyte_zero; -if mubyte_out + mubyte_zero < 0 then write_mubyte(tail) := 0 -else if mubyte_out + mubyte_zero >= 2*mubyte_zero then - write_mubyte(tail) := 2*mubyte_zero - 1 - else write_mubyte(tail) := mubyte_out + mubyte_zero; -if (spec_out = 2) or (spec_out = 3) then - if (mubyte_out > 2) or (mubyte_out = -1) or (mubyte_out = -2) then - write_noexpanding := true; -p:=scan_toks(false,true); write_tokens(tail):=def_ref; -write_noexpanding := false; -@y -begin new_whatsit(special_node,write_node_size); write_stream(tail):=null; -p:=scan_toks(false,true); write_tokens(tail):=def_ref; -@z - -@x l.25909 - pTeX -if (s = "write") and (write_mubyte (p) <> mubyte_zero) then -begin - print_char ("<"); print_int (write_mubyte(p)-mubyte_zero); print_char (">"); -end; -@y -@z - -@x l.25925 - pTeX -if write_stream(p) <> mubyte_zero then -begin - print_char ("<"); print_int (write_stream(p)-mubyte_zero); - if (write_stream(p)-mubyte_zero = 2) or - (write_stream(p)-mubyte_zero = 3) then - begin - print_char (":"); print_int (write_mubyte(p)-mubyte_zero); - end; - print_char (">"); -end; -@y -@z - -@x l.26009 - pTeX -spec_sout := spec_out; spec_out := write_stream(p) - mubyte_zero; -mubyte_sout := mubyte_out; mubyte_out := write_mubyte(p) - mubyte_zero; -active_noconvert := true; -mubyte_slog := mubyte_log; -mubyte_log := 0; -if (mubyte_out > 0) or (mubyte_out = -1) then mubyte_log := 1; -if (spec_out = 2) or (spec_out = 3) then -begin - if (mubyte_out > 0) or (mubyte_out = -1) then - begin - special_printing := true; mubyte_log := 1; - end; - if mubyte_out > 1 then cs_converting := true; -end; -@y -@z - -@x l.26031 - pTeX -if (spec_out = 1) or (spec_out = 3) then - for k:=str_start[str_ptr] to pool_ptr-1 do - str_pool[k] := si(xchr[so(str_pool[k])]); -for k:=str_start[str_ptr] to pool_ptr-1 do dvi_out(so(str_pool[k])); -spec_out := spec_sout; mubyte_out := mubyte_sout; mubyte_log := mubyte_slog; -special_printing := false; cs_converting := false; -active_noconvert := false; -@y - for k:=str_start[str_ptr] to pool_ptr-1 do dvi_out(so(str_pool[k])); -@z - -@x l.26062 - pTeX -begin -mubyte_sout := mubyte_out; mubyte_out := write_mubyte(p) - mubyte_zero; -if (mubyte_out > 2) or (mubyte_out = -1) or (mubyte_out = -2) then - write_noexpanding := true; -@<Expand macros in the token list -@y -begin @<Expand macros in the token list -@z - -@x l.26077 - pTeX -active_noconvert := true; -if mubyte_out > 1 then cs_converting := true; -mubyte_slog := mubyte_log; -if (mubyte_out > 0) or (mubyte_out = -1) then mubyte_log := 1 -else mubyte_log := 0; -token_show(def_ref); print_ln; -cs_converting := false; write_noexpanding := false; -active_noconvert := false; -mubyte_out := mubyte_sout; mubyte_log := mubyte_slog; -@y - token_show(def_ref); print_ln; -@z - -@x [53.1376] l.26309 - pTeX: -@<Glob...@> = -@!debug_format_file: boolean; -@y -@<Glob...@> = -@!debug_format_file: boolean; - -@ @<Set init...@>= -@!debug debug_format_file:=true; @+gubed; -@z - -@x l.26685 - pTeX -@* \[54/enc\TeX] System-dependent changes for enc\TeX. - -@d encTeX_banner == ' encTeX v. Jun. 2004' - -@ The boolean variable |enctex_p| is set by web2c according to the given -command line option (or an entry in the configuration file) before any -\TeX{} function is called. - -@<Global...@> = -@!enctex_p: boolean; - - -@ The boolean variable |enctex_enabled_p| is used to enable enc\TeX's -primitives. It is initialised to |false|. When loading a \.{FMT} it -is set to the value of the boolean |enctex_p| saved in the \.{FMT} file. -Additionally it is set to the value of |enctex_p| in Ini\TeX. - -@<Glob...@>= -@!enctex_enabled_p:boolean; {enable encTeX} - - -@ @<Set init...@>= -enctex_enabled_p:=false; - - -@ Auxiliary functions/procedures for enc\TeX{} (by Petr Olsak) follow. -These functions implement the \.{\\mubyte} code to convert -the multibytes in |buffer| to one byte or to one control -sequence. These functions manipulate a mubyte tree: each node of -this tree is token list with n+1 tokens (first token consist the byte -from the byte sequence itself and the other tokens point to the -branches). If you travel from root of the tree to a leaf then you -find exactly one byte sequence which we have to convert to one byte or -control sequence. There are two variants of the leaf: the ``definitive -end'' or the ``middle leaf'' if a longer byte sequence exists and the mubyte -tree continues under this leaf. First variant is implemented as one -memory word where the link part includes the token to -which we have to convert and type part includes the number 60 (normal -conversion) or 1..52 (insert the control sequence). -The second variant of ``middle leaf'' is implemented as two memory words: -first one has a type advanced by 64 and link points to the second -word where info part includes the token to which we have to convert -and link points to the next token list with the branches of -the subtree. - -The inverse: one byte to multi byte (for log printing and \.{\\write} -printing) is implemented via a pool. Each multibyte sequence is stored -in a pool as a string and |mubyte_write|[{\it printed char\/}] points -to this string. - -@d new_mubyte_node == - link (p) := get_avail; p := link (p); info (p) := get_avail; p := info (p) -@d subinfo (#) == subtype (#) - -@<Basic printing...@>= -{ read |buffer|[|i|] and convert multibyte. |i| should have been - of type 0..|buf_size|, but web2c doesn't like that construct in - argument lists. } -function read_buffer(var i:integer):ASCII_code; -var p: pointer; - last_found: integer; - last_type: integer; -begin - mubyte_skip := 0; mubyte_token := 0; - read_buffer := buffer[i]; - if mubyte_in = 0 then - begin - if mubyte_keep > 0 then mubyte_keep := 0; - return ; - end; - last_found := -2; - if (i = start) and (not mubyte_start) then - begin - mubyte_keep := 0; - if (end_line_char >= 0) and (end_line_char < 256) then - if mubyte_read [end_line_char] <> null then - begin - mubyte_start := true; mubyte_skip := -1; - p := mubyte_read [end_line_char]; - goto continue; - end; - end; -restart: - mubyte_start := false; - if (mubyte_read [buffer[i]] = null) or (mubyte_keep > 0) then - begin - if mubyte_keep > 0 then decr (mubyte_keep); - return ; - end; - p := mubyte_read [buffer[i]]; -continue: - if type (p) >= 64 then - begin - last_type := type (p) - 64; - p := link (p); - mubyte_token := info (p); last_found := mubyte_skip; - end else if type (p) > 0 then - begin - last_type := type (p); - mubyte_token := link (p); - goto found; - end; - incr (mubyte_skip); - if i + mubyte_skip > limit then - begin - mubyte_skip := 0; - if mubyte_start then goto restart; - return; - end; - repeat - p := link (p); - if subinfo (info(p)) = buffer [i+mubyte_skip] then - begin - p := info (p); goto continue; - end; - until link (p) = null; - mubyte_skip := 0; - if mubyte_start then goto restart; - if last_found = -2 then return; { no found } - mubyte_skip := last_found; -found: - if mubyte_token < 256 then { multibyte to one byte } - begin - read_buffer := mubyte_token; mubyte_token := 0; - i := i + mubyte_skip; - if mubyte_start and (i >= start) then mubyte_start := false; - return; - end else begin { multibyte to control sequence } - read_buffer := 0; - if last_type = 60 then { normal conversion } - i := i + mubyte_skip - else begin { insert control sequence } - decr (i); mubyte_keep := last_type; - if i < start then mubyte_start := true; - if last_type = 52 then mubyte_keep := 10000; - if last_type = 51 then mubyte_keep := mubyte_skip + 1; - mubyte_skip := -1; - end; - if mubyte_start and (i >= start) then mubyte_start := false; - return; - end; -exit: end; - -@ @<Declare additional routines for enc\TeX@>= -procedure mubyte_update; { saves new string to mubyte tree } -var j: pool_pointer; - p: pointer; - q: pointer; - in_mutree: integer; -begin - j := str_start [str_ptr]; - if mubyte_read [so(str_pool[j])] = null then - begin - in_mutree := 0; - p := get_avail; - mubyte_read [so(str_pool[j])] := p; - subinfo (p) := so(str_pool[j]); type (p) := 0; - end else begin - in_mutree := 1; - p := mubyte_read [so(str_pool[j])]; - end; - incr (j); - while j < pool_ptr do - begin - if in_mutree = 0 then - begin - new_mubyte_node; subinfo (p) := so(str_pool[j]); type (p) := 0; - end else { |in_mutree| = 1 } - if (type (p) > 0) and (type (p) < 64) then - begin - type (p) := type (p) + 64; - q := link (p); link (p) := get_avail; p := link (p); - info (p) := q; - new_mubyte_node; subinfo (p) := so(str_pool[j]); type (p) := 0; - in_mutree := 0; - end else begin - if type (p) >= 64 then p := link (p); - repeat - p := link (p); - if subinfo (info(p)) = so(str_pool[j]) then - begin - p := info (p); - goto continue; - end; - until link (p) = null; - new_mubyte_node; subinfo (p) := so(str_pool[j]); type (p) := 0; - in_mutree := 0; - end; -continue: - incr (j); - end; - if in_mutree = 1 then - begin - if type (p) = 0 then - begin - type (p) := mubyte_prefix + 64; - q := link (p); link (p) := get_avail; p := link (p); - link (p) := q; info (p) := mubyte_stoken; - return; - end; - if type (p) >= 64 then - begin - type (p) := mubyte_prefix + 64; - p := link (p); info (p) := mubyte_stoken; - return; - end; - end; - type (p) := mubyte_prefix; - link (p) := mubyte_stoken; -exit: end; -@# -procedure dispose_munode (p: pointer); { frees a mu subtree recursivelly } -var q: pointer; -begin - if (type (p) > 0) and (type (p) < 64) then free_avail (p) - else begin - if type (p) >= 64 then - begin - q := link (p); free_avail (p); p := q; - end; - q := link (p); free_avail (p); p := q; - while p <> null do - begin - dispose_munode (info (p)); - q := link (p); - free_avail (p); - p := q; - end; - end; -end; -@# -procedure dispose_mutableout (cs: pointer); { frees record from out table } -var p, q, r: pointer; -begin - p := mubyte_cswrite [cs mod 128]; - r := null; - while p <> null do - if info (p) = cs then - begin - if r <> null then link (r) := link (link (p)) - else mubyte_cswrite[cs mod 128] := link (link (p)); - q := link (link(p)); - free_avail (link(p)); free_avail (p); - p := q; - end else begin - r := link (p); p := link (r); - end; -end; - -@ The |print_buffer| procedure prints one character from |buffer|[|i|]. -It also increases |i| to the next character in the buffer. - -@<Basic printing...@>= -{ print one char from |buffer|[|i|]. |i| should have been of type - 0..|buf_size|, but web2c doesn't like that construct in argument lists. } -procedure print_buffer(var i:integer); -var c: ASCII_code; -begin - if mubyte_in = 0 then print (buffer[i]) { normal TeX } - else if mubyte_log > 0 then print_char (buffer[i]) - else begin - c := read_buffer (i); - if mubyte_token > 0 then print_cs (mubyte_token-cs_token_flag) - else print (c); - end; - incr (i); -end; - -@ Additional material to dump for enc\TeX. This includes whether -enc\TeX is enabled, and if it is we also have to dump the \.{\\mubyte} -arrays. - -@<Dump enc\TeX-specific data@>= -dump_int(@"45435458); {enc\TeX's magic constant: "ECTX"} -if not enctex_p then dump_int(0) -else begin - dump_int(1); - dump_things(mubyte_read[0], 256); - dump_things(mubyte_write[0], 256); - dump_things(mubyte_cswrite[0], 128); -end; - -@ Undumping the additional material we dumped for enc\TeX. This includes -conditionally undumping the \.{\\mubyte} arrays. - -@<Undump enc\TeX-specific data@>= -undump_int(x); {check magic constant of enc\TeX} -if x<>@"45435458 then goto bad_fmt; -undump_int(x); {undump |enctex_p| flag into |enctex_enabled_p|} -if x=0 then enctex_enabled_p:=false -else if x<>1 then goto bad_fmt -else begin - enctex_enabled_p:=true; - undump_things(mubyte_read[0], 256); - undump_things(mubyte_write[0], 256); - undump_things(mubyte_cswrite[0], 128); -end; - -@y -@z - -@x l.26984 - pTeX -@* \[54] System-dependent changes. -@y -@* \[55/p\TeX] System-dependent changes for p\TeX. -This section described extended variables, procesures, functions and so on -for pTeX. - -@<Declare procedures that scan font-related stuff@>= -function get_jfm_pos(@!kcode:KANJI_code;@!f:internal_font_number):eight_bits; -var @!jc:KANJI_code; {temporary register for KANJI} -@!sp,@!mp,@!ep:pointer; -begin@/ -if (proc_kanji_code=sjis_enc) then jc:=SJIStoJIS(kcode) -else jc:=EUCtoJIS(kcode); -sp:=1; { start position } -ep:=font_num_ext[f]-1; { end position } -if (kchar_code(f)(sp)<=jc)and(jc<=kchar_code(f)(ep)) then - begin while (sp <= ep) do - begin mp:=sp+((ep-sp) div 2); - if jc<kchar_code(f)(mp) then ep:=mp-1 - else if jc>kchar_code(f)(mp) then sp:=mp+1 - else - begin get_jfm_pos:=kchar_type(f)(mp); return; - end; - end; - end; -get_jfm_pos:=kchar_type(f)(0); -end; - -@ Following codes are used to calcutation a KANJI width and height. - -@<Local variables for dimension calculations@>= -@!t: eight_bits; - -@ @<The KANJI width for |cur_jfont|@>= -if direction=dir_tate then - v:=char_width(cur_tfont)(orig_char_info(cur_tfont)(qi(0))) -else - v:=char_width(cur_jfont)(orig_char_info(cur_jfont)(qi(0))) - -@ @<The KANJI height for |cur_jfont|@>= -if direction=dir_tate then begin - t:=height_depth(orig_char_info(cur_tfont)(qi(0))); - v:=char_height(cur_tfont)(t)+char_depth(cur_tfont)(t); -end else begin - t:=height_depth(orig_char_info(cur_jfont)(qi(0))); - v:=char_height(cur_jfont)(t)+char_depth(cur_jfont)(t); -end - -@ set a kansuji character. - -@ @<Put each...@>= -primitive("kansujichar",set_kansuji_char,0); -@!@:kansujichar_}{\.{\\kansujichar} primitive@> - -@ @<Cases of |print_cmd_chr|...@>= -set_kansuji_char: print_esc("kansujichar"); - -@ @<Assignments@>= -set_kansuji_char: -begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int; -if not check_kanji(cur_val) then - begin print_err("Invalid KANSUJI char ("); - print_hex(cur_val); print_char(")"); -@.Invalid KANSUJI char@> - help1("I'm skip this control sequences.");@/ - error; return; - end -else if (n<0)or(n>9) then - begin print_err("Invalid KANSUJI number ("); print_int(n); print_char(")"); -@.Invalid KANSUJI number@> - help1("I'm skip this control sequences.");@/ - error; return; - end -else - begin - if (proc_kanji_code=sjis_enc) then - define(kansuji_base+n,n,tokanji(SJIStoJIS(cur_val))) - else if (proc_kanji_code=euc_enc) then - define(kansuji_base+n,n,tokanji(EUCtoJIS(cur_val))) - else if (proc_kanji_code=jis_enc) then - define(kansuji_base+n,n,tokanji(cur_val)); - end; -end; - -@ |print_kansuji| procedure converts a number to KANJI number. - -@ @<Declare procedures needed in |scan_something|@>= -procedure print_kansuji(@!n:integer); -var @!k:0..23; {index to current digit; we assume that $|n|<10^{23}$} -@!cx: KANJI_code; {temporary register for KANJI} -begin k:=0; - if n<0 then return; {nonpositive input produces no output} - repeat dig[k]:=n mod 10; n:=n div 10; incr(k); - until n=0; - begin while k>0 do - begin decr(k); - cx:=kansuji_char(dig[k]); - if (proc_kanji_code=sjis_enc) then cx:=JIStoSJIS(cx) - else if (proc_kanji_code=euc_enc) then cx:=JIStoEUC(cx); - print_kanji(cx); - end; - end; -end; - -@ pTeX inserts a glue specified by \.{\\kanjiskip} between 2byte-characters, -automatically, if \.{\\autospacing}. This glue is suppressed by -\.{\\noautospacing}. -\.{\\xkanjiskip}, \.{\\noautoxspacing}, \.{\\autoxspacing}, \.{\\xspcode} is -used to control between 2byte and 1byte characters. - -@d reset_auto_spacing_code=0 -@d set_auto_spacing_code=1 -@d reset_auto_xspacing_code=2 -@d set_auto_xspacing_code=3 - -@<Put each...@>= -primitive("autospacing",set_auto_spacing,set_auto_spacing_code); -@!@:auto_spacing_}{\.{\\autospacing} primitive@> -primitive("noautospacing",set_auto_spacing,reset_auto_spacing_code); -@!@:no_auto_spacing_}{\.{\\noautospacing} primitive@> -primitive("autoxspacing",set_auto_spacing,set_auto_xspacing_code); -@!@:auto_xspacing_}{\.{\\autoxspacing} primitive@> -primitive("noautoxspacing",set_auto_spacing,reset_auto_xspacing_code); -@!@:no_auto_xspacing_}{\.{\\noautoxspacing} primitive@> - -@ @<Cases of |print_cmd_chr|...@>= -set_auto_spacing:begin - if (chr_code mod 2)=0 then print_esc("noauto") else print_esc("auto"); - if chr_code<2 then print("spacing") else print("xspacing"); -end; - -@ @<Assignments@>= -set_auto_spacing:begin - if cur_chr<2 then p:=auto_spacing_code - else begin p:=auto_xspacing_code; cur_chr:=(cur_chr mod 2); end; - define(p,data,cur_chr); -end; - -@ Following codes are used in section 49. - -@<Show the current japanese processing mode@>= -begin print_nl("> "); -if auto_spacing>0 then print("auto spacing mode; ") - else print("no auto spacing mode; "); -print_nl("> "); -if auto_xspacing>0 then print("auto xspacing mode") - else print("no auto xspacing mode"); -goto common_ending; -end - -@ The \.{\\inhibitglue} primitive control to insert a glue specified -JFM (Japanese Font Metic) file. The \.{\\inhibitxspcode} is used to control -inserting a space between 2byte-char and 1byte-char. - -@d inhibit_both=0 {disable to insert space before 2byte-char and after it} -@d inhibit_previous=1 {disable to insert space before 2byte-char} -@d inhibit_after=2 {disable to insert space after 2byte-char} -@d no_entry=1000 -@d new_pos=0 -@d cur_pos=1 - -@<Global...@>= - inhibit_glue_flag:boolean; - -@ @<Set init...@>= - inhibit_glue_flag:=false; - -@ @<Cases of |main_control| that don't...@>= - any_mode(inhibit_glue): inhibit_glue_flag:=true; - -@ @<Put each...@>= -primitive("inhibitglue",inhibit_glue,0); -@!@:inhibit_glue_}{\.{\\inhibitglue} primitive@> -primitive("inhibitxspcode",assign_inhibit_xsp_code,inhibit_xsp_code_base); -@!@:inhibit_xsp_code_}{\.{\\inhibitxspcode} primitive@> - -@ @<Cases of |print_cmd_chr|...@>= -inhibit_glue: print_esc("inhibitglue"); -assign_inhibit_xsp_code: print_esc("inhibitxspcode"); - -@ @<Declare procedures needed in |scan_something|@>= -function get_inhibit_pos(c:KANJI_code; n:small_number):pointer; -label done, done1; -var p,s:pointer; -begin s:=calc_pos(c); p:=s; -if n=new_pos then - begin repeat - if (inhibit_xsp_code(p)=0)or(inhibit_xsp_code(p)=c) then goto done; - incr(p); if p>255 then p:=0; - until s=p; p:=no_entry; - end -else - begin repeat - if inhibit_xsp_code(p)=0 then goto done1; - if inhibit_xsp_code(p)=c then goto done; - incr(p); if p>255 then p:=0; - until s=p; -done1: p:=no_entry; - end; -done: get_inhibit_pos:=p; -end; - -@ @<Assignments@>= -assign_inhibit_xsp_code: -begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int; -if check_kanji(n) then - begin j:=get_inhibit_pos(tokanji(n),new_pos); - if j=no_entry then - begin print_err("Inhibit table is full!!"); - help1("I'm skip this control sequences.");@/ - error; return; - end; - define(inhibit_xsp_code_base+j,cur_val,n); - end -else - begin print_err("Invalid KANJI code ("); print_hex(n); print_char(")"); -@.Invalid KANJI code@> - help1("I'm skip this control sequences.");@/ - error; return; - end; -end; - -@ @<Fetch inhibit type from some table@>= -begin scan_int; q:=get_inhibit_pos(tokanji(cur_val),cur_pos); -cur_val_level:=int_val; cur_val:=3; -if q<>no_entry then cur_val:=inhibit_xsp_type(q); -end - -@ The \.{\\prebreakpenalty} is used to specified amount of penalties inserted -before the 2byte-char which is first argument of this primitive. -The \.{\\postbreakpenalty} is inserted after the 2byte-char. - -@d pre_break_penalty_code=1 -@d post_break_penalty_code=2 - -@<Put each...@>= -primitive("prebreakpenalty",assign_kinsoku,pre_break_penalty_code); -@!@:pre_break_penalty_}{\.{\\prebreakpenalty} primitive@> -primitive("postbreakpenalty",assign_kinsoku,post_break_penalty_code); -@!@:post_break_penalty_}{\.{\\postbreakpenalty} primitive@> - -@ @<Cases of |print_cmd_chr|...@>= -assign_kinsoku: case chr_code of - pre_break_penalty_code: print_esc("prebreakpenalty"); - post_break_penalty_code: print_esc("postbreakpenalty"); - endcases; - -@ @<Declare procedures needed in |scan_something|@>= -function get_kinsoku_pos(c:KANJI_code; n:small_number):pointer; -label done, done1; -var p,s:pointer; -begin s:=calc_pos(c); p:=s; -@!debug -print_ln; print("c:="); print_int(c); print(", p:="); print_int(s); -if p+kinsoku_base<0 then - begin print("p is negative value"); print_ln; - end; -gubed -if n=new_pos then - begin repeat - if (kinsoku_type(p)=0)or(kinsoku_code(p)=c) then goto done; - incr(p); if p>255 then p:=0; - until s=p; - p:=no_entry; - end -else - begin repeat - if kinsoku_type(p)=0 then goto done1; - if kinsoku_code(p)=c then goto done; - incr(p); if p>255 then p:=0; - until s=p; -done1: p:=no_entry; - end; -done: get_kinsoku_pos:=p; -end; - -@ @<Assignments@>= -assign_kinsoku: -begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int; -if check_kanji(n) then - begin j:=get_kinsoku_pos(tokanji(n),new_pos); - if j=no_entry then - begin print_err("KINSOKU table is full!!"); - help1("I'm skip this control sequences.");@/ - error; return; - end; - if (p=pre_break_penalty_code)or(p=post_break_penalty_code) then - begin define(kinsoku_base+j,p,tokanji(n)); - word_define(kinsoku_penalty_base+j,cur_val); - end - else confusion("kinsoku"); -@:this can't happen kinsoku}{\quad kinsoku@> - end -else - begin print_err("Invalid KANJI code for "); - if (p=pre_break_penalty_code) then print("pre") - else if (p=post_break_penalty_code) then print("post") - else print_char("?"); - print("breakpenalty ("); print_hex(n); print_char(")"); -@.Invalid KANJI code@> - help1("I'm skip this control sequences.");@/ - error; return; - end; -end; - -@ @<Fetch breaking penalty from some table@>= -begin scan_int; q:=get_kinsoku_pos(tokanji(cur_val),cur_pos); -cur_val_level:=int_val; cur_val:=0; -if (q<>no_entry)and(m=kinsoku_type(q)) then - scanned_result(kinsoku_penalty(q))(int_val); -end - -@ Following codes are used in |main_control|. - -@<Insert kinsoku penalty@>= -begin kp:=get_kinsoku_pos(cx,cur_pos); -if (kp<>no_entry) then - begin if (kinsoku_type(kp)=pre_break_penalty_code) then - begin if (not is_char_node(cur_q))and(type(cur_q)=penalty_node) then - penalty(cur_q):=penalty(cur_q)+kinsoku_penalty(kp) - else - begin main_p:=link(cur_q); link(cur_q):=new_penalty(kinsoku_penalty(kp)); - subtype(link(cur_q)):=kinsoku_pena; link(link(cur_q)):=main_p; - end; - end - else if (kinsoku_type(kp)=post_break_penalty_code) then - begin tail_append(new_penalty(kinsoku_penalty(kp))); - subtype(tail):=kinsoku_pena; - end; - end; -end; - -@ @<Insert |pre_break_penalty| of |cur_chr|@>= -begin kp:=get_kinsoku_pos(cur_chr,cur_pos); -if (kp<>no_entry) then - begin if (kinsoku_type(kp)=pre_break_penalty_code) then - if (not is_char_node(tail))and(type(tail)=penalty_node) then - penalty(tail):=penalty(tail)+kinsoku_penalty(kp) - else - begin tail_append(new_penalty(kinsoku_penalty(kp))); - subtype(tail):=kinsoku_pena; - end; - end; -end; - -@ @<Insert |post_break_penalty|@>= -begin kp:=get_kinsoku_pos(cx,cur_pos); -if (kp<>no_entry) then - begin if (kinsoku_type(kp)=post_break_penalty_code) then - begin tail_append(new_penalty(kinsoku_penalty(kp))); - subtype(tail):=kinsoku_pena; - end; - end; -end; - -@ This is a part of section 32. - -The procedure |synch_dir| is used in |hlist_out| and |vlist_out|. - -@d dvi_yoko=0 -@d dvi_tate=1 -@d dvi_dtou=3 - -@<Glob...@>= -@!dvi_dir:integer; {a \.{DVI} reader program thinks we direct to} -@!cur_dir:integer; {\TeX\ thinks we direct to} -@!page_dir:eight_bits; - -@ @<Set init...@>= -page_dir:=dir_yoko; - -@ @<Declare procedures needed in |hlist_out|, |vlist_out|@>= -procedure synch_dir; -var tmp:scaled; {temporary resister} -begin - case cur_dir of - dir_yoko: - if dvi_dir<>cur_dir then begin - synch_h; synch_v; dvi_out(dirchg); dvi_out(dvi_yoko); - dir_used:=true; - case dvi_dir of - dir_tate: begin tmp:=cur_h; cur_h:=-cur_v; cur_v:=tmp end; - dir_dtou: begin tmp:=cur_h; cur_h:=cur_v; cur_v:=-tmp end; - endcases; - dvi_h:=cur_h; dvi_v:=cur_v; dvi_dir:=cur_dir; - end; - dir_tate: - if dvi_dir<>cur_dir then begin - synch_h; synch_v; dvi_out(dirchg); dvi_out(dvi_tate); - dir_used:=true; - case dvi_dir of - dir_yoko: begin tmp:=cur_h; cur_h:=cur_v; cur_v:=-tmp end; - dir_dtou: begin cur_v:=-cur_v; cur_h:=-cur_h; end; - endcases; - dvi_h:=cur_h; dvi_v:=cur_v; dvi_dir:=cur_dir; - end; - dir_dtou: - if dvi_dir<>cur_dir then begin - synch_h; synch_v; dvi_out(dirchg); dvi_out(dvi_dtou); - dir_used:=true; - case dvi_dir of - dir_yoko: begin tmp:=cur_h; cur_h:=-cur_v; cur_v:=tmp end; - dir_tate: begin cur_v:=-cur_v; cur_h:=-cur_h; end; - endcases; - dvi_h:=cur_h; dvi_v:=cur_v; dvi_dir:=cur_dir; - end; - othercases - confusion("synch_dir"); - endcases -end; - -@ This function is called from |adjust_hlist| to used to check, whether -a list which pointed |box_p| contain a printing character. -If the list contain such a character, then return `true', otherwise `false'. -If the first matter is a character, |first_char| is stored it. -|last_char| is stored a last character. If no printing characters exist -in the list, |first_char| and |last_char| is null. -@^recursion@> - -@<Glob...@>= -@!first_char:pointer; {first printable character} -@!last_char:pointer; {last printable character} -@!find_first_char:boolean; {find for a first printable character?} - -@ @<Declare procedures needed in |hlist_out|, |vlist_out|@>= -function check_box(box_p:pointer):boolean; -label done; -var @!p:pointer; {run through the current box} -@!flag:boolean; {found any printable character?} -begin flag:=false; p:=box_p; -while p<>null do - begin if is_char_node(p) then - repeat - if find_first_char then - begin first_char:=p; find_first_char:=false - end; - last_char:=p; flag:=true; - if font_dir[font(p)]<>dir_default then p:=link(p); - p:=link(p); - if p=null then goto done; - until not is_char_node(p); - case type(p) of - hlist_node: - begin flag:=true; - if shift_amount(p)=0 then - begin if check_box(list_ptr(p)) then flag:=true; - end - else if find_first_char then find_first_char:=false - else last_char:=null; - end; - ligature_node: if check_box(lig_ptr(p)) then flag:=true; - ins_node,disp_node,mark_node,adjust_node,whatsit_node,penalty_node: - do_nothing; - othercases begin flag:=true; - if find_first_char then find_first_char:=false - else last_char:=null; - end; - endcases; - p:=link(p); - end; -done: check_box:=flag; -end; - -@ Following procedure |adjust_hlist| inserts \.{\\xkanjiskip} between -2byte-char and 1byte-char in hlist which pointed |p|. -Note that the skip is inserted into a place where too difficult to decide -whether inserting or not (i.e, before penalty, after penalty). - -If |pf| is true then insert |jchr_widow_penalty| that is penalty for -creating a widow KANJI character line. - -@d no_skip=0 -@d after_schar=1 {denote after single byte character} -@d after_wchar=2 {denote after double bytes character} - -@<Declare procedures needed in |hlist_out|, |vlist_out|@>= -procedure adjust_hlist(p:pointer;pf:boolean); -label exit; -var q,s,t,u,v,x,z:pointer; - i,k:halfword; - insert_skip:no_skip..after_wchar; - cx:KANJI_code; {temporaly register for KANJI character} - ax:ASCII_code; {temporaly register for ASCII character} - do_ins:boolean; {for inserting |xkanji_skip| into prevous (or after) KANJI} -begin if link(p)=null then goto exit; -if auto_spacing>0 then - begin delete_glue_ref(space_ptr(p)); space_ptr(p):=kanji_skip; - add_glue_ref(kanji_skip); - end; -if auto_xspacing>0 then - begin delete_glue_ref(xspace_ptr(p)); xspace_ptr(p):=xkanji_skip; - add_glue_ref(xkanji_skip); - end; -u:=space_ptr(p); add_glue_ref(u); -s:=xspace_ptr(p); add_glue_ref(s); -if (not is_char_node(link(p))) {p1.0.9d} - and(type(link(p))=glue_node)and(subtype(link(p))=jfm_skip+1) then - begin v:=link(p); link(p):=link(v); - fast_delete_glue_ref(glue_ptr(v)); free_node(v,small_node_size); - end; -i:=0; insert_skip:=no_skip; p:=link(p); v:=p; q:=p; -while p<>null do - begin if is_char_node(p) then - begin repeat @<Insert a space around the character |p|@>; - q:=p; p:=link(p); incr(i); - if (i>5)and(pf) then - begin if is_char_node(v) then - if font_dir[font(v)]<>dir_default then v:=link(v); - v:=link(v); - end; - until not is_char_node(p); - end - else - begin case type(p) of - hlist_node: @<Insert hbox surround spacing@>; - ligature_node: @<Insert ligature surround spacing@>; - penalty_node,disp_node: @<Insert penalty or displace surround spacing@>; - kern_node: if (insert_skip=after_schar)and(subtype(p)<>explicit) then - do_nothing else insert_skip:=no_skip; - math_node: @<Insert math surround spacing@>; - mark_node,adjust_node,ins_node,whatsit_node: - {These nodes are vanished when typeset is done} - do_nothing; - othercases insert_skip:=no_skip; - endcases; - q:=p; p:=link(p); - end; - end; -if (not is_char_node(q))and(type(q)=glue_node)and(subtype(q)=jfm_skip+1) then - begin fast_delete_glue_ref(glue_ptr(q)); - glue_ptr(q):=zero_glue; add_glue_ref(zero_glue); - end; -delete_glue_ref(u); delete_glue_ref(s); -if (v<>null)and(pf)and(i>5) then @<Make |jchr_widow_penalty| node@>; -exit: -end; - -@ @<Insert a space around the character |p|@>= -if font_dir[font(p)]<>dir_default then - begin KANJI(cx):=info(link(p)); - if insert_skip=after_schar then @<Insert ASCII-KANJI spacing@>; - p:=link(p); insert_skip:=after_wchar; - end -else - begin ax:=qo(character(p)); - if insert_skip=after_wchar then @<Insert KANJI-ASCII spacing@>; - if auto_xsp_code(ax)>=2 then - insert_skip:=after_schar else insert_skip:=no_skip; - end - -@ @<Insert hbox surround spacing@>= -begin find_first_char:=true; first_char:=null; last_char:=null; -if (shift_amount(p)=0) then - begin if check_box(list_ptr(p)) then - begin if first_char<>null then @<Insert a space before the |first_char|@>; - if last_char<>null then - begin @<Insert a space after the |last_char|@>; - end else insert_skip:=no_skip; - end else insert_skip:=no_skip; - end else insert_skip:=no_skip; -end - -@ @<Insert a space before the |first_char|@>= -if font_dir[font(first_char)]<>dir_default then - begin KANJI(cx):=info(link(first_char)); - if insert_skip=after_schar then @<Insert ASCII-KANJI spacing@> - else if insert_skip=after_wchar then @<Insert KANJI-KANJI spacing@>; - insert_skip:=after_wchar; - end -else - begin ax:=qo(character(first_char)); - if insert_skip=after_wchar then @<Insert KANJI-ASCII spacing@>; - if auto_xsp_code(ax)>=2 then - insert_skip:=after_schar else insert_skip:=no_skip; - end; - -@ @<Insert a space after the |last_char|@>= -if font_dir[font(last_char)]<>dir_default then - begin insert_skip:=after_wchar; - if (is_char_node(link(p)))and(font_dir[font(link(p))]<>dir_default) then - begin @<Append KANJI-KANJI spacing@>; p:=link(p); - end; - end -else - begin ax:=qo(character(last_char)); - if auto_xsp_code(ax)>=2 then - insert_skip:=after_schar else insert_skip:=no_skip; - end; - -@ @<Insert math surround spacing@>= -begin if (subtype(p)=before)and(insert_skip=after_wchar) then - begin ax:=qo("0"); @<Insert KANJI-ASCII spacing@>; - insert_skip:=no_skip; - end -else if (subtype(p)=after) then - begin ax:=qo("0"); insert_skip:=after_schar; - end -else insert_skip:=no_skip; -end - -@ @<Insert ligature surround spacing@>= -begin t:=lig_ptr(p); -if is_char_node(t) then - begin ax:=qo(character(t)); - if insert_skip=after_wchar then @<Insert KANJI-ASCII spacing@>; - while link(t)<>null do t:=link(t); - if is_char_node(t) then - begin ax:=qo(character(t)); - if auto_xsp_code(ax)>=2 then - insert_skip:=after_schar else insert_skip:=no_skip; - end; - end; -end - -@ @<Insert penalty or displace surround spacing@>= -begin if is_char_node(link(p)) then - begin q:=p; p:=link(p); - if font_dir[font(p)]<>dir_default then - begin KANJI(cx):=info(link(p)); - if insert_skip=after_schar then @<Insert ASCII-KANJI spacing@> - else if insert_skip=after_wchar then @<Insert KANJI-KANJI spacing@>; - p:=link(p); insert_skip:=after_wchar; - end - else - begin ax:=qo(character(p)); - if insert_skip=after_wchar then @<Insert KANJI-ASCII spacing@>; - if auto_xsp_code(ax)>=2 then - insert_skip:=after_schar else insert_skip:=no_skip; - end; - end -end - -@ @<Insert ASCII-KANJI spacing@>= -begin - begin x:=get_inhibit_pos(cx,cur_pos); - if x<>no_entry then - if (inhibit_xsp_type(x)=inhibit_both)or - (inhibit_xsp_type(x)=inhibit_previous) then - do_ins:=false else do_ins:=true - else do_ins:=true; - end; -if do_ins then - begin z:=new_glue(s); subtype(z):=xkanji_skip_code+1; - link(z):=link(q); link(q):=z; q:=z; - end; -end - -@ @<Insert KANJI-ASCII spacing@>= -begin if (auto_xsp_code(ax) mod 2)=1 then - begin x:=get_inhibit_pos(cx,cur_pos); - if x<>no_entry then - if (inhibit_xsp_type(x)=inhibit_both)or - (inhibit_xsp_type(x)=inhibit_after) then - do_ins:=false else do_ins:=true - else do_ins:=true; - end -else do_ins:=false; -if do_ins then - begin z:=new_glue(s); subtype(z):=xkanji_skip_code+1; - link(z):=link(q); link(q):=z; q:=z; - end; -end - -@ @<Insert KANJI-KANJI spacing@>= -begin z:=new_glue(u); subtype(z):=kanji_skip_code+1; -link(z):=link(q); link(q):=z; q:=z; -end - -@ @<Append KANJI-KANJI spacing@>= -begin z:=new_glue(u); subtype(z):=kanji_skip_code+1; -link(z):=link(p); link(p):=z; p:=link(z); q:=z; -end - -@ @<Make |jchr_widow_penalty| node@>= -begin q:=v; p:=link(v); -if (is_char_node(v))and(font_dir[font(v)]<>dir_default) then - begin q:=p; p:=link(p); - end; -t:=q; s:=null; -@<Seek list and make |t| pointing widow penalty position@>; -if (s<>null) then - begin s:=link(t); - if (not is_char_node(s))and(type(s)=penalty_node) then - penalty(s):=penalty(s)+jchr_widow_penalty - else if (jchr_widow_penalty<>0) then - begin s:=new_penalty(jchr_widow_penalty); subtype(s):=widow_pena; - link(s):=link(t); link(t):=s; t:=link(s); - while(not is_char_node(t)) do - begin if (type(t)=glue_node)or(type(t)=kern_node) then goto exit; - t:=link(t); - end; - z:=new_glue(u); subtype(z):=kanji_skip_code+1; - link(z):=link(s); link(s):=z; - end; - end; -end; - -@ @<Seek list and make |t| pointing widow penalty position@>= -while(p<>null) do -begin if is_char_node(p) then - begin if font_dir[font(p)]<>dir_default then - begin KANJI(cx):=info(link(p)); i:=kcat_code(Hi(cx)); k:=0; - if (i=kanji)or(i=kana) then begin t:=q; s:=p; end; - p:=link(p); q:=p; - end - else begin k:=k+1; - if k>1 then begin q:=p; s:=null; end; - end; - end -else begin case type(p) of - penalty_node,mark_node,adjust_node,whatsit_node, - glue_node,kern_node,math_node,disp_node: - do_nothing; - othercases begin q:=p; s:=null; end; - endcases; - end; -p:=link(p); -end - -@ @<Declare procedures needed in |hlist_out|, |vlist_out|@>= -procedure dir_out; -var @!this_box: pointer; {pointer to containing box} -begin this_box:=temp_ptr; - temp_ptr:=list_ptr(this_box); - if (type(temp_ptr)<>hlist_node)and(type(temp_ptr)<>vlist_node) then - confusion("dir_out"); - case box_dir(this_box) of - dir_yoko: - case box_dir(temp_ptr) of - dir_tate: {Tate in Yoko} - begin cur_v:=cur_v-height(this_box); cur_h:=cur_h+depth(temp_ptr) end; - dir_dtou: {DtoU in Yoko} - begin cur_v:=cur_v+depth(this_box); cur_h:=cur_h+height(temp_ptr) end; - endcases; - dir_tate: - case box_dir(temp_ptr) of - dir_yoko: {Yoko in Tate} - begin cur_v:=cur_v+depth(this_box); cur_h:=cur_h+height(temp_ptr) end; - dir_dtou: {DtoU in Tate} - begin - cur_v:=cur_v+depth(this_box)-height(temp_ptr); - cur_h:=cur_h+width(temp_ptr) - end; - endcases; - dir_dtou: - case box_dir(temp_ptr) of - dir_yoko: {Yoko in DtoU} - begin cur_v:=cur_v-height(this_box); cur_h:=cur_h+depth(temp_ptr) end; - dir_tate: {Tate in DtoU} - begin - cur_v:=cur_v+depth(this_box)-height(temp_ptr); - cur_h:=cur_h+width(temp_ptr) - end; - endcases; - endcases; - cur_dir:=box_dir(temp_ptr); - if type(temp_ptr)=vlist_node then vlist_out@+else hlist_out; -end; - -@ These routines are used to output diagnostic which related direction. - -@ @<Basic printing procedures@>= -procedure print_dir(@!dir:eight_bits); {prints |dir| data} -begin if dir=dir_yoko then print_char("Y") -else if dir=dir_tate then print_char("T") -else if dir=dir_dtou then print_char("D") -end; -@# -procedure print_direction(@!d:integer); {print the direction represented by d} -begin case abs(d) of -dir_yoko: print("yoko"); -dir_tate: print("tate"); -dir_dtou: print("dtou"); -end; -if d<0 then print("(math)"); -print(" direction"); -end; - -@ The procedure |set_math_kchar| is same as |set_math_char| which -written in section 48. - -@<Declare act...@>= -procedure set_math_kchar(@!c:integer); -var p:pointer; {the new noad} -begin p:=new_noad; math_type(nucleus(p)):=math_jchar; -character(nucleus(p)):=qi(0); -math_kcode(p):=c; fam(nucleus(p)):=cur_jfam; -if font_dir[fam_fnt(fam(nucleus(p))+cur_size)]=dir_default then - begin print_err("Not two-byte family"); - help1("IGNORE.");@/ - error; - end; -type(p):=ord_noad; -link(tail):=p; tail:=p; -end; - -@ This section is a part of |main_control|. - -@<Append KANJI-character |cur_chr| ...@>= -if is_char_node(tail) then - begin cx:=qo(character(tail)); @<Insert |post_break_penalty|@>; - end -else if type(tail)=ligature_node then - begin cx:=qo(character(lig_char(tail))); @<Insert |post_break_penalty|@>; - end; -if direction=dir_tate then - begin if font_dir[main_f]=dir_tate then disp:=0 - else if font_dir[main_f]=dir_yoko then disp:=t_baseline_shift-y_baseline_shift - else disp:=t_baseline_shift; - main_f:=cur_tfont; - end -else - begin if font_dir[main_f]=dir_yoko then disp:=0 - else if font_dir[main_f]=dir_tate then disp:=y_baseline_shift-t_baseline_shift - else disp:=y_baseline_shift; - main_f:=cur_jfont; - end; -@<Append |disp_node| at end of displace area@>; -ins_kp:=false; ligature_present:=false; -cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); -main_i:=orig_char_info(main_f)(qi(0)); -goto main_loop_j+3; -@# -main_loop_j+1: space_factor:=1000; - fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l; - link(tail):=main_p; tail:=main_p; last_jchr:=tail; - fast_get_avail(main_p); info(main_p):=KANJI(cur_chr); - link(tail):=main_p; tail:=main_p; - cx:=cur_chr; @<Insert kinsoku penalty@>; - ins_kp:=false; -again_2: - get_next; - main_i:=orig_char_info(main_f)(cur_l); - case cur_cmd of - kanji,kana,other_kchar: begin - cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); goto main_loop_j+3; - end; - letter,other_char: begin ins_kp:=true; cur_l:=qi(0); goto main_loop_j+3; - end; - endcases; - x_token; - case cur_cmd of - kanji,kana,other_kchar: cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); - letter,other_char: begin ins_kp:=true; cur_l:=qi(0); end; - char_given: begin - if (cur_chr>=0)and(cur_chr<256) then - begin ins_kp:=true; cur_l:=qi(0); - end - else cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); - end; - char_num: begin scan_char_num; cur_chr:=cur_val; - if (cur_chr>=0)and(cur_chr<256) then - begin ins_kp:=true; cur_l:=qi(0); - end - else cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); - end; - inhibit_glue: begin inhibit_glue_flag:=true; goto again_2; end; - othercases begin ins_kp:=max_halfword; - cur_l:=qi(0); cur_r:=non_char; lig_stack:=null; - end; - endcases; -@# -main_loop_j+3: - if ins_kp=true then @<Insert |pre_break_penalty| of |cur_chr|@>; - @<Look ahead for glue or kerning@>; - if (ins_kp=false) then begin { Kanji -> Kanji } - goto main_loop_j+1; - end else if (ins_kp=true) then begin { Kanji -> Ascii } - {@<Append |disp_node| at begin of displace area@>;} - ins_kp:=false; goto main_loop; - end else begin { Kanji -> cs } - {@<Append |disp_node| at begin of displace area@>;} - goto reswitch; - end; - -@ @<Append |disp_node| at begin ...@>= -begin if (not is_char_node(tail))and(type(tail)=disp_node) then - begin if prev_disp=disp then - begin free_node(tail,small_node_size); tail:=prev_node; link(tail):=null; - end - else disp_dimen(tail):=disp; - end -else - if disp<>0 then - begin prev_node:=tail; tail_append(get_node(small_node_size)); - type(tail):=disp_node; disp_dimen(tail):=disp; prev_disp:=disp; - end; -end; - -@ @<Append |disp_node| at end ...@>= -if disp<>0 then -begin if (not is_char_node(tail))and(type(tail)=disp_node) then - begin disp_dimen(tail):=0; - end -else - begin prev_node:=tail; tail_append(get_node(small_node_size)); - type(tail):=disp_node; disp_dimen(tail):=0; prev_disp:=disp; - end; -end; - -@ @<Look ahead for glue or kerning@>= -cur_q:=tail; -if inhibit_glue_flag<>true then - begin if char_tag(main_i)=gk_tag then - begin main_k:=glue_kern_start(main_f)(main_i); - repeat main_j:=font_info[main_k].qqqq; - if next_char(main_j)=cur_l then - begin if op_byte(main_j)<kern_flag then - begin gp:=font_glue[main_f]; cur_r:=rem_byte(main_j); - if gp<>null then - begin while((type(gp)<>cur_r)and(link(gp)<>null)) do gp:=link(gp); - gq:=glue_ptr(gp); - end - else - begin gp:=get_node(small_node_size); font_glue[main_f]:=gp; - gq:=null; - end; - if gq=null then - begin type(gp):=cur_r; gq:=new_spec(zero_glue); - glue_ptr(gp):=gq; - main_k:=exten_base[main_f]+qi((qo(cur_r))*3); - width(gq):=font_info[main_k].sc; - stretch(gq):=font_info[main_k+1].sc; - shrink(gq):=font_info[main_k+2].sc; - add_glue_ref(gq); link(gp):=get_node(small_node_size); - gp:=link(gp); glue_ptr(gp):=null; link(gp):=null; - end; - tail_append(new_glue(gq)); subtype(tail):=jfm_skip+1; - goto skip_loop; - end - else begin - tail_append(new_kern(char_kern(main_f)(main_j))); - goto skip_loop; - end; - end; - incr(main_k); - until skip_byte(main_j)>=stop_flag; - end; -end; -skip_loop: inhibit_glue_flag:=false; - -@ @<Basic printing...@>= -procedure print_kanji(@!s:KANJI_code); {prints a single character} -begin -if s>255 then - begin print_char(Hi(s)); print_char(Lo(s)); - end else print_char(s); -end; - -@* \[56] System-dependent changes. -@z diff --git a/Build/source/texk/web2c/ptexdir/ptex-include.ch b/Build/source/texk/web2c/ptexdir/ptex-include.ch deleted file mode 100644 index 5d627d1480e..00000000000 --- a/Build/source/texk/web2c/ptexdir/ptex-include.ch +++ /dev/null @@ -1,6 +0,0 @@ -@x [???] l.2600 - pTeX: -@=#include "texmfmem.h";@> -@y -@=#include "texmfmem.h";@> -@=#include "ptexdir/kanji.h";@> -@z diff --git a/Build/source/texk/web2c/ptexdir/ptex.mk b/Build/source/texk/web2c/ptexdir/ptex.mk deleted file mode 100644 index 9f49847db6b..00000000000 --- a/Build/source/texk/web2c/ptexdir/ptex.mk +++ /dev/null @@ -1,272 +0,0 @@ -# *ATTENTION* : This file is not used in TeX Live 2009. See am/ptex.am. -# Makefile fragment for pTeX and web2c. -- tutimura(a)nn.iij4u.or.jp. Public domain. -# This fragment contains the parts of the makefile that are most likely to -# differ between releases of pTeX and derived from e-TeX. - -Makefile: $(srcdir)/ptexdir/ptex.mk - -# We build ptex. -ptex = @JPTEX@ ptex pbibtex ptftopl ppltotf pdvitype - -# Extract ptex version -ptexdir/ptex.version: ptexdir/ptex-base.ch - grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \ - | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version - -# The C sources. -ptex_c = ptexini.c ptex0.c ptex1.c ptex2.c -ptex_o = ptexini.o ptex0.o ptex1.o ptex2.o ptex-pool.o ptexextra.o ptexdir/kanji.o -plib_o = ptexdir/printversion.o ptexdir/usage.o ptexdir/openclose.o -plib = ptexdir/plib.a - -# Making ptex. -ptex: $(ptex_o) $(plib) $(ptexenc) - $(kpathsea_link) $(ptex_o) $(plib) $(ptexenc) $(socketlibs) $(LOADLIBES) - -# C file dependencies -$(ptex_c) ptexcoerce.h ptexd.h: ptex.p $(web2c_texmf) - $(web2c) ptex -ptexextra.c: ptexdir/ptexextra.h lib/texmfmp.c - sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@ -ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version - test -d ptexdir || mkdir ptexdir - sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \ - $(srcdir)/ptexdir/ptexextra.in >$@ - -# Tangling -ptex.p ptex.pool: tangle ptex.web ptex.ch - $(TANGLE) ptex.web ptex.ch - -# Generation of the web and ch file. -# Sources for ptex.web: -ptex_web_srcs = $(srcdir)/tex.web \ - $(srcdir)/tex.ch -# Sources for ptex.ch: -ptex_ch_srcs = ptex.web \ - $(srcdir)/ptexdir/ptex-base.ch \ - $(srcdir)/ptexdir/ptex-include.ch \ - $(srcdir)/tex-binpool.ch -# Rules: -ptex.web: tie $(srcdir)/ptexdir/ptex.mk $(ptex_web_srcs) - $(TIE) -m ptex.web $(ptex_web_srcs) -ptex.ch: $(ptex_ch_srcs) - $(TIE) -c ptex.ch $(ptex_ch_srcs) - -ptex-pool.c: ptex.pool $(makecpool) tmf-pool.h - $(makecpool) ptex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ - -$(plib): $(plib_o) - rm -f $@ - $(AR) $(ARFLAGS) $@ $(plib_o) - $(RANLIB) $@ - -### pTFtoPL -ptftopl: ptftopl.o $(plib) $(kpathsea) $(ptexenc) $(proglib) - $(kpathsea_link) ptftopl.o $(plib) $(ptexenc) $(LOADLIBES) -ptftopl.o: ptftopl.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -ptftopl.c: ptftopl.p $(web2c_aux) - $(web2c) ptftopl -ptftopl.p: ptftopl.web $(srcdir)/ptexdir/ptftopl.ch - $(tangle) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -ptftopl.web: $(srcdir)/tftopl.web $(srcdir)/tftopl.ch - $(TIE) -m ptftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch - - -### pPLtoTF -ppltotf: ppltotf.o $(plib) $(kpathsea) $(ptexenc) $(proglib) - $(kpathsea_link) ppltotf.o $(plib) $(ptexenc) $(LOADLIBES) -ppltotf.o: ppltotf.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h - $(compile) -DPRESERVE_PUTC -c ppltotf.c -ppltotf.c: ppltotf.p $(web2c_aux) - $(web2c) ppltotf -ppltotf.p: tangle ppltotf.web $(srcdir)/ptexdir/ppltotf.ch - $(tangle) ppltotf.web $(srcdir)/ptexdir/ppltotf.ch -ppltotf.web: $(srcdir)/pltotf.web $(srcdir)/pltotf.ch - $(TIE) -m ppltotf.web $(srcdir)/pltotf.web $(srcdir)/pltotf.ch - -### pDVItype -pdvitype: pdvitype.o $(plib) $(kpathsea) $(ptexenc) $(proglib) - $(kpathsea_link) pdvitype.o $(plib) $(ptexenc) $(LOADLIBES) -pdvitype.o: pdvitype.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h - $(compile) -DHEX_CHAR_CODE -c pdvitype.c -pdvitype.c: pdvitype.p $(web2c_aux) - $(web2c) pdvitype -pdvitype.p: tangle pdvitype.web $(srcdir)/ptexdir/pdvitype.ch - $(tangle) pdvitype.web $(srcdir)/ptexdir/pdvitype.ch -pdvitype.web: $(srcdir)/dvitype.web - cat $(srcdir)/dvitype.web > $@ - -### pBibTeX -pbibtex: pbibtex.o $(plib_o) $(kpathsea) $(ptexenc) $(proglib) - $(kpathsea_link) pbibtex.o $(plib_o) $(ptexenc) $(LOADLIBES) -pbibtex.o: pbibtex.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h - -pbibd.h: $(srcdir)/ptexdir/pbibd.sed pbibtex.c - sed -f $(srcdir)/ptexdir/pbibd.sed pbibtex.c > $@ - -pbibtex.c pbibtex.h: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed pbibtex.p - $(web2c) pbibtex -pbibtex.p: tangle bibtex.web $(srcdir)/ptexdir/pbibtex.ch - $(tangle) bibtex.web $(srcdir)/ptexdir/pbibtex.ch -clean:: pbibtex-clean -pbibtex-clean: - $(LIBTOOL) --mode=clean rm -f pbibtex - rm -f pbibtex.o pbibtex.c pbibtex.h pbibtex.p pbibd.h - - -# Additional dependencies for relinking. -$(ptexenc): - cd $(ptexenc_dir) && $(MAKE) libptexenc.la - -# Tests... -check: @JPTEX@ ptex-check -ptex-check: etrip ptex.fmt -# Test truncation (but don't bother showing the warning msg). - ./ptex --progname=ptex --output-comment="`cat $(srcdir)/PROJECTS`" \ - $(srcdir)/tests/hello 2>/dev/null \ - && ./dvitype hello.dvi | grep olaf@infovore.xs4all.nl >/dev/null -# \openout should show up in \write's. - ./ptex --progname=ptex $(srcdir)/tests/openout && grep xfoo openout.log -# one.two.tex -> one.two.log - ./ptex --progname=ptex $(srcdir)/tests/one.two && ls -l one.two.log -# uno.dos -> uno.log - ./ptex --progname=ptex $(srcdir)/tests/uno.dos && ls -l uno.log - ./ptex --progname=ptex $(srcdir)/tests/just.texi && ls -l just.log - -./ptex --progname=ptex $(srcdir)/tests/batch.tex - ./ptex --progname=ptex --shell $(srcdir)/tests/write18 | grep echo -# tcx files are a bad idea. -# ./ptex --translate-file=$(srcdir)/share/isol1-t1.tcx \ -# $(srcdir)/tests/eight && ./dvitype eight.dvi >eigh.typ - TEXMFCNF=../kpathsea \ - ./ptex --mltex --progname=einitex $(srcdir)/tests/mltextst - -./ptex --progname=ptex </dev/null - -PATH=`pwd`:$(kpathsea_dir):$(kpathsea_srcdir):$$PATH \ - WEB2C=$(kpathsea_srcdir) TMPDIR=.. \ - ./ptex --progname=ptex '\nonstopmode\font\foo=nonesuch\end' - -# Cleaning up. -clean:: ptex-clean -ptex-clean: etrip-clean - $(LIBTOOL) --mode=clean $(RM) $(ptex) - rm -f $(ptex_o) $(ptex_c) ptexextra.c ptexcoerce.h ptexd.h - rm -f ptexdir/ptexextra.h ptexdir/ptex.version - rm -f ptexdir/kanji.o $(plib_o) $(plib) - rm -f ptex.p ptex.pool ptex.web ptex.ch ptex-pool.c - rm -f ptftopl.h ptftopl.c ptftopl.o ptftopl.web ptftopl.p - rm -f ppltotf.h ppltotf.c ppltotf.o ppltotf.web ppltotf.p - rm -f pdvitype.h pdvitype.c pdvitype.o pdvitype.web pdvitype.p - rm -f ptex.fmt ptex.log - rm -f hello.dvi hello.log xfoo.out openout.log one.two.log uno.log - rm -f just.log batch.log write18.log mltextst.log texput.log - rm -f missfont.log - rm -rf tfm - -# etrip -ptestdir = $(srcdir)/ptexdir/etrip -ptestenv = TEXMFCNF=$(etestdir) - -triptrap: @JPTEX@ etrip -ptrip: pltotf tftopl ptex dvitype etrip-clean - @echo ">>> See $(etestdir)/etrip.diffs for example of acceptable diffs." >&2 - @echo "*** TRIP test for e-TeX in compatibility mode ***." - ./pltotf $(testdir)/trip.pl trip.tfm - ./tftopl ./trip.tfm trip.pl - -diff $(testdir)/trip.pl trip.pl - $(LN) $(testdir)/trip.tex . # get same filename in log - -$(SHELL) -c '$(etestenv) ./ptex --progname=einitex --ini <$(testdir)/trip1.in >ctripin.fot' - mv trip.log ctripin.log - -diff $(testdir)/tripin.log ctripin.log - -$(SHELL) -c '$(etestenv) ./ptex --progname=ptex <$(testdir)/trip2.in >ctrip.fot' - mv trip.log ctrip.log - -diff $(testdir)/trip.fot ctrip.fot - -$(DIFF) $(DIFFFLAGS) $(testdir)/trip.log ctrip.log - $(SHELL) -c '$(etestenv) ./dvitype $(dvitype_args) trip.dvi >ctrip.typ' - -$(DIFF) $(DIFFFLAGS) $(testdir)/trip.typ ctrip.typ - @echo "*** TRIP test for e-TeX in extended mode ***." - -$(SHELL) -c '$(etestenv) ./ptex --progname=einitex --ini <$(etestdir)/etrip1.in >xtripin.fot' - mv trip.log xtripin.log - -diff ctripin.log xtripin.log - -$(SHELL) -c '$(etestenv) ./ptex --progname=ptex <$(etestdir)/trip2.in >xtrip.fot' - mv trip.log xtrip.log - -diff ctrip.fot xtrip.fot - -$(DIFF) $(DIFFFLAGS) ctrip.log xtrip.log - $(SHELL) -c '$(etestenv) ./dvitype $(dvitype_args) trip.dvi >xtrip.typ' - -$(DIFF) $(DIFFFLAGS) ctrip.typ xtrip.typ - @echo "*** e-TeX specific part of e-TRIP test ***." - ./pltotf $(etestdir)/etrip.pl etrip.tfm - ./tftopl ./etrip.tfm etrip.pl - -diff $(etestdir)/etrip.pl etrip.pl - $(LN) $(etestdir)/etrip.tex . # get same filename in log - -$(SHELL) -c '$(etestenv) ./ptex --progname=einitex --ini <$(etestdir)/etrip2.in >etripin.fot' - mv etrip.log etripin.log - -diff $(etestdir)/etripin.log etripin.log - -$(SHELL) -c '$(etestenv) ./ptex --progname=ptex <$(etestdir)/etrip3.in >etrip.fot' - -diff $(etestdir)/etrip.fot etrip.fot - -$(DIFF) $(DIFFFLAGS) $(etestdir)/etrip.log etrip.log - diff $(etestdir)/etrip.out etrip.out - $(SHELL) -c '$(etestenv) ./dvitype $(dvitype_args) etrip.dvi >etrip.typ' - -$(DIFF) $(DIFFFLAGS) $(etestdir)/etrip.typ etrip.typ - -# Cleaning up for the etrip. -ptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log - rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ - rm -f xtripin.fot xtripin.log - rm -f xtrip.fot xtrip.log xtrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log - rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm - -# Distfiles ... -@MAINT@triptrapdiffs: ptexdir/etrip/etrip.diffs -@MAINT@ptexdir/etrip/etrip.diffs: ptex -@MAINT@ $(MAKE) ptrip | tail +1 >ptexdir/etrip/etrip.diffs - - -# Dumps -all_pfmts = ptex.fmt platex.fmt $(pfmts) - -dumps: @JPTEX@ pfmts -pfmts: $(all_pfmts) - -pfmtdir = $(web2cdir)/ptex -$(pfmtdir):: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(pfmtdir) - -ptex.fmt: ptex - $(dumpenv) $(MAKE) progname=ptex files="ptex.src plain.tex cmr10.tfm" prereq-check - $(dumpenv) ./ptex --progname=ptex --jobname=ptex --ini \*\\input ptex.src \\dump </dev/null - -#pelatex.fmt: ptex -# $(dumpenv) $(MAKE) progname=elatex files="latex.ltx" prereq-check -# $(dumpenv) ./ptex --progname=elatex --jobname=elatex --ini \*\\input latex.ltx </dev/null - -platex.fmt: ptex - $(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check - $(dumpenv) ./ptex --progname=platex --jobname=platex --ini \*\\input latex.ltx </dev/null - -#ctex.fmt: ptex -# $(dumpenv) $(MAKE) progname=ctex files="plain.tex cmr10.tfm" prereq-check -# $(dumpenv) ./ptex --progname=ctex --jobname=ctex --ini \\input plain \\dump </dev/null - -#olatex.fmt: ptex -# $(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check -# $(dumpenv) ./ptex --progname=olatex --progname=olatex --ini \\input latex.ltx </dev/null - -# -# Installation. -install-ptex: install-ptex-exec -install-programs: @JPTEX@ install-ptex-exec -install-ptex-exec: $(ptex) $(bindir) - for p in $(ptex); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - -install-fmts: @JPTEX@ install-ptex-fmts -install-ptex-fmts: pfmts $(pfmtdir) - pfmts="$(all_pfmts)"; \ - for f in $$pfmts; do $(INSTALL_DATA) $$f $(pfmtdir)/$$f; done - pfmts="$(pfmts)"; \ - for f in $$pfmts; do base=`basename $$f .fmt`; \ - (cd $(bindir) && (rm -f $$base; $(LN) ptex $$base)); done - -# end of ptex.mk diff --git a/Build/source/texk/web2c/ptexdir/ptexhelp.h b/Build/source/texk/web2c/ptexdir/ptexhelp.h deleted file mode 100644 index a8737fa5417..00000000000 --- a/Build/source/texk/web2c/ptexdir/ptexhelp.h +++ /dev/null @@ -1,69 +0,0 @@ -/* ptexhelp.h: for the --help option" -*/ -#ifndef PTEXHELP_H -#define PTEXHELP_H -/* block texk/web2c/help.h */ -#define HELP_H - -#ifdef PTFTOPL -const_string based_prog_name = "TFtoPL"; -const_string PTEXTFTOPLHELP[] = { -"Usage: ptftopl [option] tfmfile [plfile]", -"", -" -verbose output progress reports.", -" -version print version information and exit.", -" -help print this message and exit.", -" -kanji={jis|euc|sjis|utf8}", -" plfile kanji code.", -NULL }; -#endif /* PTFTOPL */ - -#ifdef PPLTOTF -const_string based_prog_name = "PLtoTF"; -const_string PTEXPLTOTFHELP[] = { -"Usage: ppltotf [option] plfile [tfmfile]", -"", -" -verbose output progress reports.", -" -version print version information and exit.", -" -help print this message and exit.", -" -kanji={jis|euc|sjis|utf8}", -" plfile kanji code.", -NULL }; -#endif /* PPLTOTF */ - -#ifdef PBIBTEX -const_string based_prog_name = "BibTeX"; -const_string PBIBTEXHELP[] = { -"Usage: pbibtex [option] auxfile", -"", -" -min-crossrefs=INTEGER minimum number of cross-refs required", -" for automatic cite_list inclusion (default 2).", -" -terse do silently.", -" -version print version information and exit.", -" -help print this message and exit.", -" -kanji={jis|euc|sjis|utf8} kanji code for output-file.", -NULL }; -#endif /* PBIBTEX */ - -#ifdef PDVITYPE -const_string based_prog_name = "DVItype"; -const_string PDVITYPEHELP[] = { -"Usage: pdvitype [option] dvifile", -"", -" -dpi=REAL assumed device resolution in pixels per inch", -" (default 300.0).", -" -magnification=INTEGER overrride the postamble's magnification.", -" -max-pages=INTEGER maximum number of pages (default 1000000).", -" -output-level=1..4 verbosity level.", -" 1: terse, 2: medium-level, 3: verbose,", -" 4: plus check for postamble(default).", -" -page-start=PAGE type, e.g., `1.*.-5' to specify the first page", -" with \\count0=1, \\count2=4.", -" (see the TeX book chapter 15).", -" -show-opcodes show opcodes in decimal.", -" -kanji={jis|euc|sjis|utf8} kanji code for output-file.", -" -version print version information and exit.", -" -help print this message and exit.", -NULL }; -#endif /* PDVITYPE */ -#endif /* PTEXHELP_H */ diff --git a/Build/source/texk/web2c/ptexdir/reautoconf b/Build/source/texk/web2c/ptexdir/reautoconf deleted file mode 100755 index 0bf54835df3..00000000000 --- a/Build/source/texk/web2c/ptexdir/reautoconf +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -x -LANG=C -rm -rf ../autom4te.cache/ - -(cd ../../../; ./reautoconf texk/web2c) diff --git a/Build/source/texk/web2c/tmf-pool.h b/Build/source/texk/web2c/tmf-pool.h deleted file mode 100644 index cab97311570..00000000000 --- a/Build/source/texk/web2c/tmf-pool.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2008 Akira Kakuto - You may freely use, modify and/or distribute this file. */ - -#ifndef TMF_POOL_H -#define TMF_POOL_H -#ifndef META_FONT -typedef int integer; -typedef integer strnumber; -typedef unsigned char packedASCIIcode; -typedef integer poolpointer; -extern packedASCIIcode *strpool; -extern poolpointer poolptr; -#else -#define EXTERN extern -#include "mfd.h" -#endif -#endif diff --git a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog index 1e921b92a5c..8f9a0ae66fb 100644 --- a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog +++ b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-const: Change OutputFormat and PipeOutputFormat back + to non-const. + 2010-05-20 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-04-strcpy-bug (new): Bug fixes: diff --git a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const index 208d6bf115c..182d0b4241c 100644 --- a/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const +++ b/Build/source/utils/chktex/chktex-1.6.4-PATCHES/patch-01-const @@ -39,13 +39,11 @@ diff -ur chktex-1.6.4.orig/ChkTeX.h chktex-1.6.4/ChkTeX.h DEF(int, HeadErrOut, TRUE) \ - DEF(char *, OutputName, "") \ - DEF(char *, PseudoInName, NULL) \ -- DEF(char *, OutputFormat, VerbNormal) \ -- DEF(char *, PipeOutputFormat, NULL) \ -- DEF(char *, Delimit, ":") \ + DEF(const char *, OutputName, "") \ + DEF(const char *, PseudoInName, NULL) \ -+ DEF(const char *, OutputFormat, VerbNormal) \ -+ DEF(const char *, PipeOutputFormat, NULL) \ + DEF(char *, OutputFormat, VerbNormal) \ + DEF(char *, PipeOutputFormat, NULL) \ +- DEF(char *, Delimit, ":") \ + DEF(const char *, Delimit, ":") \ DEF(long, DebugLevel, 0) @@ -107,15 +105,6 @@ diff -ur chktex-1.6.4.orig/FindErrs.c chktex-1.6.4/FindErrs.c { switch (Cnt) { -@@ -1329,7 +1330,7 @@ - char PrintBuffer[BUFSIZ]; - va_list MsgArgs; - -- char *LastNorm = OutputFormat; -+ const char *LastNorm = OutputFormat; - char *of; - int c; - @@ -1468,7 +1469,7 @@ static enum ErrNum PerformCommand(const char *Cmd, char *Arg) @@ -137,15 +126,6 @@ diff -ur chktex-1.6.4.orig/FindErrs.h chktex-1.6.4/FindErrs.h }; enum ItState -@@ -183,7 +183,7 @@ - - extern struct ErrMsg LaTeXMsgs[emMaxFault + 1]; - --extern char *OutputFormat; -+extern const char *OutputFormat; - - int FindErr(const char *, const unsigned long); - void PrintError(const char *, const char *, const long, const long, diff -ur chktex-1.6.4.orig/OpSys.c chktex-1.6.4/OpSys.c --- chktex-1.6.4.orig/OpSys.c 2007-10-20 09:10:48.000000000 +0200 +++ chktex-1.6.4/OpSys.c 2010-05-02 22:18:12.805229781 +0200 diff --git a/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h b/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h index 8e59ec4f0bf..5d25a0d6728 100644 --- a/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h +++ b/Build/source/utils/chktex/chktex-1.6.4/ChkTeX.h @@ -279,8 +279,8 @@ DEBUGBITS(Debug_BIT) DEF(int, HeadErrOut, TRUE) \ DEF(const char *, OutputName, "") \ DEF(const char *, PseudoInName, NULL) \ - DEF(const char *, OutputFormat, VerbNormal) \ - DEF(const char *, PipeOutputFormat, NULL) \ + DEF(char *, OutputFormat, VerbNormal) \ + DEF(char *, PipeOutputFormat, NULL) \ DEF(const char *, Delimit, ":") \ DEF(long, DebugLevel, 0) diff --git a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c index 933bd4567e3..cb5269eb4f3 100644 --- a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c +++ b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.c @@ -1331,7 +1331,7 @@ PrintError(const char *File, const char *String, char PrintBuffer[BUFSIZ]; va_list MsgArgs; - const char *LastNorm = OutputFormat; + char *LastNorm = OutputFormat; char *of; int c; diff --git a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h index b3e651bef45..f3580600ba9 100644 --- a/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h +++ b/Build/source/utils/chktex/chktex-1.6.4/FindErrs.h @@ -183,7 +183,7 @@ enum DotLevel extern struct ErrMsg LaTeXMsgs[emMaxFault + 1]; -extern const char *OutputFormat; +extern char *OutputFormat; int FindErr(const char *, const unsigned long); void PrintError(const char *, const char *, const long, const long, diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 9af3f902ea6..3ed9a8c09cb 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -677,7 +677,7 @@ with_xindy_recode enable_xindy_old enable_xpdfopen enable_web2c -with_tex_banner +with_banner_add with_editor enable_auto_core enable_dump_share @@ -1553,7 +1553,7 @@ Optional Packages: [default: no] --with-xindy-recode For `xindy': use `recode' instead of `iconv' (default is NO) - --with-tex-banner=STR version string appended to banner lines [Web2C YEAR] + --with-banner-add=STR add STR to version string appended to banner lines --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript @@ -3448,9 +3448,9 @@ test "x$enable_web2c" = xno || { ## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options for TeX and MF -# Check whether --with-tex-banner was given. -if test "${with_tex_banner+set}" = set; then : - withval=$with_tex_banner; +# Check whether --with-banner-add was given. +if test "${with_banner_add+set}" = set; then : + withval=$with_banner_add; fi # Check whether --with-editor was given. |