From 5b7fc5648e10cbbceaedc3ed8fbca0c3518f698b Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Thu, 10 Jul 2008 15:57:31 +0000 Subject: [PATCH] Fix some weave issues git-svn-id: svn+ssh://scm.foundry.supelec.fr/svn/metapost/mplib/trunk@622 b0617d17-b707-0410-b22c-fd2634e05cc4 --- src/texk/web2c/mpdir/memio.w | 2 ++ src/texk/web2c/mpdir/mp.w | 5 +++-- src/texk/web2c/mpdir/mpxout.w | 14 +++++++------- src/texk/web2c/mpdir/psout.w | 19 ++----------------- src/texk/web2c/mpdir/tfmin.w | 5 +++++ 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/texk/web2c/mpdir/memio.w b/src/texk/web2c/mpdir/memio.w index 202b1bf..809c6cf 100644 --- a/src/texk/web2c/mpdir/memio.w +++ b/src/texk/web2c/mpdir/memio.w @@ -21,6 +21,8 @@ % Here is TeX material that gets inserted after \input webmac +\font\tenlogo=logo10 % font used for the METAFONT logo +\def\MP{{\tenlogo META}\-{\tenlogo POST}} \def\title{MetaPost MEM reading and writing} \def\topofcontents{\hsize 5.5in \vglue -30pt plus 1fil minus 1.5in diff --git a/src/texk/web2c/mpdir/mp.w b/src/texk/web2c/mpdir/mp.w index c074a91..cfaeb52 100644 --- a/src/texk/web2c/mpdir/mp.w +++ b/src/texk/web2c/mpdir/mp.w @@ -35,7 +35,8 @@ \def\section{\mathhexbox278} \let\swap=\leftrightarrow \def\round{\mathop{\rm round}\nolimits} -\mathchardef\vb="026A % synonym for `\|' +\mathchardef\vbv="026A % synonym for `\|' +\def\vb{\relax\ifmmode\vbv\else$\vbv$\fi} \def\(#1){} % this is used to make section names sort themselves better \def\9#1{} % this is used for sort keys in the index via @@:sort key}{entry@@> @@ -71,7 +72,7 @@ features of the implementation, but they rarely attempt to explain the \MP\ language itself, since the reader is supposed to be familiar with {\sl The {\logos METAFONT\/}book} as well as the manual @.WEB@> -@:METAFONTbook}{\sl The {\logos METAFONT\/}book}@> +@:METAFONTbook}{\sl The {\logos METAFONT\/}book@> {\sl A User's Manual for MetaPost}, Computing Science Technical Report 162, AT\AM T Bell Laboratories. diff --git a/src/texk/web2c/mpdir/mpxout.w b/src/texk/web2c/mpdir/mpxout.w index 9b01225..caf4915 100644 --- a/src/texk/web2c/mpdir/mpxout.w +++ b/src/texk/web2c/mpdir/mpxout.w @@ -2501,13 +2501,13 @@ mpx->h = 0; mpx->v = 0; @ @(mpxout.h@>= typedef char *(*mpx_file_finder)(MPX, const char *, const char *, int); enum mpx_filetype { - mpx_tfm_format, /* kpse_tfm_format */ - mpx_vf_format, /* kpse_vf_format */ - mpx_trfontmap_format, /* kpse_mpsupport_format */ - mpx_trcharadj_format, /* kpse_mpsupport_format */ - mpx_desc_format, /* kpse_troff_font_format */ - mpx_fontdesc_format, /* kpse_troff_font_format */ - mpx_specchar_format /* kpse_mpsupport_format */ + mpx_tfm_format, /* |kpse_tfm_format| */ + mpx_vf_format, /* |kpse_vf_format| */ + mpx_trfontmap_format, /* |kpse_mpsupport_format| */ + mpx_trcharadj_format, /* |kpse_mpsupport_format| */ + mpx_desc_format, /* |kpse_troff_font_format| */ + mpx_fontdesc_format, /* |kpse_troff_font_format| */ + mpx_specchar_format /* |kpse_mpsupport_format| */ }; @ @= diff --git a/src/texk/web2c/mpdir/psout.w b/src/texk/web2c/mpdir/psout.w index bdb93c6..e4ec7a0 100644 --- a/src/texk/web2c/mpdir/psout.w +++ b/src/texk/web2c/mpdir/psout.w @@ -36,7 +36,8 @@ \def\section{\mathhexbox278} \let\swap=\leftrightarrow \def\round{\mathop{\rm round}\nolimits} -\mathchardef\vb="026A % synonym for `\|' +\mathchardef\vbv="026A % synonym for `\|' +\def\vb{\relax\ifmmode\vbv\else$\vbv$\fi} \def\[#1]{} % from pascal web \def\(#1){} % this is used to make section names sort themselves better \def\9#1{} % this is used for sort keys in the index via @@:sort key}{entry@@> @@ -246,9 +247,6 @@ static void mp_ps_print_int (MP mp,integer n) { /* prints an integer in decimal mp_ps_print_the_digs(mp, k); } -@ @= -void mp_ps_print_int (MP mp,integer n); - @ \MP\ also makes use of a trivial procedure to print two digits. The following subroutine is usually called with a parameter in the range |0<=n<=99|. @@ -5537,19 +5535,6 @@ int mp_ps_ship_out (mp_edge_object *hh, int prologues, int procset) { else if (gr_type(p)==mp_text_code) { do_write_prescript(p,mp_text_object); } } -@ The envelope of a cyclic path~|q| could be computed by calling -|make_envelope| once for |q| and once for its reversal. We don't do this -because it would fail color regions that are covered by the pen regardless -of where it is placed on~|q|. - -@= -if ( gr_left_type(q)!=mp_endpoint ) { - gr_left_type(mp_gr_insert_knot(mp, q,gr_x_coord(q),gr_y_coord(q)))=mp_endpoint; - gr_right_type(q)=mp_endpoint; - q=gr_next_knot(q); - t=1; -} - @ @= ps_room(18); mp_ps_print_char(mp, ' '); diff --git a/src/texk/web2c/mpdir/tfmin.w b/src/texk/web2c/mpdir/tfmin.w index 9b8a1df..4ea71d2 100644 --- a/src/texk/web2c/mpdir/tfmin.w +++ b/src/texk/web2c/mpdir/tfmin.w @@ -21,6 +21,11 @@ % Here is TeX material that gets inserted after \input webmac +\font\tenlogo=logo10 % font used for the METAFONT logo +\font\logos=logosl10 +\def\MF{{\tenlogo META}\-{\tenlogo FONT}} +\def\MP{{\tenlogo META}\-{\tenlogo POST}} + \def\title{Reading TEX metrics files} \pdfoutput=1 -- 2.32.0.93.g670b81a890