summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-02-02 00:04:34 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-02-02 00:04:34 +0000
commit48c969b3d450a42ff52db01e8d60c0c7667c0c47 (patch)
treefc650ffd8ed4dbd3f534ec990030e97fb5b5dd87 /Build
parent01d4d5d4e1b0a8238f9b5d568f331b2c1929f812 (diff)
mplibdir/mp.w: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@43118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w32
1 files changed, 25 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index 2b32fcdb415..75b67de6e92 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -1,4 +1,4 @@
-% $Id: mp.w 2114 2017-01-12 09:53:45Z luigi $
+% $Id: mp.w 2115 2017-02-01 13:56:12Z luigi $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -29161,14 +29161,30 @@ static void mp_set_up_boundingpath (MP mp, mp_node p) {
unsigned char ljoin, lcap;
mp_number miterlim;
mp_knot q = mp_copy_path (mp, cur_exp_knot ()); /* the original path */
+ mp_knot pen;
mp_knot qq;
+
new_number(miterlim);
- /* TODO: accept elliptical pens for straight paths */
+ pen = (value_knot (p));
+ /* accept elliptical pens for s paths */
+ /* using mp_make_path to convert an elliptical pen to a polygonal one. */
+ /* The approximation of 8 knots should be good enough. */
if (pen_is_elliptical (value_knot (p))) {
- mp_bad_envelope_pen (mp);
- set_cur_exp_knot (q);
- mp->cur_exp.type = mp_path_type;
- return;
+ mp_knot kp,kq;
+ pen = copy_pen (value_knot (p));
+ mp_make_path(mp, pen);
+ kq=pen;
+ do {
+ kp = kq;
+ kq = mp_next_knot (kq);
+ mp_prev_knot (kq) = kp;
+ } while (kq != pen);
+ mp_close_path_cycle (mp, kp, pen);
+ /* old one */
+ /* mp_bad_envelope_pen (mp); */
+ /* set_cur_exp_knot (q); */
+ /* mp->cur_exp.type = mp_path_type; */
+ /*return;*/
}
if (number_greater (internal_value (mp_linejoin), unity_t))
ljoin = 2;
@@ -29186,7 +29202,9 @@ static void mp_set_up_boundingpath (MP mp, mp_node p) {
set_number_to_unity(miterlim);
else
number_clone(miterlim, internal_value (mp_miterlimit));
- qq = mp_make_envelope(mp, q, value_knot (p), ljoin, lcap, miterlim);
+
+ /*qq = mp_make_envelope(mp, q, value_knot (p), ljoin, lcap, miterlim);*/
+ qq = mp_make_envelope(mp, q, pen, ljoin, lcap, miterlim);
set_cur_exp_knot (qq);
mp->cur_exp.type = mp_path_type;