summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w34
-rw-r--r--Build/source/texk/web2c/triptrap/mptrap.fot2
-rw-r--r--Build/source/texk/web2c/triptrap/mptrap.log2
-rw-r--r--Build/source/texk/web2c/triptrap/mptrapin.log2
-rw-r--r--Build/source/texk/web2c/triptrap/mtrap.02
-rw-r--r--Build/source/texk/web2c/triptrap/mtrap.12
-rw-r--r--Build/source/texk/web2c/triptrap/mtrap.log4
-rw-r--r--Build/source/texk/web2c/triptrap/trap.1482
-rw-r--r--Build/source/texk/web2c/triptrap/trap.1492
-rw-r--r--Build/source/texk/web2c/triptrap/trap.1502
-rw-r--r--Build/source/texk/web2c/triptrap/trap.1512
-rw-r--r--Build/source/texk/web2c/triptrap/trap.1972
-rw-r--r--Build/source/texk/web2c/triptrap/trap.2002
-rw-r--r--Build/source/texk/web2c/triptrap/trap.52
-rw-r--r--Build/source/texk/web2c/triptrap/trap.62
16 files changed, 47 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 29d5ce5b9cc..7215c1d368b 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-09 Taco Hoekwater <taco@elvenkind.com>
+
+ * Released version of MPLib 1.203
+
2009-06-03 Taco Hoekwater <taco@elvenkind.com>
* Released version of MPLib 1.202
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index c493e6af553..75297db6d3a 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -1,4 +1,4 @@
- $Id: mp.w 1084 2009-06-03 07:40:57Z taco $
+ $Id: mp.w 1096 2009-06-09 12:28:28Z taco $
%
% Copyright 2008-2009 Taco Hoekwater.
%
@@ -89,13 +89,13 @@ undergoes any modifications, so that it will be clear which version of
@^extensions to \MP@>
@^system dependencies@>
-@d default_banner "This is MetaPost, Version 1.202" /* printed when \MP\ starts */
+@d default_banner "This is MetaPost, Version 1.203" /* printed when \MP\ starts */
@d true 1
@d false 0
@(mpmp.h@>=
-#define metapost_version "1.202"
-#define metapost_magic (('M'*256) + 'P')*65536 + 1202
+#define metapost_version "1.203"
+#define metapost_magic (('M'*256) + 'P')*65536 + 1203
#define metapost_old_magic (('M'*256) + 'P')*65536 + 1080
@ The external library header for \MP\ is |mplib.h|. It contains a
@@ -279,10 +279,10 @@ MP mp_initialize (MP_options *opt) {
@<Initialize the output routines@>;
@<Get the first line of input and prepare to start@>;
@<Initializations after first line is read@>;
+ @<Fix up |mp->internal[mp_job_name]|@>;
} else {
mp->history=mp_spotless;
}
- @<Fix up |mp->internal[mp_job_name]|@>;
return mp;
}
@@ -15899,6 +15899,23 @@ text(frozen_repeat_loop)=intern(" ENDFOR");
}
mp->cur_type=mp_known; q=mp_stash_cur_exp(mp); /* make |q| an \&{expr} argument */
value(p)=mp->cur_exp+step_size(p); /* set |value(p)| for the next iteration */
+ /* detect numeric overflow */
+ if ((step_size(p)>0) && (value(p)<mp->cur_exp)) {
+ if (final_value(p)>0) {
+ value(p)=final_value(p);
+ final_value(p) = final_value(p) - 1;
+ } else {
+ value(p)=final_value(p)+1;
+ }
+ } else if ((step_size(p)<0) && (value(p)>mp->cur_exp)) {
+ if (final_value(p)<0) {
+ value(p)=final_value(p);
+ final_value(p) = final_value(p)+1;
+ } else {
+ value(p)=final_value(p)-1;
+ }
+ }
+
} else if ( p==null ) {
p=loop_list(mp->loop_ptr);
if ( p==null ) {
@@ -18403,6 +18420,8 @@ static void mp_scan_expression (MP mp) {
int t; /* knot type following a path join */
t=0; y=0; x=0;
my_var_flag=mp->var_flag; mac_name=null;
+ mp->expand_depth_count++;
+ mp_check_expansion_depth(mp);
RESTART:
if ((mp->cur_cmd<min_primary_command)||
(mp->cur_cmd>max_primary_command) )
@@ -18434,6 +18453,7 @@ CONTINUE:
goto CONTINUE;
}
}
+ mp->expand_depth_count--;
}
@ The reader should review the data structure conventions for paths before
@@ -22813,6 +22833,7 @@ if (mp->troff_mode) {
mp->internal[mp_gtroffmode]=unity;
mp->internal[mp_prologues]=unity;
}
+@<Fix up |mp->internal[mp_job_name]|@>;
if ( mp->start_sym>0 ) { /* insert the `\&{everyjob}' symbol */
mp->cur_sym=mp->start_sym; mp_back_input(mp);
}
@@ -26036,7 +26057,8 @@ static char * mp_get_output_file_name (MP mp) {
char *f;
char *saved_name; /* saved |name_of_file| */
saved_name = xstrdup(mp->name_of_file);
- f = mp_set_output_file_name(mp, mp_round_unscaled(mp, mp->internal[mp_char_code]));
+ (void)mp_set_output_file_name(mp, mp_round_unscaled(mp, mp->internal[mp_char_code]));
+ f = xstrdup(mp->name_of_file);
mp_pack_file_name(mp, saved_name,NULL,NULL);
free(saved_name);
return f;
diff --git a/Build/source/texk/web2c/triptrap/mptrap.fot b/Build/source/texk/web2c/triptrap/mptrap.fot
index a07eaac6d87..3c67ddbee64 100644
--- a/Build/source/texk/web2c/triptrap/mptrap.fot
+++ b/Build/source/texk/web2c/triptrap/mptrap.fot
@@ -1,4 +1,4 @@
-This is MetaPost, version 1.202 (kpathsea version 3.5.7dev)
+This is MetaPost, version 1.203 (kpathsea version 3.5.7dev)
**(./trap.mp
\*//*\trap\pass2!
! Missing symbolic token inserted.
diff --git a/Build/source/texk/web2c/triptrap/mptrap.log b/Build/source/texk/web2c/triptrap/mptrap.log
index 15ff5d19dfb..b7487ee5c8f 100644
--- a/Build/source/texk/web2c/triptrap/mptrap.log
+++ b/Build/source/texk/web2c/triptrap/mptrap.log
@@ -1,4 +1,4 @@
-This is MetaPost, version 1.202 (kpathsea version 3.5.7dev) (mem=trap 2009.06.02) 2 JUN 2009 22:19
+This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (mem=trap 2009.06.02) 2 JUN 2009 22:19
** trap
(./trap.mp
{if}
diff --git a/Build/source/texk/web2c/triptrap/mptrapin.log b/Build/source/texk/web2c/triptrap/mptrapin.log
index 3cf976b3c92..962abfbb9f4 100644
--- a/Build/source/texk/web2c/triptrap/mptrapin.log
+++ b/Build/source/texk/web2c/triptrap/mptrapin.log
@@ -1,4 +1,4 @@
-This is MetaPost, version 1.202 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47
+This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47
**\input trap
(./trap.mp
>> << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}((5.5 0.5))
diff --git a/Build/source/texk/web2c/triptrap/mtrap.0 b/Build/source/texk/web2c/triptrap/mtrap.0
index 3a6cbe4057a..b1f8d54914c 100644
--- a/Build/source/texk/web2c/triptrap/mtrap.0
+++ b/Build/source/texk/web2c/triptrap/mtrap.0
@@ -1,7 +1,7 @@
%!PS
%%BoundingBox: -36 -24 84 84
%%HiResBoundingBox: -36 -24 84 84
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.05.25:1247
%%Pages: 1
%*Font: trapf 9.9628 9.96265 35:c008
diff --git a/Build/source/texk/web2c/triptrap/mtrap.1 b/Build/source/texk/web2c/triptrap/mtrap.1
index 4368c4dcb3e..d9ccaa9eeae 100644
--- a/Build/source/texk/web2c/triptrap/mtrap.1
+++ b/Build/source/texk/web2c/triptrap/mtrap.1
@@ -1,7 +1,7 @@
%!PS-Adobe-3.0 EPSF-3.0
%%BoundingBox: -84 -36 24 84
%%HiResBoundingBox: -84 -36 24 84
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.05.25:1247
%%Pages: 1
%%DocumentFonts: trapf
diff --git a/Build/source/texk/web2c/triptrap/mtrap.log b/Build/source/texk/web2c/triptrap/mtrap.log
index 43635cd530c..3a0b9ac2ba4 100644
--- a/Build/source/texk/web2c/triptrap/mtrap.log
+++ b/Build/source/texk/web2c/triptrap/mtrap.log
@@ -1,4 +1,4 @@
-This is MetaPost, version 1.202 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47
+This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47
**mtrap
(./mtrap.mp
Memory usage 19&13 (3972 still untouched)
@@ -926,7 +926,7 @@ String usage 16&50 (84&7716 now untouched)
>> "%!PS"
>> "%%BoundingBox: -36 -24 84 84 "
>> "%%HiResBoundingBox: -36 -24 84 84 "
->> "%%Creator: MetaPost 1.202"
+>> "%%Creator: MetaPost 1.203"
>> "%%Pages: 1"
>> "%*Font: trapf 9.9628 9.96265 35:c008"
>> "%%BeginProlog"
diff --git a/Build/source/texk/web2c/triptrap/trap.148 b/Build/source/texk/web2c/triptrap/trap.148
index 8db0036dce3..37b23324ea2 100644
--- a/Build/source/texk/web2c/triptrap/trap.148
+++ b/Build/source/texk/web2c/triptrap/trap.148
@@ -1,7 +1,7 @@
%!PS
%%BoundingBox: -4 -6 13 6
%%HiResBoundingBox: -3.5 -5.5 12.5 5.5
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2230
%%Pages: 1
%%BeginProlog
diff --git a/Build/source/texk/web2c/triptrap/trap.149 b/Build/source/texk/web2c/triptrap/trap.149
index e78d23ebd3f..ab12356dfad 100644
--- a/Build/source/texk/web2c/triptrap/trap.149
+++ b/Build/source/texk/web2c/triptrap/trap.149
@@ -1,7 +1,7 @@
%!PS
%%BoundingBox: -28 -28 52 37
%%HiResBoundingBox: -27.5 -27.5 51.6906 36.71318
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2238
%%Pages: 1
%%BeginProlog
diff --git a/Build/source/texk/web2c/triptrap/trap.150 b/Build/source/texk/web2c/triptrap/trap.150
index 33796be177e..4a18488ecfe 100644
--- a/Build/source/texk/web2c/triptrap/trap.150
+++ b/Build/source/texk/web2c/triptrap/trap.150
@@ -1,7 +1,7 @@
%!PS-Adobe-3.0 EPSF-3.0
%%BoundingBox: -5 -5 33 25
%%HiResBoundingBox: -5 -5 33 25
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2235
%%Pages: 1
%%BeginProlog
diff --git a/Build/source/texk/web2c/triptrap/trap.151 b/Build/source/texk/web2c/triptrap/trap.151
index 7f6be6a74b6..3661c6250da 100644
--- a/Build/source/texk/web2c/triptrap/trap.151
+++ b/Build/source/texk/web2c/triptrap/trap.151
@@ -1,7 +1,7 @@
%!PS-Adobe-3.0 EPSF-3.0
%%BoundingBox: -4096 -102 4096 261
%%HiResBoundingBox: -4095.49998 -101.96362 4095.49998 261
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2234
%%Pages: 1
%%BeginProlog
diff --git a/Build/source/texk/web2c/triptrap/trap.197 b/Build/source/texk/web2c/triptrap/trap.197
index 5fc04e0d449..8180c18efcb 100644
--- a/Build/source/texk/web2c/triptrap/trap.197
+++ b/Build/source/texk/web2c/triptrap/trap.197
@@ -1,7 +1,7 @@
%!PS-Adobe-3.0 EPSF-3.0
%%BoundingBox: -2 -4 8 4
%%HiResBoundingBox: -1.99254 -3.98508 7.97011 3.98506
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2231
%%Pages: 1
%%DocumentFonts: trapf
diff --git a/Build/source/texk/web2c/triptrap/trap.200 b/Build/source/texk/web2c/triptrap/trap.200
index 36f4ace1d8f..56db8d7065e 100644
--- a/Build/source/texk/web2c/triptrap/trap.200
+++ b/Build/source/texk/web2c/triptrap/trap.200
@@ -1,7 +1,7 @@
%!PS
%%BoundingBox: -7 -6 37 38
%%HiResBoundingBox: -6.2132 -5.9851 36.21318 37.00375
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2231
%%Pages: 1
%*Font: trapf 9.96265 9.96265 41:800000008000b8
diff --git a/Build/source/texk/web2c/triptrap/trap.5 b/Build/source/texk/web2c/triptrap/trap.5
index 6db4ead2501..00e0bdfe48d 100644
--- a/Build/source/texk/web2c/triptrap/trap.5
+++ b/Build/source/texk/web2c/triptrap/trap.5
@@ -1,7 +1,7 @@
%!PS
%%BoundingBox: -151 -2 169 21
%%HiResBoundingBox: -150.99219 -2 168.99219 20.00024
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2219
%%Pages: 1
%%BeginProlog
diff --git a/Build/source/texk/web2c/triptrap/trap.6 b/Build/source/texk/web2c/triptrap/trap.6
index 57a27351528..e65d4efd90b 100644
--- a/Build/source/texk/web2c/triptrap/trap.6
+++ b/Build/source/texk/web2c/triptrap/trap.6
@@ -1,7 +1,7 @@
%!PS
%%BoundingBox: 3 0 6 3
%%HiResBoundingBox: 3 0 6 2.25
-%%Creator: MetaPost 1.202
+%%Creator: MetaPost 1.203
%%CreationDate: 2009.06.02:2219
%%Pages: 1
%%BeginProlog
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 00:11:40 +0000