From 8a4ff60407892418bc30437cfc11a7c89ca0e1e4 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Tue, 23 Apr 2019 15:09:30 +0000
Subject: [PATCH] mplib: new primitive void (TH)
---
source/texk/web2c/mplibdir/ChangeLog | 7 +++++--
source/texk/web2c/mplibdir/mp.w | 25 +++++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/source/texk/web2c/mplibdir/ChangeLog b/source/texk/web2c/mplibdir/ChangeLog
index 61360ed67..b6f1945f1 100644
--- a/source/texk/web2c/mplibdir/ChangeLog
+++ b/source/texk/web2c/mplibdir/ChangeLog
@@ -1,11 +1,14 @@
2019-03-06 Luigi Scarso <luigi.scarso@gmail.com>
- * Code clean-up.
+ * Code clean-up.
+
+
+2019-02-06: Taco Hoekwater <taco@elvenkind.com>
+ * New primitive void: convert a suffix to a boolean. Work in progress.
2019-01-28 Andreas Scherer <https://ascherer.github.io>
* mpost.w: TeXnical nitpicking.
-
2019-01-26 Luigi Scarso <luigi.scarso@gmail.com>
* Fixed bisection algorithm (overflow of number of bisections in decimal mode with low precision)
* Added 2 levels to the bisection algorithm for cubic intersection. Need testing.
diff --git a/source/texk/web2c/mplibdir/mp.w b/source/texk/web2c/mplibdir/mp.w
index 682fb4e53..059ba9a0e 100644
--- a/source/texk/web2c/mplibdir/mp.w
+++ b/source/texk/web2c/mplibdir/mp.w
@@ -3272,6 +3272,7 @@ mp_begin_group, /* beginning of a group (\&{begingroup}) */
mp_nullary, /* an operator without arguments (e.g., \&{normaldeviate}) */
mp_unary, /* an operator with one argument (e.g., \&{sqrt}) */
mp_str_op, /* convert a suffix to a string (\&{str}) */
+mp_void_op, /* convert a suffix to a boolean (\&{void}) */
mp_cycle, /* close a cyclic path (\&{cycle}) */
mp_primary_binary, /* binary operation taking `\&{of}' (e.g., \&{point}) */
mp_capsule_token, /* a value that has been put into a token list */
@@ -5028,6 +5029,8 @@ mp_primitive (mp, "step", mp_step_token, 0);
@:step_}{\&{step} primitive@>;
mp_primitive (mp, "str", mp_str_op, 0);
@:str_}{\&{str} primitive@>;
+mp_primitive (mp, "void", mp_void_op, 0);
+@:void_}{\&{void} primitive@>;
mp_primitive (mp, "tension", mp_tension, 0);
@:tension_}{\&{tension} primitive@>;
mp_primitive (mp, "to", mp_to_token, 0);
@@ -5160,6 +5163,9 @@ break;
case mp_str_op:
mp_print (mp, "str");
break;
+case mp_void_op:
+mp_print (mp, "void");
+break;
case mp_tension:
mp_print (mp, "tension");
break;
@@ -23752,6 +23758,25 @@ RESTART:
mp->cur_exp.type = mp_string_type;
goto DONE;
break;
+ case mp_void_op:
+ {
+ /* Convert a suffix to a boolean */
+ mp_value new_expr;
+ memset(&new_expr,0,sizeof(mp_value));
+ new_number(new_expr.data.n);
+ mp_get_x_next (mp);
+ mp_scan_suffix (mp);
+ if (cur_exp_node() == NULL) {
+ set_number_from_boolean (new_expr.data.n, mp_true_code);
+ } else {
+ set_number_from_boolean (new_expr.data.n, mp_false_code);
+ }
+ mp_flush_cur_exp (mp, new_expr);
+ cur_exp_node() = NULL; /* !! do not replace with |set_cur_exp_node()| !! */
+ mp->cur_exp.type = mp_boolean_type;
+ goto DONE;
+ }
+ break;
case mp_internal_quantity:
/* Scan an internal numeric quantity */
/* If an internal quantity appears all by itself on the left of an
--
GitLab