Fossil SCM

Work around issues with aggressive caching of pikchr.wasm that were making it difficult to upgrade. (1) On the /built-in page, allow filenames to have text of the form -vNNNNNNNN before the file suffix, where N is an arbitrary digit and there are at least 8 of them. The extra -vNNNNNNNN is removed before looking up the file. (2) When running "make wasm" modify the generated scripts to add random -vNNNNNNNN values to key filenames, so that browsers won't try to use the old names still in cache.

drh 2025-03-06 11:01 trunk merge

Commit dd20f34950e5b81051600543cf2bd81ef2e22e0195c051fe35dc8351b1633479

Parent 4d34e18c213827e…

9 files changed +3 -2 +1088 -1026 +170 -130 +16 +12 -4 +4 -3 +4 -3 +36

~ extsrc/pikchr-worker.js ~ extsrc/pikchr.c ~ extsrc/pikchr.js ~ extsrc/pikchr.wasm ~ src/builtin.c ~ src/fossil.page.pikchrshowasm.js ~ src/main.mk ~ tools/makemake.tcl ~ tools/randomize-js-names.tcl

M extsrc/pikchr-worker.js

+3 -2

		--- extsrc/pikchr-worker.js
		+++ extsrc/pikchr-worker.js
		@@ -206,16 +206,17 @@
206	206	data:{step: ++f.last.step, text: text\|\|null}
207	207	});
208	208	}
209	209	};
210	210
211		- importScripts('pikchr.js');
	211	+ importScripts('pikchr-v7583078860.js');
212	212	/**
213	213	initPikchrModule() is installed via pikchr.js due to
214	214	building with:
215	215
216	216	emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initPikchrModule
217	217	*/
218	218	initPikchrModule(pikchrModule).then(function(thisModule){
219		- wMsg('pikchr-ready');
	219	+ //globalThis.M = pikchrModule; console.warn("pikchrModule=globalThis.M=",globalThis.M);
	220	+ wMsg('pikchr-ready', pikchrModule.ccall('pikchr_version','string'));
220	221	});
221	222	})();
222	223

	--- extsrc/pikchr-worker.js
	+++ extsrc/pikchr-worker.js
	@@ -206,16 +206,17 @@
206	data:{step: ++f.last.step, text: text\|\|null}
207	});
208	}
209	};
210
211	importScripts('pikchr.js');
212	/**
213	initPikchrModule() is installed via pikchr.js due to
214	building with:
215
216	emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initPikchrModule
217	*/
218	initPikchrModule(pikchrModule).then(function(thisModule){
219	wMsg('pikchr-ready');

220	});
221	})();
222

	--- extsrc/pikchr-worker.js
	+++ extsrc/pikchr-worker.js
	@@ -206,16 +206,17 @@
206	data:{step: ++f.last.step, text: text\|\|null}
207	});
208	}
209	};
210
211	importScripts('pikchr-v7583078860.js');
212	/**
213	initPikchrModule() is installed via pikchr.js due to
214	building with:
215
216	emcc ... -sMODULARIZE=1 -sEXPORT_NAME=initPikchrModule
217	*/
218	initPikchrModule(pikchrModule).then(function(thisModule){
219	//globalThis.M = pikchrModule; console.warn("pikchrModule=globalThis.M=",globalThis.M);
220	wMsg('pikchr-ready', pikchrModule.ccall('pikchr_version','string'));
221	});
222	})();
223

M extsrc/pikchr.c

+1088 -1026

		--- extsrc/pikchr.c
		+++ extsrc/pikchr.c
		@@ -1,8 +1,47 @@
1	1	/* This file is automatically generated by Lemon from input grammar
2	2	** source file "pikchr.y".
3	3	*/
	4	+/*
	5	+** 2000-05-29
	6	+**
	7	+** The author disclaims copyright to this source code. In place of
	8	+** a legal notice, here is a blessing:
	9	+**
	10	+** May you do good and not evil.
	11	+** May you find forgiveness for yourself and forgive others.
	12	+** May you share freely, never taking more than you give.
	13	+**
	14	+*************************************************************************
	15	+** Driver template for the LEMON parser generator.
	16	+**
	17	+** The "lemon" program processes an LALR(1) input grammar file, then uses
	18	+** this template to construct a parser. The "lemon" program inserts text
	19	+** at each "%%" line. Also, any "P-a-r-s-e" identifier prefix (without the
	20	+** interstitial "-" characters) contained in this template is changed into
	21	+** the value of the %name directive from the grammar. Otherwise, the content
	22	+** of this template is copied straight through into the generate parser
	23	+** source file.
	24	+**
	25	+** The following is the concatenation of all %include directives from the
	26	+** input grammar file:
	27	+*/
	28	+/********** Begin %include sections from the grammar **********************/
	29	+#line 1 "VERSION.h"
	30	+#define MANIFEST_UUID "052f07296e76ab2312caf2a4bf6237e574b3e533c7a36ee8f34db833baa3efb4"
	31	+#define MANIFEST_VERSION "[052f07296e]"
	32	+#define MANIFEST_DATE "2025-03-05 10:54:16"
	33	+#define MANIFEST_YEAR "2025"
	34	+#define MANIFEST_ISODATE "20250305105416"
	35	+#define MANIFEST_NUMERIC_DATE 20250305
	36	+#define MANIFEST_NUMERIC_TIME 105416
	37	+#define RELEASE_VERSION "1.0"
	38	+#define RELEASE_VERSION_NUMBER 10000
	39	+#define RELEASE_RESOURCE_VERSION 1,0,0,0
	40	+#define COMPILER "gcc-13.3.0"
	41	+#line 2 "pikchr.y"
	42	+
4	43	/*
5	44	** Zero-Clause BSD license:
6	45	**
7	46	** Copyright (C) 2020-09-01 by D. Richard Hipp <[email protected]>
8	47	**
		@@ -504,11 +543,11 @@
504	543	static PObj pik_position_assert(Pik,PPoint,PToken,PPoint*);
505	544	static PNum pik_dist(PPoint,PPoint);
506	545	static void pik_add_macro(Pik,PToken pId,PToken *pCode);
507	546
508	547
509		-#line 535 "pikchr.c"
	548	+#line 549 "pikchr.c"
510	549	/************** End of %include directives ********************************/
511	550	/* These constants specify the various numeric values for terminal symbols.
512	551	*************** Begin token definitions ***********************************/
513	552	#ifndef T_ID
514	553	#define T_ID 1
		@@ -534,84 +573,85 @@
534	573	#define T_COLOR 21
535	574	#define T_THICKNESS 22
536	575	#define T_PRINT 23
537	576	#define T_STRING 24
538	577	#define T_COMMA 25
539		-#define T_CLASSNAME 26
540		-#define T_LB 27
541		-#define T_RB 28
542		-#define T_UP 29
543		-#define T_DOWN 30
544		-#define T_LEFT 31
545		-#define T_RIGHT 32
546		-#define T_CLOSE 33
547		-#define T_CHOP 34
548		-#define T_FROM 35
549		-#define T_TO 36
550		-#define T_THEN 37
551		-#define T_HEADING 38
552		-#define T_GO 39
553		-#define T_AT 40
554		-#define T_WITH 41
555		-#define T_SAME 42
556		-#define T_AS 43
557		-#define T_FIT 44
558		-#define T_BEHIND 45
559		-#define T_UNTIL 46
560		-#define T_EVEN 47
561		-#define T_DOT_E 48
562		-#define T_HEIGHT 49
563		-#define T_WIDTH 50
564		-#define T_RADIUS 51
565		-#define T_DIAMETER 52
566		-#define T_DOTTED 53
567		-#define T_DASHED 54
568		-#define T_CW 55
569		-#define T_CCW 56
570		-#define T_LARROW 57
571		-#define T_RARROW 58
572		-#define T_LRARROW 59
573		-#define T_INVIS 60
574		-#define T_THICK 61
575		-#define T_THIN 62
576		-#define T_SOLID 63
577		-#define T_CENTER 64
578		-#define T_LJUST 65
579		-#define T_RJUST 66
580		-#define T_ABOVE 67
581		-#define T_BELOW 68
582		-#define T_ITALIC 69
583		-#define T_BOLD 70
584		-#define T_MONO 71
585		-#define T_ALIGNED 72
586		-#define T_BIG 73
587		-#define T_SMALL 74
588		-#define T_AND 75
589		-#define T_LT 76
590		-#define T_GT 77
591		-#define T_ON 78
592		-#define T_WAY 79
593		-#define T_BETWEEN 80
594		-#define T_THE 81
595		-#define T_NTH 82
596		-#define T_VERTEX 83
597		-#define T_TOP 84
598		-#define T_BOTTOM 85
599		-#define T_START 86
600		-#define T_END 87
601		-#define T_IN 88
602		-#define T_THIS 89
603		-#define T_DOT_U 90
604		-#define T_LAST 91
605		-#define T_NUMBER 92
606		-#define T_FUNC1 93
607		-#define T_FUNC2 94
608		-#define T_DIST 95
609		-#define T_DOT_XY 96
610		-#define T_X 97
611		-#define T_Y 98
612		-#define T_DOT_L 99
	578	+#define T_ISODATE 26
	579	+#define T_CLASSNAME 27
	580	+#define T_LB 28
	581	+#define T_RB 29
	582	+#define T_UP 30
	583	+#define T_DOWN 31
	584	+#define T_LEFT 32
	585	+#define T_RIGHT 33
	586	+#define T_CLOSE 34
	587	+#define T_CHOP 35
	588	+#define T_FROM 36
	589	+#define T_TO 37
	590	+#define T_THEN 38
	591	+#define T_HEADING 39
	592	+#define T_GO 40
	593	+#define T_AT 41
	594	+#define T_WITH 42
	595	+#define T_SAME 43
	596	+#define T_AS 44
	597	+#define T_FIT 45
	598	+#define T_BEHIND 46
	599	+#define T_UNTIL 47
	600	+#define T_EVEN 48
	601	+#define T_DOT_E 49
	602	+#define T_HEIGHT 50
	603	+#define T_WIDTH 51
	604	+#define T_RADIUS 52
	605	+#define T_DIAMETER 53
	606	+#define T_DOTTED 54
	607	+#define T_DASHED 55
	608	+#define T_CW 56
	609	+#define T_CCW 57
	610	+#define T_LARROW 58
	611	+#define T_RARROW 59
	612	+#define T_LRARROW 60
	613	+#define T_INVIS 61
	614	+#define T_THICK 62
	615	+#define T_THIN 63
	616	+#define T_SOLID 64
	617	+#define T_CENTER 65
	618	+#define T_LJUST 66
	619	+#define T_RJUST 67
	620	+#define T_ABOVE 68
	621	+#define T_BELOW 69
	622	+#define T_ITALIC 70
	623	+#define T_BOLD 71
	624	+#define T_MONO 72
	625	+#define T_ALIGNED 73
	626	+#define T_BIG 74
	627	+#define T_SMALL 75
	628	+#define T_AND 76
	629	+#define T_LT 77
	630	+#define T_GT 78
	631	+#define T_ON 79
	632	+#define T_WAY 80
	633	+#define T_BETWEEN 81
	634	+#define T_THE 82
	635	+#define T_NTH 83
	636	+#define T_VERTEX 84
	637	+#define T_TOP 85
	638	+#define T_BOTTOM 86
	639	+#define T_START 87
	640	+#define T_END 88
	641	+#define T_IN 89
	642	+#define T_THIS 90
	643	+#define T_DOT_U 91
	644	+#define T_LAST 92
	645	+#define T_NUMBER 93
	646	+#define T_FUNC1 94
	647	+#define T_FUNC2 95
	648	+#define T_DIST 96
	649	+#define T_DOT_XY 97
	650	+#define T_X 98
	651	+#define T_Y 99
	652	+#define T_DOT_L 100
613	653	#endif
614	654	/************** End token definitions *************************************/
615	655
616	656	/* The next sections is a series of control #defines.
617	657	** various aspects of the generated parser.
		@@ -672,22 +712,22 @@
672	712	#ifndef INTERFACE
673	713	# define INTERFACE 1
674	714	#endif
675	715	/*********** Begin control #defines ***************************************/
676	716	#define YYCODETYPE unsigned char
677		-#define YYNOCODE 136
	717	+#define YYNOCODE 138
678	718	#define YYACTIONTYPE unsigned short int
679	719	#define pik_parserTOKENTYPE PToken
680	720	typedef union {
681	721	int yyinit;
682	722	pik_parserTOKENTYPE yy0;
683		- PNum yy21;
684		- PPoint yy63;
685		- PRel yy72;
686		- PObj* yy162;
687		- short int yy188;
688		- PList* yy235;
	723	+ PList* yy23;
	724	+ PRel yy28;
	725	+ PObj* yy54;
	726	+ PNum yy129;
	727	+ PPoint yy187;
	728	+ short int yy272;
689	729	} YYMINORTYPE;
690	730	#ifndef YYSTACKDEPTH
691	731	#define YYSTACKDEPTH 100
692	732	#endif
693	733	#define pik_parserARG_SDECL
		@@ -705,21 +745,21 @@
705	745	#define pik_parserCTX_STORE yypParser->p=p;
706	746	#define YYFALLBACK 1
707	747	#define YYNSTATE 164
708	748	#define YYNRULE 156
709	749	#define YYNRULE_WITH_ACTION 116
710		-#define YYNTOKEN 100
	750	+#define YYNTOKEN 101
711	751	#define YY_MAX_SHIFT 163
712	752	#define YY_MIN_SHIFTREDUCE 287
713	753	#define YY_MAX_SHIFTREDUCE 442
714	754	#define YY_ERROR_ACTION 443
715	755	#define YY_ACCEPT_ACTION 444
716	756	#define YY_NO_ACTION 445
717	757	#define YY_MIN_REDUCE 446
718	758	#define YY_MAX_REDUCE 601
719		-#define YY_MIN_DSTRCTR 100
720		-#define YY_MAX_DSTRCTR 103
	759	+#define YY_MIN_DSTRCTR 101
	760	+#define YY_MAX_DSTRCTR 104
721	761	/*********** End control #defines *****************************************/
722	762	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
723	763
724	764	/* Define the yytestcase() macro to be a no-op if is not already defined
725	765	** otherwise.
		@@ -798,324 +838,322 @@
798	838	** yy_reduce_ofst[] For each state, the offset into yy_action for
799	839	** shifting non-terminals after a reduce.
800	840	** yy_default[] Default action for each state.
801	841	**
802	842	********* Begin parsing tables ********************************************/
803		-#define YY_ACTTAB_COUNT (1313)
	843	+#define YY_ACTTAB_COUNT (1305)
804	844	static const YYACTIONTYPE yy_action[] = {
805	845	/* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
806		- /* 10 */ 575, 492, 161, 119, 453, 113, 120, 161, 119, 530,
807		- /* 20 */ 427, 428, 339, 559, 81, 30, 560, 561, 575, 64,
808		- /* 30 */ 63, 62, 61, 322, 323, 9, 8, 33, 149, 32,
809		- /* 40 */ 7, 71, 127, 38, 335, 66, 48, 37, 28, 339,
810		- /* 50 */ 339, 339, 339, 425, 426, 340, 341, 342, 343, 344,
811		- /* 60 */ 345, 346, 347, 348, 474, 528, 161, 119, 577, 77,
812		- /* 70 */ 577, 73, 306, 148, 474, 533, 161, 119, 112, 113,
813		- /* 80 */ 120, 161, 119, 128, 427, 428, 339, 31, 81, 531,
814		- /* 90 */ 161, 119, 474, 35, 330, 378, 158, 322, 323, 9,
815		- /* 100 */ 8, 33, 149, 32, 7, 71, 127, 328, 335, 66,
816		- /* 110 */ 579, 378, 158, 339, 339, 339, 339, 425, 426, 340,
817		- /* 120 */ 341, 342, 343, 344, 345, 346, 347, 348, 394, 435,
818		- /* 130 */ 46, 59, 60, 64, 63, 62, 61, 357, 36, 376,
819		- /* 140 */ 54, 51, 2, 47, 403, 13, 297, 411, 412, 413,
820		- /* 150 */ 414, 80, 162, 308, 79, 133, 310, 126, 441, 440,
821		- /* 160 */ 118, 123, 83, 404, 405, 406, 408, 80, 84, 308,
822		- /* 170 */ 79, 299, 411, 412, 413, 414, 118, 69, 350, 350,
823		- /* 180 */ 350, 350, 350, 350, 350, 350, 350, 350, 350, 62,
824		- /* 190 */ 61, 434, 64, 63, 62, 61, 313, 398, 399, 427,
825		- /* 200 */ 428, 339, 380, 157, 64, 63, 62, 61, 122, 106,
826		- /* 210 */ 535, 436, 437, 438, 439, 298, 375, 391, 117, 393,
827		- /* 220 */ 155, 154, 153, 394, 435, 49, 59, 60, 339, 339,
828		- /* 230 */ 339, 339, 425, 426, 376, 3, 4, 2, 64, 63,
829		- /* 240 */ 62, 61, 156, 156, 156, 394, 379, 159, 59, 60,
830		- /* 250 */ 76, 67, 535, 441, 440, 5, 102, 6, 535, 42,
831		- /* 260 */ 131, 535, 69, 107, 301, 302, 303, 394, 305, 15,
832		- /* 270 */ 59, 60, 120, 161, 119, 446, 463, 424, 376, 423,
833		- /* 280 */ 1, 42, 397, 78, 78, 36, 434, 11, 394, 435,
834		- /* 290 */ 356, 59, 60, 12, 152, 139, 432, 14, 16, 376,
835		- /* 300 */ 18, 65, 2, 138, 106, 430, 436, 437, 438, 439,
836		- /* 310 */ 44, 375, 19, 117, 393, 155, 154, 153, 441, 440,
837		- /* 320 */ 142, 140, 64, 63, 62, 61, 106, 20, 68, 376,
838		- /* 330 */ 359, 107, 23, 375, 45, 117, 393, 155, 154, 153,
839		- /* 340 */ 120, 161, 119, 55, 463, 114, 26, 57, 106, 147,
840		- /* 350 */ 146, 434, 569, 58, 392, 375, 43, 117, 393, 155,
841		- /* 360 */ 154, 153, 152, 384, 64, 63, 62, 61, 382, 106,
842		- /* 370 */ 383, 436, 437, 438, 439, 377, 375, 70, 117, 393,
843		- /* 380 */ 155, 154, 153, 160, 39, 22, 21, 445, 142, 140,
844		- /* 390 */ 64, 63, 62, 61, 24, 17, 145, 141, 431, 108,
845		- /* 400 */ 445, 445, 445, 391, 445, 445, 375, 445, 117, 445,
846		- /* 410 */ 445, 55, 74, 445, 148, 445, 445, 147, 146, 124,
847		- /* 420 */ 113, 120, 161, 119, 43, 445, 445, 142, 140, 64,
848		- /* 430 */ 63, 62, 61, 445, 394, 445, 445, 59, 60, 64,
849		- /* 440 */ 63, 62, 61, 149, 445, 376, 445, 445, 42, 445,
850		- /* 450 */ 55, 445, 391, 22, 21, 445, 147, 146, 445, 445,
851		- /* 460 */ 52, 445, 24, 43, 145, 141, 431, 394, 445, 445,
852		- /* 470 */ 59, 60, 64, 63, 62, 61, 445, 445, 376, 132,
853		- /* 480 */ 130, 42, 445, 445, 445, 355, 156, 156, 156, 445,
854		- /* 490 */ 445, 445, 22, 21, 445, 394, 473, 445, 59, 60,
855		- /* 500 */ 445, 24, 445, 145, 141, 431, 376, 445, 107, 42,
856		- /* 510 */ 64, 63, 62, 61, 445, 106, 445, 120, 161, 119,
857		- /* 520 */ 445, 478, 375, 354, 117, 393, 155, 154, 153, 445,
858		- /* 530 */ 394, 143, 473, 59, 60, 64, 63, 62, 61, 152,
859		- /* 540 */ 445, 376, 445, 445, 42, 445, 445, 445, 106, 64,
860		- /* 550 */ 63, 62, 61, 445, 445, 375, 50, 117, 393, 155,
861		- /* 560 */ 154, 153, 445, 394, 144, 445, 59, 60, 445, 445,
862		- /* 570 */ 53, 72, 445, 148, 376, 445, 106, 42, 125, 113,
863		- /* 580 */ 120, 161, 119, 375, 445, 117, 393, 155, 154, 153,
864		- /* 590 */ 394, 445, 445, 59, 60, 445, 445, 445, 445, 445,
865		- /* 600 */ 445, 102, 149, 445, 42, 445, 74, 445, 148, 445,
866		- /* 610 */ 445, 106, 445, 497, 113, 120, 161, 119, 375, 445,
867		- /* 620 */ 117, 393, 155, 154, 153, 394, 445, 445, 59, 60,
868		- /* 630 */ 445, 445, 88, 445, 445, 445, 376, 149, 445, 40,
869		- /* 640 */ 445, 120, 161, 119, 106, 445, 445, 435, 110, 110,
870		- /* 650 */ 445, 375, 445, 117, 393, 155, 154, 153, 394, 445,
871		- /* 660 */ 445, 59, 60, 152, 85, 445, 445, 445, 445, 376,
872		- /* 670 */ 445, 106, 41, 120, 161, 119, 441, 440, 375, 445,
873		- /* 680 */ 117, 393, 155, 154, 153, 448, 454, 29, 445, 445,
874		- /* 690 */ 74, 450, 148, 75, 88, 152, 445, 496, 113, 120,
875		- /* 700 */ 161, 119, 163, 120, 161, 119, 106, 27, 445, 434,
876		- /* 710 */ 111, 111, 445, 375, 445, 117, 393, 155, 154, 153,
877		- /* 720 */ 445, 149, 445, 445, 445, 152, 74, 445, 148, 436,
878		- /* 730 */ 437, 438, 439, 490, 113, 120, 161, 119, 445, 106,
879		- /* 740 */ 121, 447, 454, 29, 445, 445, 375, 450, 117, 393,
880		- /* 750 */ 155, 154, 153, 445, 445, 445, 445, 149, 163, 74,
881		- /* 760 */ 445, 148, 444, 27, 445, 445, 484, 113, 120, 161,
882		- /* 770 */ 119, 445, 445, 445, 74, 445, 148, 445, 445, 445,
883		- /* 780 */ 445, 483, 113, 120, 161, 119, 74, 445, 148, 86,
884		- /* 790 */ 149, 445, 445, 480, 113, 120, 161, 119, 120, 161,
885		- /* 800 */ 119, 445, 74, 445, 148, 149, 445, 445, 445, 134,
886		- /* 810 */ 113, 120, 161, 119, 74, 445, 148, 149, 445, 445,
887		- /* 820 */ 152, 517, 113, 120, 161, 119, 88, 64, 63, 62,
888		- /* 830 */ 61, 445, 445, 149, 445, 120, 161, 119, 445, 74,
889		- /* 840 */ 396, 148, 475, 445, 445, 149, 137, 113, 120, 161,
890		- /* 850 */ 119, 74, 445, 148, 445, 445, 445, 152, 525, 113,
891		- /* 860 */ 120, 161, 119, 445, 74, 445, 148, 445, 445, 445,
892		- /* 870 */ 149, 527, 113, 120, 161, 119, 445, 445, 445, 74,
893		- /* 880 */ 445, 148, 149, 445, 445, 445, 524, 113, 120, 161,
894		- /* 890 */ 119, 74, 445, 148, 98, 149, 445, 445, 526, 113,
895		- /* 900 */ 120, 161, 119, 120, 161, 119, 445, 74, 445, 148,
896		- /* 910 */ 149, 445, 445, 445, 523, 113, 120, 161, 119, 74,
897		- /* 920 */ 445, 148, 149, 445, 445, 152, 522, 113, 120, 161,
898		- /* 930 */ 119, 89, 64, 63, 62, 61, 445, 445, 149, 445,
899		- /* 940 */ 120, 161, 119, 445, 74, 395, 148, 445, 445, 445,
900		- /* 950 */ 149, 521, 113, 120, 161, 119, 74, 445, 148, 445,
901		- /* 960 */ 445, 445, 152, 520, 113, 120, 161, 119, 445, 74,
902		- /* 970 */ 445, 148, 445, 445, 445, 149, 519, 113, 120, 161,
903		- /* 980 */ 119, 445, 445, 445, 74, 445, 148, 149, 445, 445,
904		- /* 990 */ 445, 150, 113, 120, 161, 119, 74, 445, 148, 90,
905		- /* 1000 */ 149, 445, 445, 151, 113, 120, 161, 119, 120, 161,
906		- /* 1010 */ 119, 445, 74, 445, 148, 149, 445, 435, 445, 136,
907		- /* 1020 */ 113, 120, 161, 119, 74, 445, 148, 149, 445, 445,
908		- /* 1030 */ 152, 135, 113, 120, 161, 119, 64, 63, 62, 61,
909		- /* 1040 */ 445, 445, 445, 149, 445, 445, 441, 440, 445, 88,
910		- /* 1050 */ 445, 445, 445, 445, 445, 149, 445, 56, 120, 161,
911		- /* 1060 */ 119, 88, 445, 445, 10, 479, 479, 445, 445, 445,
912		- /* 1070 */ 120, 161, 119, 445, 445, 445, 445, 82, 445, 434,
913		- /* 1080 */ 152, 445, 445, 445, 466, 445, 34, 109, 447, 454,
914		- /* 1090 */ 29, 445, 152, 445, 450, 445, 445, 445, 107, 436,
915		- /* 1100 */ 437, 438, 439, 87, 445, 163, 445, 120, 161, 119,
916		- /* 1110 */ 27, 451, 120, 161, 119, 99, 445, 64, 63, 62,
917		- /* 1120 */ 61, 445, 100, 445, 120, 161, 119, 101, 445, 152,
918		- /* 1130 */ 391, 120, 161, 119, 152, 445, 120, 161, 119, 91,
919		- /* 1140 */ 445, 445, 445, 445, 445, 445, 152, 445, 120, 161,
920		- /* 1150 */ 119, 103, 445, 152, 92, 445, 445, 445, 152, 445,
921		- /* 1160 */ 120, 161, 119, 120, 161, 119, 93, 445, 445, 104,
922		- /* 1170 */ 152, 445, 445, 445, 445, 120, 161, 119, 120, 161,
923		- /* 1180 */ 119, 445, 152, 445, 94, 152, 445, 445, 445, 445,
924		- /* 1190 */ 445, 445, 105, 120, 161, 119, 445, 152, 445, 95,
925		- /* 1200 */ 152, 120, 161, 119, 445, 445, 445, 96, 120, 161,
926		- /* 1210 */ 119, 445, 445, 445, 445, 152, 120, 161, 119, 445,
927		- /* 1220 */ 445, 445, 445, 152, 445, 445, 445, 445, 445, 445,
928		- /* 1230 */ 152, 97, 445, 445, 549, 445, 445, 548, 152, 445,
929		- /* 1240 */ 120, 161, 119, 120, 161, 119, 120, 161, 119, 445,
930		- /* 1250 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
931		- /* 1260 */ 445, 445, 152, 547, 445, 152, 546, 445, 152, 115,
932		- /* 1270 */ 445, 445, 120, 161, 119, 120, 161, 119, 120, 161,
933		- /* 1280 */ 119, 116, 445, 445, 445, 445, 445, 445, 445, 445,
934		- /* 1290 */ 120, 161, 119, 445, 152, 445, 445, 152, 445, 445,
935		- /* 1300 */ 152, 445, 445, 445, 445, 445, 445, 445, 445, 445,
936		- /* 1310 */ 445, 445, 152,
	846	+ /* 10 */ 575, 64, 63, 62, 61, 453, 113, 120, 161, 119,
	847	+ /* 20 */ 427, 428, 339, 357, 81, 121, 447, 454, 29, 575,
	848	+ /* 30 */ 530, 13, 50, 450, 322, 323, 9, 8, 33, 149,
	849	+ /* 40 */ 32, 7, 71, 127, 163, 335, 66, 28, 444, 27,
	850	+ /* 50 */ 339, 339, 339, 339, 425, 426, 340, 341, 342, 343,
	851	+ /* 60 */ 344, 345, 346, 347, 348, 474, 64, 63, 62, 61,
	852	+ /* 70 */ 54, 51, 73, 306, 148, 474, 492, 161, 119, 297,
	853	+ /* 80 */ 112, 113, 120, 161, 119, 427, 428, 339, 30, 81,
	854	+ /* 90 */ 109, 447, 454, 29, 474, 528, 161, 119, 450, 322,
	855	+ /* 100 */ 323, 9, 8, 33, 149, 32, 7, 71, 127, 163,
	856	+ /* 110 */ 335, 66, 535, 36, 27, 339, 339, 339, 339, 425,
	857	+ /* 120 */ 426, 340, 341, 342, 343, 344, 345, 346, 347, 348,
	858	+ /* 130 */ 394, 435, 310, 59, 60, 64, 63, 62, 61, 313,
	859	+ /* 140 */ 74, 376, 148, 69, 2, 533, 161, 119, 124, 113,
	860	+ /* 150 */ 120, 161, 119, 80, 535, 31, 308, 79, 83, 107,
	861	+ /* 160 */ 535, 441, 440, 535, 394, 435, 299, 59, 60, 120,
	862	+ /* 170 */ 161, 119, 149, 463, 376, 376, 330, 84, 2, 122,
	863	+ /* 180 */ 78, 78, 38, 156, 156, 156, 48, 37, 559, 328,
	864	+ /* 190 */ 128, 152, 560, 561, 434, 441, 440, 350, 350, 350,
	865	+ /* 200 */ 350, 350, 350, 350, 350, 350, 350, 350, 577, 77,
	866	+ /* 210 */ 577, 35, 106, 46, 436, 437, 438, 439, 579, 375,
	867	+ /* 220 */ 298, 117, 393, 155, 154, 153, 47, 4, 434, 69,
	868	+ /* 230 */ 394, 435, 3, 59, 60, 411, 412, 413, 414, 398,
	869	+ /* 240 */ 399, 376, 62, 61, 2, 108, 106, 5, 436, 437,
	870	+ /* 250 */ 438, 439, 375, 375, 117, 117, 393, 155, 154, 153,
	871	+ /* 260 */ 76, 441, 440, 67, 6, 142, 140, 64, 63, 62,
	872	+ /* 270 */ 61, 380, 157, 424, 427, 428, 339, 379, 159, 45,
	873	+ /* 280 */ 423, 72, 131, 148, 531, 161, 119, 1, 55, 125,
	874	+ /* 290 */ 113, 120, 161, 119, 434, 147, 146, 64, 63, 62,
	875	+ /* 300 */ 61, 397, 43, 11, 339, 339, 339, 339, 425, 426,
	876	+ /* 310 */ 355, 65, 106, 149, 436, 437, 438, 439, 74, 375,
	877	+ /* 320 */ 148, 117, 393, 155, 154, 153, 497, 113, 120, 161,
	878	+ /* 330 */ 119, 22, 21, 12, 142, 140, 64, 63, 62, 61,
	879	+ /* 340 */ 24, 356, 145, 141, 431, 64, 63, 62, 61, 391,
	880	+ /* 350 */ 149, 448, 454, 29, 378, 158, 85, 55, 450, 394,
	881	+ /* 360 */ 432, 138, 59, 60, 147, 146, 120, 161, 119, 163,
	882	+ /* 370 */ 102, 43, 139, 42, 27, 430, 14, 15, 301, 302,
	883	+ /* 380 */ 303, 446, 305, 16, 44, 74, 18, 148, 152, 19,
	884	+ /* 390 */ 20, 36, 68, 496, 113, 120, 161, 119, 114, 359,
	885	+ /* 400 */ 22, 21, 23, 142, 140, 64, 63, 62, 61, 24,
	886	+ /* 410 */ 107, 145, 141, 431, 26, 57, 377, 149, 58, 118,
	887	+ /* 420 */ 120, 161, 119, 392, 463, 384, 55, 64, 63, 62,
	888	+ /* 430 */ 61, 382, 569, 147, 146, 160, 383, 435, 39, 70,
	889	+ /* 440 */ 43, 106, 152, 445, 445, 88, 445, 445, 375, 445,
	890	+ /* 450 */ 117, 393, 155, 154, 153, 120, 161, 119, 445, 17,
	891	+ /* 460 */ 445, 10, 479, 479, 445, 445, 435, 441, 440, 22,
	892	+ /* 470 */ 21, 445, 403, 64, 63, 62, 61, 152, 24, 445,
	893	+ /* 480 */ 145, 141, 431, 133, 75, 126, 354, 445, 445, 123,
	894	+ /* 490 */ 445, 404, 405, 406, 408, 80, 441, 440, 308, 79,
	895	+ /* 500 */ 434, 411, 412, 413, 414, 394, 445, 445, 59, 60,
	896	+ /* 510 */ 64, 63, 62, 61, 445, 445, 376, 445, 445, 42,
	897	+ /* 520 */ 436, 437, 438, 439, 156, 156, 156, 394, 445, 434,
	898	+ /* 530 */ 59, 60, 64, 63, 62, 61, 445, 445, 376, 445,
	899	+ /* 540 */ 445, 42, 445, 394, 473, 391, 59, 60, 445, 436,
	900	+ /* 550 */ 437, 438, 439, 49, 376, 445, 74, 42, 148, 445,
	901	+ /* 560 */ 88, 445, 445, 445, 490, 113, 120, 161, 119, 445,
	902	+ /* 570 */ 120, 161, 119, 132, 130, 394, 143, 475, 59, 60,
	903	+ /* 580 */ 445, 473, 64, 63, 62, 61, 376, 106, 149, 42,
	904	+ /* 590 */ 445, 445, 152, 445, 375, 391, 117, 393, 155, 154,
	905	+ /* 600 */ 153, 394, 144, 52, 59, 60, 445, 445, 445, 106,
	906	+ /* 610 */ 445, 445, 376, 445, 445, 42, 375, 445, 117, 393,
	907	+ /* 620 */ 155, 154, 153, 445, 445, 106, 64, 63, 62, 61,
	908	+ /* 630 */ 445, 445, 375, 445, 117, 393, 155, 154, 153, 394,
	909	+ /* 640 */ 445, 445, 59, 60, 88, 445, 445, 53, 445, 445,
	910	+ /* 650 */ 376, 445, 445, 42, 120, 161, 119, 106, 445, 445,
	911	+ /* 660 */ 445, 110, 110, 445, 375, 445, 117, 393, 155, 154,
	912	+ /* 670 */ 153, 394, 445, 445, 59, 60, 152, 107, 445, 445,
	913	+ /* 680 */ 445, 445, 102, 106, 445, 42, 445, 120, 161, 119,
	914	+ /* 690 */ 375, 451, 117, 393, 155, 154, 153, 394, 445, 445,
	915	+ /* 700 */ 59, 60, 64, 63, 62, 61, 445, 445, 376, 152,
	916	+ /* 710 */ 445, 40, 445, 394, 445, 396, 59, 60, 445, 445,
	917	+ /* 720 */ 445, 106, 445, 445, 376, 88, 445, 41, 375, 445,
	918	+ /* 730 */ 117, 393, 155, 154, 153, 120, 161, 119, 74, 445,
	919	+ /* 740 */ 148, 445, 111, 111, 107, 445, 484, 113, 120, 161,
	920	+ /* 750 */ 119, 445, 445, 106, 120, 161, 119, 152, 478, 445,
	921	+ /* 760 */ 375, 86, 117, 393, 155, 154, 153, 445, 445, 445,
	922	+ /* 770 */ 149, 120, 161, 119, 445, 445, 152, 445, 445, 106,
	923	+ /* 780 */ 445, 64, 63, 62, 61, 445, 375, 445, 117, 393,
	924	+ /* 790 */ 155, 154, 153, 152, 395, 106, 64, 63, 62, 61,
	925	+ /* 800 */ 98, 445, 375, 445, 117, 393, 155, 154, 153, 445,
	926	+ /* 810 */ 120, 161, 119, 445, 74, 445, 148, 56, 445, 74,
	927	+ /* 820 */ 445, 148, 483, 113, 120, 161, 119, 480, 113, 120,
	928	+ /* 830 */ 161, 119, 152, 74, 445, 148, 445, 89, 445, 445,
	929	+ /* 840 */ 445, 134, 113, 120, 161, 119, 149, 120, 161, 119,
	930	+ /* 850 */ 445, 149, 74, 445, 148, 445, 445, 445, 378, 158,
	931	+ /* 860 */ 517, 113, 120, 161, 119, 149, 74, 445, 148, 152,
	932	+ /* 870 */ 445, 74, 445, 148, 137, 113, 120, 161, 119, 525,
	933	+ /* 880 */ 113, 120, 161, 119, 149, 74, 445, 148, 64, 63,
	934	+ /* 890 */ 62, 61, 445, 527, 113, 120, 161, 119, 149, 445,
	935	+ /* 900 */ 445, 391, 445, 149, 445, 445, 445, 445, 445, 445,
	936	+ /* 910 */ 74, 445, 148, 445, 445, 162, 445, 149, 524, 113,
	937	+ /* 920 */ 120, 161, 119, 118, 445, 74, 445, 148, 445, 445,
	938	+ /* 930 */ 445, 445, 445, 526, 113, 120, 161, 119, 445, 74,
	939	+ /* 940 */ 445, 148, 149, 445, 445, 445, 445, 523, 113, 120,
	940	+ /* 950 */ 161, 119, 74, 445, 148, 445, 445, 149, 445, 445,
	941	+ /* 960 */ 522, 113, 120, 161, 119, 445, 74, 445, 148, 445,
	942	+ /* 970 */ 445, 149, 445, 445, 521, 113, 120, 161, 119, 74,
	943	+ /* 980 */ 445, 148, 445, 445, 149, 445, 445, 520, 113, 120,
	944	+ /* 990 */ 161, 119, 445, 74, 445, 148, 445, 445, 149, 445,
	945	+ /* 1000 */ 445, 519, 113, 120, 161, 119, 445, 445, 445, 445,
	946	+ /* 1010 */ 445, 149, 445, 445, 445, 445, 445, 445, 74, 445,
	947	+ /* 1020 */ 148, 445, 445, 445, 445, 149, 150, 113, 120, 161,
	948	+ /* 1030 */ 119, 74, 445, 148, 445, 445, 445, 445, 445, 151,
	949	+ /* 1040 */ 113, 120, 161, 119, 445, 74, 445, 148, 445, 445,
	950	+ /* 1050 */ 149, 445, 445, 136, 113, 120, 161, 119, 74, 445,
	951	+ /* 1060 */ 148, 445, 445, 149, 445, 445, 135, 113, 120, 161,
	952	+ /* 1070 */ 119, 445, 88, 445, 445, 445, 445, 149, 445, 445,
	953	+ /* 1080 */ 445, 90, 120, 161, 119, 445, 445, 445, 445, 82,
	954	+ /* 1090 */ 149, 120, 161, 119, 445, 87, 466, 445, 34, 99,
	955	+ /* 1100 */ 445, 445, 445, 445, 152, 120, 161, 119, 100, 120,
	956	+ /* 1110 */ 161, 119, 445, 152, 445, 445, 445, 445, 120, 161,
	957	+ /* 1120 */ 119, 445, 445, 445, 101, 445, 445, 152, 445, 445,
	958	+ /* 1130 */ 445, 152, 91, 445, 120, 161, 119, 103, 445, 445,
	959	+ /* 1140 */ 152, 445, 120, 161, 119, 445, 445, 120, 161, 119,
	960	+ /* 1150 */ 445, 92, 445, 445, 445, 445, 152, 445, 445, 445,
	961	+ /* 1160 */ 93, 120, 161, 119, 152, 445, 104, 445, 445, 152,
	962	+ /* 1170 */ 120, 161, 119, 445, 94, 445, 120, 161, 119, 445,
	963	+ /* 1180 */ 445, 445, 445, 152, 120, 161, 119, 445, 445, 105,
	964	+ /* 1190 */ 445, 445, 152, 445, 445, 445, 445, 95, 152, 120,
	965	+ /* 1200 */ 161, 119, 96, 445, 445, 97, 152, 120, 161, 119,
	966	+ /* 1210 */ 445, 445, 120, 161, 119, 120, 161, 119, 445, 445,
	967	+ /* 1220 */ 445, 152, 445, 445, 445, 445, 445, 445, 445, 152,
	968	+ /* 1230 */ 549, 445, 445, 548, 152, 445, 445, 152, 547, 445,
	969	+ /* 1240 */ 120, 161, 119, 120, 161, 119, 546, 445, 120, 161,
	970	+ /* 1250 */ 119, 445, 445, 445, 445, 445, 120, 161, 119, 445,
	971	+ /* 1260 */ 445, 445, 152, 445, 445, 152, 445, 445, 445, 115,
	972	+ /* 1270 */ 152, 445, 116, 445, 445, 445, 445, 445, 152, 120,
	973	+ /* 1280 */ 161, 119, 120, 161, 119, 445, 445, 445, 445, 445,
	974	+ /* 1290 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
	975	+ /* 1300 */ 445, 152, 445, 445, 152,
937	976	};
938	977	static const YYCODETYPE yy_lookahead[] = {
939		- /* 0 */ 0, 113, 114, 115, 134, 102, 103, 104, 106, 106,
940		- /* 10 */ 10, 113, 114, 115, 111, 112, 113, 114, 115, 106,
941		- /* 20 */ 20, 21, 22, 105, 24, 126, 108, 109, 28, 4,
942		- /* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 135, 39,
943		- /* 40 */ 40, 41, 42, 105, 44, 45, 108, 109, 107, 49,
	978	+ /* 0 */ 0, 115, 116, 117, 136, 103, 104, 105, 107, 107,
	979	+ /* 10 */ 10, 4, 5, 6, 7, 113, 114, 115, 116, 117,
	980	+ /* 20 */ 20, 21, 22, 17, 24, 101, 102, 103, 104, 29,
	981	+ /* 30 */ 107, 25, 25, 109, 34, 35, 36, 37, 38, 137,
	982	+ /* 40 */ 40, 41, 42, 43, 120, 45, 46, 109, 124, 125,
944	983	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
945		- /* 60 */ 60, 61, 62, 63, 0, 113, 114, 115, 130, 131,
946		- /* 70 */ 132, 104, 25, 106, 10, 113, 114, 115, 111, 112,
947		- /* 80 */ 113, 114, 115, 106, 20, 21, 22, 128, 24, 113,
948		- /* 90 */ 114, 115, 28, 129, 2, 26, 27, 33, 34, 35,
949		- /* 100 */ 36, 37, 135, 39, 40, 41, 42, 2, 44, 45,
950		- /* 110 */ 133, 26, 27, 49, 50, 51, 52, 53, 54, 55,
951		- /* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
952		- /* 130 */ 38, 4, 5, 4, 5, 6, 7, 17, 10, 12,
953		- /* 140 */ 4, 5, 15, 38, 1, 25, 17, 29, 30, 31,
954		- /* 150 */ 32, 24, 83, 26, 27, 12, 28, 14, 31, 32,
955		- /* 160 */ 91, 18, 116, 20, 21, 22, 23, 24, 116, 26,
956		- /* 170 */ 27, 19, 29, 30, 31, 32, 91, 3, 64, 65,
957		- /* 180 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 6,
958		- /* 190 */ 7, 64, 4, 5, 6, 7, 8, 97, 98, 20,
959		- /* 200 */ 21, 22, 26, 27, 4, 5, 6, 7, 1, 82,
960		- /* 210 */ 48, 84, 85, 86, 87, 17, 89, 17, 91, 92,
961		- /* 220 */ 93, 94, 95, 1, 2, 25, 4, 5, 49, 50,
962		- /* 230 */ 51, 52, 53, 54, 12, 16, 15, 15, 4, 5,
963		- /* 240 */ 6, 7, 20, 21, 22, 1, 26, 27, 4, 5,
964		- /* 250 */ 48, 43, 90, 31, 32, 40, 12, 40, 96, 15,
965		- /* 260 */ 47, 99, 88, 104, 20, 21, 22, 1, 24, 35,
966		- /* 270 */ 4, 5, 113, 114, 115, 0, 117, 41, 12, 41,
967		- /* 280 */ 13, 15, 17, 124, 125, 10, 64, 25, 1, 2,
968		- /* 290 */ 17, 4, 5, 75, 135, 81, 80, 3, 3, 12,
969		- /* 300 */ 3, 99, 15, 79, 82, 80, 84, 85, 86, 87,
970		- /* 310 */ 38, 89, 3, 91, 92, 93, 94, 95, 31, 32,
971		- /* 320 */ 2, 3, 4, 5, 6, 7, 82, 3, 3, 12,
972		- /* 330 */ 77, 104, 25, 89, 16, 91, 92, 93, 94, 95,
973		- /* 340 */ 113, 114, 115, 25, 117, 96, 15, 15, 82, 31,
974		- /* 350 */ 32, 64, 125, 15, 17, 89, 38, 91, 92, 93,
975		- /* 360 */ 94, 95, 135, 28, 4, 5, 6, 7, 28, 82,
976		- /* 370 */ 28, 84, 85, 86, 87, 12, 89, 3, 91, 92,
977		- /* 380 */ 93, 94, 95, 90, 11, 67, 68, 136, 2, 3,
978		- /* 390 */ 4, 5, 6, 7, 76, 35, 78, 79, 80, 82,
979		- /* 400 */ 136, 136, 136, 17, 136, 136, 89, 136, 91, 136,
980		- /* 410 */ 136, 25, 104, 136, 106, 136, 136, 31, 32, 111,
981		- /* 420 */ 112, 113, 114, 115, 38, 136, 136, 2, 3, 4,
982		- /* 430 */ 5, 6, 7, 136, 1, 136, 136, 4, 5, 4,
983		- /* 440 */ 5, 6, 7, 135, 136, 12, 136, 136, 15, 136,
984		- /* 450 */ 25, 136, 17, 67, 68, 136, 31, 32, 136, 136,
985		- /* 460 */ 25, 136, 76, 38, 78, 79, 80, 1, 136, 136,
986		- /* 470 */ 4, 5, 4, 5, 6, 7, 136, 136, 12, 46,
987		- /* 480 */ 47, 15, 136, 136, 136, 17, 20, 21, 22, 136,
988		- /* 490 */ 136, 136, 67, 68, 136, 1, 2, 136, 4, 5,
989		- /* 500 */ 136, 76, 136, 78, 79, 80, 12, 136, 104, 15,
990		- /* 510 */ 4, 5, 6, 7, 136, 82, 136, 113, 114, 115,
991		- /* 520 */ 136, 117, 89, 17, 91, 92, 93, 94, 95, 136,
992		- /* 530 */ 1, 2, 38, 4, 5, 4, 5, 6, 7, 135,
993		- /* 540 */ 136, 12, 136, 136, 15, 136, 136, 136, 82, 4,
994		- /* 550 */ 5, 6, 7, 136, 136, 89, 25, 91, 92, 93,
995		- /* 560 */ 94, 95, 136, 1, 2, 136, 4, 5, 136, 136,
996		- /* 570 */ 25, 104, 136, 106, 12, 136, 82, 15, 111, 112,
997		- /* 580 */ 113, 114, 115, 89, 136, 91, 92, 93, 94, 95,
998		- /* 590 */ 1, 136, 136, 4, 5, 136, 136, 136, 136, 136,
999		- /* 600 */ 136, 12, 135, 136, 15, 136, 104, 136, 106, 136,
1000		- /* 610 */ 136, 82, 136, 111, 112, 113, 114, 115, 89, 136,
1001		- /* 620 */ 91, 92, 93, 94, 95, 1, 136, 136, 4, 5,
1002		- /* 630 */ 136, 136, 104, 136, 136, 136, 12, 135, 136, 15,
1003		- /* 640 */ 136, 113, 114, 115, 82, 136, 136, 2, 120, 121,
1004		- /* 650 */ 136, 89, 136, 91, 92, 93, 94, 95, 1, 136,
1005		- /* 660 */ 136, 4, 5, 135, 104, 136, 136, 136, 136, 12,
1006		- /* 670 */ 136, 82, 15, 113, 114, 115, 31, 32, 89, 136,
1007		- /* 680 */ 91, 92, 93, 94, 95, 101, 102, 103, 136, 136,
1008		- /* 690 */ 104, 107, 106, 48, 104, 135, 136, 111, 112, 113,
1009		- /* 700 */ 114, 115, 118, 113, 114, 115, 82, 123, 136, 64,
1010		- /* 710 */ 120, 121, 136, 89, 136, 91, 92, 93, 94, 95,
1011		- /* 720 */ 136, 135, 136, 136, 136, 135, 104, 136, 106, 84,
1012		- /* 730 */ 85, 86, 87, 111, 112, 113, 114, 115, 136, 82,
1013		- /* 740 */ 100, 101, 102, 103, 136, 136, 89, 107, 91, 92,
1014		- /* 750 */ 93, 94, 95, 136, 136, 136, 136, 135, 118, 104,
1015		- /* 760 */ 136, 106, 122, 123, 136, 136, 111, 112, 113, 114,
1016		- /* 770 */ 115, 136, 136, 136, 104, 136, 106, 136, 136, 136,
1017		- /* 780 */ 136, 111, 112, 113, 114, 115, 104, 136, 106, 104,
1018		- /* 790 */ 135, 136, 136, 111, 112, 113, 114, 115, 113, 114,
1019		- /* 800 */ 115, 136, 104, 136, 106, 135, 136, 136, 136, 111,
1020		- /* 810 */ 112, 113, 114, 115, 104, 136, 106, 135, 136, 136,
1021		- /* 820 */ 135, 111, 112, 113, 114, 115, 104, 4, 5, 6,
1022		- /* 830 */ 7, 136, 136, 135, 136, 113, 114, 115, 136, 104,
1023		- /* 840 */ 17, 106, 120, 136, 136, 135, 111, 112, 113, 114,
1024		- /* 850 */ 115, 104, 136, 106, 136, 136, 136, 135, 111, 112,
1025		- /* 860 */ 113, 114, 115, 136, 104, 136, 106, 136, 136, 136,
1026		- /* 870 */ 135, 111, 112, 113, 114, 115, 136, 136, 136, 104,
1027		- /* 880 */ 136, 106, 135, 136, 136, 136, 111, 112, 113, 114,
1028		- /* 890 */ 115, 104, 136, 106, 104, 135, 136, 136, 111, 112,
1029		- /* 900 */ 113, 114, 115, 113, 114, 115, 136, 104, 136, 106,
1030		- /* 910 */ 135, 136, 136, 136, 111, 112, 113, 114, 115, 104,
1031		- /* 920 */ 136, 106, 135, 136, 136, 135, 111, 112, 113, 114,
1032		- /* 930 */ 115, 104, 4, 5, 6, 7, 136, 136, 135, 136,
1033		- /* 940 */ 113, 114, 115, 136, 104, 17, 106, 136, 136, 136,
1034		- /* 950 */ 135, 111, 112, 113, 114, 115, 104, 136, 106, 136,
1035		- /* 960 */ 136, 136, 135, 111, 112, 113, 114, 115, 136, 104,
1036		- /* 970 */ 136, 106, 136, 136, 136, 135, 111, 112, 113, 114,
1037		- /* 980 */ 115, 136, 136, 136, 104, 136, 106, 135, 136, 136,
1038		- /* 990 */ 136, 111, 112, 113, 114, 115, 104, 136, 106, 104,
1039		- /* 1000 */ 135, 136, 136, 111, 112, 113, 114, 115, 113, 114,
1040		- /* 1010 */ 115, 136, 104, 136, 106, 135, 136, 2, 136, 111,
1041		- /* 1020 */ 112, 113, 114, 115, 104, 136, 106, 135, 136, 136,
1042		- /* 1030 */ 135, 111, 112, 113, 114, 115, 4, 5, 6, 7,
1043		- /* 1040 */ 136, 136, 136, 135, 136, 136, 31, 32, 136, 104,
1044		- /* 1050 */ 136, 136, 136, 136, 136, 135, 136, 25, 113, 114,
1045		- /* 1060 */ 115, 104, 136, 136, 119, 120, 121, 136, 136, 136,
1046		- /* 1070 */ 113, 114, 115, 136, 136, 136, 136, 120, 136, 64,
1047		- /* 1080 */ 135, 136, 136, 136, 127, 136, 129, 100, 101, 102,
1048		- /* 1090 */ 103, 136, 135, 136, 107, 136, 136, 136, 104, 84,
1049		- /* 1100 */ 85, 86, 87, 104, 136, 118, 136, 113, 114, 115,
1050		- /* 1110 */ 123, 117, 113, 114, 115, 104, 136, 4, 5, 6,
1051		- /* 1120 */ 7, 136, 104, 136, 113, 114, 115, 104, 136, 135,
1052		- /* 1130 */ 17, 113, 114, 115, 135, 136, 113, 114, 115, 104,
1053		- /* 1140 */ 136, 136, 136, 136, 136, 136, 135, 136, 113, 114,
1054		- /* 1150 */ 115, 104, 136, 135, 104, 136, 136, 136, 135, 136,
1055		- /* 1160 */ 113, 114, 115, 113, 114, 115, 104, 136, 136, 104,
1056		- /* 1170 */ 135, 136, 136, 136, 136, 113, 114, 115, 113, 114,
1057		- /* 1180 */ 115, 136, 135, 136, 104, 135, 136, 136, 136, 136,
1058		- /* 1190 */ 136, 136, 104, 113, 114, 115, 136, 135, 136, 104,
1059		- /* 1200 */ 135, 113, 114, 115, 136, 136, 136, 104, 113, 114,
1060		- /* 1210 */ 115, 136, 136, 136, 136, 135, 113, 114, 115, 136,
1061		- /* 1220 */ 136, 136, 136, 135, 136, 136, 136, 136, 136, 136,
1062		- /* 1230 */ 135, 104, 136, 136, 104, 136, 136, 104, 135, 136,
1063		- /* 1240 */ 113, 114, 115, 113, 114, 115, 113, 114, 115, 136,
1064		- /* 1250 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
1065		- /* 1260 */ 136, 136, 135, 104, 136, 135, 104, 136, 135, 104,
1066		- /* 1270 */ 136, 136, 113, 114, 115, 113, 114, 115, 113, 114,
1067		- /* 1280 */ 115, 104, 136, 136, 136, 136, 136, 136, 136, 136,
1068		- /* 1290 */ 113, 114, 115, 136, 135, 136, 136, 135, 136, 136,
1069		- /* 1300 */ 135, 136, 136, 136, 136, 136, 136, 136, 136, 136,
1070		- /* 1310 */ 136, 136, 135, 100, 100, 100, 100, 100, 100, 100,
1071		- /* 1320 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1072		- /* 1330 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1073		- /* 1340 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1074		- /* 1350 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1075		- /* 1360 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1076		- /* 1370 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1077		- /* 1380 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1078		- /* 1390 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1079		- /* 1400 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1080		- /* 1410 */ 100, 100, 100,
	984	+ /* 60 */ 60, 61, 62, 63, 64, 0, 4, 5, 6, 7,
	985	+ /* 70 */ 4, 5, 105, 25, 107, 10, 115, 116, 117, 17,
	986	+ /* 80 */ 113, 114, 115, 116, 117, 20, 21, 22, 128, 24,
	987	+ /* 90 */ 101, 102, 103, 104, 29, 115, 116, 117, 109, 34,
	988	+ /* 100 */ 35, 36, 37, 38, 137, 40, 41, 42, 43, 120,
	989	+ /* 110 */ 45, 46, 49, 10, 125, 50, 51, 52, 53, 54,
	990	+ /* 120 */ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
	991	+ /* 130 */ 1, 2, 29, 4, 5, 4, 5, 6, 7, 8,
	992	+ /* 140 */ 105, 12, 107, 3, 15, 115, 116, 117, 113, 114,
	993	+ /* 150 */ 115, 116, 117, 24, 91, 130, 27, 28, 118, 105,
	994	+ /* 160 */ 97, 32, 33, 100, 1, 2, 19, 4, 5, 115,
	995	+ /* 170 */ 116, 117, 137, 119, 12, 12, 2, 118, 15, 1,
	996	+ /* 180 */ 126, 127, 106, 20, 21, 22, 110, 111, 106, 2,
	997	+ /* 190 */ 107, 137, 110, 111, 65, 32, 33, 65, 66, 67,
	998	+ /* 200 */ 68, 69, 70, 71, 72, 73, 74, 75, 132, 133,
	999	+ /* 210 */ 134, 131, 83, 39, 85, 86, 87, 88, 135, 90,
	1000	+ /* 220 */ 17, 92, 93, 94, 95, 96, 39, 15, 65, 89,
	1001	+ /* 230 */ 1, 2, 16, 4, 5, 30, 31, 32, 33, 98,
	1002	+ /* 240 */ 99, 12, 6, 7, 15, 83, 83, 41, 85, 86,
	1003	+ /* 250 */ 87, 88, 90, 90, 92, 92, 93, 94, 95, 96,
	1004	+ /* 260 */ 49, 32, 33, 44, 41, 2, 3, 4, 5, 6,
	1005	+ /* 270 */ 7, 27, 28, 42, 20, 21, 22, 27, 28, 16,
	1006	+ /* 280 */ 42, 105, 48, 107, 115, 116, 117, 13, 25, 113,
	1007	+ /* 290 */ 114, 115, 116, 117, 65, 32, 33, 4, 5, 6,
	1008	+ /* 300 */ 7, 17, 39, 25, 50, 51, 52, 53, 54, 55,
	1009	+ /* 310 */ 17, 100, 83, 137, 85, 86, 87, 88, 105, 90,
	1010	+ /* 320 */ 107, 92, 93, 94, 95, 96, 113, 114, 115, 116,
	1011	+ /* 330 */ 117, 68, 69, 76, 2, 3, 4, 5, 6, 7,
	1012	+ /* 340 */ 77, 17, 79, 80, 81, 4, 5, 6, 7, 17,
	1013	+ /* 350 */ 137, 102, 103, 104, 27, 28, 105, 25, 109, 1,
	1014	+ /* 360 */ 81, 80, 4, 5, 32, 33, 115, 116, 117, 120,
	1015	+ /* 370 */ 12, 39, 82, 15, 125, 81, 3, 36, 20, 21,
	1016	+ /* 380 */ 22, 0, 24, 3, 39, 105, 3, 107, 137, 3,
	1017	+ /* 390 */ 3, 10, 3, 113, 114, 115, 116, 117, 97, 78,
	1018	+ /* 400 */ 68, 69, 25, 2, 3, 4, 5, 6, 7, 77,
	1019	+ /* 410 */ 105, 79, 80, 81, 15, 15, 12, 137, 15, 92,
	1020	+ /* 420 */ 115, 116, 117, 17, 119, 29, 25, 4, 5, 6,
	1021	+ /* 430 */ 7, 29, 127, 32, 33, 91, 29, 2, 11, 3,
	1022	+ /* 440 */ 39, 83, 137, 138, 138, 105, 138, 138, 90, 138,
	1023	+ /* 450 */ 92, 93, 94, 95, 96, 115, 116, 117, 138, 36,
	1024	+ /* 460 */ 138, 121, 122, 123, 138, 138, 2, 32, 33, 68,
	1025	+ /* 470 */ 69, 138, 1, 4, 5, 6, 7, 137, 77, 138,
	1026	+ /* 480 */ 79, 80, 81, 12, 49, 14, 17, 138, 138, 18,
	1027	+ /* 490 */ 138, 20, 21, 22, 23, 24, 32, 33, 27, 28,
	1028	+ /* 500 */ 65, 30, 31, 32, 33, 1, 138, 138, 4, 5,
	1029	+ /* 510 */ 4, 5, 6, 7, 138, 138, 12, 138, 138, 15,
	1030	+ /* 520 */ 85, 86, 87, 88, 20, 21, 22, 1, 138, 65,
	1031	+ /* 530 */ 4, 5, 4, 5, 6, 7, 138, 138, 12, 138,
	1032	+ /* 540 */ 138, 15, 138, 1, 2, 17, 4, 5, 138, 85,
	1033	+ /* 550 */ 86, 87, 88, 25, 12, 138, 105, 15, 107, 138,
	1034	+ /* 560 */ 105, 138, 138, 138, 113, 114, 115, 116, 117, 138,
	1035	+ /* 570 */ 115, 116, 117, 47, 48, 1, 2, 122, 4, 5,
	1036	+ /* 580 */ 138, 39, 4, 5, 6, 7, 12, 83, 137, 15,
	1037	+ /* 590 */ 138, 138, 137, 138, 90, 17, 92, 93, 94, 95,
	1038	+ /* 600 */ 96, 1, 2, 25, 4, 5, 138, 138, 138, 83,
	1039	+ /* 610 */ 138, 138, 12, 138, 138, 15, 90, 138, 92, 93,
	1040	+ /* 620 */ 94, 95, 96, 138, 138, 83, 4, 5, 6, 7,
	1041	+ /* 630 */ 138, 138, 90, 138, 92, 93, 94, 95, 96, 1,
	1042	+ /* 640 */ 138, 138, 4, 5, 105, 138, 138, 25, 138, 138,
	1043	+ /* 650 */ 12, 138, 138, 15, 115, 116, 117, 83, 138, 138,
	1044	+ /* 660 */ 138, 122, 123, 138, 90, 138, 92, 93, 94, 95,
	1045	+ /* 670 */ 96, 1, 138, 138, 4, 5, 137, 105, 138, 138,
	1046	+ /* 680 */ 138, 138, 12, 83, 138, 15, 138, 115, 116, 117,
	1047	+ /* 690 */ 90, 119, 92, 93, 94, 95, 96, 1, 138, 138,
	1048	+ /* 700 */ 4, 5, 4, 5, 6, 7, 138, 138, 12, 137,
	1049	+ /* 710 */ 138, 15, 138, 1, 138, 17, 4, 5, 138, 138,
	1050	+ /* 720 */ 138, 83, 138, 138, 12, 105, 138, 15, 90, 138,
	1051	+ /* 730 */ 92, 93, 94, 95, 96, 115, 116, 117, 105, 138,
	1052	+ /* 740 */ 107, 138, 122, 123, 105, 138, 113, 114, 115, 116,
	1053	+ /* 750 */ 117, 138, 138, 83, 115, 116, 117, 137, 119, 138,
	1054	+ /* 760 */ 90, 105, 92, 93, 94, 95, 96, 138, 138, 138,
	1055	+ /* 770 */ 137, 115, 116, 117, 138, 138, 137, 138, 138, 83,
	1056	+ /* 780 */ 138, 4, 5, 6, 7, 138, 90, 138, 92, 93,
	1057	+ /* 790 */ 94, 95, 96, 137, 17, 83, 4, 5, 6, 7,
	1058	+ /* 800 */ 105, 138, 90, 138, 92, 93, 94, 95, 96, 138,
	1059	+ /* 810 */ 115, 116, 117, 138, 105, 138, 107, 25, 138, 105,
	1060	+ /* 820 */ 138, 107, 113, 114, 115, 116, 117, 113, 114, 115,
	1061	+ /* 830 */ 116, 117, 137, 105, 138, 107, 138, 105, 138, 138,
	1062	+ /* 840 */ 138, 113, 114, 115, 116, 117, 137, 115, 116, 117,
	1063	+ /* 850 */ 138, 137, 105, 138, 107, 138, 138, 138, 27, 28,
	1064	+ /* 860 */ 113, 114, 115, 116, 117, 137, 105, 138, 107, 137,
	1065	+ /* 870 */ 138, 105, 138, 107, 113, 114, 115, 116, 117, 113,
	1066	+ /* 880 */ 114, 115, 116, 117, 137, 105, 138, 107, 4, 5,
	1067	+ /* 890 */ 6, 7, 138, 113, 114, 115, 116, 117, 137, 138,
	1068	+ /* 900 */ 138, 17, 138, 137, 138, 138, 138, 138, 138, 138,
	1069	+ /* 910 */ 105, 138, 107, 138, 138, 84, 138, 137, 113, 114,
	1070	+ /* 920 */ 115, 116, 117, 92, 138, 105, 138, 107, 138, 138,
	1071	+ /* 930 */ 138, 138, 138, 113, 114, 115, 116, 117, 138, 105,
	1072	+ /* 940 */ 138, 107, 137, 138, 138, 138, 138, 113, 114, 115,
	1073	+ /* 950 */ 116, 117, 105, 138, 107, 138, 138, 137, 138, 138,
	1074	+ /* 960 */ 113, 114, 115, 116, 117, 138, 105, 138, 107, 138,
	1075	+ /* 970 */ 138, 137, 138, 138, 113, 114, 115, 116, 117, 105,
	1076	+ /* 980 */ 138, 107, 138, 138, 137, 138, 138, 113, 114, 115,
	1077	+ /* 990 */ 116, 117, 138, 105, 138, 107, 138, 138, 137, 138,
	1078	+ /* 1000 */ 138, 113, 114, 115, 116, 117, 138, 138, 138, 138,
	1079	+ /* 1010 */ 138, 137, 138, 138, 138, 138, 138, 138, 105, 138,
	1080	+ /* 1020 */ 107, 138, 138, 138, 138, 137, 113, 114, 115, 116,
	1081	+ /* 1030 */ 117, 105, 138, 107, 138, 138, 138, 138, 138, 113,
	1082	+ /* 1040 */ 114, 115, 116, 117, 138, 105, 138, 107, 138, 138,
	1083	+ /* 1050 */ 137, 138, 138, 113, 114, 115, 116, 117, 105, 138,
	1084	+ /* 1060 */ 107, 138, 138, 137, 138, 138, 113, 114, 115, 116,
	1085	+ /* 1070 */ 117, 138, 105, 138, 138, 138, 138, 137, 138, 138,
	1086	+ /* 1080 */ 138, 105, 115, 116, 117, 138, 138, 138, 138, 122,
	1087	+ /* 1090 */ 137, 115, 116, 117, 138, 105, 129, 138, 131, 105,
	1088	+ /* 1100 */ 138, 138, 138, 138, 137, 115, 116, 117, 105, 115,
	1089	+ /* 1110 */ 116, 117, 138, 137, 138, 138, 138, 138, 115, 116,
	1090	+ /* 1120 */ 117, 138, 138, 138, 105, 138, 138, 137, 138, 138,
	1091	+ /* 1130 */ 138, 137, 105, 138, 115, 116, 117, 105, 138, 138,
	1092	+ /* 1140 */ 137, 138, 115, 116, 117, 138, 138, 115, 116, 117,
	1093	+ /* 1150 */ 138, 105, 138, 138, 138, 138, 137, 138, 138, 138,
	1094	+ /* 1160 */ 105, 115, 116, 117, 137, 138, 105, 138, 138, 137,
	1095	+ /* 1170 */ 115, 116, 117, 138, 105, 138, 115, 116, 117, 138,
	1096	+ /* 1180 */ 138, 138, 138, 137, 115, 116, 117, 138, 138, 105,
	1097	+ /* 1190 */ 138, 138, 137, 138, 138, 138, 138, 105, 137, 115,
	1098	+ /* 1200 */ 116, 117, 105, 138, 138, 105, 137, 115, 116, 117,
	1099	+ /* 1210 */ 138, 138, 115, 116, 117, 115, 116, 117, 138, 138,
	1100	+ /* 1220 */ 138, 137, 138, 138, 138, 138, 138, 138, 138, 137,
	1101	+ /* 1230 */ 105, 138, 138, 105, 137, 138, 138, 137, 105, 138,
	1102	+ /* 1240 */ 115, 116, 117, 115, 116, 117, 105, 138, 115, 116,
	1103	+ /* 1250 */ 117, 138, 138, 138, 138, 138, 115, 116, 117, 138,
	1104	+ /* 1260 */ 138, 138, 137, 138, 138, 137, 138, 138, 138, 105,
	1105	+ /* 1270 */ 137, 138, 105, 138, 138, 138, 138, 138, 137, 115,
	1106	+ /* 1280 */ 116, 117, 115, 116, 117, 138, 138, 138, 138, 138,
	1107	+ /* 1290 */ 138, 138, 138, 138, 138, 138, 138, 138, 138, 138,
	1108	+ /* 1300 */ 138, 137, 138, 138, 137, 101, 101, 101, 101, 101,
	1109	+ /* 1310 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1110	+ /* 1320 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1111	+ /* 1330 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1112	+ /* 1340 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1113	+ /* 1350 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1114	+ /* 1360 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1115	+ /* 1370 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1116	+ /* 1380 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1117	+ /* 1390 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
	1118	+ /* 1400 */ 101, 101, 101, 101, 101, 101,
1081	1119	};
1082	1120	#define YY_SHIFT_COUNT (163)
1083	1121	#define YY_SHIFT_MIN (0)
1084		-#define YY_SHIFT_MAX (1113)
	1122	+#define YY_SHIFT_MAX (884)
1085	1123	static const unsigned short int yy_shift_ofst[] = {
1086		- /* 0 */ 143, 127, 222, 287, 287, 287, 287, 287, 287, 287,
1087		- /* 10 */ 287, 287, 287, 287, 287, 287, 287, 287, 287, 287,
1088		- /* 20 */ 287, 287, 287, 287, 287, 287, 287, 244, 433, 266,
1089		- /* 30 */ 244, 143, 494, 494, 0, 64, 143, 589, 266, 589,
1090		- /* 40 */ 466, 466, 466, 529, 562, 266, 266, 266, 266, 266,
1091		- /* 50 */ 266, 624, 266, 266, 657, 266, 266, 266, 266, 266,
1092		- /* 60 */ 266, 266, 266, 266, 266, 179, 317, 317, 317, 317,
1093		- /* 70 */ 317, 645, 318, 386, 425, 1015, 1015, 118, 47, 1313,
1094		- /* 80 */ 1313, 1313, 1313, 114, 114, 200, 435, 129, 188, 234,
1095		- /* 90 */ 360, 468, 531, 506, 545, 823, 1032, 928, 1113, 25,
1096		- /* 100 */ 25, 25, 162, 25, 25, 25, 69, 25, 85, 128,
1097		- /* 110 */ 92, 105, 120, 136, 100, 183, 183, 176, 220, 174,
1098		- /* 120 */ 202, 275, 152, 207, 198, 219, 221, 208, 215, 217,
1099		- /* 130 */ 236, 238, 213, 267, 265, 262, 218, 273, 216, 224,
1100		- /* 140 */ 214, 225, 294, 295, 297, 272, 309, 324, 325, 249,
1101		- /* 150 */ 253, 307, 249, 331, 332, 338, 337, 335, 340, 342,
1102		- /* 160 */ 363, 293, 374, 373,
	1124	+ /* 0 */ 471, 129, 163, 229, 229, 229, 229, 229, 229, 229,
	1125	+ /* 10 */ 229, 229, 229, 229, 229, 229, 229, 229, 229, 229,
	1126	+ /* 20 */ 229, 229, 229, 229, 229, 229, 229, 358, 526, 638,
	1127	+ /* 30 */ 358, 471, 542, 542, 0, 65, 471, 670, 638, 670,
	1128	+ /* 40 */ 504, 504, 504, 574, 600, 638, 638, 638, 638, 638,
	1129	+ /* 50 */ 638, 696, 638, 638, 712, 638, 638, 638, 638, 638,
	1130	+ /* 60 */ 638, 638, 638, 638, 638, 254, 162, 162, 162, 162,
	1131	+ /* 70 */ 162, 435, 263, 332, 401, 464, 464, 205, 48, 1305,
	1132	+ /* 80 */ 1305, 1305, 1305, 132, 132, 528, 578, 62, 131, 341,
	1133	+ /* 90 */ 423, 293, 7, 469, 622, 698, 792, 777, 884, 506,
	1134	+ /* 100 */ 506, 506, 63, 506, 506, 506, 831, 506, 327, 103,
	1135	+ /* 110 */ 174, 187, 6, 66, 141, 236, 236, 244, 250, 140,
	1136	+ /* 120 */ 211, 381, 147, 178, 203, 216, 212, 219, 206, 223,
	1137	+ /* 130 */ 231, 238, 234, 274, 284, 278, 257, 324, 279, 281,
	1138	+ /* 140 */ 290, 294, 373, 380, 383, 345, 386, 387, 389, 301,
	1139	+ /* 150 */ 321, 377, 301, 399, 400, 403, 406, 396, 402, 407,
	1140	+ /* 160 */ 404, 344, 436, 427,
1103	1141	};
1104	1142	#define YY_REDUCE_COUNT (82)
1105		-#define YY_REDUCE_MIN (-130)
1106		-#define YY_REDUCE_MAX (1177)
	1143	+#define YY_REDUCE_MIN (-132)
	1144	+#define YY_REDUCE_MAX (1167)
1107	1145	static const short yy_reduce_ofst[] = {
1108		- /* 0 */ 640, -97, -33, 308, 467, 502, 586, 622, 655, 670,
1109		- /* 10 */ 682, 698, 710, 735, 747, 760, 775, 787, 803, 815,
1110		- /* 20 */ 840, 852, 865, 880, 892, 908, 920, 159, 945, 957,
1111		- /* 30 */ 227, 987, 528, 590, -62, -62, 584, 404, 722, 994,
1112		- /* 40 */ 560, 685, 790, 827, 895, 999, 1011, 1018, 1023, 1035,
1113		- /* 50 */ 1047, 1050, 1062, 1065, 1080, 1088, 1095, 1103, 1127, 1130,
1114		- /* 60 */ 1133, 1159, 1162, 1165, 1177, -82, -112, -102, -48, -38,
1115		- /* 70 */ -24, -23, -130, -130, -130, -98, -87, -59, -101, -41,
1116		- /* 80 */ 46, 52, -36,
	1146	+ /* 0 */ -76, -98, -33, 35, 176, 213, 280, 451, 633, 709,
	1147	+ /* 10 */ 714, 728, 747, 761, 766, 780, 805, 820, 834, 847,
	1148	+ /* 20 */ 861, 874, 888, 913, 926, 940, 953, 54, 340, 967,
	1149	+ /* 30 */ 305, -11, 539, 620, 76, 76, 249, 639, 455, 572,
	1150	+ /* 40 */ 251, 656, 695, 732, 976, 990, 994, 1003, 1019, 1027,
	1151	+ /* 50 */ 1032, 1046, 1055, 1061, 1069, 1084, 1092, 1097, 1100, 1125,
	1152	+ /* 60 */ 1128, 1133, 1141, 1164, 1167, 82, -114, -39, -20, 30,
	1153	+ /* 70 */ 169, 83, -132, -132, -132, -99, -77, -62, -40, 25,
	1154	+ /* 80 */ 40, 59, 80,
1117	1155	};
1118	1156	static const YYACTIONTYPE yy_default[] = {
1119	1157	/* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1120	1158	/* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1121	1159	/* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
		@@ -1176,10 +1214,11 @@
1176	1214	0, /* COLOR => nothing */
1177	1215	0, /* THICKNESS => nothing */
1178	1216	0, /* PRINT => nothing */
1179	1217	0, /* STRING => nothing */
1180	1218	0, /* COMMA => nothing */
	1219	+ 0, /* ISODATE => nothing */
1181	1220	0, /* CLASSNAME => nothing */
1182	1221	0, /* LB => nothing */
1183	1222	0, /* RB => nothing */
1184	1223	0, /* UP => nothing */
1185	1224	0, /* DOWN => nothing */
		@@ -1359,120 +1398,122 @@
1359	1398	/* 21 */ "COLOR",
1360	1399	/* 22 */ "THICKNESS",
1361	1400	/* 23 */ "PRINT",
1362	1401	/* 24 */ "STRING",
1363	1402	/* 25 */ "COMMA",
1364		- /* 26 */ "CLASSNAME",
1365		- /* 27 */ "LB",
1366		- /* 28 */ "RB",
1367		- /* 29 */ "UP",
1368		- /* 30 */ "DOWN",
1369		- /* 31 */ "LEFT",
1370		- /* 32 */ "RIGHT",
1371		- /* 33 */ "CLOSE",
1372		- /* 34 */ "CHOP",
1373		- /* 35 */ "FROM",
1374		- /* 36 */ "TO",
1375		- /* 37 */ "THEN",
1376		- /* 38 */ "HEADING",
1377		- /* 39 */ "GO",
1378		- /* 40 */ "AT",
1379		- /* 41 */ "WITH",
1380		- /* 42 */ "SAME",
1381		- /* 43 */ "AS",
1382		- /* 44 */ "FIT",
1383		- /* 45 */ "BEHIND",
1384		- /* 46 */ "UNTIL",
1385		- /* 47 */ "EVEN",
1386		- /* 48 */ "DOT_E",
1387		- /* 49 */ "HEIGHT",
1388		- /* 50 */ "WIDTH",
1389		- /* 51 */ "RADIUS",
1390		- /* 52 */ "DIAMETER",
1391		- /* 53 */ "DOTTED",
1392		- /* 54 */ "DASHED",
1393		- /* 55 */ "CW",
1394		- /* 56 */ "CCW",
1395		- /* 57 */ "LARROW",
1396		- /* 58 */ "RARROW",
1397		- /* 59 */ "LRARROW",
1398		- /* 60 */ "INVIS",
1399		- /* 61 */ "THICK",
1400		- /* 62 */ "THIN",
1401		- /* 63 */ "SOLID",
1402		- /* 64 */ "CENTER",
1403		- /* 65 */ "LJUST",
1404		- /* 66 */ "RJUST",
1405		- /* 67 */ "ABOVE",
1406		- /* 68 */ "BELOW",
1407		- /* 69 */ "ITALIC",
1408		- /* 70 */ "BOLD",
1409		- /* 71 */ "MONO",
1410		- /* 72 */ "ALIGNED",
1411		- /* 73 */ "BIG",
1412		- /* 74 */ "SMALL",
1413		- /* 75 */ "AND",
1414		- /* 76 */ "LT",
1415		- /* 77 */ "GT",
1416		- /* 78 */ "ON",
1417		- /* 79 */ "WAY",
1418		- /* 80 */ "BETWEEN",
1419		- /* 81 */ "THE",
1420		- /* 82 */ "NTH",
1421		- /* 83 */ "VERTEX",
1422		- /* 84 */ "TOP",
1423		- /* 85 */ "BOTTOM",
1424		- /* 86 */ "START",
1425		- /* 87 */ "END",
1426		- /* 88 */ "IN",
1427		- /* 89 */ "THIS",
1428		- /* 90 */ "DOT_U",
1429		- /* 91 */ "LAST",
1430		- /* 92 */ "NUMBER",
1431		- /* 93 */ "FUNC1",
1432		- /* 94 */ "FUNC2",
1433		- /* 95 */ "DIST",
1434		- /* 96 */ "DOT_XY",
1435		- /* 97 */ "X",
1436		- /* 98 */ "Y",
1437		- /* 99 */ "DOT_L",
1438		- /* 100 */ "statement_list",
1439		- /* 101 */ "statement",
1440		- /* 102 */ "unnamed_statement",
1441		- /* 103 */ "basetype",
1442		- /* 104 */ "expr",
1443		- /* 105 */ "numproperty",
1444		- /* 106 */ "edge",
1445		- /* 107 */ "direction",
1446		- /* 108 */ "dashproperty",
1447		- /* 109 */ "colorproperty",
1448		- /* 110 */ "locproperty",
1449		- /* 111 */ "position",
1450		- /* 112 */ "place",
1451		- /* 113 */ "object",
1452		- /* 114 */ "objectname",
1453		- /* 115 */ "nth",
1454		- /* 116 */ "textposition",
1455		- /* 117 */ "rvalue",
1456		- /* 118 */ "lvalue",
1457		- /* 119 */ "even",
1458		- /* 120 */ "relexpr",
1459		- /* 121 */ "optrelexpr",
1460		- /* 122 */ "document",
1461		- /* 123 */ "print",
1462		- /* 124 */ "prlist",
1463		- /* 125 */ "pritem",
1464		- /* 126 */ "prsep",
1465		- /* 127 */ "attribute_list",
1466		- /* 128 */ "savelist",
1467		- /* 129 */ "alist",
1468		- /* 130 */ "attribute",
1469		- /* 131 */ "go",
1470		- /* 132 */ "boolproperty",
1471		- /* 133 */ "withclause",
1472		- /* 134 */ "between",
1473		- /* 135 */ "place2",
	1403	+ /* 26 */ "ISODATE",
	1404	+ /* 27 */ "CLASSNAME",
	1405	+ /* 28 */ "LB",
	1406	+ /* 29 */ "RB",
	1407	+ /* 30 */ "UP",
	1408	+ /* 31 */ "DOWN",
	1409	+ /* 32 */ "LEFT",
	1410	+ /* 33 */ "RIGHT",
	1411	+ /* 34 */ "CLOSE",
	1412	+ /* 35 */ "CHOP",
	1413	+ /* 36 */ "FROM",
	1414	+ /* 37 */ "TO",
	1415	+ /* 38 */ "THEN",
	1416	+ /* 39 */ "HEADING",
	1417	+ /* 40 */ "GO",
	1418	+ /* 41 */ "AT",
	1419	+ /* 42 */ "WITH",
	1420	+ /* 43 */ "SAME",
	1421	+ /* 44 */ "AS",
	1422	+ /* 45 */ "FIT",
	1423	+ /* 46 */ "BEHIND",
	1424	+ /* 47 */ "UNTIL",
	1425	+ /* 48 */ "EVEN",
	1426	+ /* 49 */ "DOT_E",
	1427	+ /* 50 */ "HEIGHT",
	1428	+ /* 51 */ "WIDTH",
	1429	+ /* 52 */ "RADIUS",
	1430	+ /* 53 */ "DIAMETER",
	1431	+ /* 54 */ "DOTTED",
	1432	+ /* 55 */ "DASHED",
	1433	+ /* 56 */ "CW",
	1434	+ /* 57 */ "CCW",
	1435	+ /* 58 */ "LARROW",
	1436	+ /* 59 */ "RARROW",
	1437	+ /* 60 */ "LRARROW",
	1438	+ /* 61 */ "INVIS",
	1439	+ /* 62 */ "THICK",
	1440	+ /* 63 */ "THIN",
	1441	+ /* 64 */ "SOLID",
	1442	+ /* 65 */ "CENTER",
	1443	+ /* 66 */ "LJUST",
	1444	+ /* 67 */ "RJUST",
	1445	+ /* 68 */ "ABOVE",
	1446	+ /* 69 */ "BELOW",
	1447	+ /* 70 */ "ITALIC",
	1448	+ /* 71 */ "BOLD",
	1449	+ /* 72 */ "MONO",
	1450	+ /* 73 */ "ALIGNED",
	1451	+ /* 74 */ "BIG",
	1452	+ /* 75 */ "SMALL",
	1453	+ /* 76 */ "AND",
	1454	+ /* 77 */ "LT",
	1455	+ /* 78 */ "GT",
	1456	+ /* 79 */ "ON",
	1457	+ /* 80 */ "WAY",
	1458	+ /* 81 */ "BETWEEN",
	1459	+ /* 82 */ "THE",
	1460	+ /* 83 */ "NTH",
	1461	+ /* 84 */ "VERTEX",
	1462	+ /* 85 */ "TOP",
	1463	+ /* 86 */ "BOTTOM",
	1464	+ /* 87 */ "START",
	1465	+ /* 88 */ "END",
	1466	+ /* 89 */ "IN",
	1467	+ /* 90 */ "THIS",
	1468	+ /* 91 */ "DOT_U",
	1469	+ /* 92 */ "LAST",
	1470	+ /* 93 */ "NUMBER",
	1471	+ /* 94 */ "FUNC1",
	1472	+ /* 95 */ "FUNC2",
	1473	+ /* 96 */ "DIST",
	1474	+ /* 97 */ "DOT_XY",
	1475	+ /* 98 */ "X",
	1476	+ /* 99 */ "Y",
	1477	+ /* 100 */ "DOT_L",
	1478	+ /* 101 */ "statement_list",
	1479	+ /* 102 */ "statement",
	1480	+ /* 103 */ "unnamed_statement",
	1481	+ /* 104 */ "basetype",
	1482	+ /* 105 */ "expr",
	1483	+ /* 106 */ "numproperty",
	1484	+ /* 107 */ "edge",
	1485	+ /* 108 */ "isodate",
	1486	+ /* 109 */ "direction",
	1487	+ /* 110 */ "dashproperty",
	1488	+ /* 111 */ "colorproperty",
	1489	+ /* 112 */ "locproperty",
	1490	+ /* 113 */ "position",
	1491	+ /* 114 */ "place",
	1492	+ /* 115 */ "object",
	1493	+ /* 116 */ "objectname",
	1494	+ /* 117 */ "nth",
	1495	+ /* 118 */ "textposition",
	1496	+ /* 119 */ "rvalue",
	1497	+ /* 120 */ "lvalue",
	1498	+ /* 121 */ "even",
	1499	+ /* 122 */ "relexpr",
	1500	+ /* 123 */ "optrelexpr",
	1501	+ /* 124 */ "document",
	1502	+ /* 125 */ "print",
	1503	+ /* 126 */ "prlist",
	1504	+ /* 127 */ "pritem",
	1505	+ /* 128 */ "prsep",
	1506	+ /* 129 */ "attribute_list",
	1507	+ /* 130 */ "savelist",
	1508	+ /* 131 */ "alist",
	1509	+ /* 132 */ "attribute",
	1510	+ /* 133 */ "go",
	1511	+ /* 134 */ "boolproperty",
	1512	+ /* 135 */ "withclause",
	1513	+ /* 136 */ "between",
	1514	+ /* 137 */ "place2",
1474	1515	};
1475	1516	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1476	1517
1477	1518	#ifndef NDEBUG
1478	1519	/* For tracing reduce actions, the names of all rules are required.
		@@ -1755,24 +1796,24 @@
1755	1796	** Note: during a reduce, the only symbols destroyed are those
1756	1797	** which appear on the RHS of the rule, but which are not used
1757	1798	** inside the C code.
1758	1799	*/
1759	1800	/******* Begin destructor definitions *************************************/
1760		- case 100: /* statement_list */
1761		-{
1762		-#line 523 "pikchr.y"
1763		-pik_elist_free(p,(yypminor->yy235));
1764		-#line 1789 "pikchr.c"
1765		-}
1766		- break;
1767		- case 101: /* statement */
1768		- case 102: /* unnamed_statement */
1769		- case 103: /* basetype */
1770		-{
1771		-#line 525 "pikchr.y"
1772		-pik_elem_free(p,(yypminor->yy162));
1773		-#line 1798 "pikchr.c"
	1801	+ case 101: /* statement_list */
	1802	+{
	1803	+#line 524 "pikchr.y"
	1804	+pik_elist_free(p,(yypminor->yy23));
	1805	+#line 1805 "pikchr.c"
	1806	+}
	1807	+ break;
	1808	+ case 102: /* statement */
	1809	+ case 103: /* unnamed_statement */
	1810	+ case 104: /* basetype */
	1811	+{
	1812	+#line 526 "pikchr.y"
	1813	+pik_elem_free(p,(yypminor->yy54));
	1814	+#line 1814 "pikchr.c"
1774	1815	}
1775	1816	break;
1776	1817	/******* End destructor definitions ***************************************/
1777	1818	default: break; /* If no destructor action specified: do nothing */
1778	1819	}
		@@ -2003,14 +2044,14 @@
2003	2044	#endif
2004	2045	while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
2005	2046	/* Here code is inserted which will execute if the parser
2006	2047	** stack every overflows */
2007	2048	/****** Begin %stack_overflow code ****************************************/
2008		-#line 557 "pikchr.y"
	2049	+#line 559 "pikchr.y"
2009	2050
2010	2051	pik_error(p, 0, "parser stack overflow");
2011		-#line 2036 "pikchr.c"
	2052	+#line 2052 "pikchr.c"
2012	2053	/****** End %stack_overflow code ******************************************/
2013	2054	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
2014	2055	pik_parserCTX_STORE
2015	2056	}
2016	2057
		@@ -2072,166 +2113,166 @@
2072	2113	}
2073	2114
2074	2115	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
2075	2116	** of that rule */
2076	2117	static const YYCODETYPE yyRuleInfoLhs[] = {
2077		- 122, /* (0) document ::= statement_list */
2078		- 100, /* (1) statement_list ::= statement */
2079		- 100, /* (2) statement_list ::= statement_list EOL statement */
2080		- 101, /* (3) statement ::= */
2081		- 101, /* (4) statement ::= direction */
2082		- 101, /* (5) statement ::= lvalue ASSIGN rvalue */
2083		- 101, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2084		- 101, /* (7) statement ::= PLACENAME COLON position */
2085		- 101, /* (8) statement ::= unnamed_statement */
2086		- 101, /* (9) statement ::= print prlist */
2087		- 101, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2088		- 101, /* (11) statement ::= ASSERT LP position EQ position RP */
2089		- 101, /* (12) statement ::= DEFINE ID CODEBLOCK */
2090		- 117, /* (13) rvalue ::= PLACENAME */
2091		- 125, /* (14) pritem ::= FILL */
2092		- 125, /* (15) pritem ::= COLOR */
2093		- 125, /* (16) pritem ::= THICKNESS */
2094		- 125, /* (17) pritem ::= rvalue */
2095		- 125, /* (18) pritem ::= STRING */
2096		- 126, /* (19) prsep ::= COMMA */
2097		- 102, /* (20) unnamed_statement ::= basetype attribute_list */
2098		- 103, /* (21) basetype ::= CLASSNAME */
2099		- 103, /* (22) basetype ::= STRING textposition */
2100		- 103, /* (23) basetype ::= LB savelist statement_list RB */
2101		- 128, /* (24) savelist ::= */
2102		- 120, /* (25) relexpr ::= expr */
2103		- 120, /* (26) relexpr ::= expr PERCENT */
2104		- 121, /* (27) optrelexpr ::= */
2105		- 127, /* (28) attribute_list ::= relexpr alist */
2106		- 130, /* (29) attribute ::= numproperty relexpr */
2107		- 130, /* (30) attribute ::= dashproperty expr */
2108		- 130, /* (31) attribute ::= dashproperty */
2109		- 130, /* (32) attribute ::= colorproperty rvalue */
2110		- 130, /* (33) attribute ::= go direction optrelexpr */
2111		- 130, /* (34) attribute ::= go direction even position */
2112		- 130, /* (35) attribute ::= CLOSE */
2113		- 130, /* (36) attribute ::= CHOP */
2114		- 130, /* (37) attribute ::= FROM position */
2115		- 130, /* (38) attribute ::= TO position */
2116		- 130, /* (39) attribute ::= THEN */
2117		- 130, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2118		- 130, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2119		- 130, /* (42) attribute ::= GO optrelexpr HEADING expr */
2120		- 130, /* (43) attribute ::= GO optrelexpr EDGEPT */
2121		- 130, /* (44) attribute ::= AT position */
2122		- 130, /* (45) attribute ::= SAME */
2123		- 130, /* (46) attribute ::= SAME AS object */
2124		- 130, /* (47) attribute ::= STRING textposition */
2125		- 130, /* (48) attribute ::= FIT */
2126		- 130, /* (49) attribute ::= BEHIND object */
2127		- 133, /* (50) withclause ::= DOT_E edge AT position */
2128		- 133, /* (51) withclause ::= edge AT position */
2129		- 105, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2130		- 132, /* (53) boolproperty ::= CW */
2131		- 132, /* (54) boolproperty ::= CCW */
2132		- 132, /* (55) boolproperty ::= LARROW */
2133		- 132, /* (56) boolproperty ::= RARROW */
2134		- 132, /* (57) boolproperty ::= LRARROW */
2135		- 132, /* (58) boolproperty ::= INVIS */
2136		- 132, /* (59) boolproperty ::= THICK */
2137		- 132, /* (60) boolproperty ::= THIN */
2138		- 132, /* (61) boolproperty ::= SOLID */
2139		- 116, /* (62) textposition ::= */
2140		- 116, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
2141		- 111, /* (64) position ::= expr COMMA expr */
2142		- 111, /* (65) position ::= place PLUS expr COMMA expr */
2143		- 111, /* (66) position ::= place MINUS expr COMMA expr */
2144		- 111, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2145		- 111, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2146		- 111, /* (69) position ::= LP position COMMA position RP */
2147		- 111, /* (70) position ::= LP position RP */
2148		- 111, /* (71) position ::= expr between position AND position */
2149		- 111, /* (72) position ::= expr LT position COMMA position GT */
2150		- 111, /* (73) position ::= expr ABOVE position */
2151		- 111, /* (74) position ::= expr BELOW position */
2152		- 111, /* (75) position ::= expr LEFT OF position */
2153		- 111, /* (76) position ::= expr RIGHT OF position */
2154		- 111, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2155		- 111, /* (78) position ::= expr HEADING EDGEPT OF position */
2156		- 111, /* (79) position ::= expr EDGEPT OF position */
2157		- 111, /* (80) position ::= expr ON HEADING expr FROM position */
2158		- 111, /* (81) position ::= expr HEADING expr FROM position */
2159		- 112, /* (82) place ::= edge OF object */
2160		- 135, /* (83) place2 ::= object */
2161		- 135, /* (84) place2 ::= object DOT_E edge */
2162		- 135, /* (85) place2 ::= NTH VERTEX OF object */
2163		- 113, /* (86) object ::= nth */
2164		- 113, /* (87) object ::= nth OF\|IN object */
2165		- 114, /* (88) objectname ::= THIS */
2166		- 114, /* (89) objectname ::= PLACENAME */
2167		- 114, /* (90) objectname ::= objectname DOT_U PLACENAME */
2168		- 115, /* (91) nth ::= NTH CLASSNAME */
2169		- 115, /* (92) nth ::= NTH LAST CLASSNAME */
2170		- 115, /* (93) nth ::= LAST CLASSNAME */
2171		- 115, /* (94) nth ::= LAST */
2172		- 115, /* (95) nth ::= NTH LB RB */
2173		- 115, /* (96) nth ::= NTH LAST LB RB */
2174		- 115, /* (97) nth ::= LAST LB RB */
2175		- 104, /* (98) expr ::= expr PLUS expr */
2176		- 104, /* (99) expr ::= expr MINUS expr */
2177		- 104, /* (100) expr ::= expr STAR expr */
2178		- 104, /* (101) expr ::= expr SLASH expr */
2179		- 104, /* (102) expr ::= MINUS expr */
2180		- 104, /* (103) expr ::= PLUS expr */
2181		- 104, /* (104) expr ::= LP expr RP */
2182		- 104, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2183		- 104, /* (106) expr ::= NUMBER */
2184		- 104, /* (107) expr ::= ID */
2185		- 104, /* (108) expr ::= FUNC1 LP expr RP */
2186		- 104, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2187		- 104, /* (110) expr ::= DIST LP position COMMA position RP */
2188		- 104, /* (111) expr ::= place2 DOT_XY X */
2189		- 104, /* (112) expr ::= place2 DOT_XY Y */
2190		- 104, /* (113) expr ::= object DOT_L numproperty */
2191		- 104, /* (114) expr ::= object DOT_L dashproperty */
2192		- 104, /* (115) expr ::= object DOT_L colorproperty */
2193		- 118, /* (116) lvalue ::= ID */
2194		- 118, /* (117) lvalue ::= FILL */
2195		- 118, /* (118) lvalue ::= COLOR */
2196		- 118, /* (119) lvalue ::= THICKNESS */
2197		- 117, /* (120) rvalue ::= expr */
2198		- 123, /* (121) print ::= PRINT */
2199		- 124, /* (122) prlist ::= pritem */
2200		- 124, /* (123) prlist ::= prlist prsep pritem */
2201		- 107, /* (124) direction ::= UP */
2202		- 107, /* (125) direction ::= DOWN */
2203		- 107, /* (126) direction ::= LEFT */
2204		- 107, /* (127) direction ::= RIGHT */
2205		- 121, /* (128) optrelexpr ::= relexpr */
2206		- 127, /* (129) attribute_list ::= alist */
2207		- 129, /* (130) alist ::= */
2208		- 129, /* (131) alist ::= alist attribute */
2209		- 130, /* (132) attribute ::= boolproperty */
2210		- 130, /* (133) attribute ::= WITH withclause */
2211		- 131, /* (134) go ::= GO */
2212		- 131, /* (135) go ::= */
2213		- 119, /* (136) even ::= UNTIL EVEN WITH */
2214		- 119, /* (137) even ::= EVEN WITH */
2215		- 108, /* (138) dashproperty ::= DOTTED */
2216		- 108, /* (139) dashproperty ::= DASHED */
2217		- 109, /* (140) colorproperty ::= FILL */
2218		- 109, /* (141) colorproperty ::= COLOR */
2219		- 111, /* (142) position ::= place */
2220		- 134, /* (143) between ::= WAY BETWEEN */
2221		- 134, /* (144) between ::= BETWEEN */
2222		- 134, /* (145) between ::= OF THE WAY BETWEEN */
2223		- 112, /* (146) place ::= place2 */
2224		- 106, /* (147) edge ::= CENTER */
2225		- 106, /* (148) edge ::= EDGEPT */
2226		- 106, /* (149) edge ::= TOP */
2227		- 106, /* (150) edge ::= BOTTOM */
2228		- 106, /* (151) edge ::= START */
2229		- 106, /* (152) edge ::= END */
2230		- 106, /* (153) edge ::= RIGHT */
2231		- 106, /* (154) edge ::= LEFT */
2232		- 113, /* (155) object ::= objectname */
	2118	+ 124, /* (0) document ::= statement_list */
	2119	+ 101, /* (1) statement_list ::= statement */
	2120	+ 101, /* (2) statement_list ::= statement_list EOL statement */
	2121	+ 102, /* (3) statement ::= */
	2122	+ 102, /* (4) statement ::= direction */
	2123	+ 102, /* (5) statement ::= lvalue ASSIGN rvalue */
	2124	+ 102, /* (6) statement ::= PLACENAME COLON unnamed_statement */
	2125	+ 102, /* (7) statement ::= PLACENAME COLON position */
	2126	+ 102, /* (8) statement ::= unnamed_statement */
	2127	+ 102, /* (9) statement ::= print prlist */
	2128	+ 102, /* (10) statement ::= ASSERT LP expr EQ expr RP */
	2129	+ 102, /* (11) statement ::= ASSERT LP position EQ position RP */
	2130	+ 102, /* (12) statement ::= DEFINE ID CODEBLOCK */
	2131	+ 119, /* (13) rvalue ::= PLACENAME */
	2132	+ 127, /* (14) pritem ::= FILL */
	2133	+ 127, /* (15) pritem ::= COLOR */
	2134	+ 127, /* (16) pritem ::= THICKNESS */
	2135	+ 127, /* (17) pritem ::= rvalue */
	2136	+ 127, /* (18) pritem ::= STRING */
	2137	+ 128, /* (19) prsep ::= COMMA */
	2138	+ 103, /* (20) unnamed_statement ::= basetype attribute_list */
	2139	+ 104, /* (21) basetype ::= CLASSNAME */
	2140	+ 104, /* (22) basetype ::= STRING textposition */
	2141	+ 104, /* (23) basetype ::= LB savelist statement_list RB */
	2142	+ 130, /* (24) savelist ::= */
	2143	+ 122, /* (25) relexpr ::= expr */
	2144	+ 122, /* (26) relexpr ::= expr PERCENT */
	2145	+ 123, /* (27) optrelexpr ::= */
	2146	+ 129, /* (28) attribute_list ::= relexpr alist */
	2147	+ 132, /* (29) attribute ::= numproperty relexpr */
	2148	+ 132, /* (30) attribute ::= dashproperty expr */
	2149	+ 132, /* (31) attribute ::= dashproperty */
	2150	+ 132, /* (32) attribute ::= colorproperty rvalue */
	2151	+ 132, /* (33) attribute ::= go direction optrelexpr */
	2152	+ 132, /* (34) attribute ::= go direction even position */
	2153	+ 132, /* (35) attribute ::= CLOSE */
	2154	+ 132, /* (36) attribute ::= CHOP */
	2155	+ 132, /* (37) attribute ::= FROM position */
	2156	+ 132, /* (38) attribute ::= TO position */
	2157	+ 132, /* (39) attribute ::= THEN */
	2158	+ 132, /* (40) attribute ::= THEN optrelexpr HEADING expr */
	2159	+ 132, /* (41) attribute ::= THEN optrelexpr EDGEPT */
	2160	+ 132, /* (42) attribute ::= GO optrelexpr HEADING expr */
	2161	+ 132, /* (43) attribute ::= GO optrelexpr EDGEPT */
	2162	+ 132, /* (44) attribute ::= AT position */
	2163	+ 132, /* (45) attribute ::= SAME */
	2164	+ 132, /* (46) attribute ::= SAME AS object */
	2165	+ 132, /* (47) attribute ::= STRING textposition */
	2166	+ 132, /* (48) attribute ::= FIT */
	2167	+ 132, /* (49) attribute ::= BEHIND object */
	2168	+ 135, /* (50) withclause ::= DOT_E edge AT position */
	2169	+ 135, /* (51) withclause ::= edge AT position */
	2170	+ 106, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
	2171	+ 134, /* (53) boolproperty ::= CW */
	2172	+ 134, /* (54) boolproperty ::= CCW */
	2173	+ 134, /* (55) boolproperty ::= LARROW */
	2174	+ 134, /* (56) boolproperty ::= RARROW */
	2175	+ 134, /* (57) boolproperty ::= LRARROW */
	2176	+ 134, /* (58) boolproperty ::= INVIS */
	2177	+ 134, /* (59) boolproperty ::= THICK */
	2178	+ 134, /* (60) boolproperty ::= THIN */
	2179	+ 134, /* (61) boolproperty ::= SOLID */
	2180	+ 118, /* (62) textposition ::= */
	2181	+ 118, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
	2182	+ 113, /* (64) position ::= expr COMMA expr */
	2183	+ 113, /* (65) position ::= place PLUS expr COMMA expr */
	2184	+ 113, /* (66) position ::= place MINUS expr COMMA expr */
	2185	+ 113, /* (67) position ::= place PLUS LP expr COMMA expr RP */
	2186	+ 113, /* (68) position ::= place MINUS LP expr COMMA expr RP */
	2187	+ 113, /* (69) position ::= LP position COMMA position RP */
	2188	+ 113, /* (70) position ::= LP position RP */
	2189	+ 113, /* (71) position ::= expr between position AND position */
	2190	+ 113, /* (72) position ::= expr LT position COMMA position GT */
	2191	+ 113, /* (73) position ::= expr ABOVE position */
	2192	+ 113, /* (74) position ::= expr BELOW position */
	2193	+ 113, /* (75) position ::= expr LEFT OF position */
	2194	+ 113, /* (76) position ::= expr RIGHT OF position */
	2195	+ 113, /* (77) position ::= expr ON HEADING EDGEPT OF position */
	2196	+ 113, /* (78) position ::= expr HEADING EDGEPT OF position */
	2197	+ 113, /* (79) position ::= expr EDGEPT OF position */
	2198	+ 113, /* (80) position ::= expr ON HEADING expr FROM position */
	2199	+ 113, /* (81) position ::= expr HEADING expr FROM position */
	2200	+ 114, /* (82) place ::= edge OF object */
	2201	+ 137, /* (83) place2 ::= object */
	2202	+ 137, /* (84) place2 ::= object DOT_E edge */
	2203	+ 137, /* (85) place2 ::= NTH VERTEX OF object */
	2204	+ 115, /* (86) object ::= nth */
	2205	+ 115, /* (87) object ::= nth OF\|IN object */
	2206	+ 116, /* (88) objectname ::= THIS */
	2207	+ 116, /* (89) objectname ::= PLACENAME */
	2208	+ 116, /* (90) objectname ::= objectname DOT_U PLACENAME */
	2209	+ 117, /* (91) nth ::= NTH CLASSNAME */
	2210	+ 117, /* (92) nth ::= NTH LAST CLASSNAME */
	2211	+ 117, /* (93) nth ::= LAST CLASSNAME */
	2212	+ 117, /* (94) nth ::= LAST */
	2213	+ 117, /* (95) nth ::= NTH LB RB */
	2214	+ 117, /* (96) nth ::= NTH LAST LB RB */
	2215	+ 117, /* (97) nth ::= LAST LB RB */
	2216	+ 105, /* (98) expr ::= expr PLUS expr */
	2217	+ 105, /* (99) expr ::= expr MINUS expr */
	2218	+ 105, /* (100) expr ::= expr STAR expr */
	2219	+ 105, /* (101) expr ::= expr SLASH expr */
	2220	+ 105, /* (102) expr ::= MINUS expr */
	2221	+ 105, /* (103) expr ::= PLUS expr */
	2222	+ 105, /* (104) expr ::= LP expr RP */
	2223	+ 105, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2224	+ 105, /* (106) expr ::= NUMBER */
	2225	+ 105, /* (107) expr ::= ID */
	2226	+ 105, /* (108) expr ::= FUNC1 LP expr RP */
	2227	+ 105, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
	2228	+ 105, /* (110) expr ::= DIST LP position COMMA position RP */
	2229	+ 105, /* (111) expr ::= place2 DOT_XY X */
	2230	+ 105, /* (112) expr ::= place2 DOT_XY Y */
	2231	+ 105, /* (113) expr ::= object DOT_L numproperty */
	2232	+ 105, /* (114) expr ::= object DOT_L dashproperty */
	2233	+ 105, /* (115) expr ::= object DOT_L colorproperty */
	2234	+ 120, /* (116) lvalue ::= ID */
	2235	+ 120, /* (117) lvalue ::= FILL */
	2236	+ 120, /* (118) lvalue ::= COLOR */
	2237	+ 120, /* (119) lvalue ::= THICKNESS */
	2238	+ 119, /* (120) rvalue ::= expr */
	2239	+ 125, /* (121) print ::= PRINT */
	2240	+ 126, /* (122) prlist ::= pritem */
	2241	+ 126, /* (123) prlist ::= prlist prsep pritem */
	2242	+ 109, /* (124) direction ::= UP */
	2243	+ 109, /* (125) direction ::= DOWN */
	2244	+ 109, /* (126) direction ::= LEFT */
	2245	+ 109, /* (127) direction ::= RIGHT */
	2246	+ 123, /* (128) optrelexpr ::= relexpr */
	2247	+ 129, /* (129) attribute_list ::= alist */
	2248	+ 131, /* (130) alist ::= */
	2249	+ 131, /* (131) alist ::= alist attribute */
	2250	+ 132, /* (132) attribute ::= boolproperty */
	2251	+ 132, /* (133) attribute ::= WITH withclause */
	2252	+ 133, /* (134) go ::= GO */
	2253	+ 133, /* (135) go ::= */
	2254	+ 121, /* (136) even ::= UNTIL EVEN WITH */
	2255	+ 121, /* (137) even ::= EVEN WITH */
	2256	+ 110, /* (138) dashproperty ::= DOTTED */
	2257	+ 110, /* (139) dashproperty ::= DASHED */
	2258	+ 111, /* (140) colorproperty ::= FILL */
	2259	+ 111, /* (141) colorproperty ::= COLOR */
	2260	+ 113, /* (142) position ::= place */
	2261	+ 136, /* (143) between ::= WAY BETWEEN */
	2262	+ 136, /* (144) between ::= BETWEEN */
	2263	+ 136, /* (145) between ::= OF THE WAY BETWEEN */
	2264	+ 114, /* (146) place ::= place2 */
	2265	+ 107, /* (147) edge ::= CENTER */
	2266	+ 107, /* (148) edge ::= EDGEPT */
	2267	+ 107, /* (149) edge ::= TOP */
	2268	+ 107, /* (150) edge ::= BOTTOM */
	2269	+ 107, /* (151) edge ::= START */
	2270	+ 107, /* (152) edge ::= END */
	2271	+ 107, /* (153) edge ::= RIGHT */
	2272	+ 107, /* (154) edge ::= LEFT */
	2273	+ 115, /* (155) object ::= objectname */
2233	2274	};
2234	2275
2235	2276	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2236	2277	** of symbols on the right-hand side of that rule. */
2237	2278	static const signed char yyRuleInfoNRhs[] = {
		@@ -2431,620 +2472,620 @@
2431	2472	** break;
2432	2473	*/
2433	2474	/******** Begin reduce actions ********************************************/
2434	2475	YYMINORTYPE yylhsminor;
2435	2476	case 0: /* document ::= statement_list */
2436		-#line 561 "pikchr.y"
2437		-{pik_render(p,yymsp[0].minor.yy235);}
2438		-#line 2463 "pikchr.c"
	2477	+#line 563 "pikchr.y"
	2478	+{pik_render(p,yymsp[0].minor.yy23);}
	2479	+#line 2479 "pikchr.c"
2439	2480	break;
2440	2481	case 1: /* statement_list ::= statement */
2441		-#line 564 "pikchr.y"
2442		-{ yylhsminor.yy235 = pik_elist_append(p,0,yymsp[0].minor.yy162); }
2443		-#line 2468 "pikchr.c"
2444		- yymsp[0].minor.yy235 = yylhsminor.yy235;
	2482	+#line 566 "pikchr.y"
	2483	+{ yylhsminor.yy23 = pik_elist_append(p,0,yymsp[0].minor.yy54); }
	2484	+#line 2484 "pikchr.c"
	2485	+ yymsp[0].minor.yy23 = yylhsminor.yy23;
2445	2486	break;
2446	2487	case 2: /* statement_list ::= statement_list EOL statement */
2447		-#line 566 "pikchr.y"
2448		-{ yylhsminor.yy235 = pik_elist_append(p,yymsp[-2].minor.yy235,yymsp[0].minor.yy162); }
2449		-#line 2474 "pikchr.c"
2450		- yymsp[-2].minor.yy235 = yylhsminor.yy235;
	2488	+#line 568 "pikchr.y"
	2489	+{ yylhsminor.yy23 = pik_elist_append(p,yymsp[-2].minor.yy23,yymsp[0].minor.yy54); }
	2490	+#line 2490 "pikchr.c"
	2491	+ yymsp[-2].minor.yy23 = yylhsminor.yy23;
2451	2492	break;
2452	2493	case 3: /* statement ::= */
2453		-#line 569 "pikchr.y"
2454		-{ yymsp[1].minor.yy162 = 0; }
2455		-#line 2480 "pikchr.c"
	2494	+#line 571 "pikchr.y"
	2495	+{ yymsp[1].minor.yy54 = 0; }
	2496	+#line 2496 "pikchr.c"
2456	2497	break;
2457	2498	case 4: /* statement ::= direction */
2458		-#line 570 "pikchr.y"
2459		-{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy162=0; }
2460		-#line 2485 "pikchr.c"
2461		- yymsp[0].minor.yy162 = yylhsminor.yy162;
	2499	+#line 572 "pikchr.y"
	2500	+{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy54=0; }
	2501	+#line 2501 "pikchr.c"
	2502	+ yymsp[0].minor.yy54 = yylhsminor.yy54;
2462	2503	break;
2463	2504	case 5: /* statement ::= lvalue ASSIGN rvalue */
2464		-#line 571 "pikchr.y"
2465		-{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy21,&yymsp[-1].minor.yy0); yylhsminor.yy162=0;}
2466		-#line 2491 "pikchr.c"
2467		- yymsp[-2].minor.yy162 = yylhsminor.yy162;
	2505	+#line 573 "pikchr.y"
	2506	+{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy129,&yymsp[-1].minor.yy0); yylhsminor.yy54=0;}
	2507	+#line 2507 "pikchr.c"
	2508	+ yymsp[-2].minor.yy54 = yylhsminor.yy54;
2468	2509	break;
2469	2510	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2470		-#line 573 "pikchr.y"
2471		-{ yylhsminor.yy162 = yymsp[0].minor.yy162; pik_elem_setname(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0); }
2472		-#line 2497 "pikchr.c"
2473		- yymsp[-2].minor.yy162 = yylhsminor.yy162;
	2511	+#line 575 "pikchr.y"
	2512	+{ yylhsminor.yy54 = yymsp[0].minor.yy54; pik_elem_setname(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0); }
	2513	+#line 2513 "pikchr.c"
	2514	+ yymsp[-2].minor.yy54 = yylhsminor.yy54;
2474	2515	break;
2475	2516	case 7: /* statement ::= PLACENAME COLON position */
2476		-#line 575 "pikchr.y"
2477		-{ yylhsminor.yy162 = pik_elem_new(p,0,0,0);
2478		- if(yylhsminor.yy162){ yylhsminor.yy162->ptAt = yymsp[0].minor.yy63; pik_elem_setname(p,yylhsminor.yy162,&yymsp[-2].minor.yy0); }}
2479		-#line 2504 "pikchr.c"
2480		- yymsp[-2].minor.yy162 = yylhsminor.yy162;
	2517	+#line 577 "pikchr.y"
	2518	+{ yylhsminor.yy54 = pik_elem_new(p,0,0,0);
	2519	+ if(yylhsminor.yy54){ yylhsminor.yy54->ptAt = yymsp[0].minor.yy187; pik_elem_setname(p,yylhsminor.yy54,&yymsp[-2].minor.yy0); }}
	2520	+#line 2520 "pikchr.c"
	2521	+ yymsp[-2].minor.yy54 = yylhsminor.yy54;
2481	2522	break;
2482	2523	case 8: /* statement ::= unnamed_statement */
2483		-#line 577 "pikchr.y"
2484		-{yylhsminor.yy162 = yymsp[0].minor.yy162;}
2485		-#line 2510 "pikchr.c"
2486		- yymsp[0].minor.yy162 = yylhsminor.yy162;
	2524	+#line 579 "pikchr.y"
	2525	+{yylhsminor.yy54 = yymsp[0].minor.yy54;}
	2526	+#line 2526 "pikchr.c"
	2527	+ yymsp[0].minor.yy54 = yylhsminor.yy54;
2487	2528	break;
2488	2529	case 9: /* statement ::= print prlist */
2489		-#line 578 "pikchr.y"
2490		-{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy162=0;}
2491		-#line 2516 "pikchr.c"
	2530	+#line 580 "pikchr.y"
	2531	+{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy54=0;}
	2532	+#line 2532 "pikchr.c"
2492	2533	break;
2493	2534	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2494		-#line 583 "pikchr.y"
2495		-{yymsp[-5].minor.yy162=pik_assert(p,yymsp[-3].minor.yy21,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy21);}
2496		-#line 2521 "pikchr.c"
	2535	+#line 585 "pikchr.y"
	2536	+{yymsp[-5].minor.yy54=pik_assert(p,yymsp[-3].minor.yy129,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy129);}
	2537	+#line 2537 "pikchr.c"
2497	2538	break;
2498	2539	case 11: /* statement ::= ASSERT LP position EQ position RP */
2499		-#line 585 "pikchr.y"
2500		-{yymsp[-5].minor.yy162=pik_position_assert(p,&yymsp[-3].minor.yy63,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy63);}
2501		-#line 2526 "pikchr.c"
	2540	+#line 587 "pikchr.y"
	2541	+{yymsp[-5].minor.yy54=pik_position_assert(p,&yymsp[-3].minor.yy187,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy187);}
	2542	+#line 2542 "pikchr.c"
2502	2543	break;
2503	2544	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2504		-#line 586 "pikchr.y"
2505		-{yymsp[-2].minor.yy162=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2506		-#line 2531 "pikchr.c"
	2545	+#line 588 "pikchr.y"
	2546	+{yymsp[-2].minor.yy54=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
	2547	+#line 2547 "pikchr.c"
2507	2548	break;
2508	2549	case 13: /* rvalue ::= PLACENAME */
2509		-#line 597 "pikchr.y"
2510		-{yylhsminor.yy21 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2511		-#line 2536 "pikchr.c"
2512		- yymsp[0].minor.yy21 = yylhsminor.yy21;
	2550	+#line 599 "pikchr.y"
	2551	+{yylhsminor.yy129 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
	2552	+#line 2552 "pikchr.c"
	2553	+ yymsp[0].minor.yy129 = yylhsminor.yy129;
2513	2554	break;
2514	2555	case 14: /* pritem ::= FILL */
2515	2556	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2516	2557	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2517		-#line 602 "pikchr.y"
	2558	+#line 604 "pikchr.y"
2518	2559	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2519		-#line 2544 "pikchr.c"
	2560	+#line 2560 "pikchr.c"
2520	2561	break;
2521	2562	case 17: /* pritem ::= rvalue */
2522		-#line 605 "pikchr.y"
2523		-{pik_append_num(p,"",yymsp[0].minor.yy21);}
2524		-#line 2549 "pikchr.c"
	2563	+#line 607 "pikchr.y"
	2564	+{pik_append_num(p,"",yymsp[0].minor.yy129);}
	2565	+#line 2565 "pikchr.c"
2525	2566	break;
2526	2567	case 18: /* pritem ::= STRING */
2527		-#line 606 "pikchr.y"
	2568	+#line 608 "pikchr.y"
2528	2569	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2529		-#line 2554 "pikchr.c"
	2570	+#line 2570 "pikchr.c"
2530	2571	break;
2531	2572	case 19: /* prsep ::= COMMA */
2532		-#line 607 "pikchr.y"
	2573	+#line 609 "pikchr.y"
2533	2574	{pik_append(p, " ", 1);}
2534		-#line 2559 "pikchr.c"
	2575	+#line 2575 "pikchr.c"
2535	2576	break;
2536	2577	case 20: /* unnamed_statement ::= basetype attribute_list */
2537		-#line 610 "pikchr.y"
2538		-{yylhsminor.yy162 = yymsp[-1].minor.yy162; pik_after_adding_attributes(p,yylhsminor.yy162);}
2539		-#line 2564 "pikchr.c"
2540		- yymsp[-1].minor.yy162 = yylhsminor.yy162;
	2578	+#line 614 "pikchr.y"
	2579	+{yylhsminor.yy54 = yymsp[-1].minor.yy54; pik_after_adding_attributes(p,yylhsminor.yy54);}
	2580	+#line 2580 "pikchr.c"
	2581	+ yymsp[-1].minor.yy54 = yylhsminor.yy54;
2541	2582	break;
2542	2583	case 21: /* basetype ::= CLASSNAME */
2543		-#line 612 "pikchr.y"
2544		-{yylhsminor.yy162 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2545		-#line 2570 "pikchr.c"
2546		- yymsp[0].minor.yy162 = yylhsminor.yy162;
	2584	+#line 616 "pikchr.y"
	2585	+{yylhsminor.yy54 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
	2586	+#line 2586 "pikchr.c"
	2587	+ yymsp[0].minor.yy54 = yylhsminor.yy54;
2547	2588	break;
2548	2589	case 22: /* basetype ::= STRING textposition */
2549		-#line 614 "pikchr.y"
2550		-{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy188; yylhsminor.yy162 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2551		-#line 2576 "pikchr.c"
2552		- yymsp[-1].minor.yy162 = yylhsminor.yy162;
	2590	+#line 618 "pikchr.y"
	2591	+{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy272; yylhsminor.yy54 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
	2592	+#line 2592 "pikchr.c"
	2593	+ yymsp[-1].minor.yy54 = yylhsminor.yy54;
2553	2594	break;
2554	2595	case 23: /* basetype ::= LB savelist statement_list RB */
2555		-#line 616 "pikchr.y"
2556		-{ p->list = yymsp[-2].minor.yy235; yymsp[-3].minor.yy162 = pik_elem_new(p,0,0,yymsp[-1].minor.yy235); if(yymsp[-3].minor.yy162) yymsp[-3].minor.yy162->errTok = yymsp[0].minor.yy0; }
2557		-#line 2582 "pikchr.c"
	2596	+#line 620 "pikchr.y"
	2597	+{ p->list = yymsp[-2].minor.yy23; yymsp[-3].minor.yy54 = pik_elem_new(p,0,0,yymsp[-1].minor.yy23); if(yymsp[-3].minor.yy54) yymsp[-3].minor.yy54->errTok = yymsp[0].minor.yy0; }
	2598	+#line 2598 "pikchr.c"
2558	2599	break;
2559	2600	case 24: /* savelist ::= */
2560		-#line 621 "pikchr.y"
2561		-{yymsp[1].minor.yy235 = p->list; p->list = 0;}
2562		-#line 2587 "pikchr.c"
	2601	+#line 625 "pikchr.y"
	2602	+{yymsp[1].minor.yy23 = p->list; p->list = 0;}
	2603	+#line 2603 "pikchr.c"
2563	2604	break;
2564	2605	case 25: /* relexpr ::= expr */
2565		-#line 628 "pikchr.y"
2566		-{yylhsminor.yy72.rAbs = yymsp[0].minor.yy21; yylhsminor.yy72.rRel = 0;}
2567		-#line 2592 "pikchr.c"
2568		- yymsp[0].minor.yy72 = yylhsminor.yy72;
	2606	+#line 632 "pikchr.y"
	2607	+{yylhsminor.yy28.rAbs = yymsp[0].minor.yy129; yylhsminor.yy28.rRel = 0;}
	2608	+#line 2608 "pikchr.c"
	2609	+ yymsp[0].minor.yy28 = yylhsminor.yy28;
2569	2610	break;
2570	2611	case 26: /* relexpr ::= expr PERCENT */
2571		-#line 629 "pikchr.y"
2572		-{yylhsminor.yy72.rAbs = 0; yylhsminor.yy72.rRel = yymsp[-1].minor.yy21/100;}
2573		-#line 2598 "pikchr.c"
2574		- yymsp[-1].minor.yy72 = yylhsminor.yy72;
	2612	+#line 633 "pikchr.y"
	2613	+{yylhsminor.yy28.rAbs = 0; yylhsminor.yy28.rRel = yymsp[-1].minor.yy129/100;}
	2614	+#line 2614 "pikchr.c"
	2615	+ yymsp[-1].minor.yy28 = yylhsminor.yy28;
2575	2616	break;
2576	2617	case 27: /* optrelexpr ::= */
2577		-#line 631 "pikchr.y"
2578		-{yymsp[1].minor.yy72.rAbs = 0; yymsp[1].minor.yy72.rRel = 1.0;}
2579		-#line 2604 "pikchr.c"
	2618	+#line 635 "pikchr.y"
	2619	+{yymsp[1].minor.yy28.rAbs = 0; yymsp[1].minor.yy28.rRel = 1.0;}
	2620	+#line 2620 "pikchr.c"
2580	2621	break;
2581	2622	case 28: /* attribute_list ::= relexpr alist */
2582		-#line 633 "pikchr.y"
2583		-{pik_add_direction(p,0,&yymsp[-1].minor.yy72);}
2584		-#line 2609 "pikchr.c"
	2623	+#line 637 "pikchr.y"
	2624	+{pik_add_direction(p,0,&yymsp[-1].minor.yy28);}
	2625	+#line 2625 "pikchr.c"
2585	2626	break;
2586	2627	case 29: /* attribute ::= numproperty relexpr */
2587		-#line 637 "pikchr.y"
2588		-{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy72); }
2589		-#line 2614 "pikchr.c"
	2628	+#line 641 "pikchr.y"
	2629	+{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy28); }
	2630	+#line 2630 "pikchr.c"
2590	2631	break;
2591	2632	case 30: /* attribute ::= dashproperty expr */
2592		-#line 638 "pikchr.y"
2593		-{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy21); }
2594		-#line 2619 "pikchr.c"
	2633	+#line 642 "pikchr.y"
	2634	+{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy129); }
	2635	+#line 2635 "pikchr.c"
2595	2636	break;
2596	2637	case 31: /* attribute ::= dashproperty */
2597		-#line 639 "pikchr.y"
	2638	+#line 643 "pikchr.y"
2598	2639	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2599		-#line 2624 "pikchr.c"
	2640	+#line 2640 "pikchr.c"
2600	2641	break;
2601	2642	case 32: /* attribute ::= colorproperty rvalue */
2602		-#line 640 "pikchr.y"
2603		-{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy21); }
2604		-#line 2629 "pikchr.c"
	2643	+#line 644 "pikchr.y"
	2644	+{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy129); }
	2645	+#line 2645 "pikchr.c"
2605	2646	break;
2606	2647	case 33: /* attribute ::= go direction optrelexpr */
2607		-#line 641 "pikchr.y"
2608		-{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy72);}
2609		-#line 2634 "pikchr.c"
	2648	+#line 645 "pikchr.y"
	2649	+{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy28);}
	2650	+#line 2650 "pikchr.c"
2610	2651	break;
2611	2652	case 34: /* attribute ::= go direction even position */
2612		-#line 642 "pikchr.y"
2613		-{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy63);}
2614		-#line 2639 "pikchr.c"
	2653	+#line 646 "pikchr.y"
	2654	+{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy187);}
	2655	+#line 2655 "pikchr.c"
2615	2656	break;
2616	2657	case 35: /* attribute ::= CLOSE */
2617		-#line 643 "pikchr.y"
	2658	+#line 647 "pikchr.y"
2618	2659	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2619		-#line 2644 "pikchr.c"
	2660	+#line 2660 "pikchr.c"
2620	2661	break;
2621	2662	case 36: /* attribute ::= CHOP */
2622		-#line 644 "pikchr.y"
	2663	+#line 648 "pikchr.y"
2623	2664	{ p->cur->bChop = 1; }
2624		-#line 2649 "pikchr.c"
	2665	+#line 2665 "pikchr.c"
2625	2666	break;
2626	2667	case 37: /* attribute ::= FROM position */
2627		-#line 645 "pikchr.y"
2628		-{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy63); }
2629		-#line 2654 "pikchr.c"
	2668	+#line 649 "pikchr.y"
	2669	+{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy187); }
	2670	+#line 2670 "pikchr.c"
2630	2671	break;
2631	2672	case 38: /* attribute ::= TO position */
2632		-#line 646 "pikchr.y"
2633		-{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy63); }
2634		-#line 2659 "pikchr.c"
	2673	+#line 650 "pikchr.y"
	2674	+{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy187); }
	2675	+#line 2675 "pikchr.c"
2635	2676	break;
2636	2677	case 39: /* attribute ::= THEN */
2637		-#line 647 "pikchr.y"
	2678	+#line 651 "pikchr.y"
2638	2679	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2639		-#line 2664 "pikchr.c"
	2680	+#line 2680 "pikchr.c"
2640	2681	break;
2641	2682	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2642	2683	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2643		-#line 649 "pikchr.y"
2644		-{pik_move_hdg(p,&yymsp[-2].minor.yy72,&yymsp[-1].minor.yy0,yymsp[0].minor.yy21,0,&yymsp[-3].minor.yy0);}
2645		-#line 2670 "pikchr.c"
	2684	+#line 653 "pikchr.y"
	2685	+{pik_move_hdg(p,&yymsp[-2].minor.yy28,&yymsp[-1].minor.yy0,yymsp[0].minor.yy129,0,&yymsp[-3].minor.yy0);}
	2686	+#line 2686 "pikchr.c"
2646	2687	break;
2647	2688	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2648	2689	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2649		-#line 650 "pikchr.y"
2650		-{pik_move_hdg(p,&yymsp[-1].minor.yy72,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2651		-#line 2676 "pikchr.c"
	2690	+#line 654 "pikchr.y"
	2691	+{pik_move_hdg(p,&yymsp[-1].minor.yy28,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
	2692	+#line 2692 "pikchr.c"
2652	2693	break;
2653	2694	case 44: /* attribute ::= AT position */
2654		-#line 655 "pikchr.y"
2655		-{ pik_set_at(p,0,&yymsp[0].minor.yy63,&yymsp[-1].minor.yy0); }
2656		-#line 2681 "pikchr.c"
	2695	+#line 659 "pikchr.y"
	2696	+{ pik_set_at(p,0,&yymsp[0].minor.yy187,&yymsp[-1].minor.yy0); }
	2697	+#line 2697 "pikchr.c"
2657	2698	break;
2658	2699	case 45: /* attribute ::= SAME */
2659		-#line 657 "pikchr.y"
	2700	+#line 661 "pikchr.y"
2660	2701	{pik_same(p,0,&yymsp[0].minor.yy0);}
2661		-#line 2686 "pikchr.c"
	2702	+#line 2702 "pikchr.c"
2662	2703	break;
2663	2704	case 46: /* attribute ::= SAME AS object */
2664		-#line 658 "pikchr.y"
2665		-{pik_same(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0);}
2666		-#line 2691 "pikchr.c"
	2705	+#line 662 "pikchr.y"
	2706	+{pik_same(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0);}
	2707	+#line 2707 "pikchr.c"
2667	2708	break;
2668	2709	case 47: /* attribute ::= STRING textposition */
2669		-#line 659 "pikchr.y"
2670		-{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy188);}
2671		-#line 2696 "pikchr.c"
	2710	+#line 663 "pikchr.y"
	2711	+{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy272);}
	2712	+#line 2712 "pikchr.c"
2672	2713	break;
2673	2714	case 48: /* attribute ::= FIT */
2674		-#line 660 "pikchr.y"
	2715	+#line 664 "pikchr.y"
2675	2716	{pik_size_to_fit(p,0,&yymsp[0].minor.yy0,3); }
2676		-#line 2701 "pikchr.c"
	2717	+#line 2717 "pikchr.c"
2677	2718	break;
2678	2719	case 49: /* attribute ::= BEHIND object */
2679		-#line 661 "pikchr.y"
2680		-{pik_behind(p,yymsp[0].minor.yy162);}
2681		-#line 2706 "pikchr.c"
	2720	+#line 665 "pikchr.y"
	2721	+{pik_behind(p,yymsp[0].minor.yy54);}
	2722	+#line 2722 "pikchr.c"
2682	2723	break;
2683	2724	case 50: /* withclause ::= DOT_E edge AT position */
2684	2725	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2685		-#line 669 "pikchr.y"
2686		-{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy63,&yymsp[-1].minor.yy0); }
2687		-#line 2712 "pikchr.c"
	2726	+#line 673 "pikchr.y"
	2727	+{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy187,&yymsp[-1].minor.yy0); }
	2728	+#line 2728 "pikchr.c"
2688	2729	break;
2689	2730	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2690		-#line 673 "pikchr.y"
	2731	+#line 677 "pikchr.y"
2691	2732	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2692		-#line 2717 "pikchr.c"
	2733	+#line 2733 "pikchr.c"
2693	2734	yymsp[0].minor.yy0 = yylhsminor.yy0;
2694	2735	break;
2695	2736	case 53: /* boolproperty ::= CW */
2696		-#line 684 "pikchr.y"
	2737	+#line 688 "pikchr.y"
2697	2738	{p->cur->cw = 1;}
2698		-#line 2723 "pikchr.c"
	2739	+#line 2739 "pikchr.c"
2699	2740	break;
2700	2741	case 54: /* boolproperty ::= CCW */
2701		-#line 685 "pikchr.y"
	2742	+#line 689 "pikchr.y"
2702	2743	{p->cur->cw = 0;}
2703		-#line 2728 "pikchr.c"
	2744	+#line 2744 "pikchr.c"
2704	2745	break;
2705	2746	case 55: /* boolproperty ::= LARROW */
2706		-#line 686 "pikchr.y"
	2747	+#line 690 "pikchr.y"
2707	2748	{p->cur->larrow=1; p->cur->rarrow=0; }
2708		-#line 2733 "pikchr.c"
	2749	+#line 2749 "pikchr.c"
2709	2750	break;
2710	2751	case 56: /* boolproperty ::= RARROW */
2711		-#line 687 "pikchr.y"
	2752	+#line 691 "pikchr.y"
2712	2753	{p->cur->larrow=0; p->cur->rarrow=1; }
2713		-#line 2738 "pikchr.c"
	2754	+#line 2754 "pikchr.c"
2714	2755	break;
2715	2756	case 57: /* boolproperty ::= LRARROW */
2716		-#line 688 "pikchr.y"
	2757	+#line 692 "pikchr.y"
2717	2758	{p->cur->larrow=1; p->cur->rarrow=1; }
2718		-#line 2743 "pikchr.c"
	2759	+#line 2759 "pikchr.c"
2719	2760	break;
2720	2761	case 58: /* boolproperty ::= INVIS */
2721		-#line 689 "pikchr.y"
	2762	+#line 693 "pikchr.y"
2722	2763	{p->cur->sw = -0.00001;}
2723		-#line 2748 "pikchr.c"
	2764	+#line 2764 "pikchr.c"
2724	2765	break;
2725	2766	case 59: /* boolproperty ::= THICK */
2726		-#line 690 "pikchr.y"
	2767	+#line 694 "pikchr.y"
2727	2768	{p->cur->sw *= 1.5;}
2728		-#line 2753 "pikchr.c"
	2769	+#line 2769 "pikchr.c"
2729	2770	break;
2730	2771	case 60: /* boolproperty ::= THIN */
2731		-#line 691 "pikchr.y"
	2772	+#line 695 "pikchr.y"
2732	2773	{p->cur->sw *= 0.67;}
2733		-#line 2758 "pikchr.c"
	2774	+#line 2774 "pikchr.c"
2734	2775	break;
2735	2776	case 61: /* boolproperty ::= SOLID */
2736		-#line 692 "pikchr.y"
	2777	+#line 696 "pikchr.y"
2737	2778	{p->cur->sw = pik_value(p,"thickness",9,0);
2738	2779	p->cur->dotted = p->cur->dashed = 0.0;}
2739		-#line 2764 "pikchr.c"
	2780	+#line 2780 "pikchr.c"
2740	2781	break;
2741	2782	case 62: /* textposition ::= */
2742		-#line 695 "pikchr.y"
2743		-{yymsp[1].minor.yy188 = 0;}
2744		-#line 2769 "pikchr.c"
	2783	+#line 699 "pikchr.y"
	2784	+{yymsp[1].minor.yy272 = 0;}
	2785	+#line 2785 "pikchr.c"
2745	2786	break;
2746	2787	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
2747		-#line 698 "pikchr.y"
2748		-{yylhsminor.yy188 = (short int)pik_text_position(yymsp[-1].minor.yy188,&yymsp[0].minor.yy0);}
2749		-#line 2774 "pikchr.c"
2750		- yymsp[-1].minor.yy188 = yylhsminor.yy188;
	2788	+#line 702 "pikchr.y"
	2789	+{yylhsminor.yy272 = (short int)pik_text_position(yymsp[-1].minor.yy272,&yymsp[0].minor.yy0);}
	2790	+#line 2790 "pikchr.c"
	2791	+ yymsp[-1].minor.yy272 = yylhsminor.yy272;
2751	2792	break;
2752	2793	case 64: /* position ::= expr COMMA expr */
2753		-#line 701 "pikchr.y"
2754		-{yylhsminor.yy63.x=yymsp[-2].minor.yy21; yylhsminor.yy63.y=yymsp[0].minor.yy21;}
2755		-#line 2780 "pikchr.c"
2756		- yymsp[-2].minor.yy63 = yylhsminor.yy63;
	2794	+#line 705 "pikchr.y"
	2795	+{yylhsminor.yy187.x=yymsp[-2].minor.yy129; yylhsminor.yy187.y=yymsp[0].minor.yy129;}
	2796	+#line 2796 "pikchr.c"
	2797	+ yymsp[-2].minor.yy187 = yylhsminor.yy187;
2757	2798	break;
2758	2799	case 65: /* position ::= place PLUS expr COMMA expr */
2759		-#line 703 "pikchr.y"
2760		-{yylhsminor.yy63.x=yymsp[-4].minor.yy63.x+yymsp[-2].minor.yy21; yylhsminor.yy63.y=yymsp[-4].minor.yy63.y+yymsp[0].minor.yy21;}
2761		-#line 2786 "pikchr.c"
2762		- yymsp[-4].minor.yy63 = yylhsminor.yy63;
	2800	+#line 707 "pikchr.y"
	2801	+{yylhsminor.yy187.x=yymsp[-4].minor.yy187.x+yymsp[-2].minor.yy129; yylhsminor.yy187.y=yymsp[-4].minor.yy187.y+yymsp[0].minor.yy129;}
	2802	+#line 2802 "pikchr.c"
	2803	+ yymsp[-4].minor.yy187 = yylhsminor.yy187;
2763	2804	break;
2764	2805	case 66: /* position ::= place MINUS expr COMMA expr */
2765		-#line 704 "pikchr.y"
2766		-{yylhsminor.yy63.x=yymsp[-4].minor.yy63.x-yymsp[-2].minor.yy21; yylhsminor.yy63.y=yymsp[-4].minor.yy63.y-yymsp[0].minor.yy21;}
2767		-#line 2792 "pikchr.c"
2768		- yymsp[-4].minor.yy63 = yylhsminor.yy63;
	2806	+#line 708 "pikchr.y"
	2807	+{yylhsminor.yy187.x=yymsp[-4].minor.yy187.x-yymsp[-2].minor.yy129; yylhsminor.yy187.y=yymsp[-4].minor.yy187.y-yymsp[0].minor.yy129;}
	2808	+#line 2808 "pikchr.c"
	2809	+ yymsp[-4].minor.yy187 = yylhsminor.yy187;
2769	2810	break;
2770	2811	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2771		-#line 706 "pikchr.y"
2772		-{yylhsminor.yy63.x=yymsp[-6].minor.yy63.x+yymsp[-3].minor.yy21; yylhsminor.yy63.y=yymsp[-6].minor.yy63.y+yymsp[-1].minor.yy21;}
2773		-#line 2798 "pikchr.c"
2774		- yymsp[-6].minor.yy63 = yylhsminor.yy63;
	2812	+#line 710 "pikchr.y"
	2813	+{yylhsminor.yy187.x=yymsp[-6].minor.yy187.x+yymsp[-3].minor.yy129; yylhsminor.yy187.y=yymsp[-6].minor.yy187.y+yymsp[-1].minor.yy129;}
	2814	+#line 2814 "pikchr.c"
	2815	+ yymsp[-6].minor.yy187 = yylhsminor.yy187;
2775	2816	break;
2776	2817	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2777		-#line 708 "pikchr.y"
2778		-{yylhsminor.yy63.x=yymsp[-6].minor.yy63.x-yymsp[-3].minor.yy21; yylhsminor.yy63.y=yymsp[-6].minor.yy63.y-yymsp[-1].minor.yy21;}
2779		-#line 2804 "pikchr.c"
2780		- yymsp[-6].minor.yy63 = yylhsminor.yy63;
	2818	+#line 712 "pikchr.y"
	2819	+{yylhsminor.yy187.x=yymsp[-6].minor.yy187.x-yymsp[-3].minor.yy129; yylhsminor.yy187.y=yymsp[-6].minor.yy187.y-yymsp[-1].minor.yy129;}
	2820	+#line 2820 "pikchr.c"
	2821	+ yymsp[-6].minor.yy187 = yylhsminor.yy187;
2781	2822	break;
2782	2823	case 69: /* position ::= LP position COMMA position RP */
2783		-#line 709 "pikchr.y"
2784		-{yymsp[-4].minor.yy63.x=yymsp[-3].minor.yy63.x; yymsp[-4].minor.yy63.y=yymsp[-1].minor.yy63.y;}
2785		-#line 2810 "pikchr.c"
	2824	+#line 713 "pikchr.y"
	2825	+{yymsp[-4].minor.yy187.x=yymsp[-3].minor.yy187.x; yymsp[-4].minor.yy187.y=yymsp[-1].minor.yy187.y;}
	2826	+#line 2826 "pikchr.c"
2786	2827	break;
2787	2828	case 70: /* position ::= LP position RP */
2788		-#line 710 "pikchr.y"
2789		-{yymsp[-2].minor.yy63=yymsp[-1].minor.yy63;}
2790		-#line 2815 "pikchr.c"
	2829	+#line 714 "pikchr.y"
	2830	+{yymsp[-2].minor.yy187=yymsp[-1].minor.yy187;}
	2831	+#line 2831 "pikchr.c"
2791	2832	break;
2792	2833	case 71: /* position ::= expr between position AND position */
2793		-#line 712 "pikchr.y"
2794		-{yylhsminor.yy63 = pik_position_between(yymsp[-4].minor.yy21,yymsp[-2].minor.yy63,yymsp[0].minor.yy63);}
2795		-#line 2820 "pikchr.c"
2796		- yymsp[-4].minor.yy63 = yylhsminor.yy63;
	2834	+#line 716 "pikchr.y"
	2835	+{yylhsminor.yy187 = pik_position_between(yymsp[-4].minor.yy129,yymsp[-2].minor.yy187,yymsp[0].minor.yy187);}
	2836	+#line 2836 "pikchr.c"
	2837	+ yymsp[-4].minor.yy187 = yylhsminor.yy187;
2797	2838	break;
2798	2839	case 72: /* position ::= expr LT position COMMA position GT */
2799		-#line 714 "pikchr.y"
2800		-{yylhsminor.yy63 = pik_position_between(yymsp[-5].minor.yy21,yymsp[-3].minor.yy63,yymsp[-1].minor.yy63);}
2801		-#line 2826 "pikchr.c"
2802		- yymsp[-5].minor.yy63 = yylhsminor.yy63;
	2840	+#line 718 "pikchr.y"
	2841	+{yylhsminor.yy187 = pik_position_between(yymsp[-5].minor.yy129,yymsp[-3].minor.yy187,yymsp[-1].minor.yy187);}
	2842	+#line 2842 "pikchr.c"
	2843	+ yymsp[-5].minor.yy187 = yylhsminor.yy187;
2803	2844	break;
2804	2845	case 73: /* position ::= expr ABOVE position */
2805		-#line 715 "pikchr.y"
2806		-{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.y += yymsp[-2].minor.yy21;}
2807		-#line 2832 "pikchr.c"
2808		- yymsp[-2].minor.yy63 = yylhsminor.yy63;
	2846	+#line 719 "pikchr.y"
	2847	+{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.y += yymsp[-2].minor.yy129;}
	2848	+#line 2848 "pikchr.c"
	2849	+ yymsp[-2].minor.yy187 = yylhsminor.yy187;
2809	2850	break;
2810	2851	case 74: /* position ::= expr BELOW position */
2811		-#line 716 "pikchr.y"
2812		-{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.y -= yymsp[-2].minor.yy21;}
2813		-#line 2838 "pikchr.c"
2814		- yymsp[-2].minor.yy63 = yylhsminor.yy63;
	2852	+#line 720 "pikchr.y"
	2853	+{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.y -= yymsp[-2].minor.yy129;}
	2854	+#line 2854 "pikchr.c"
	2855	+ yymsp[-2].minor.yy187 = yylhsminor.yy187;
2815	2856	break;
2816	2857	case 75: /* position ::= expr LEFT OF position */
2817		-#line 717 "pikchr.y"
2818		-{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.x -= yymsp[-3].minor.yy21;}
2819		-#line 2844 "pikchr.c"
2820		- yymsp[-3].minor.yy63 = yylhsminor.yy63;
	2858	+#line 721 "pikchr.y"
	2859	+{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.x -= yymsp[-3].minor.yy129;}
	2860	+#line 2860 "pikchr.c"
	2861	+ yymsp[-3].minor.yy187 = yylhsminor.yy187;
2821	2862	break;
2822	2863	case 76: /* position ::= expr RIGHT OF position */
2823		-#line 718 "pikchr.y"
2824		-{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.x += yymsp[-3].minor.yy21;}
2825		-#line 2850 "pikchr.c"
2826		- yymsp[-3].minor.yy63 = yylhsminor.yy63;
	2864	+#line 722 "pikchr.y"
	2865	+{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.x += yymsp[-3].minor.yy129;}
	2866	+#line 2866 "pikchr.c"
	2867	+ yymsp[-3].minor.yy187 = yylhsminor.yy187;
2827	2868	break;
2828	2869	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2829		-#line 720 "pikchr.y"
2830		-{yylhsminor.yy63 = pik_position_at_hdg(yymsp[-5].minor.yy21,&yymsp[-2].minor.yy0,yymsp[0].minor.yy63);}
2831		-#line 2856 "pikchr.c"
2832		- yymsp[-5].minor.yy63 = yylhsminor.yy63;
	2870	+#line 724 "pikchr.y"
	2871	+{yylhsminor.yy187 = pik_position_at_hdg(yymsp[-5].minor.yy129,&yymsp[-2].minor.yy0,yymsp[0].minor.yy187);}
	2872	+#line 2872 "pikchr.c"
	2873	+ yymsp[-5].minor.yy187 = yylhsminor.yy187;
2833	2874	break;
2834	2875	case 78: /* position ::= expr HEADING EDGEPT OF position */
2835		-#line 722 "pikchr.y"
2836		-{yylhsminor.yy63 = pik_position_at_hdg(yymsp[-4].minor.yy21,&yymsp[-2].minor.yy0,yymsp[0].minor.yy63);}
2837		-#line 2862 "pikchr.c"
2838		- yymsp[-4].minor.yy63 = yylhsminor.yy63;
	2876	+#line 726 "pikchr.y"
	2877	+{yylhsminor.yy187 = pik_position_at_hdg(yymsp[-4].minor.yy129,&yymsp[-2].minor.yy0,yymsp[0].minor.yy187);}
	2878	+#line 2878 "pikchr.c"
	2879	+ yymsp[-4].minor.yy187 = yylhsminor.yy187;
2839	2880	break;
2840	2881	case 79: /* position ::= expr EDGEPT OF position */
2841		-#line 724 "pikchr.y"
2842		-{yylhsminor.yy63 = pik_position_at_hdg(yymsp[-3].minor.yy21,&yymsp[-2].minor.yy0,yymsp[0].minor.yy63);}
2843		-#line 2868 "pikchr.c"
2844		- yymsp[-3].minor.yy63 = yylhsminor.yy63;
	2882	+#line 728 "pikchr.y"
	2883	+{yylhsminor.yy187 = pik_position_at_hdg(yymsp[-3].minor.yy129,&yymsp[-2].minor.yy0,yymsp[0].minor.yy187);}
	2884	+#line 2884 "pikchr.c"
	2885	+ yymsp[-3].minor.yy187 = yylhsminor.yy187;
2845	2886	break;
2846	2887	case 80: /* position ::= expr ON HEADING expr FROM position */
2847		-#line 726 "pikchr.y"
2848		-{yylhsminor.yy63 = pik_position_at_angle(yymsp[-5].minor.yy21,yymsp[-2].minor.yy21,yymsp[0].minor.yy63);}
2849		-#line 2874 "pikchr.c"
2850		- yymsp[-5].minor.yy63 = yylhsminor.yy63;
	2888	+#line 730 "pikchr.y"
	2889	+{yylhsminor.yy187 = pik_position_at_angle(yymsp[-5].minor.yy129,yymsp[-2].minor.yy129,yymsp[0].minor.yy187);}
	2890	+#line 2890 "pikchr.c"
	2891	+ yymsp[-5].minor.yy187 = yylhsminor.yy187;
2851	2892	break;
2852	2893	case 81: /* position ::= expr HEADING expr FROM position */
2853		-#line 728 "pikchr.y"
2854		-{yylhsminor.yy63 = pik_position_at_angle(yymsp[-4].minor.yy21,yymsp[-2].minor.yy21,yymsp[0].minor.yy63);}
2855		-#line 2880 "pikchr.c"
2856		- yymsp[-4].minor.yy63 = yylhsminor.yy63;
	2894	+#line 732 "pikchr.y"
	2895	+{yylhsminor.yy187 = pik_position_at_angle(yymsp[-4].minor.yy129,yymsp[-2].minor.yy129,yymsp[0].minor.yy187);}
	2896	+#line 2896 "pikchr.c"
	2897	+ yymsp[-4].minor.yy187 = yylhsminor.yy187;
2857	2898	break;
2858	2899	case 82: /* place ::= edge OF object */
2859		-#line 740 "pikchr.y"
2860		-{yylhsminor.yy63 = pik_place_of_elem(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0);}
2861		-#line 2886 "pikchr.c"
2862		- yymsp[-2].minor.yy63 = yylhsminor.yy63;
	2900	+#line 744 "pikchr.y"
	2901	+{yylhsminor.yy187 = pik_place_of_elem(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0);}
	2902	+#line 2902 "pikchr.c"
	2903	+ yymsp[-2].minor.yy187 = yylhsminor.yy187;
2863	2904	break;
2864	2905	case 83: /* place2 ::= object */
2865		-#line 741 "pikchr.y"
2866		-{yylhsminor.yy63 = pik_place_of_elem(p,yymsp[0].minor.yy162,0);}
2867		-#line 2892 "pikchr.c"
2868		- yymsp[0].minor.yy63 = yylhsminor.yy63;
	2906	+#line 745 "pikchr.y"
	2907	+{yylhsminor.yy187 = pik_place_of_elem(p,yymsp[0].minor.yy54,0);}
	2908	+#line 2908 "pikchr.c"
	2909	+ yymsp[0].minor.yy187 = yylhsminor.yy187;
2869	2910	break;
2870	2911	case 84: /* place2 ::= object DOT_E edge */
2871		-#line 742 "pikchr.y"
2872		-{yylhsminor.yy63 = pik_place_of_elem(p,yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}
2873		-#line 2898 "pikchr.c"
2874		- yymsp[-2].minor.yy63 = yylhsminor.yy63;
	2912	+#line 746 "pikchr.y"
	2913	+{yylhsminor.yy187 = pik_place_of_elem(p,yymsp[-2].minor.yy54,&yymsp[0].minor.yy0);}
	2914	+#line 2914 "pikchr.c"
	2915	+ yymsp[-2].minor.yy187 = yylhsminor.yy187;
2875	2916	break;
2876	2917	case 85: /* place2 ::= NTH VERTEX OF object */
2877		-#line 743 "pikchr.y"
2878		-{yylhsminor.yy63 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy162);}
2879		-#line 2904 "pikchr.c"
2880		- yymsp[-3].minor.yy63 = yylhsminor.yy63;
	2918	+#line 747 "pikchr.y"
	2919	+{yylhsminor.yy187 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy54);}
	2920	+#line 2920 "pikchr.c"
	2921	+ yymsp[-3].minor.yy187 = yylhsminor.yy187;
2881	2922	break;
2882	2923	case 86: /* object ::= nth */
2883		-#line 755 "pikchr.y"
2884		-{yylhsminor.yy162 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2885		-#line 2910 "pikchr.c"
2886		- yymsp[0].minor.yy162 = yylhsminor.yy162;
	2924	+#line 759 "pikchr.y"
	2925	+{yylhsminor.yy54 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
	2926	+#line 2926 "pikchr.c"
	2927	+ yymsp[0].minor.yy54 = yylhsminor.yy54;
2887	2928	break;
2888	2929	case 87: /* object ::= nth OF\|IN object */
2889		-#line 756 "pikchr.y"
2890		-{yylhsminor.yy162 = pik_find_nth(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0);}
2891		-#line 2916 "pikchr.c"
2892		- yymsp[-2].minor.yy162 = yylhsminor.yy162;
	2930	+#line 760 "pikchr.y"
	2931	+{yylhsminor.yy54 = pik_find_nth(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0);}
	2932	+#line 2932 "pikchr.c"
	2933	+ yymsp[-2].minor.yy54 = yylhsminor.yy54;
2893	2934	break;
2894	2935	case 88: /* objectname ::= THIS */
2895		-#line 758 "pikchr.y"
2896		-{yymsp[0].minor.yy162 = p->cur;}
2897		-#line 2922 "pikchr.c"
	2936	+#line 762 "pikchr.y"
	2937	+{yymsp[0].minor.yy54 = p->cur;}
	2938	+#line 2938 "pikchr.c"
2898	2939	break;
2899	2940	case 89: /* objectname ::= PLACENAME */
2900		-#line 759 "pikchr.y"
2901		-{yylhsminor.yy162 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2902		-#line 2927 "pikchr.c"
2903		- yymsp[0].minor.yy162 = yylhsminor.yy162;
	2941	+#line 763 "pikchr.y"
	2942	+{yylhsminor.yy54 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
	2943	+#line 2943 "pikchr.c"
	2944	+ yymsp[0].minor.yy54 = yylhsminor.yy54;
2904	2945	break;
2905	2946	case 90: /* objectname ::= objectname DOT_U PLACENAME */
2906		-#line 761 "pikchr.y"
2907		-{yylhsminor.yy162 = pik_find_byname(p,yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}
2908		-#line 2933 "pikchr.c"
2909		- yymsp[-2].minor.yy162 = yylhsminor.yy162;
	2947	+#line 765 "pikchr.y"
	2948	+{yylhsminor.yy54 = pik_find_byname(p,yymsp[-2].minor.yy54,&yymsp[0].minor.yy0);}
	2949	+#line 2949 "pikchr.c"
	2950	+ yymsp[-2].minor.yy54 = yylhsminor.yy54;
2910	2951	break;
2911	2952	case 91: /* nth ::= NTH CLASSNAME */
2912		-#line 763 "pikchr.y"
	2953	+#line 767 "pikchr.y"
2913	2954	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2914		-#line 2939 "pikchr.c"
	2955	+#line 2955 "pikchr.c"
2915	2956	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2916	2957	break;
2917	2958	case 92: /* nth ::= NTH LAST CLASSNAME */
2918		-#line 764 "pikchr.y"
	2959	+#line 768 "pikchr.y"
2919	2960	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2920		-#line 2945 "pikchr.c"
	2961	+#line 2961 "pikchr.c"
2921	2962	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2922	2963	break;
2923	2964	case 93: /* nth ::= LAST CLASSNAME */
2924		-#line 765 "pikchr.y"
	2965	+#line 769 "pikchr.y"
2925	2966	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2926		-#line 2951 "pikchr.c"
	2967	+#line 2967 "pikchr.c"
2927	2968	break;
2928	2969	case 94: /* nth ::= LAST */
2929		-#line 766 "pikchr.y"
	2970	+#line 770 "pikchr.y"
2930	2971	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2931		-#line 2956 "pikchr.c"
	2972	+#line 2972 "pikchr.c"
2932	2973	yymsp[0].minor.yy0 = yylhsminor.yy0;
2933	2974	break;
2934	2975	case 95: /* nth ::= NTH LB RB */
2935		-#line 767 "pikchr.y"
	2976	+#line 771 "pikchr.y"
2936	2977	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2937		-#line 2962 "pikchr.c"
	2978	+#line 2978 "pikchr.c"
2938	2979	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2939	2980	break;
2940	2981	case 96: /* nth ::= NTH LAST LB RB */
2941		-#line 768 "pikchr.y"
	2982	+#line 772 "pikchr.y"
2942	2983	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2943		-#line 2968 "pikchr.c"
	2984	+#line 2984 "pikchr.c"
2944	2985	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2945	2986	break;
2946	2987	case 97: /* nth ::= LAST LB RB */
2947		-#line 769 "pikchr.y"
	2988	+#line 773 "pikchr.y"
2948	2989	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2949		-#line 2974 "pikchr.c"
	2990	+#line 2990 "pikchr.c"
2950	2991	break;
2951	2992	case 98: /* expr ::= expr PLUS expr */
2952		-#line 771 "pikchr.y"
2953		-{yylhsminor.yy21=yymsp[-2].minor.yy21+yymsp[0].minor.yy21;}
2954		-#line 2979 "pikchr.c"
2955		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	2993	+#line 775 "pikchr.y"
	2994	+{yylhsminor.yy129=yymsp[-2].minor.yy129+yymsp[0].minor.yy129;}
	2995	+#line 2995 "pikchr.c"
	2996	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
2956	2997	break;
2957	2998	case 99: /* expr ::= expr MINUS expr */
2958		-#line 772 "pikchr.y"
2959		-{yylhsminor.yy21=yymsp[-2].minor.yy21-yymsp[0].minor.yy21;}
2960		-#line 2985 "pikchr.c"
2961		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	2999	+#line 776 "pikchr.y"
	3000	+{yylhsminor.yy129=yymsp[-2].minor.yy129-yymsp[0].minor.yy129;}
	3001	+#line 3001 "pikchr.c"
	3002	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
2962	3003	break;
2963	3004	case 100: /* expr ::= expr STAR expr */
2964		-#line 773 "pikchr.y"
2965		-{yylhsminor.yy21=yymsp[-2].minor.yy21*yymsp[0].minor.yy21;}
2966		-#line 2991 "pikchr.c"
2967		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	3005	+#line 777 "pikchr.y"
	3006	+{yylhsminor.yy129=yymsp[-2].minor.yy129*yymsp[0].minor.yy129;}
	3007	+#line 3007 "pikchr.c"
	3008	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
2968	3009	break;
2969	3010	case 101: /* expr ::= expr SLASH expr */
2970		-#line 774 "pikchr.y"
	3011	+#line 778 "pikchr.y"
2971	3012	{
2972		- if( yymsp[0].minor.yy21==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy21 = 0.0; }
2973		- else{ yylhsminor.yy21 = yymsp[-2].minor.yy21/yymsp[0].minor.yy21; }
	3013	+ if( yymsp[0].minor.yy129==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy129 = 0.0; }
	3014	+ else{ yylhsminor.yy129 = yymsp[-2].minor.yy129/yymsp[0].minor.yy129; }
2974	3015	}
2975		-#line 3000 "pikchr.c"
2976		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	3016	+#line 3016 "pikchr.c"
	3017	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
2977	3018	break;
2978	3019	case 102: /* expr ::= MINUS expr */
2979		-#line 778 "pikchr.y"
2980		-{yymsp[-1].minor.yy21=-yymsp[0].minor.yy21;}
2981		-#line 3006 "pikchr.c"
	3020	+#line 782 "pikchr.y"
	3021	+{yymsp[-1].minor.yy129=-yymsp[0].minor.yy129;}
	3022	+#line 3022 "pikchr.c"
2982	3023	break;
2983	3024	case 103: /* expr ::= PLUS expr */
2984		-#line 779 "pikchr.y"
2985		-{yymsp[-1].minor.yy21=yymsp[0].minor.yy21;}
2986		-#line 3011 "pikchr.c"
	3025	+#line 783 "pikchr.y"
	3026	+{yymsp[-1].minor.yy129=yymsp[0].minor.yy129;}
	3027	+#line 3027 "pikchr.c"
2987	3028	break;
2988	3029	case 104: /* expr ::= LP expr RP */
2989		-#line 780 "pikchr.y"
2990		-{yymsp[-2].minor.yy21=yymsp[-1].minor.yy21;}
2991		-#line 3016 "pikchr.c"
	3030	+#line 784 "pikchr.y"
	3031	+{yymsp[-2].minor.yy129=yymsp[-1].minor.yy129;}
	3032	+#line 3032 "pikchr.c"
2992	3033	break;
2993	3034	case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2994		-#line 781 "pikchr.y"
2995		-{yymsp[-2].minor.yy21=pik_get_var(p,&yymsp[-1].minor.yy0);}
2996		-#line 3021 "pikchr.c"
	3035	+#line 785 "pikchr.y"
	3036	+{yymsp[-2].minor.yy129=pik_get_var(p,&yymsp[-1].minor.yy0);}
	3037	+#line 3037 "pikchr.c"
2997	3038	break;
2998	3039	case 106: /* expr ::= NUMBER */
2999		-#line 782 "pikchr.y"
3000		-{yylhsminor.yy21=pik_atof(&yymsp[0].minor.yy0);}
3001		-#line 3026 "pikchr.c"
3002		- yymsp[0].minor.yy21 = yylhsminor.yy21;
	3040	+#line 786 "pikchr.y"
	3041	+{yylhsminor.yy129=pik_atof(&yymsp[0].minor.yy0);}
	3042	+#line 3042 "pikchr.c"
	3043	+ yymsp[0].minor.yy129 = yylhsminor.yy129;
3003	3044	break;
3004	3045	case 107: /* expr ::= ID */
3005		-#line 783 "pikchr.y"
3006		-{yylhsminor.yy21=pik_get_var(p,&yymsp[0].minor.yy0);}
3007		-#line 3032 "pikchr.c"
3008		- yymsp[0].minor.yy21 = yylhsminor.yy21;
	3046	+#line 787 "pikchr.y"
	3047	+{yylhsminor.yy129=pik_get_var(p,&yymsp[0].minor.yy0);}
	3048	+#line 3048 "pikchr.c"
	3049	+ yymsp[0].minor.yy129 = yylhsminor.yy129;
3009	3050	break;
3010	3051	case 108: /* expr ::= FUNC1 LP expr RP */
3011		-#line 784 "pikchr.y"
3012		-{yylhsminor.yy21 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy21,0.0);}
3013		-#line 3038 "pikchr.c"
3014		- yymsp[-3].minor.yy21 = yylhsminor.yy21;
	3052	+#line 788 "pikchr.y"
	3053	+{yylhsminor.yy129 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy129,0.0);}
	3054	+#line 3054 "pikchr.c"
	3055	+ yymsp[-3].minor.yy129 = yylhsminor.yy129;
3015	3056	break;
3016	3057	case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
3017		-#line 785 "pikchr.y"
3018		-{yylhsminor.yy21 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy21,yymsp[-1].minor.yy21);}
3019		-#line 3044 "pikchr.c"
3020		- yymsp[-5].minor.yy21 = yylhsminor.yy21;
	3058	+#line 789 "pikchr.y"
	3059	+{yylhsminor.yy129 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy129,yymsp[-1].minor.yy129);}
	3060	+#line 3060 "pikchr.c"
	3061	+ yymsp[-5].minor.yy129 = yylhsminor.yy129;
3021	3062	break;
3022	3063	case 110: /* expr ::= DIST LP position COMMA position RP */
3023		-#line 786 "pikchr.y"
3024		-{yymsp[-5].minor.yy21 = pik_dist(&yymsp[-3].minor.yy63,&yymsp[-1].minor.yy63);}
3025		-#line 3050 "pikchr.c"
	3064	+#line 790 "pikchr.y"
	3065	+{yymsp[-5].minor.yy129 = pik_dist(&yymsp[-3].minor.yy187,&yymsp[-1].minor.yy187);}
	3066	+#line 3066 "pikchr.c"
3026	3067	break;
3027	3068	case 111: /* expr ::= place2 DOT_XY X */
3028		-#line 787 "pikchr.y"
3029		-{yylhsminor.yy21 = yymsp[-2].minor.yy63.x;}
3030		-#line 3055 "pikchr.c"
3031		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	3069	+#line 791 "pikchr.y"
	3070	+{yylhsminor.yy129 = yymsp[-2].minor.yy187.x;}
	3071	+#line 3071 "pikchr.c"
	3072	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
3032	3073	break;
3033	3074	case 112: /* expr ::= place2 DOT_XY Y */
3034		-#line 788 "pikchr.y"
3035		-{yylhsminor.yy21 = yymsp[-2].minor.yy63.y;}
3036		-#line 3061 "pikchr.c"
3037		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	3075	+#line 792 "pikchr.y"
	3076	+{yylhsminor.yy129 = yymsp[-2].minor.yy187.y;}
	3077	+#line 3077 "pikchr.c"
	3078	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
3038	3079	break;
3039	3080	case 113: /* expr ::= object DOT_L numproperty */
3040	3081	case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
3041	3082	case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
3042		-#line 789 "pikchr.y"
3043		-{yylhsminor.yy21=pik_property_of(yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}
3044		-#line 3069 "pikchr.c"
3045		- yymsp[-2].minor.yy21 = yylhsminor.yy21;
	3083	+#line 793 "pikchr.y"
	3084	+{yylhsminor.yy129=pik_property_of(yymsp[-2].minor.yy54,&yymsp[0].minor.yy0);}
	3085	+#line 3085 "pikchr.c"
	3086	+ yymsp[-2].minor.yy129 = yylhsminor.yy129;
3046	3087	break;
3047	3088	default:
3048	3089	/* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
3049	3090	/* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
3050	3091	/* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
		@@ -3142,19 +3183,19 @@
3142	3183	){
3143	3184	pik_parserARG_FETCH
3144	3185	pik_parserCTX_FETCH
3145	3186	#define TOKEN yyminor
3146	3187	/********** Begin %syntax_error code **************************************/
3147		-#line 549 "pikchr.y"
	3188	+#line 551 "pikchr.y"
3148	3189
3149	3190	if( TOKEN.z && TOKEN.z[0] ){
3150	3191	pik_error(p, &TOKEN, "syntax error");
3151	3192	}else{
3152	3193	pik_error(p, 0, "syntax error");
3153	3194	}
3154	3195	UNUSED_PARAMETER(yymajor);
3155		-#line 3180 "pikchr.c"
	3196	+#line 3196 "pikchr.c"
3156	3197	/********** End %syntax_error code ****************************************/
3157	3198	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3158	3199	pik_parserCTX_STORE
3159	3200	}
3160	3201
		@@ -3419,11 +3460,11 @@
3419	3460	#else
3420	3461	(void)iToken;
3421	3462	return 0;
3422	3463	#endif
3423	3464	}
3424		-#line 794 "pikchr.y"
	3465	+#line 798 "pikchr.y"
3425	3466
3426	3467
3427	3468
3428	3469	/* Chart of the 148 official CSS color names with their
3429	3470	** corresponding RGB values thru Color Module Level 4:
		@@ -7246,11 +7287,12 @@
7246	7287	pik_append_num(p, " width=\"", p->wSVG);
7247	7288	pik_append_num(p, "\" height=\"", p->hSVG);
7248	7289	pik_append(p, "\"", 1);
7249	7290	}
7250	7291	pik_append_dis(p, " viewBox=\"0 0 ",w,"");
7251		- pik_append_dis(p, " ",h,"\">\n");
	7292	+ pik_append_dis(p, " ",h,"\"");
	7293	+ pik_append(p, " data-pikchr-date=\"" MANIFEST_ISODATE "\">\n", -1);
7252	7294	pik_elist_render(p, pList);
7253	7295	pik_append(p,"</svg>\n", -1);
7254	7296	}else{
7255	7297	p->wSVG = -1;
7256	7298	p->hSVG = -1;
		@@ -7330,10 +7372,11 @@
7330	7372	{ "n", 1, T_EDGEPT, 0, CP_N },
7331	7373	{ "ne", 2, T_EDGEPT, 0, CP_NE },
7332	7374	{ "north", 5, T_EDGEPT, 0, CP_N },
7333	7375	{ "nw", 2, T_EDGEPT, 0, CP_NW },
7334	7376	{ "of", 2, T_OF, 0, 0 },
	7377	+ { "pikchr_date",11, T_ISODATE, 0, 0, },
7335	7378	{ "previous", 8, T_LAST, 0, 0, },
7336	7379	{ "print", 5, T_PRINT, 0, 0 },
7337	7380	{ "rad", 3, T_RADIUS, 0, 0 },
7338	7381	{ "radius", 6, T_RADIUS, 0, 0 },
7339	7382	{ "right", 5, T_RIGHT, DIR_RIGHT, CP_E },
		@@ -7913,15 +7956,30 @@
7913	7956	#endif
7914	7957	token.n = (unsigned short)(sz & 0xffff);
7915	7958	if( p->nToken++ > PIKCHR_TOKEN_LIMIT ){
7916	7959	pik_error(p, &token, "script is too complex");
7917	7960	break;
	7961	+ }
	7962	+ if( token.eType==T_ISODATE ){
	7963	+ token.z = "\"" MANIFEST_ISODATE "\"";
	7964	+ token.n = sizeof(MANIFEST_ISODATE)+1;
	7965	+ token.eType = T_STRING;
7918	7966	}
7919	7967	pik_parser(pParser, token.eType, token);
7920	7968	}
7921	7969	}
7922	7970	}
	7971	+
	7972	+/*
	7973	+** Return the version name.
	7974	+*/
	7975	+const char *pikchr_version(void)
	7976	+ /* Emscripten workaround, else it chokes on the inlined version */;
	7977	+
	7978	+const char *pikchr_version(void){
	7979	+ return RELEASE_VERSION " " MANIFEST_ISODATE;
	7980	+}
7923	7981
7924	7982	/*
7925	7983	** Parse the PIKCHR script contained in zText[]. Return a rendering. Or
7926	7984	** if an error is encountered, return the error text. The error message
7927	7985	** is HTML formatted. So regardless of what happens, the return text
		@@ -8141,10 +8199,14 @@
8141	8199	exit(1);
8142	8200	}
8143	8201	bSvgOnly = 1;
8144	8202	mFlags \|= PIKCHR_PLAINTEXT_ERRORS;
8145	8203	}else
	8204	+ if( strcmp(z,"version")==0 \|\| strcmp(z,"v")==0 ){
	8205	+ printf("pikchr %s\n", pikchr_version());
	8206	+ return 0;
	8207	+ }else
8146	8208	{
8147	8209	fprintf(stderr,"unknown option: \"%s\"\n", argv[i]);
8148	8210	usage(argv[0]);
8149	8211	}
8150	8212	continue;
		@@ -8253,6 +8315,6 @@
8253	8315
8254	8316
8255	8317	#endif /* PIKCHR_TCL */
8256	8318
8257	8319
8258		-#line 8283 "pikchr.c"
	8320	+#line 8320 "pikchr.c"
8259	8321

	--- extsrc/pikchr.c
	+++ extsrc/pikchr.c
	@@ -1,8 +1,47 @@
1	/* This file is automatically generated by Lemon from input grammar
2	** source file "pikchr.y".
3	*/







































4	/*
5	** Zero-Clause BSD license:
6	**
7	** Copyright (C) 2020-09-01 by D. Richard Hipp <[email protected]>
8	**
	@@ -504,11 +543,11 @@
504	static PObj pik_position_assert(Pik,PPoint,PToken,PPoint*);
505	static PNum pik_dist(PPoint,PPoint);
506	static void pik_add_macro(Pik,PToken pId,PToken *pCode);
507
508
509	#line 535 "pikchr.c"
510	/************** End of %include directives ********************************/
511	/* These constants specify the various numeric values for terminal symbols.
512	*************** Begin token definitions ***********************************/
513	#ifndef T_ID
514	#define T_ID 1
	@@ -534,84 +573,85 @@
534	#define T_COLOR 21
535	#define T_THICKNESS 22
536	#define T_PRINT 23
537	#define T_STRING 24
538	#define T_COMMA 25
539	#define T_CLASSNAME 26
540	#define T_LB 27
541	#define T_RB 28
542	#define T_UP 29
543	#define T_DOWN 30
544	#define T_LEFT 31
545	#define T_RIGHT 32
546	#define T_CLOSE 33
547	#define T_CHOP 34
548	#define T_FROM 35
549	#define T_TO 36
550	#define T_THEN 37
551	#define T_HEADING 38
552	#define T_GO 39
553	#define T_AT 40
554	#define T_WITH 41
555	#define T_SAME 42
556	#define T_AS 43
557	#define T_FIT 44
558	#define T_BEHIND 45
559	#define T_UNTIL 46
560	#define T_EVEN 47
561	#define T_DOT_E 48
562	#define T_HEIGHT 49
563	#define T_WIDTH 50
564	#define T_RADIUS 51
565	#define T_DIAMETER 52
566	#define T_DOTTED 53
567	#define T_DASHED 54
568	#define T_CW 55
569	#define T_CCW 56
570	#define T_LARROW 57
571	#define T_RARROW 58
572	#define T_LRARROW 59
573	#define T_INVIS 60
574	#define T_THICK 61
575	#define T_THIN 62
576	#define T_SOLID 63
577	#define T_CENTER 64
578	#define T_LJUST 65
579	#define T_RJUST 66
580	#define T_ABOVE 67
581	#define T_BELOW 68
582	#define T_ITALIC 69
583	#define T_BOLD 70
584	#define T_MONO 71
585	#define T_ALIGNED 72
586	#define T_BIG 73
587	#define T_SMALL 74
588	#define T_AND 75
589	#define T_LT 76
590	#define T_GT 77
591	#define T_ON 78
592	#define T_WAY 79
593	#define T_BETWEEN 80
594	#define T_THE 81
595	#define T_NTH 82
596	#define T_VERTEX 83
597	#define T_TOP 84
598	#define T_BOTTOM 85
599	#define T_START 86
600	#define T_END 87
601	#define T_IN 88
602	#define T_THIS 89
603	#define T_DOT_U 90
604	#define T_LAST 91
605	#define T_NUMBER 92
606	#define T_FUNC1 93
607	#define T_FUNC2 94
608	#define T_DIST 95
609	#define T_DOT_XY 96
610	#define T_X 97
611	#define T_Y 98
612	#define T_DOT_L 99

613	#endif
614	/************** End token definitions *************************************/
615
616	/* The next sections is a series of control #defines.
617	** various aspects of the generated parser.
	@@ -672,22 +712,22 @@
672	#ifndef INTERFACE
673	# define INTERFACE 1
674	#endif
675	/*********** Begin control #defines ***************************************/
676	#define YYCODETYPE unsigned char
677	#define YYNOCODE 136
678	#define YYACTIONTYPE unsigned short int
679	#define pik_parserTOKENTYPE PToken
680	typedef union {
681	int yyinit;
682	pik_parserTOKENTYPE yy0;
683	PNum yy21;
684	PPoint yy63;
685	PRel yy72;
686	PObj* yy162;
687	short int yy188;
688	PList* yy235;
689	} YYMINORTYPE;
690	#ifndef YYSTACKDEPTH
691	#define YYSTACKDEPTH 100
692	#endif
693	#define pik_parserARG_SDECL
	@@ -705,21 +745,21 @@
705	#define pik_parserCTX_STORE yypParser->p=p;
706	#define YYFALLBACK 1
707	#define YYNSTATE 164
708	#define YYNRULE 156
709	#define YYNRULE_WITH_ACTION 116
710	#define YYNTOKEN 100
711	#define YY_MAX_SHIFT 163
712	#define YY_MIN_SHIFTREDUCE 287
713	#define YY_MAX_SHIFTREDUCE 442
714	#define YY_ERROR_ACTION 443
715	#define YY_ACCEPT_ACTION 444
716	#define YY_NO_ACTION 445
717	#define YY_MIN_REDUCE 446
718	#define YY_MAX_REDUCE 601
719	#define YY_MIN_DSTRCTR 100
720	#define YY_MAX_DSTRCTR 103
721	/*********** End control #defines *****************************************/
722	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
723
724	/* Define the yytestcase() macro to be a no-op if is not already defined
725	** otherwise.
	@@ -798,324 +838,322 @@
798	** yy_reduce_ofst[] For each state, the offset into yy_action for
799	** shifting non-terminals after a reduce.
800	** yy_default[] Default action for each state.
801	**
802	********* Begin parsing tables ********************************************/
803	#define YY_ACTTAB_COUNT (1313)
804	static const YYACTIONTYPE yy_action[] = {
805	/* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
806	/* 10 */ 575, 492, 161, 119, 453, 113, 120, 161, 119, 530,
807	/* 20 */ 427, 428, 339, 559, 81, 30, 560, 561, 575, 64,
808	/* 30 */ 63, 62, 61, 322, 323, 9, 8, 33, 149, 32,
809	/* 40 */ 7, 71, 127, 38, 335, 66, 48, 37, 28, 339,
810	/* 50 */ 339, 339, 339, 425, 426, 340, 341, 342, 343, 344,
811	/* 60 */ 345, 346, 347, 348, 474, 528, 161, 119, 577, 77,
812	/* 70 */ 577, 73, 306, 148, 474, 533, 161, 119, 112, 113,
813	/* 80 */ 120, 161, 119, 128, 427, 428, 339, 31, 81, 531,
814	/* 90 */ 161, 119, 474, 35, 330, 378, 158, 322, 323, 9,
815	/* 100 */ 8, 33, 149, 32, 7, 71, 127, 328, 335, 66,
816	/* 110 */ 579, 378, 158, 339, 339, 339, 339, 425, 426, 340,
817	/* 120 */ 341, 342, 343, 344, 345, 346, 347, 348, 394, 435,
818	/* 130 */ 46, 59, 60, 64, 63, 62, 61, 357, 36, 376,
819	/* 140 */ 54, 51, 2, 47, 403, 13, 297, 411, 412, 413,
820	/* 150 */ 414, 80, 162, 308, 79, 133, 310, 126, 441, 440,
821	/* 160 */ 118, 123, 83, 404, 405, 406, 408, 80, 84, 308,
822	/* 170 */ 79, 299, 411, 412, 413, 414, 118, 69, 350, 350,
823	/* 180 */ 350, 350, 350, 350, 350, 350, 350, 350, 350, 62,
824	/* 190 */ 61, 434, 64, 63, 62, 61, 313, 398, 399, 427,
825	/* 200 */ 428, 339, 380, 157, 64, 63, 62, 61, 122, 106,
826	/* 210 */ 535, 436, 437, 438, 439, 298, 375, 391, 117, 393,
827	/* 220 */ 155, 154, 153, 394, 435, 49, 59, 60, 339, 339,
828	/* 230 */ 339, 339, 425, 426, 376, 3, 4, 2, 64, 63,
829	/* 240 */ 62, 61, 156, 156, 156, 394, 379, 159, 59, 60,
830	/* 250 */ 76, 67, 535, 441, 440, 5, 102, 6, 535, 42,
831	/* 260 */ 131, 535, 69, 107, 301, 302, 303, 394, 305, 15,
832	/* 270 */ 59, 60, 120, 161, 119, 446, 463, 424, 376, 423,
833	/* 280 */ 1, 42, 397, 78, 78, 36, 434, 11, 394, 435,
834	/* 290 */ 356, 59, 60, 12, 152, 139, 432, 14, 16, 376,
835	/* 300 */ 18, 65, 2, 138, 106, 430, 436, 437, 438, 439,
836	/* 310 */ 44, 375, 19, 117, 393, 155, 154, 153, 441, 440,
837	/* 320 */ 142, 140, 64, 63, 62, 61, 106, 20, 68, 376,
838	/* 330 */ 359, 107, 23, 375, 45, 117, 393, 155, 154, 153,
839	/* 340 */ 120, 161, 119, 55, 463, 114, 26, 57, 106, 147,
840	/* 350 */ 146, 434, 569, 58, 392, 375, 43, 117, 393, 155,
841	/* 360 */ 154, 153, 152, 384, 64, 63, 62, 61, 382, 106,
842	/* 370 */ 383, 436, 437, 438, 439, 377, 375, 70, 117, 393,
843	/* 380 */ 155, 154, 153, 160, 39, 22, 21, 445, 142, 140,
844	/* 390 */ 64, 63, 62, 61, 24, 17, 145, 141, 431, 108,
845	/* 400 */ 445, 445, 445, 391, 445, 445, 375, 445, 117, 445,
846	/* 410 */ 445, 55, 74, 445, 148, 445, 445, 147, 146, 124,
847	/* 420 */ 113, 120, 161, 119, 43, 445, 445, 142, 140, 64,
848	/* 430 */ 63, 62, 61, 445, 394, 445, 445, 59, 60, 64,
849	/* 440 */ 63, 62, 61, 149, 445, 376, 445, 445, 42, 445,
850	/* 450 */ 55, 445, 391, 22, 21, 445, 147, 146, 445, 445,
851	/* 460 */ 52, 445, 24, 43, 145, 141, 431, 394, 445, 445,
852	/* 470 */ 59, 60, 64, 63, 62, 61, 445, 445, 376, 132,
853	/* 480 */ 130, 42, 445, 445, 445, 355, 156, 156, 156, 445,
854	/* 490 */ 445, 445, 22, 21, 445, 394, 473, 445, 59, 60,
855	/* 500 */ 445, 24, 445, 145, 141, 431, 376, 445, 107, 42,
856	/* 510 */ 64, 63, 62, 61, 445, 106, 445, 120, 161, 119,
857	/* 520 */ 445, 478, 375, 354, 117, 393, 155, 154, 153, 445,
858	/* 530 */ 394, 143, 473, 59, 60, 64, 63, 62, 61, 152,
859	/* 540 */ 445, 376, 445, 445, 42, 445, 445, 445, 106, 64,
860	/* 550 */ 63, 62, 61, 445, 445, 375, 50, 117, 393, 155,
861	/* 560 */ 154, 153, 445, 394, 144, 445, 59, 60, 445, 445,
862	/* 570 */ 53, 72, 445, 148, 376, 445, 106, 42, 125, 113,
863	/* 580 */ 120, 161, 119, 375, 445, 117, 393, 155, 154, 153,
864	/* 590 */ 394, 445, 445, 59, 60, 445, 445, 445, 445, 445,
865	/* 600 */ 445, 102, 149, 445, 42, 445, 74, 445, 148, 445,
866	/* 610 */ 445, 106, 445, 497, 113, 120, 161, 119, 375, 445,
867	/* 620 */ 117, 393, 155, 154, 153, 394, 445, 445, 59, 60,
868	/* 630 */ 445, 445, 88, 445, 445, 445, 376, 149, 445, 40,
869	/* 640 */ 445, 120, 161, 119, 106, 445, 445, 435, 110, 110,
870	/* 650 */ 445, 375, 445, 117, 393, 155, 154, 153, 394, 445,
871	/* 660 */ 445, 59, 60, 152, 85, 445, 445, 445, 445, 376,
872	/* 670 */ 445, 106, 41, 120, 161, 119, 441, 440, 375, 445,
873	/* 680 */ 117, 393, 155, 154, 153, 448, 454, 29, 445, 445,
874	/* 690 */ 74, 450, 148, 75, 88, 152, 445, 496, 113, 120,
875	/* 700 */ 161, 119, 163, 120, 161, 119, 106, 27, 445, 434,
876	/* 710 */ 111, 111, 445, 375, 445, 117, 393, 155, 154, 153,
877	/* 720 */ 445, 149, 445, 445, 445, 152, 74, 445, 148, 436,
878	/* 730 */ 437, 438, 439, 490, 113, 120, 161, 119, 445, 106,
879	/* 740 */ 121, 447, 454, 29, 445, 445, 375, 450, 117, 393,
880	/* 750 */ 155, 154, 153, 445, 445, 445, 445, 149, 163, 74,
881	/* 760 */ 445, 148, 444, 27, 445, 445, 484, 113, 120, 161,
882	/* 770 */ 119, 445, 445, 445, 74, 445, 148, 445, 445, 445,
883	/* 780 */ 445, 483, 113, 120, 161, 119, 74, 445, 148, 86,
884	/* 790 */ 149, 445, 445, 480, 113, 120, 161, 119, 120, 161,
885	/* 800 */ 119, 445, 74, 445, 148, 149, 445, 445, 445, 134,
886	/* 810 */ 113, 120, 161, 119, 74, 445, 148, 149, 445, 445,
887	/* 820 */ 152, 517, 113, 120, 161, 119, 88, 64, 63, 62,
888	/* 830 */ 61, 445, 445, 149, 445, 120, 161, 119, 445, 74,
889	/* 840 */ 396, 148, 475, 445, 445, 149, 137, 113, 120, 161,
890	/* 850 */ 119, 74, 445, 148, 445, 445, 445, 152, 525, 113,
891	/* 860 */ 120, 161, 119, 445, 74, 445, 148, 445, 445, 445,
892	/* 870 */ 149, 527, 113, 120, 161, 119, 445, 445, 445, 74,
893	/* 880 */ 445, 148, 149, 445, 445, 445, 524, 113, 120, 161,
894	/* 890 */ 119, 74, 445, 148, 98, 149, 445, 445, 526, 113,
895	/* 900 */ 120, 161, 119, 120, 161, 119, 445, 74, 445, 148,
896	/* 910 */ 149, 445, 445, 445, 523, 113, 120, 161, 119, 74,
897	/* 920 */ 445, 148, 149, 445, 445, 152, 522, 113, 120, 161,
898	/* 930 */ 119, 89, 64, 63, 62, 61, 445, 445, 149, 445,
899	/* 940 */ 120, 161, 119, 445, 74, 395, 148, 445, 445, 445,
900	/* 950 */ 149, 521, 113, 120, 161, 119, 74, 445, 148, 445,
901	/* 960 */ 445, 445, 152, 520, 113, 120, 161, 119, 445, 74,
902	/* 970 */ 445, 148, 445, 445, 445, 149, 519, 113, 120, 161,
903	/* 980 */ 119, 445, 445, 445, 74, 445, 148, 149, 445, 445,
904	/* 990 */ 445, 150, 113, 120, 161, 119, 74, 445, 148, 90,
905	/* 1000 */ 149, 445, 445, 151, 113, 120, 161, 119, 120, 161,
906	/* 1010 */ 119, 445, 74, 445, 148, 149, 445, 435, 445, 136,
907	/* 1020 */ 113, 120, 161, 119, 74, 445, 148, 149, 445, 445,
908	/* 1030 */ 152, 135, 113, 120, 161, 119, 64, 63, 62, 61,
909	/* 1040 */ 445, 445, 445, 149, 445, 445, 441, 440, 445, 88,
910	/* 1050 */ 445, 445, 445, 445, 445, 149, 445, 56, 120, 161,
911	/* 1060 */ 119, 88, 445, 445, 10, 479, 479, 445, 445, 445,
912	/* 1070 */ 120, 161, 119, 445, 445, 445, 445, 82, 445, 434,
913	/* 1080 */ 152, 445, 445, 445, 466, 445, 34, 109, 447, 454,
914	/* 1090 */ 29, 445, 152, 445, 450, 445, 445, 445, 107, 436,
915	/* 1100 */ 437, 438, 439, 87, 445, 163, 445, 120, 161, 119,
916	/* 1110 */ 27, 451, 120, 161, 119, 99, 445, 64, 63, 62,
917	/* 1120 */ 61, 445, 100, 445, 120, 161, 119, 101, 445, 152,
918	/* 1130 */ 391, 120, 161, 119, 152, 445, 120, 161, 119, 91,
919	/* 1140 */ 445, 445, 445, 445, 445, 445, 152, 445, 120, 161,
920	/* 1150 */ 119, 103, 445, 152, 92, 445, 445, 445, 152, 445,
921	/* 1160 */ 120, 161, 119, 120, 161, 119, 93, 445, 445, 104,
922	/* 1170 */ 152, 445, 445, 445, 445, 120, 161, 119, 120, 161,
923	/* 1180 */ 119, 445, 152, 445, 94, 152, 445, 445, 445, 445,
924	/* 1190 */ 445, 445, 105, 120, 161, 119, 445, 152, 445, 95,
925	/* 1200 */ 152, 120, 161, 119, 445, 445, 445, 96, 120, 161,
926	/* 1210 */ 119, 445, 445, 445, 445, 152, 120, 161, 119, 445,
927	/* 1220 */ 445, 445, 445, 152, 445, 445, 445, 445, 445, 445,
928	/* 1230 */ 152, 97, 445, 445, 549, 445, 445, 548, 152, 445,
929	/* 1240 */ 120, 161, 119, 120, 161, 119, 120, 161, 119, 445,
930	/* 1250 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
931	/* 1260 */ 445, 445, 152, 547, 445, 152, 546, 445, 152, 115,
932	/* 1270 */ 445, 445, 120, 161, 119, 120, 161, 119, 120, 161,
933	/* 1280 */ 119, 116, 445, 445, 445, 445, 445, 445, 445, 445,
934	/* 1290 */ 120, 161, 119, 445, 152, 445, 445, 152, 445, 445,
935	/* 1300 */ 152, 445, 445, 445, 445, 445, 445, 445, 445, 445,
936	/* 1310 */ 445, 445, 152,
937	};
938	static const YYCODETYPE yy_lookahead[] = {
939	/* 0 */ 0, 113, 114, 115, 134, 102, 103, 104, 106, 106,
940	/* 10 */ 10, 113, 114, 115, 111, 112, 113, 114, 115, 106,
941	/* 20 */ 20, 21, 22, 105, 24, 126, 108, 109, 28, 4,
942	/* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 135, 39,
943	/* 40 */ 40, 41, 42, 105, 44, 45, 108, 109, 107, 49,
944	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
945	/* 60 */ 60, 61, 62, 63, 0, 113, 114, 115, 130, 131,
946	/* 70 */ 132, 104, 25, 106, 10, 113, 114, 115, 111, 112,
947	/* 80 */ 113, 114, 115, 106, 20, 21, 22, 128, 24, 113,
948	/* 90 */ 114, 115, 28, 129, 2, 26, 27, 33, 34, 35,
949	/* 100 */ 36, 37, 135, 39, 40, 41, 42, 2, 44, 45,
950	/* 110 */ 133, 26, 27, 49, 50, 51, 52, 53, 54, 55,
951	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
952	/* 130 */ 38, 4, 5, 4, 5, 6, 7, 17, 10, 12,
953	/* 140 */ 4, 5, 15, 38, 1, 25, 17, 29, 30, 31,
954	/* 150 */ 32, 24, 83, 26, 27, 12, 28, 14, 31, 32,
955	/* 160 */ 91, 18, 116, 20, 21, 22, 23, 24, 116, 26,
956	/* 170 */ 27, 19, 29, 30, 31, 32, 91, 3, 64, 65,
957	/* 180 */ 66, 67, 68, 69, 70, 71, 72, 73, 74, 6,
958	/* 190 */ 7, 64, 4, 5, 6, 7, 8, 97, 98, 20,
959	/* 200 */ 21, 22, 26, 27, 4, 5, 6, 7, 1, 82,
960	/* 210 */ 48, 84, 85, 86, 87, 17, 89, 17, 91, 92,
961	/* 220 */ 93, 94, 95, 1, 2, 25, 4, 5, 49, 50,
962	/* 230 */ 51, 52, 53, 54, 12, 16, 15, 15, 4, 5,
963	/* 240 */ 6, 7, 20, 21, 22, 1, 26, 27, 4, 5,
964	/* 250 */ 48, 43, 90, 31, 32, 40, 12, 40, 96, 15,
965	/* 260 */ 47, 99, 88, 104, 20, 21, 22, 1, 24, 35,
966	/* 270 */ 4, 5, 113, 114, 115, 0, 117, 41, 12, 41,
967	/* 280 */ 13, 15, 17, 124, 125, 10, 64, 25, 1, 2,
968	/* 290 */ 17, 4, 5, 75, 135, 81, 80, 3, 3, 12,
969	/* 300 */ 3, 99, 15, 79, 82, 80, 84, 85, 86, 87,
970	/* 310 */ 38, 89, 3, 91, 92, 93, 94, 95, 31, 32,
971	/* 320 */ 2, 3, 4, 5, 6, 7, 82, 3, 3, 12,
972	/* 330 */ 77, 104, 25, 89, 16, 91, 92, 93, 94, 95,
973	/* 340 */ 113, 114, 115, 25, 117, 96, 15, 15, 82, 31,
974	/* 350 */ 32, 64, 125, 15, 17, 89, 38, 91, 92, 93,
975	/* 360 */ 94, 95, 135, 28, 4, 5, 6, 7, 28, 82,
976	/* 370 */ 28, 84, 85, 86, 87, 12, 89, 3, 91, 92,
977	/* 380 */ 93, 94, 95, 90, 11, 67, 68, 136, 2, 3,
978	/* 390 */ 4, 5, 6, 7, 76, 35, 78, 79, 80, 82,
979	/* 400 */ 136, 136, 136, 17, 136, 136, 89, 136, 91, 136,
980	/* 410 */ 136, 25, 104, 136, 106, 136, 136, 31, 32, 111,
981	/* 420 */ 112, 113, 114, 115, 38, 136, 136, 2, 3, 4,
982	/* 430 */ 5, 6, 7, 136, 1, 136, 136, 4, 5, 4,
983	/* 440 */ 5, 6, 7, 135, 136, 12, 136, 136, 15, 136,
984	/* 450 */ 25, 136, 17, 67, 68, 136, 31, 32, 136, 136,
985	/* 460 */ 25, 136, 76, 38, 78, 79, 80, 1, 136, 136,
986	/* 470 */ 4, 5, 4, 5, 6, 7, 136, 136, 12, 46,
987	/* 480 */ 47, 15, 136, 136, 136, 17, 20, 21, 22, 136,
988	/* 490 */ 136, 136, 67, 68, 136, 1, 2, 136, 4, 5,
989	/* 500 */ 136, 76, 136, 78, 79, 80, 12, 136, 104, 15,
990	/* 510 */ 4, 5, 6, 7, 136, 82, 136, 113, 114, 115,
991	/* 520 */ 136, 117, 89, 17, 91, 92, 93, 94, 95, 136,
992	/* 530 */ 1, 2, 38, 4, 5, 4, 5, 6, 7, 135,
993	/* 540 */ 136, 12, 136, 136, 15, 136, 136, 136, 82, 4,
994	/* 550 */ 5, 6, 7, 136, 136, 89, 25, 91, 92, 93,
995	/* 560 */ 94, 95, 136, 1, 2, 136, 4, 5, 136, 136,
996	/* 570 */ 25, 104, 136, 106, 12, 136, 82, 15, 111, 112,
997	/* 580 */ 113, 114, 115, 89, 136, 91, 92, 93, 94, 95,
998	/* 590 */ 1, 136, 136, 4, 5, 136, 136, 136, 136, 136,
999	/* 600 */ 136, 12, 135, 136, 15, 136, 104, 136, 106, 136,
1000	/* 610 */ 136, 82, 136, 111, 112, 113, 114, 115, 89, 136,
1001	/* 620 */ 91, 92, 93, 94, 95, 1, 136, 136, 4, 5,
1002	/* 630 */ 136, 136, 104, 136, 136, 136, 12, 135, 136, 15,
1003	/* 640 */ 136, 113, 114, 115, 82, 136, 136, 2, 120, 121,
1004	/* 650 */ 136, 89, 136, 91, 92, 93, 94, 95, 1, 136,
1005	/* 660 */ 136, 4, 5, 135, 104, 136, 136, 136, 136, 12,
1006	/* 670 */ 136, 82, 15, 113, 114, 115, 31, 32, 89, 136,
1007	/* 680 */ 91, 92, 93, 94, 95, 101, 102, 103, 136, 136,
1008	/* 690 */ 104, 107, 106, 48, 104, 135, 136, 111, 112, 113,
1009	/* 700 */ 114, 115, 118, 113, 114, 115, 82, 123, 136, 64,
1010	/* 710 */ 120, 121, 136, 89, 136, 91, 92, 93, 94, 95,
1011	/* 720 */ 136, 135, 136, 136, 136, 135, 104, 136, 106, 84,
1012	/* 730 */ 85, 86, 87, 111, 112, 113, 114, 115, 136, 82,
1013	/* 740 */ 100, 101, 102, 103, 136, 136, 89, 107, 91, 92,
1014	/* 750 */ 93, 94, 95, 136, 136, 136, 136, 135, 118, 104,
1015	/* 760 */ 136, 106, 122, 123, 136, 136, 111, 112, 113, 114,
1016	/* 770 */ 115, 136, 136, 136, 104, 136, 106, 136, 136, 136,
1017	/* 780 */ 136, 111, 112, 113, 114, 115, 104, 136, 106, 104,
1018	/* 790 */ 135, 136, 136, 111, 112, 113, 114, 115, 113, 114,
1019	/* 800 */ 115, 136, 104, 136, 106, 135, 136, 136, 136, 111,
1020	/* 810 */ 112, 113, 114, 115, 104, 136, 106, 135, 136, 136,
1021	/* 820 */ 135, 111, 112, 113, 114, 115, 104, 4, 5, 6,
1022	/* 830 */ 7, 136, 136, 135, 136, 113, 114, 115, 136, 104,
1023	/* 840 */ 17, 106, 120, 136, 136, 135, 111, 112, 113, 114,
1024	/* 850 */ 115, 104, 136, 106, 136, 136, 136, 135, 111, 112,
1025	/* 860 */ 113, 114, 115, 136, 104, 136, 106, 136, 136, 136,
1026	/* 870 */ 135, 111, 112, 113, 114, 115, 136, 136, 136, 104,
1027	/* 880 */ 136, 106, 135, 136, 136, 136, 111, 112, 113, 114,
1028	/* 890 */ 115, 104, 136, 106, 104, 135, 136, 136, 111, 112,
1029	/* 900 */ 113, 114, 115, 113, 114, 115, 136, 104, 136, 106,
1030	/* 910 */ 135, 136, 136, 136, 111, 112, 113, 114, 115, 104,
1031	/* 920 */ 136, 106, 135, 136, 136, 135, 111, 112, 113, 114,
1032	/* 930 */ 115, 104, 4, 5, 6, 7, 136, 136, 135, 136,
1033	/* 940 */ 113, 114, 115, 136, 104, 17, 106, 136, 136, 136,
1034	/* 950 */ 135, 111, 112, 113, 114, 115, 104, 136, 106, 136,
1035	/* 960 */ 136, 136, 135, 111, 112, 113, 114, 115, 136, 104,
1036	/* 970 */ 136, 106, 136, 136, 136, 135, 111, 112, 113, 114,
1037	/* 980 */ 115, 136, 136, 136, 104, 136, 106, 135, 136, 136,
1038	/* 990 */ 136, 111, 112, 113, 114, 115, 104, 136, 106, 104,
1039	/* 1000 */ 135, 136, 136, 111, 112, 113, 114, 115, 113, 114,
1040	/* 1010 */ 115, 136, 104, 136, 106, 135, 136, 2, 136, 111,
1041	/* 1020 */ 112, 113, 114, 115, 104, 136, 106, 135, 136, 136,
1042	/* 1030 */ 135, 111, 112, 113, 114, 115, 4, 5, 6, 7,
1043	/* 1040 */ 136, 136, 136, 135, 136, 136, 31, 32, 136, 104,
1044	/* 1050 */ 136, 136, 136, 136, 136, 135, 136, 25, 113, 114,
1045	/* 1060 */ 115, 104, 136, 136, 119, 120, 121, 136, 136, 136,
1046	/* 1070 */ 113, 114, 115, 136, 136, 136, 136, 120, 136, 64,
1047	/* 1080 */ 135, 136, 136, 136, 127, 136, 129, 100, 101, 102,
1048	/* 1090 */ 103, 136, 135, 136, 107, 136, 136, 136, 104, 84,
1049	/* 1100 */ 85, 86, 87, 104, 136, 118, 136, 113, 114, 115,
1050	/* 1110 */ 123, 117, 113, 114, 115, 104, 136, 4, 5, 6,
1051	/* 1120 */ 7, 136, 104, 136, 113, 114, 115, 104, 136, 135,
1052	/* 1130 */ 17, 113, 114, 115, 135, 136, 113, 114, 115, 104,
1053	/* 1140 */ 136, 136, 136, 136, 136, 136, 135, 136, 113, 114,
1054	/* 1150 */ 115, 104, 136, 135, 104, 136, 136, 136, 135, 136,
1055	/* 1160 */ 113, 114, 115, 113, 114, 115, 104, 136, 136, 104,
1056	/* 1170 */ 135, 136, 136, 136, 136, 113, 114, 115, 113, 114,
1057	/* 1180 */ 115, 136, 135, 136, 104, 135, 136, 136, 136, 136,
1058	/* 1190 */ 136, 136, 104, 113, 114, 115, 136, 135, 136, 104,
1059	/* 1200 */ 135, 113, 114, 115, 136, 136, 136, 104, 113, 114,
1060	/* 1210 */ 115, 136, 136, 136, 136, 135, 113, 114, 115, 136,
1061	/* 1220 */ 136, 136, 136, 135, 136, 136, 136, 136, 136, 136,
1062	/* 1230 */ 135, 104, 136, 136, 104, 136, 136, 104, 135, 136,
1063	/* 1240 */ 113, 114, 115, 113, 114, 115, 113, 114, 115, 136,
1064	/* 1250 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136,
1065	/* 1260 */ 136, 136, 135, 104, 136, 135, 104, 136, 135, 104,
1066	/* 1270 */ 136, 136, 113, 114, 115, 113, 114, 115, 113, 114,
1067	/* 1280 */ 115, 104, 136, 136, 136, 136, 136, 136, 136, 136,
1068	/* 1290 */ 113, 114, 115, 136, 135, 136, 136, 135, 136, 136,
1069	/* 1300 */ 135, 136, 136, 136, 136, 136, 136, 136, 136, 136,
1070	/* 1310 */ 136, 136, 135, 100, 100, 100, 100, 100, 100, 100,
1071	/* 1320 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1072	/* 1330 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1073	/* 1340 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1074	/* 1350 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1075	/* 1360 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1076	/* 1370 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1077	/* 1380 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1078	/* 1390 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1079	/* 1400 */ 100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
1080	/* 1410 */ 100, 100, 100,
1081	};
1082	#define YY_SHIFT_COUNT (163)
1083	#define YY_SHIFT_MIN (0)
1084	#define YY_SHIFT_MAX (1113)
1085	static const unsigned short int yy_shift_ofst[] = {
1086	/* 0 */ 143, 127, 222, 287, 287, 287, 287, 287, 287, 287,
1087	/* 10 */ 287, 287, 287, 287, 287, 287, 287, 287, 287, 287,
1088	/* 20 */ 287, 287, 287, 287, 287, 287, 287, 244, 433, 266,
1089	/* 30 */ 244, 143, 494, 494, 0, 64, 143, 589, 266, 589,
1090	/* 40 */ 466, 466, 466, 529, 562, 266, 266, 266, 266, 266,
1091	/* 50 */ 266, 624, 266, 266, 657, 266, 266, 266, 266, 266,
1092	/* 60 */ 266, 266, 266, 266, 266, 179, 317, 317, 317, 317,
1093	/* 70 */ 317, 645, 318, 386, 425, 1015, 1015, 118, 47, 1313,
1094	/* 80 */ 1313, 1313, 1313, 114, 114, 200, 435, 129, 188, 234,
1095	/* 90 */ 360, 468, 531, 506, 545, 823, 1032, 928, 1113, 25,
1096	/* 100 */ 25, 25, 162, 25, 25, 25, 69, 25, 85, 128,
1097	/* 110 */ 92, 105, 120, 136, 100, 183, 183, 176, 220, 174,
1098	/* 120 */ 202, 275, 152, 207, 198, 219, 221, 208, 215, 217,
1099	/* 130 */ 236, 238, 213, 267, 265, 262, 218, 273, 216, 224,
1100	/* 140 */ 214, 225, 294, 295, 297, 272, 309, 324, 325, 249,
1101	/* 150 */ 253, 307, 249, 331, 332, 338, 337, 335, 340, 342,
1102	/* 160 */ 363, 293, 374, 373,
1103	};
1104	#define YY_REDUCE_COUNT (82)
1105	#define YY_REDUCE_MIN (-130)
1106	#define YY_REDUCE_MAX (1177)
1107	static const short yy_reduce_ofst[] = {
1108	/* 0 */ 640, -97, -33, 308, 467, 502, 586, 622, 655, 670,
1109	/* 10 */ 682, 698, 710, 735, 747, 760, 775, 787, 803, 815,
1110	/* 20 */ 840, 852, 865, 880, 892, 908, 920, 159, 945, 957,
1111	/* 30 */ 227, 987, 528, 590, -62, -62, 584, 404, 722, 994,
1112	/* 40 */ 560, 685, 790, 827, 895, 999, 1011, 1018, 1023, 1035,
1113	/* 50 */ 1047, 1050, 1062, 1065, 1080, 1088, 1095, 1103, 1127, 1130,
1114	/* 60 */ 1133, 1159, 1162, 1165, 1177, -82, -112, -102, -48, -38,
1115	/* 70 */ -24, -23, -130, -130, -130, -98, -87, -59, -101, -41,
1116	/* 80 */ 46, 52, -36,
1117	};
1118	static const YYACTIONTYPE yy_default[] = {
1119	/* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1120	/* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1121	/* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
	@@ -1176,10 +1214,11 @@
1176	0, /* COLOR => nothing */
1177	0, /* THICKNESS => nothing */
1178	0, /* PRINT => nothing */
1179	0, /* STRING => nothing */
1180	0, /* COMMA => nothing */

1181	0, /* CLASSNAME => nothing */
1182	0, /* LB => nothing */
1183	0, /* RB => nothing */
1184	0, /* UP => nothing */
1185	0, /* DOWN => nothing */
	@@ -1359,120 +1398,122 @@
1359	/* 21 */ "COLOR",
1360	/* 22 */ "THICKNESS",
1361	/* 23 */ "PRINT",
1362	/* 24 */ "STRING",
1363	/* 25 */ "COMMA",
1364	/* 26 */ "CLASSNAME",
1365	/* 27 */ "LB",
1366	/* 28 */ "RB",
1367	/* 29 */ "UP",
1368	/* 30 */ "DOWN",
1369	/* 31 */ "LEFT",
1370	/* 32 */ "RIGHT",
1371	/* 33 */ "CLOSE",
1372	/* 34 */ "CHOP",
1373	/* 35 */ "FROM",
1374	/* 36 */ "TO",
1375	/* 37 */ "THEN",
1376	/* 38 */ "HEADING",
1377	/* 39 */ "GO",
1378	/* 40 */ "AT",
1379	/* 41 */ "WITH",
1380	/* 42 */ "SAME",
1381	/* 43 */ "AS",
1382	/* 44 */ "FIT",
1383	/* 45 */ "BEHIND",
1384	/* 46 */ "UNTIL",
1385	/* 47 */ "EVEN",
1386	/* 48 */ "DOT_E",
1387	/* 49 */ "HEIGHT",
1388	/* 50 */ "WIDTH",
1389	/* 51 */ "RADIUS",
1390	/* 52 */ "DIAMETER",
1391	/* 53 */ "DOTTED",
1392	/* 54 */ "DASHED",
1393	/* 55 */ "CW",
1394	/* 56 */ "CCW",
1395	/* 57 */ "LARROW",
1396	/* 58 */ "RARROW",
1397	/* 59 */ "LRARROW",
1398	/* 60 */ "INVIS",
1399	/* 61 */ "THICK",
1400	/* 62 */ "THIN",
1401	/* 63 */ "SOLID",
1402	/* 64 */ "CENTER",
1403	/* 65 */ "LJUST",
1404	/* 66 */ "RJUST",
1405	/* 67 */ "ABOVE",
1406	/* 68 */ "BELOW",
1407	/* 69 */ "ITALIC",
1408	/* 70 */ "BOLD",
1409	/* 71 */ "MONO",
1410	/* 72 */ "ALIGNED",
1411	/* 73 */ "BIG",
1412	/* 74 */ "SMALL",
1413	/* 75 */ "AND",
1414	/* 76 */ "LT",
1415	/* 77 */ "GT",
1416	/* 78 */ "ON",
1417	/* 79 */ "WAY",
1418	/* 80 */ "BETWEEN",
1419	/* 81 */ "THE",
1420	/* 82 */ "NTH",
1421	/* 83 */ "VERTEX",
1422	/* 84 */ "TOP",
1423	/* 85 */ "BOTTOM",
1424	/* 86 */ "START",
1425	/* 87 */ "END",
1426	/* 88 */ "IN",
1427	/* 89 */ "THIS",
1428	/* 90 */ "DOT_U",
1429	/* 91 */ "LAST",
1430	/* 92 */ "NUMBER",
1431	/* 93 */ "FUNC1",
1432	/* 94 */ "FUNC2",
1433	/* 95 */ "DIST",
1434	/* 96 */ "DOT_XY",
1435	/* 97 */ "X",
1436	/* 98 */ "Y",
1437	/* 99 */ "DOT_L",
1438	/* 100 */ "statement_list",
1439	/* 101 */ "statement",
1440	/* 102 */ "unnamed_statement",
1441	/* 103 */ "basetype",
1442	/* 104 */ "expr",
1443	/* 105 */ "numproperty",
1444	/* 106 */ "edge",
1445	/* 107 */ "direction",
1446	/* 108 */ "dashproperty",
1447	/* 109 */ "colorproperty",
1448	/* 110 */ "locproperty",
1449	/* 111 */ "position",
1450	/* 112 */ "place",
1451	/* 113 */ "object",
1452	/* 114 */ "objectname",
1453	/* 115 */ "nth",
1454	/* 116 */ "textposition",
1455	/* 117 */ "rvalue",
1456	/* 118 */ "lvalue",
1457	/* 119 */ "even",
1458	/* 120 */ "relexpr",
1459	/* 121 */ "optrelexpr",
1460	/* 122 */ "document",
1461	/* 123 */ "print",
1462	/* 124 */ "prlist",
1463	/* 125 */ "pritem",
1464	/* 126 */ "prsep",
1465	/* 127 */ "attribute_list",
1466	/* 128 */ "savelist",
1467	/* 129 */ "alist",
1468	/* 130 */ "attribute",
1469	/* 131 */ "go",
1470	/* 132 */ "boolproperty",
1471	/* 133 */ "withclause",
1472	/* 134 */ "between",
1473	/* 135 */ "place2",


1474	};
1475	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1476
1477	#ifndef NDEBUG
1478	/* For tracing reduce actions, the names of all rules are required.
	@@ -1755,24 +1796,24 @@
1755	** Note: during a reduce, the only symbols destroyed are those
1756	** which appear on the RHS of the rule, but which are not used
1757	** inside the C code.
1758	*/
1759	/******* Begin destructor definitions *************************************/
1760	case 100: /* statement_list */
1761	{
1762	#line 523 "pikchr.y"
1763	pik_elist_free(p,(yypminor->yy235));
1764	#line 1789 "pikchr.c"
1765	}
1766	break;
1767	case 101: /* statement */
1768	case 102: /* unnamed_statement */
1769	case 103: /* basetype */
1770	{
1771	#line 525 "pikchr.y"
1772	pik_elem_free(p,(yypminor->yy162));
1773	#line 1798 "pikchr.c"
1774	}
1775	break;
1776	/******* End destructor definitions ***************************************/
1777	default: break; /* If no destructor action specified: do nothing */
1778	}
	@@ -2003,14 +2044,14 @@
2003	#endif
2004	while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
2005	/* Here code is inserted which will execute if the parser
2006	** stack every overflows */
2007	/****** Begin %stack_overflow code ****************************************/
2008	#line 557 "pikchr.y"
2009
2010	pik_error(p, 0, "parser stack overflow");
2011	#line 2036 "pikchr.c"
2012	/****** End %stack_overflow code ******************************************/
2013	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
2014	pik_parserCTX_STORE
2015	}
2016
	@@ -2072,166 +2113,166 @@
2072	}
2073
2074	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
2075	** of that rule */
2076	static const YYCODETYPE yyRuleInfoLhs[] = {
2077	122, /* (0) document ::= statement_list */
2078	100, /* (1) statement_list ::= statement */
2079	100, /* (2) statement_list ::= statement_list EOL statement */
2080	101, /* (3) statement ::= */
2081	101, /* (4) statement ::= direction */
2082	101, /* (5) statement ::= lvalue ASSIGN rvalue */
2083	101, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2084	101, /* (7) statement ::= PLACENAME COLON position */
2085	101, /* (8) statement ::= unnamed_statement */
2086	101, /* (9) statement ::= print prlist */
2087	101, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2088	101, /* (11) statement ::= ASSERT LP position EQ position RP */
2089	101, /* (12) statement ::= DEFINE ID CODEBLOCK */
2090	117, /* (13) rvalue ::= PLACENAME */
2091	125, /* (14) pritem ::= FILL */
2092	125, /* (15) pritem ::= COLOR */
2093	125, /* (16) pritem ::= THICKNESS */
2094	125, /* (17) pritem ::= rvalue */
2095	125, /* (18) pritem ::= STRING */
2096	126, /* (19) prsep ::= COMMA */
2097	102, /* (20) unnamed_statement ::= basetype attribute_list */
2098	103, /* (21) basetype ::= CLASSNAME */
2099	103, /* (22) basetype ::= STRING textposition */
2100	103, /* (23) basetype ::= LB savelist statement_list RB */
2101	128, /* (24) savelist ::= */
2102	120, /* (25) relexpr ::= expr */
2103	120, /* (26) relexpr ::= expr PERCENT */
2104	121, /* (27) optrelexpr ::= */
2105	127, /* (28) attribute_list ::= relexpr alist */
2106	130, /* (29) attribute ::= numproperty relexpr */
2107	130, /* (30) attribute ::= dashproperty expr */
2108	130, /* (31) attribute ::= dashproperty */
2109	130, /* (32) attribute ::= colorproperty rvalue */
2110	130, /* (33) attribute ::= go direction optrelexpr */
2111	130, /* (34) attribute ::= go direction even position */
2112	130, /* (35) attribute ::= CLOSE */
2113	130, /* (36) attribute ::= CHOP */
2114	130, /* (37) attribute ::= FROM position */
2115	130, /* (38) attribute ::= TO position */
2116	130, /* (39) attribute ::= THEN */
2117	130, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2118	130, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2119	130, /* (42) attribute ::= GO optrelexpr HEADING expr */
2120	130, /* (43) attribute ::= GO optrelexpr EDGEPT */
2121	130, /* (44) attribute ::= AT position */
2122	130, /* (45) attribute ::= SAME */
2123	130, /* (46) attribute ::= SAME AS object */
2124	130, /* (47) attribute ::= STRING textposition */
2125	130, /* (48) attribute ::= FIT */
2126	130, /* (49) attribute ::= BEHIND object */
2127	133, /* (50) withclause ::= DOT_E edge AT position */
2128	133, /* (51) withclause ::= edge AT position */
2129	105, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2130	132, /* (53) boolproperty ::= CW */
2131	132, /* (54) boolproperty ::= CCW */
2132	132, /* (55) boolproperty ::= LARROW */
2133	132, /* (56) boolproperty ::= RARROW */
2134	132, /* (57) boolproperty ::= LRARROW */
2135	132, /* (58) boolproperty ::= INVIS */
2136	132, /* (59) boolproperty ::= THICK */
2137	132, /* (60) boolproperty ::= THIN */
2138	132, /* (61) boolproperty ::= SOLID */
2139	116, /* (62) textposition ::= */
2140	116, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
2141	111, /* (64) position ::= expr COMMA expr */
2142	111, /* (65) position ::= place PLUS expr COMMA expr */
2143	111, /* (66) position ::= place MINUS expr COMMA expr */
2144	111, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2145	111, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2146	111, /* (69) position ::= LP position COMMA position RP */
2147	111, /* (70) position ::= LP position RP */
2148	111, /* (71) position ::= expr between position AND position */
2149	111, /* (72) position ::= expr LT position COMMA position GT */
2150	111, /* (73) position ::= expr ABOVE position */
2151	111, /* (74) position ::= expr BELOW position */
2152	111, /* (75) position ::= expr LEFT OF position */
2153	111, /* (76) position ::= expr RIGHT OF position */
2154	111, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2155	111, /* (78) position ::= expr HEADING EDGEPT OF position */
2156	111, /* (79) position ::= expr EDGEPT OF position */
2157	111, /* (80) position ::= expr ON HEADING expr FROM position */
2158	111, /* (81) position ::= expr HEADING expr FROM position */
2159	112, /* (82) place ::= edge OF object */
2160	135, /* (83) place2 ::= object */
2161	135, /* (84) place2 ::= object DOT_E edge */
2162	135, /* (85) place2 ::= NTH VERTEX OF object */
2163	113, /* (86) object ::= nth */
2164	113, /* (87) object ::= nth OF\|IN object */
2165	114, /* (88) objectname ::= THIS */
2166	114, /* (89) objectname ::= PLACENAME */
2167	114, /* (90) objectname ::= objectname DOT_U PLACENAME */
2168	115, /* (91) nth ::= NTH CLASSNAME */
2169	115, /* (92) nth ::= NTH LAST CLASSNAME */
2170	115, /* (93) nth ::= LAST CLASSNAME */
2171	115, /* (94) nth ::= LAST */
2172	115, /* (95) nth ::= NTH LB RB */
2173	115, /* (96) nth ::= NTH LAST LB RB */
2174	115, /* (97) nth ::= LAST LB RB */
2175	104, /* (98) expr ::= expr PLUS expr */
2176	104, /* (99) expr ::= expr MINUS expr */
2177	104, /* (100) expr ::= expr STAR expr */
2178	104, /* (101) expr ::= expr SLASH expr */
2179	104, /* (102) expr ::= MINUS expr */
2180	104, /* (103) expr ::= PLUS expr */
2181	104, /* (104) expr ::= LP expr RP */
2182	104, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2183	104, /* (106) expr ::= NUMBER */
2184	104, /* (107) expr ::= ID */
2185	104, /* (108) expr ::= FUNC1 LP expr RP */
2186	104, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2187	104, /* (110) expr ::= DIST LP position COMMA position RP */
2188	104, /* (111) expr ::= place2 DOT_XY X */
2189	104, /* (112) expr ::= place2 DOT_XY Y */
2190	104, /* (113) expr ::= object DOT_L numproperty */
2191	104, /* (114) expr ::= object DOT_L dashproperty */
2192	104, /* (115) expr ::= object DOT_L colorproperty */
2193	118, /* (116) lvalue ::= ID */
2194	118, /* (117) lvalue ::= FILL */
2195	118, /* (118) lvalue ::= COLOR */
2196	118, /* (119) lvalue ::= THICKNESS */
2197	117, /* (120) rvalue ::= expr */
2198	123, /* (121) print ::= PRINT */
2199	124, /* (122) prlist ::= pritem */
2200	124, /* (123) prlist ::= prlist prsep pritem */
2201	107, /* (124) direction ::= UP */
2202	107, /* (125) direction ::= DOWN */
2203	107, /* (126) direction ::= LEFT */
2204	107, /* (127) direction ::= RIGHT */
2205	121, /* (128) optrelexpr ::= relexpr */
2206	127, /* (129) attribute_list ::= alist */
2207	129, /* (130) alist ::= */
2208	129, /* (131) alist ::= alist attribute */
2209	130, /* (132) attribute ::= boolproperty */
2210	130, /* (133) attribute ::= WITH withclause */
2211	131, /* (134) go ::= GO */
2212	131, /* (135) go ::= */
2213	119, /* (136) even ::= UNTIL EVEN WITH */
2214	119, /* (137) even ::= EVEN WITH */
2215	108, /* (138) dashproperty ::= DOTTED */
2216	108, /* (139) dashproperty ::= DASHED */
2217	109, /* (140) colorproperty ::= FILL */
2218	109, /* (141) colorproperty ::= COLOR */
2219	111, /* (142) position ::= place */
2220	134, /* (143) between ::= WAY BETWEEN */
2221	134, /* (144) between ::= BETWEEN */
2222	134, /* (145) between ::= OF THE WAY BETWEEN */
2223	112, /* (146) place ::= place2 */
2224	106, /* (147) edge ::= CENTER */
2225	106, /* (148) edge ::= EDGEPT */
2226	106, /* (149) edge ::= TOP */
2227	106, /* (150) edge ::= BOTTOM */
2228	106, /* (151) edge ::= START */
2229	106, /* (152) edge ::= END */
2230	106, /* (153) edge ::= RIGHT */
2231	106, /* (154) edge ::= LEFT */
2232	113, /* (155) object ::= objectname */
2233	};
2234
2235	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2236	** of symbols on the right-hand side of that rule. */
2237	static const signed char yyRuleInfoNRhs[] = {
	@@ -2431,620 +2472,620 @@
2431	** break;
2432	*/
2433	/******** Begin reduce actions ********************************************/
2434	YYMINORTYPE yylhsminor;
2435	case 0: /* document ::= statement_list */
2436	#line 561 "pikchr.y"
2437	{pik_render(p,yymsp[0].minor.yy235);}
2438	#line 2463 "pikchr.c"
2439	break;
2440	case 1: /* statement_list ::= statement */
2441	#line 564 "pikchr.y"
2442	{ yylhsminor.yy235 = pik_elist_append(p,0,yymsp[0].minor.yy162); }
2443	#line 2468 "pikchr.c"
2444	yymsp[0].minor.yy235 = yylhsminor.yy235;
2445	break;
2446	case 2: /* statement_list ::= statement_list EOL statement */
2447	#line 566 "pikchr.y"
2448	{ yylhsminor.yy235 = pik_elist_append(p,yymsp[-2].minor.yy235,yymsp[0].minor.yy162); }
2449	#line 2474 "pikchr.c"
2450	yymsp[-2].minor.yy235 = yylhsminor.yy235;
2451	break;
2452	case 3: /* statement ::= */
2453	#line 569 "pikchr.y"
2454	{ yymsp[1].minor.yy162 = 0; }
2455	#line 2480 "pikchr.c"
2456	break;
2457	case 4: /* statement ::= direction */
2458	#line 570 "pikchr.y"
2459	{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy162=0; }
2460	#line 2485 "pikchr.c"
2461	yymsp[0].minor.yy162 = yylhsminor.yy162;
2462	break;
2463	case 5: /* statement ::= lvalue ASSIGN rvalue */
2464	#line 571 "pikchr.y"
2465	{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy21,&yymsp[-1].minor.yy0); yylhsminor.yy162=0;}
2466	#line 2491 "pikchr.c"
2467	yymsp[-2].minor.yy162 = yylhsminor.yy162;
2468	break;
2469	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2470	#line 573 "pikchr.y"
2471	{ yylhsminor.yy162 = yymsp[0].minor.yy162; pik_elem_setname(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0); }
2472	#line 2497 "pikchr.c"
2473	yymsp[-2].minor.yy162 = yylhsminor.yy162;
2474	break;
2475	case 7: /* statement ::= PLACENAME COLON position */
2476	#line 575 "pikchr.y"
2477	{ yylhsminor.yy162 = pik_elem_new(p,0,0,0);
2478	if(yylhsminor.yy162){ yylhsminor.yy162->ptAt = yymsp[0].minor.yy63; pik_elem_setname(p,yylhsminor.yy162,&yymsp[-2].minor.yy0); }}
2479	#line 2504 "pikchr.c"
2480	yymsp[-2].minor.yy162 = yylhsminor.yy162;
2481	break;
2482	case 8: /* statement ::= unnamed_statement */
2483	#line 577 "pikchr.y"
2484	{yylhsminor.yy162 = yymsp[0].minor.yy162;}
2485	#line 2510 "pikchr.c"
2486	yymsp[0].minor.yy162 = yylhsminor.yy162;
2487	break;
2488	case 9: /* statement ::= print prlist */
2489	#line 578 "pikchr.y"
2490	{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy162=0;}
2491	#line 2516 "pikchr.c"
2492	break;
2493	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2494	#line 583 "pikchr.y"
2495	{yymsp[-5].minor.yy162=pik_assert(p,yymsp[-3].minor.yy21,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy21);}
2496	#line 2521 "pikchr.c"
2497	break;
2498	case 11: /* statement ::= ASSERT LP position EQ position RP */
2499	#line 585 "pikchr.y"
2500	{yymsp[-5].minor.yy162=pik_position_assert(p,&yymsp[-3].minor.yy63,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy63);}
2501	#line 2526 "pikchr.c"
2502	break;
2503	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2504	#line 586 "pikchr.y"
2505	{yymsp[-2].minor.yy162=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2506	#line 2531 "pikchr.c"
2507	break;
2508	case 13: /* rvalue ::= PLACENAME */
2509	#line 597 "pikchr.y"
2510	{yylhsminor.yy21 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2511	#line 2536 "pikchr.c"
2512	yymsp[0].minor.yy21 = yylhsminor.yy21;
2513	break;
2514	case 14: /* pritem ::= FILL */
2515	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2516	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2517	#line 602 "pikchr.y"
2518	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2519	#line 2544 "pikchr.c"
2520	break;
2521	case 17: /* pritem ::= rvalue */
2522	#line 605 "pikchr.y"
2523	{pik_append_num(p,"",yymsp[0].minor.yy21);}
2524	#line 2549 "pikchr.c"
2525	break;
2526	case 18: /* pritem ::= STRING */
2527	#line 606 "pikchr.y"
2528	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2529	#line 2554 "pikchr.c"
2530	break;
2531	case 19: /* prsep ::= COMMA */
2532	#line 607 "pikchr.y"
2533	{pik_append(p, " ", 1);}
2534	#line 2559 "pikchr.c"
2535	break;
2536	case 20: /* unnamed_statement ::= basetype attribute_list */
2537	#line 610 "pikchr.y"
2538	{yylhsminor.yy162 = yymsp[-1].minor.yy162; pik_after_adding_attributes(p,yylhsminor.yy162);}
2539	#line 2564 "pikchr.c"
2540	yymsp[-1].minor.yy162 = yylhsminor.yy162;
2541	break;
2542	case 21: /* basetype ::= CLASSNAME */
2543	#line 612 "pikchr.y"
2544	{yylhsminor.yy162 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2545	#line 2570 "pikchr.c"
2546	yymsp[0].minor.yy162 = yylhsminor.yy162;
2547	break;
2548	case 22: /* basetype ::= STRING textposition */
2549	#line 614 "pikchr.y"
2550	{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy188; yylhsminor.yy162 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2551	#line 2576 "pikchr.c"
2552	yymsp[-1].minor.yy162 = yylhsminor.yy162;
2553	break;
2554	case 23: /* basetype ::= LB savelist statement_list RB */
2555	#line 616 "pikchr.y"
2556	{ p->list = yymsp[-2].minor.yy235; yymsp[-3].minor.yy162 = pik_elem_new(p,0,0,yymsp[-1].minor.yy235); if(yymsp[-3].minor.yy162) yymsp[-3].minor.yy162->errTok = yymsp[0].minor.yy0; }
2557	#line 2582 "pikchr.c"
2558	break;
2559	case 24: /* savelist ::= */
2560	#line 621 "pikchr.y"
2561	{yymsp[1].minor.yy235 = p->list; p->list = 0;}
2562	#line 2587 "pikchr.c"
2563	break;
2564	case 25: /* relexpr ::= expr */
2565	#line 628 "pikchr.y"
2566	{yylhsminor.yy72.rAbs = yymsp[0].minor.yy21; yylhsminor.yy72.rRel = 0;}
2567	#line 2592 "pikchr.c"
2568	yymsp[0].minor.yy72 = yylhsminor.yy72;
2569	break;
2570	case 26: /* relexpr ::= expr PERCENT */
2571	#line 629 "pikchr.y"
2572	{yylhsminor.yy72.rAbs = 0; yylhsminor.yy72.rRel = yymsp[-1].minor.yy21/100;}
2573	#line 2598 "pikchr.c"
2574	yymsp[-1].minor.yy72 = yylhsminor.yy72;
2575	break;
2576	case 27: /* optrelexpr ::= */
2577	#line 631 "pikchr.y"
2578	{yymsp[1].minor.yy72.rAbs = 0; yymsp[1].minor.yy72.rRel = 1.0;}
2579	#line 2604 "pikchr.c"
2580	break;
2581	case 28: /* attribute_list ::= relexpr alist */
2582	#line 633 "pikchr.y"
2583	{pik_add_direction(p,0,&yymsp[-1].minor.yy72);}
2584	#line 2609 "pikchr.c"
2585	break;
2586	case 29: /* attribute ::= numproperty relexpr */
2587	#line 637 "pikchr.y"
2588	{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy72); }
2589	#line 2614 "pikchr.c"
2590	break;
2591	case 30: /* attribute ::= dashproperty expr */
2592	#line 638 "pikchr.y"
2593	{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy21); }
2594	#line 2619 "pikchr.c"
2595	break;
2596	case 31: /* attribute ::= dashproperty */
2597	#line 639 "pikchr.y"
2598	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2599	#line 2624 "pikchr.c"
2600	break;
2601	case 32: /* attribute ::= colorproperty rvalue */
2602	#line 640 "pikchr.y"
2603	{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy21); }
2604	#line 2629 "pikchr.c"
2605	break;
2606	case 33: /* attribute ::= go direction optrelexpr */
2607	#line 641 "pikchr.y"
2608	{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy72);}
2609	#line 2634 "pikchr.c"
2610	break;
2611	case 34: /* attribute ::= go direction even position */
2612	#line 642 "pikchr.y"
2613	{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy63);}
2614	#line 2639 "pikchr.c"
2615	break;
2616	case 35: /* attribute ::= CLOSE */
2617	#line 643 "pikchr.y"
2618	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2619	#line 2644 "pikchr.c"
2620	break;
2621	case 36: /* attribute ::= CHOP */
2622	#line 644 "pikchr.y"
2623	{ p->cur->bChop = 1; }
2624	#line 2649 "pikchr.c"
2625	break;
2626	case 37: /* attribute ::= FROM position */
2627	#line 645 "pikchr.y"
2628	{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy63); }
2629	#line 2654 "pikchr.c"
2630	break;
2631	case 38: /* attribute ::= TO position */
2632	#line 646 "pikchr.y"
2633	{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy63); }
2634	#line 2659 "pikchr.c"
2635	break;
2636	case 39: /* attribute ::= THEN */
2637	#line 647 "pikchr.y"
2638	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2639	#line 2664 "pikchr.c"
2640	break;
2641	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2642	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2643	#line 649 "pikchr.y"
2644	{pik_move_hdg(p,&yymsp[-2].minor.yy72,&yymsp[-1].minor.yy0,yymsp[0].minor.yy21,0,&yymsp[-3].minor.yy0);}
2645	#line 2670 "pikchr.c"
2646	break;
2647	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2648	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2649	#line 650 "pikchr.y"
2650	{pik_move_hdg(p,&yymsp[-1].minor.yy72,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2651	#line 2676 "pikchr.c"
2652	break;
2653	case 44: /* attribute ::= AT position */
2654	#line 655 "pikchr.y"
2655	{ pik_set_at(p,0,&yymsp[0].minor.yy63,&yymsp[-1].minor.yy0); }
2656	#line 2681 "pikchr.c"
2657	break;
2658	case 45: /* attribute ::= SAME */
2659	#line 657 "pikchr.y"
2660	{pik_same(p,0,&yymsp[0].minor.yy0);}
2661	#line 2686 "pikchr.c"
2662	break;
2663	case 46: /* attribute ::= SAME AS object */
2664	#line 658 "pikchr.y"
2665	{pik_same(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0);}
2666	#line 2691 "pikchr.c"
2667	break;
2668	case 47: /* attribute ::= STRING textposition */
2669	#line 659 "pikchr.y"
2670	{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy188);}
2671	#line 2696 "pikchr.c"
2672	break;
2673	case 48: /* attribute ::= FIT */
2674	#line 660 "pikchr.y"
2675	{pik_size_to_fit(p,0,&yymsp[0].minor.yy0,3); }
2676	#line 2701 "pikchr.c"
2677	break;
2678	case 49: /* attribute ::= BEHIND object */
2679	#line 661 "pikchr.y"
2680	{pik_behind(p,yymsp[0].minor.yy162);}
2681	#line 2706 "pikchr.c"
2682	break;
2683	case 50: /* withclause ::= DOT_E edge AT position */
2684	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2685	#line 669 "pikchr.y"
2686	{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy63,&yymsp[-1].minor.yy0); }
2687	#line 2712 "pikchr.c"
2688	break;
2689	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2690	#line 673 "pikchr.y"
2691	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2692	#line 2717 "pikchr.c"
2693	yymsp[0].minor.yy0 = yylhsminor.yy0;
2694	break;
2695	case 53: /* boolproperty ::= CW */
2696	#line 684 "pikchr.y"
2697	{p->cur->cw = 1;}
2698	#line 2723 "pikchr.c"
2699	break;
2700	case 54: /* boolproperty ::= CCW */
2701	#line 685 "pikchr.y"
2702	{p->cur->cw = 0;}
2703	#line 2728 "pikchr.c"
2704	break;
2705	case 55: /* boolproperty ::= LARROW */
2706	#line 686 "pikchr.y"
2707	{p->cur->larrow=1; p->cur->rarrow=0; }
2708	#line 2733 "pikchr.c"
2709	break;
2710	case 56: /* boolproperty ::= RARROW */
2711	#line 687 "pikchr.y"
2712	{p->cur->larrow=0; p->cur->rarrow=1; }
2713	#line 2738 "pikchr.c"
2714	break;
2715	case 57: /* boolproperty ::= LRARROW */
2716	#line 688 "pikchr.y"
2717	{p->cur->larrow=1; p->cur->rarrow=1; }
2718	#line 2743 "pikchr.c"
2719	break;
2720	case 58: /* boolproperty ::= INVIS */
2721	#line 689 "pikchr.y"
2722	{p->cur->sw = -0.00001;}
2723	#line 2748 "pikchr.c"
2724	break;
2725	case 59: /* boolproperty ::= THICK */
2726	#line 690 "pikchr.y"
2727	{p->cur->sw *= 1.5;}
2728	#line 2753 "pikchr.c"
2729	break;
2730	case 60: /* boolproperty ::= THIN */
2731	#line 691 "pikchr.y"
2732	{p->cur->sw *= 0.67;}
2733	#line 2758 "pikchr.c"
2734	break;
2735	case 61: /* boolproperty ::= SOLID */
2736	#line 692 "pikchr.y"
2737	{p->cur->sw = pik_value(p,"thickness",9,0);
2738	p->cur->dotted = p->cur->dashed = 0.0;}
2739	#line 2764 "pikchr.c"
2740	break;
2741	case 62: /* textposition ::= */
2742	#line 695 "pikchr.y"
2743	{yymsp[1].minor.yy188 = 0;}
2744	#line 2769 "pikchr.c"
2745	break;
2746	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
2747	#line 698 "pikchr.y"
2748	{yylhsminor.yy188 = (short int)pik_text_position(yymsp[-1].minor.yy188,&yymsp[0].minor.yy0);}
2749	#line 2774 "pikchr.c"
2750	yymsp[-1].minor.yy188 = yylhsminor.yy188;
2751	break;
2752	case 64: /* position ::= expr COMMA expr */
2753	#line 701 "pikchr.y"
2754	{yylhsminor.yy63.x=yymsp[-2].minor.yy21; yylhsminor.yy63.y=yymsp[0].minor.yy21;}
2755	#line 2780 "pikchr.c"
2756	yymsp[-2].minor.yy63 = yylhsminor.yy63;
2757	break;
2758	case 65: /* position ::= place PLUS expr COMMA expr */
2759	#line 703 "pikchr.y"
2760	{yylhsminor.yy63.x=yymsp[-4].minor.yy63.x+yymsp[-2].minor.yy21; yylhsminor.yy63.y=yymsp[-4].minor.yy63.y+yymsp[0].minor.yy21;}
2761	#line 2786 "pikchr.c"
2762	yymsp[-4].minor.yy63 = yylhsminor.yy63;
2763	break;
2764	case 66: /* position ::= place MINUS expr COMMA expr */
2765	#line 704 "pikchr.y"
2766	{yylhsminor.yy63.x=yymsp[-4].minor.yy63.x-yymsp[-2].minor.yy21; yylhsminor.yy63.y=yymsp[-4].minor.yy63.y-yymsp[0].minor.yy21;}
2767	#line 2792 "pikchr.c"
2768	yymsp[-4].minor.yy63 = yylhsminor.yy63;
2769	break;
2770	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2771	#line 706 "pikchr.y"
2772	{yylhsminor.yy63.x=yymsp[-6].minor.yy63.x+yymsp[-3].minor.yy21; yylhsminor.yy63.y=yymsp[-6].minor.yy63.y+yymsp[-1].minor.yy21;}
2773	#line 2798 "pikchr.c"
2774	yymsp[-6].minor.yy63 = yylhsminor.yy63;
2775	break;
2776	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2777	#line 708 "pikchr.y"
2778	{yylhsminor.yy63.x=yymsp[-6].minor.yy63.x-yymsp[-3].minor.yy21; yylhsminor.yy63.y=yymsp[-6].minor.yy63.y-yymsp[-1].minor.yy21;}
2779	#line 2804 "pikchr.c"
2780	yymsp[-6].minor.yy63 = yylhsminor.yy63;
2781	break;
2782	case 69: /* position ::= LP position COMMA position RP */
2783	#line 709 "pikchr.y"
2784	{yymsp[-4].minor.yy63.x=yymsp[-3].minor.yy63.x; yymsp[-4].minor.yy63.y=yymsp[-1].minor.yy63.y;}
2785	#line 2810 "pikchr.c"
2786	break;
2787	case 70: /* position ::= LP position RP */
2788	#line 710 "pikchr.y"
2789	{yymsp[-2].minor.yy63=yymsp[-1].minor.yy63;}
2790	#line 2815 "pikchr.c"
2791	break;
2792	case 71: /* position ::= expr between position AND position */
2793	#line 712 "pikchr.y"
2794	{yylhsminor.yy63 = pik_position_between(yymsp[-4].minor.yy21,yymsp[-2].minor.yy63,yymsp[0].minor.yy63);}
2795	#line 2820 "pikchr.c"
2796	yymsp[-4].minor.yy63 = yylhsminor.yy63;
2797	break;
2798	case 72: /* position ::= expr LT position COMMA position GT */
2799	#line 714 "pikchr.y"
2800	{yylhsminor.yy63 = pik_position_between(yymsp[-5].minor.yy21,yymsp[-3].minor.yy63,yymsp[-1].minor.yy63);}
2801	#line 2826 "pikchr.c"
2802	yymsp[-5].minor.yy63 = yylhsminor.yy63;
2803	break;
2804	case 73: /* position ::= expr ABOVE position */
2805	#line 715 "pikchr.y"
2806	{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.y += yymsp[-2].minor.yy21;}
2807	#line 2832 "pikchr.c"
2808	yymsp[-2].minor.yy63 = yylhsminor.yy63;
2809	break;
2810	case 74: /* position ::= expr BELOW position */
2811	#line 716 "pikchr.y"
2812	{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.y -= yymsp[-2].minor.yy21;}
2813	#line 2838 "pikchr.c"
2814	yymsp[-2].minor.yy63 = yylhsminor.yy63;
2815	break;
2816	case 75: /* position ::= expr LEFT OF position */
2817	#line 717 "pikchr.y"
2818	{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.x -= yymsp[-3].minor.yy21;}
2819	#line 2844 "pikchr.c"
2820	yymsp[-3].minor.yy63 = yylhsminor.yy63;
2821	break;
2822	case 76: /* position ::= expr RIGHT OF position */
2823	#line 718 "pikchr.y"
2824	{yylhsminor.yy63=yymsp[0].minor.yy63; yylhsminor.yy63.x += yymsp[-3].minor.yy21;}
2825	#line 2850 "pikchr.c"
2826	yymsp[-3].minor.yy63 = yylhsminor.yy63;
2827	break;
2828	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2829	#line 720 "pikchr.y"
2830	{yylhsminor.yy63 = pik_position_at_hdg(yymsp[-5].minor.yy21,&yymsp[-2].minor.yy0,yymsp[0].minor.yy63);}
2831	#line 2856 "pikchr.c"
2832	yymsp[-5].minor.yy63 = yylhsminor.yy63;
2833	break;
2834	case 78: /* position ::= expr HEADING EDGEPT OF position */
2835	#line 722 "pikchr.y"
2836	{yylhsminor.yy63 = pik_position_at_hdg(yymsp[-4].minor.yy21,&yymsp[-2].minor.yy0,yymsp[0].minor.yy63);}
2837	#line 2862 "pikchr.c"
2838	yymsp[-4].minor.yy63 = yylhsminor.yy63;
2839	break;
2840	case 79: /* position ::= expr EDGEPT OF position */
2841	#line 724 "pikchr.y"
2842	{yylhsminor.yy63 = pik_position_at_hdg(yymsp[-3].minor.yy21,&yymsp[-2].minor.yy0,yymsp[0].minor.yy63);}
2843	#line 2868 "pikchr.c"
2844	yymsp[-3].minor.yy63 = yylhsminor.yy63;
2845	break;
2846	case 80: /* position ::= expr ON HEADING expr FROM position */
2847	#line 726 "pikchr.y"
2848	{yylhsminor.yy63 = pik_position_at_angle(yymsp[-5].minor.yy21,yymsp[-2].minor.yy21,yymsp[0].minor.yy63);}
2849	#line 2874 "pikchr.c"
2850	yymsp[-5].minor.yy63 = yylhsminor.yy63;
2851	break;
2852	case 81: /* position ::= expr HEADING expr FROM position */
2853	#line 728 "pikchr.y"
2854	{yylhsminor.yy63 = pik_position_at_angle(yymsp[-4].minor.yy21,yymsp[-2].minor.yy21,yymsp[0].minor.yy63);}
2855	#line 2880 "pikchr.c"
2856	yymsp[-4].minor.yy63 = yylhsminor.yy63;
2857	break;
2858	case 82: /* place ::= edge OF object */
2859	#line 740 "pikchr.y"
2860	{yylhsminor.yy63 = pik_place_of_elem(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0);}
2861	#line 2886 "pikchr.c"
2862	yymsp[-2].minor.yy63 = yylhsminor.yy63;
2863	break;
2864	case 83: /* place2 ::= object */
2865	#line 741 "pikchr.y"
2866	{yylhsminor.yy63 = pik_place_of_elem(p,yymsp[0].minor.yy162,0);}
2867	#line 2892 "pikchr.c"
2868	yymsp[0].minor.yy63 = yylhsminor.yy63;
2869	break;
2870	case 84: /* place2 ::= object DOT_E edge */
2871	#line 742 "pikchr.y"
2872	{yylhsminor.yy63 = pik_place_of_elem(p,yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}
2873	#line 2898 "pikchr.c"
2874	yymsp[-2].minor.yy63 = yylhsminor.yy63;
2875	break;
2876	case 85: /* place2 ::= NTH VERTEX OF object */
2877	#line 743 "pikchr.y"
2878	{yylhsminor.yy63 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy162);}
2879	#line 2904 "pikchr.c"
2880	yymsp[-3].minor.yy63 = yylhsminor.yy63;
2881	break;
2882	case 86: /* object ::= nth */
2883	#line 755 "pikchr.y"
2884	{yylhsminor.yy162 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2885	#line 2910 "pikchr.c"
2886	yymsp[0].minor.yy162 = yylhsminor.yy162;
2887	break;
2888	case 87: /* object ::= nth OF\|IN object */
2889	#line 756 "pikchr.y"
2890	{yylhsminor.yy162 = pik_find_nth(p,yymsp[0].minor.yy162,&yymsp[-2].minor.yy0);}
2891	#line 2916 "pikchr.c"
2892	yymsp[-2].minor.yy162 = yylhsminor.yy162;
2893	break;
2894	case 88: /* objectname ::= THIS */
2895	#line 758 "pikchr.y"
2896	{yymsp[0].minor.yy162 = p->cur;}
2897	#line 2922 "pikchr.c"
2898	break;
2899	case 89: /* objectname ::= PLACENAME */
2900	#line 759 "pikchr.y"
2901	{yylhsminor.yy162 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2902	#line 2927 "pikchr.c"
2903	yymsp[0].minor.yy162 = yylhsminor.yy162;
2904	break;
2905	case 90: /* objectname ::= objectname DOT_U PLACENAME */
2906	#line 761 "pikchr.y"
2907	{yylhsminor.yy162 = pik_find_byname(p,yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}
2908	#line 2933 "pikchr.c"
2909	yymsp[-2].minor.yy162 = yylhsminor.yy162;
2910	break;
2911	case 91: /* nth ::= NTH CLASSNAME */
2912	#line 763 "pikchr.y"
2913	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2914	#line 2939 "pikchr.c"
2915	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2916	break;
2917	case 92: /* nth ::= NTH LAST CLASSNAME */
2918	#line 764 "pikchr.y"
2919	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2920	#line 2945 "pikchr.c"
2921	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2922	break;
2923	case 93: /* nth ::= LAST CLASSNAME */
2924	#line 765 "pikchr.y"
2925	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2926	#line 2951 "pikchr.c"
2927	break;
2928	case 94: /* nth ::= LAST */
2929	#line 766 "pikchr.y"
2930	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2931	#line 2956 "pikchr.c"
2932	yymsp[0].minor.yy0 = yylhsminor.yy0;
2933	break;
2934	case 95: /* nth ::= NTH LB RB */
2935	#line 767 "pikchr.y"
2936	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2937	#line 2962 "pikchr.c"
2938	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2939	break;
2940	case 96: /* nth ::= NTH LAST LB RB */
2941	#line 768 "pikchr.y"
2942	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2943	#line 2968 "pikchr.c"
2944	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2945	break;
2946	case 97: /* nth ::= LAST LB RB */
2947	#line 769 "pikchr.y"
2948	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2949	#line 2974 "pikchr.c"
2950	break;
2951	case 98: /* expr ::= expr PLUS expr */
2952	#line 771 "pikchr.y"
2953	{yylhsminor.yy21=yymsp[-2].minor.yy21+yymsp[0].minor.yy21;}
2954	#line 2979 "pikchr.c"
2955	yymsp[-2].minor.yy21 = yylhsminor.yy21;
2956	break;
2957	case 99: /* expr ::= expr MINUS expr */
2958	#line 772 "pikchr.y"
2959	{yylhsminor.yy21=yymsp[-2].minor.yy21-yymsp[0].minor.yy21;}
2960	#line 2985 "pikchr.c"
2961	yymsp[-2].minor.yy21 = yylhsminor.yy21;
2962	break;
2963	case 100: /* expr ::= expr STAR expr */
2964	#line 773 "pikchr.y"
2965	{yylhsminor.yy21=yymsp[-2].minor.yy21*yymsp[0].minor.yy21;}
2966	#line 2991 "pikchr.c"
2967	yymsp[-2].minor.yy21 = yylhsminor.yy21;
2968	break;
2969	case 101: /* expr ::= expr SLASH expr */
2970	#line 774 "pikchr.y"
2971	{
2972	if( yymsp[0].minor.yy21==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy21 = 0.0; }
2973	else{ yylhsminor.yy21 = yymsp[-2].minor.yy21/yymsp[0].minor.yy21; }
2974	}
2975	#line 3000 "pikchr.c"
2976	yymsp[-2].minor.yy21 = yylhsminor.yy21;
2977	break;
2978	case 102: /* expr ::= MINUS expr */
2979	#line 778 "pikchr.y"
2980	{yymsp[-1].minor.yy21=-yymsp[0].minor.yy21;}
2981	#line 3006 "pikchr.c"
2982	break;
2983	case 103: /* expr ::= PLUS expr */
2984	#line 779 "pikchr.y"
2985	{yymsp[-1].minor.yy21=yymsp[0].minor.yy21;}
2986	#line 3011 "pikchr.c"
2987	break;
2988	case 104: /* expr ::= LP expr RP */
2989	#line 780 "pikchr.y"
2990	{yymsp[-2].minor.yy21=yymsp[-1].minor.yy21;}
2991	#line 3016 "pikchr.c"
2992	break;
2993	case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2994	#line 781 "pikchr.y"
2995	{yymsp[-2].minor.yy21=pik_get_var(p,&yymsp[-1].minor.yy0);}
2996	#line 3021 "pikchr.c"
2997	break;
2998	case 106: /* expr ::= NUMBER */
2999	#line 782 "pikchr.y"
3000	{yylhsminor.yy21=pik_atof(&yymsp[0].minor.yy0);}
3001	#line 3026 "pikchr.c"
3002	yymsp[0].minor.yy21 = yylhsminor.yy21;
3003	break;
3004	case 107: /* expr ::= ID */
3005	#line 783 "pikchr.y"
3006	{yylhsminor.yy21=pik_get_var(p,&yymsp[0].minor.yy0);}
3007	#line 3032 "pikchr.c"
3008	yymsp[0].minor.yy21 = yylhsminor.yy21;
3009	break;
3010	case 108: /* expr ::= FUNC1 LP expr RP */
3011	#line 784 "pikchr.y"
3012	{yylhsminor.yy21 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy21,0.0);}
3013	#line 3038 "pikchr.c"
3014	yymsp[-3].minor.yy21 = yylhsminor.yy21;
3015	break;
3016	case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
3017	#line 785 "pikchr.y"
3018	{yylhsminor.yy21 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy21,yymsp[-1].minor.yy21);}
3019	#line 3044 "pikchr.c"
3020	yymsp[-5].minor.yy21 = yylhsminor.yy21;
3021	break;
3022	case 110: /* expr ::= DIST LP position COMMA position RP */
3023	#line 786 "pikchr.y"
3024	{yymsp[-5].minor.yy21 = pik_dist(&yymsp[-3].minor.yy63,&yymsp[-1].minor.yy63);}
3025	#line 3050 "pikchr.c"
3026	break;
3027	case 111: /* expr ::= place2 DOT_XY X */
3028	#line 787 "pikchr.y"
3029	{yylhsminor.yy21 = yymsp[-2].minor.yy63.x;}
3030	#line 3055 "pikchr.c"
3031	yymsp[-2].minor.yy21 = yylhsminor.yy21;
3032	break;
3033	case 112: /* expr ::= place2 DOT_XY Y */
3034	#line 788 "pikchr.y"
3035	{yylhsminor.yy21 = yymsp[-2].minor.yy63.y;}
3036	#line 3061 "pikchr.c"
3037	yymsp[-2].minor.yy21 = yylhsminor.yy21;
3038	break;
3039	case 113: /* expr ::= object DOT_L numproperty */
3040	case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
3041	case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
3042	#line 789 "pikchr.y"
3043	{yylhsminor.yy21=pik_property_of(yymsp[-2].minor.yy162,&yymsp[0].minor.yy0);}
3044	#line 3069 "pikchr.c"
3045	yymsp[-2].minor.yy21 = yylhsminor.yy21;
3046	break;
3047	default:
3048	/* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
3049	/* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
3050	/* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
	@@ -3142,19 +3183,19 @@
3142	){
3143	pik_parserARG_FETCH
3144	pik_parserCTX_FETCH
3145	#define TOKEN yyminor
3146	/********** Begin %syntax_error code **************************************/
3147	#line 549 "pikchr.y"
3148
3149	if( TOKEN.z && TOKEN.z[0] ){
3150	pik_error(p, &TOKEN, "syntax error");
3151	}else{
3152	pik_error(p, 0, "syntax error");
3153	}
3154	UNUSED_PARAMETER(yymajor);
3155	#line 3180 "pikchr.c"
3156	/********** End %syntax_error code ****************************************/
3157	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3158	pik_parserCTX_STORE
3159	}
3160
	@@ -3419,11 +3460,11 @@
3419	#else
3420	(void)iToken;
3421	return 0;
3422	#endif
3423	}
3424	#line 794 "pikchr.y"
3425
3426
3427
3428	/* Chart of the 148 official CSS color names with their
3429	** corresponding RGB values thru Color Module Level 4:
	@@ -7246,11 +7287,12 @@
7246	pik_append_num(p, " width=\"", p->wSVG);
7247	pik_append_num(p, "\" height=\"", p->hSVG);
7248	pik_append(p, "\"", 1);
7249	}
7250	pik_append_dis(p, " viewBox=\"0 0 ",w,"");
7251	pik_append_dis(p, " ",h,"\">\n");

7252	pik_elist_render(p, pList);
7253	pik_append(p,"</svg>\n", -1);
7254	}else{
7255	p->wSVG = -1;
7256	p->hSVG = -1;
	@@ -7330,10 +7372,11 @@
7330	{ "n", 1, T_EDGEPT, 0, CP_N },
7331	{ "ne", 2, T_EDGEPT, 0, CP_NE },
7332	{ "north", 5, T_EDGEPT, 0, CP_N },
7333	{ "nw", 2, T_EDGEPT, 0, CP_NW },
7334	{ "of", 2, T_OF, 0, 0 },

7335	{ "previous", 8, T_LAST, 0, 0, },
7336	{ "print", 5, T_PRINT, 0, 0 },
7337	{ "rad", 3, T_RADIUS, 0, 0 },
7338	{ "radius", 6, T_RADIUS, 0, 0 },
7339	{ "right", 5, T_RIGHT, DIR_RIGHT, CP_E },
	@@ -7913,15 +7956,30 @@
7913	#endif
7914	token.n = (unsigned short)(sz & 0xffff);
7915	if( p->nToken++ > PIKCHR_TOKEN_LIMIT ){
7916	pik_error(p, &token, "script is too complex");
7917	break;





7918	}
7919	pik_parser(pParser, token.eType, token);
7920	}
7921	}
7922	}










7923
7924	/*
7925	** Parse the PIKCHR script contained in zText[]. Return a rendering. Or
7926	** if an error is encountered, return the error text. The error message
7927	** is HTML formatted. So regardless of what happens, the return text
	@@ -8141,10 +8199,14 @@
8141	exit(1);
8142	}
8143	bSvgOnly = 1;
8144	mFlags \|= PIKCHR_PLAINTEXT_ERRORS;
8145	}else




8146	{
8147	fprintf(stderr,"unknown option: \"%s\"\n", argv[i]);
8148	usage(argv[0]);
8149	}
8150	continue;
	@@ -8253,6 +8315,6 @@
8253
8254
8255	#endif /* PIKCHR_TCL */
8256
8257
8258	#line 8283 "pikchr.c"
8259

	--- extsrc/pikchr.c
	+++ extsrc/pikchr.c
	@@ -1,8 +1,47 @@
1	/* This file is automatically generated by Lemon from input grammar
2	** source file "pikchr.y".
3	*/
4	/*
5	** 2000-05-29
6	**
7	** The author disclaims copyright to this source code. In place of
8	** a legal notice, here is a blessing:
9	**
10	** May you do good and not evil.
11	** May you find forgiveness for yourself and forgive others.
12	** May you share freely, never taking more than you give.
13	**
14	*************************************************************************
15	** Driver template for the LEMON parser generator.
16	**
17	** The "lemon" program processes an LALR(1) input grammar file, then uses
18	** this template to construct a parser. The "lemon" program inserts text
19	** at each "%%" line. Also, any "P-a-r-s-e" identifier prefix (without the
20	** interstitial "-" characters) contained in this template is changed into
21	** the value of the %name directive from the grammar. Otherwise, the content
22	** of this template is copied straight through into the generate parser
23	** source file.
24	**
25	** The following is the concatenation of all %include directives from the
26	** input grammar file:
27	*/
28	/********** Begin %include sections from the grammar **********************/
29	#line 1 "VERSION.h"
30	#define MANIFEST_UUID "052f07296e76ab2312caf2a4bf6237e574b3e533c7a36ee8f34db833baa3efb4"
31	#define MANIFEST_VERSION "[052f07296e]"
32	#define MANIFEST_DATE "2025-03-05 10:54:16"
33	#define MANIFEST_YEAR "2025"
34	#define MANIFEST_ISODATE "20250305105416"
35	#define MANIFEST_NUMERIC_DATE 20250305
36	#define MANIFEST_NUMERIC_TIME 105416
37	#define RELEASE_VERSION "1.0"
38	#define RELEASE_VERSION_NUMBER 10000
39	#define RELEASE_RESOURCE_VERSION 1,0,0,0
40	#define COMPILER "gcc-13.3.0"
41	#line 2 "pikchr.y"
42
43	/*
44	** Zero-Clause BSD license:
45	**
46	** Copyright (C) 2020-09-01 by D. Richard Hipp <[email protected]>
47	**
	@@ -504,11 +543,11 @@
543	static PObj pik_position_assert(Pik,PPoint,PToken,PPoint*);
544	static PNum pik_dist(PPoint,PPoint);
545	static void pik_add_macro(Pik,PToken pId,PToken *pCode);
546
547
548	#line 549 "pikchr.c"
549	/************** End of %include directives ********************************/
550	/* These constants specify the various numeric values for terminal symbols.
551	*************** Begin token definitions ***********************************/
552	#ifndef T_ID
553	#define T_ID 1
	@@ -534,84 +573,85 @@
573	#define T_COLOR 21
574	#define T_THICKNESS 22
575	#define T_PRINT 23
576	#define T_STRING 24
577	#define T_COMMA 25
578	#define T_ISODATE 26
579	#define T_CLASSNAME 27
580	#define T_LB 28
581	#define T_RB 29
582	#define T_UP 30
583	#define T_DOWN 31
584	#define T_LEFT 32
585	#define T_RIGHT 33
586	#define T_CLOSE 34
587	#define T_CHOP 35
588	#define T_FROM 36
589	#define T_TO 37
590	#define T_THEN 38
591	#define T_HEADING 39
592	#define T_GO 40
593	#define T_AT 41
594	#define T_WITH 42
595	#define T_SAME 43
596	#define T_AS 44
597	#define T_FIT 45
598	#define T_BEHIND 46
599	#define T_UNTIL 47
600	#define T_EVEN 48
601	#define T_DOT_E 49
602	#define T_HEIGHT 50
603	#define T_WIDTH 51
604	#define T_RADIUS 52
605	#define T_DIAMETER 53
606	#define T_DOTTED 54
607	#define T_DASHED 55
608	#define T_CW 56
609	#define T_CCW 57
610	#define T_LARROW 58
611	#define T_RARROW 59
612	#define T_LRARROW 60
613	#define T_INVIS 61
614	#define T_THICK 62
615	#define T_THIN 63
616	#define T_SOLID 64
617	#define T_CENTER 65
618	#define T_LJUST 66
619	#define T_RJUST 67
620	#define T_ABOVE 68
621	#define T_BELOW 69
622	#define T_ITALIC 70
623	#define T_BOLD 71
624	#define T_MONO 72
625	#define T_ALIGNED 73
626	#define T_BIG 74
627	#define T_SMALL 75
628	#define T_AND 76
629	#define T_LT 77
630	#define T_GT 78
631	#define T_ON 79
632	#define T_WAY 80
633	#define T_BETWEEN 81
634	#define T_THE 82
635	#define T_NTH 83
636	#define T_VERTEX 84
637	#define T_TOP 85
638	#define T_BOTTOM 86
639	#define T_START 87
640	#define T_END 88
641	#define T_IN 89
642	#define T_THIS 90
643	#define T_DOT_U 91
644	#define T_LAST 92
645	#define T_NUMBER 93
646	#define T_FUNC1 94
647	#define T_FUNC2 95
648	#define T_DIST 96
649	#define T_DOT_XY 97
650	#define T_X 98
651	#define T_Y 99
652	#define T_DOT_L 100
653	#endif
654	/************** End token definitions *************************************/
655
656	/* The next sections is a series of control #defines.
657	** various aspects of the generated parser.
	@@ -672,22 +712,22 @@
712	#ifndef INTERFACE
713	# define INTERFACE 1
714	#endif
715	/*********** Begin control #defines ***************************************/
716	#define YYCODETYPE unsigned char
717	#define YYNOCODE 138
718	#define YYACTIONTYPE unsigned short int
719	#define pik_parserTOKENTYPE PToken
720	typedef union {
721	int yyinit;
722	pik_parserTOKENTYPE yy0;
723	PList* yy23;
724	PRel yy28;
725	PObj* yy54;
726	PNum yy129;
727	PPoint yy187;
728	short int yy272;
729	} YYMINORTYPE;
730	#ifndef YYSTACKDEPTH
731	#define YYSTACKDEPTH 100
732	#endif
733	#define pik_parserARG_SDECL
	@@ -705,21 +745,21 @@
745	#define pik_parserCTX_STORE yypParser->p=p;
746	#define YYFALLBACK 1
747	#define YYNSTATE 164
748	#define YYNRULE 156
749	#define YYNRULE_WITH_ACTION 116
750	#define YYNTOKEN 101
751	#define YY_MAX_SHIFT 163
752	#define YY_MIN_SHIFTREDUCE 287
753	#define YY_MAX_SHIFTREDUCE 442
754	#define YY_ERROR_ACTION 443
755	#define YY_ACCEPT_ACTION 444
756	#define YY_NO_ACTION 445
757	#define YY_MIN_REDUCE 446
758	#define YY_MAX_REDUCE 601
759	#define YY_MIN_DSTRCTR 101
760	#define YY_MAX_DSTRCTR 104
761	/*********** End control #defines *****************************************/
762	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
763
764	/* Define the yytestcase() macro to be a no-op if is not already defined
765	** otherwise.
	@@ -798,324 +838,322 @@
838	** yy_reduce_ofst[] For each state, the offset into yy_action for
839	** shifting non-terminals after a reduce.
840	** yy_default[] Default action for each state.
841	**
842	********* Begin parsing tables ********************************************/
843	#define YY_ACTTAB_COUNT (1305)
844	static const YYACTIONTYPE yy_action[] = {
845	/* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
846	/* 10 */ 575, 64, 63, 62, 61, 453, 113, 120, 161, 119,
847	/* 20 */ 427, 428, 339, 357, 81, 121, 447, 454, 29, 575,
848	/* 30 */ 530, 13, 50, 450, 322, 323, 9, 8, 33, 149,
849	/* 40 */ 32, 7, 71, 127, 163, 335, 66, 28, 444, 27,
850	/* 50 */ 339, 339, 339, 339, 425, 426, 340, 341, 342, 343,
851	/* 60 */ 344, 345, 346, 347, 348, 474, 64, 63, 62, 61,
852	/* 70 */ 54, 51, 73, 306, 148, 474, 492, 161, 119, 297,
853	/* 80 */ 112, 113, 120, 161, 119, 427, 428, 339, 30, 81,
854	/* 90 */ 109, 447, 454, 29, 474, 528, 161, 119, 450, 322,
855	/* 100 */ 323, 9, 8, 33, 149, 32, 7, 71, 127, 163,
856	/* 110 */ 335, 66, 535, 36, 27, 339, 339, 339, 339, 425,
857	/* 120 */ 426, 340, 341, 342, 343, 344, 345, 346, 347, 348,
858	/* 130 */ 394, 435, 310, 59, 60, 64, 63, 62, 61, 313,
859	/* 140 */ 74, 376, 148, 69, 2, 533, 161, 119, 124, 113,
860	/* 150 */ 120, 161, 119, 80, 535, 31, 308, 79, 83, 107,
861	/* 160 */ 535, 441, 440, 535, 394, 435, 299, 59, 60, 120,
862	/* 170 */ 161, 119, 149, 463, 376, 376, 330, 84, 2, 122,
863	/* 180 */ 78, 78, 38, 156, 156, 156, 48, 37, 559, 328,
864	/* 190 */ 128, 152, 560, 561, 434, 441, 440, 350, 350, 350,
865	/* 200 */ 350, 350, 350, 350, 350, 350, 350, 350, 577, 77,
866	/* 210 */ 577, 35, 106, 46, 436, 437, 438, 439, 579, 375,
867	/* 220 */ 298, 117, 393, 155, 154, 153, 47, 4, 434, 69,
868	/* 230 */ 394, 435, 3, 59, 60, 411, 412, 413, 414, 398,
869	/* 240 */ 399, 376, 62, 61, 2, 108, 106, 5, 436, 437,
870	/* 250 */ 438, 439, 375, 375, 117, 117, 393, 155, 154, 153,
871	/* 260 */ 76, 441, 440, 67, 6, 142, 140, 64, 63, 62,
872	/* 270 */ 61, 380, 157, 424, 427, 428, 339, 379, 159, 45,
873	/* 280 */ 423, 72, 131, 148, 531, 161, 119, 1, 55, 125,
874	/* 290 */ 113, 120, 161, 119, 434, 147, 146, 64, 63, 62,
875	/* 300 */ 61, 397, 43, 11, 339, 339, 339, 339, 425, 426,
876	/* 310 */ 355, 65, 106, 149, 436, 437, 438, 439, 74, 375,
877	/* 320 */ 148, 117, 393, 155, 154, 153, 497, 113, 120, 161,
878	/* 330 */ 119, 22, 21, 12, 142, 140, 64, 63, 62, 61,
879	/* 340 */ 24, 356, 145, 141, 431, 64, 63, 62, 61, 391,
880	/* 350 */ 149, 448, 454, 29, 378, 158, 85, 55, 450, 394,
881	/* 360 */ 432, 138, 59, 60, 147, 146, 120, 161, 119, 163,
882	/* 370 */ 102, 43, 139, 42, 27, 430, 14, 15, 301, 302,
883	/* 380 */ 303, 446, 305, 16, 44, 74, 18, 148, 152, 19,
884	/* 390 */ 20, 36, 68, 496, 113, 120, 161, 119, 114, 359,
885	/* 400 */ 22, 21, 23, 142, 140, 64, 63, 62, 61, 24,
886	/* 410 */ 107, 145, 141, 431, 26, 57, 377, 149, 58, 118,
887	/* 420 */ 120, 161, 119, 392, 463, 384, 55, 64, 63, 62,
888	/* 430 */ 61, 382, 569, 147, 146, 160, 383, 435, 39, 70,
889	/* 440 */ 43, 106, 152, 445, 445, 88, 445, 445, 375, 445,
890	/* 450 */ 117, 393, 155, 154, 153, 120, 161, 119, 445, 17,
891	/* 460 */ 445, 10, 479, 479, 445, 445, 435, 441, 440, 22,
892	/* 470 */ 21, 445, 403, 64, 63, 62, 61, 152, 24, 445,
893	/* 480 */ 145, 141, 431, 133, 75, 126, 354, 445, 445, 123,
894	/* 490 */ 445, 404, 405, 406, 408, 80, 441, 440, 308, 79,
895	/* 500 */ 434, 411, 412, 413, 414, 394, 445, 445, 59, 60,
896	/* 510 */ 64, 63, 62, 61, 445, 445, 376, 445, 445, 42,
897	/* 520 */ 436, 437, 438, 439, 156, 156, 156, 394, 445, 434,
898	/* 530 */ 59, 60, 64, 63, 62, 61, 445, 445, 376, 445,
899	/* 540 */ 445, 42, 445, 394, 473, 391, 59, 60, 445, 436,
900	/* 550 */ 437, 438, 439, 49, 376, 445, 74, 42, 148, 445,
901	/* 560 */ 88, 445, 445, 445, 490, 113, 120, 161, 119, 445,
902	/* 570 */ 120, 161, 119, 132, 130, 394, 143, 475, 59, 60,
903	/* 580 */ 445, 473, 64, 63, 62, 61, 376, 106, 149, 42,
904	/* 590 */ 445, 445, 152, 445, 375, 391, 117, 393, 155, 154,
905	/* 600 */ 153, 394, 144, 52, 59, 60, 445, 445, 445, 106,
906	/* 610 */ 445, 445, 376, 445, 445, 42, 375, 445, 117, 393,
907	/* 620 */ 155, 154, 153, 445, 445, 106, 64, 63, 62, 61,
908	/* 630 */ 445, 445, 375, 445, 117, 393, 155, 154, 153, 394,
909	/* 640 */ 445, 445, 59, 60, 88, 445, 445, 53, 445, 445,
910	/* 650 */ 376, 445, 445, 42, 120, 161, 119, 106, 445, 445,
911	/* 660 */ 445, 110, 110, 445, 375, 445, 117, 393, 155, 154,
912	/* 670 */ 153, 394, 445, 445, 59, 60, 152, 107, 445, 445,
913	/* 680 */ 445, 445, 102, 106, 445, 42, 445, 120, 161, 119,
914	/* 690 */ 375, 451, 117, 393, 155, 154, 153, 394, 445, 445,
915	/* 700 */ 59, 60, 64, 63, 62, 61, 445, 445, 376, 152,
916	/* 710 */ 445, 40, 445, 394, 445, 396, 59, 60, 445, 445,
917	/* 720 */ 445, 106, 445, 445, 376, 88, 445, 41, 375, 445,
918	/* 730 */ 117, 393, 155, 154, 153, 120, 161, 119, 74, 445,
919	/* 740 */ 148, 445, 111, 111, 107, 445, 484, 113, 120, 161,
920	/* 750 */ 119, 445, 445, 106, 120, 161, 119, 152, 478, 445,
921	/* 760 */ 375, 86, 117, 393, 155, 154, 153, 445, 445, 445,
922	/* 770 */ 149, 120, 161, 119, 445, 445, 152, 445, 445, 106,
923	/* 780 */ 445, 64, 63, 62, 61, 445, 375, 445, 117, 393,
924	/* 790 */ 155, 154, 153, 152, 395, 106, 64, 63, 62, 61,
925	/* 800 */ 98, 445, 375, 445, 117, 393, 155, 154, 153, 445,
926	/* 810 */ 120, 161, 119, 445, 74, 445, 148, 56, 445, 74,
927	/* 820 */ 445, 148, 483, 113, 120, 161, 119, 480, 113, 120,
928	/* 830 */ 161, 119, 152, 74, 445, 148, 445, 89, 445, 445,
929	/* 840 */ 445, 134, 113, 120, 161, 119, 149, 120, 161, 119,
930	/* 850 */ 445, 149, 74, 445, 148, 445, 445, 445, 378, 158,
931	/* 860 */ 517, 113, 120, 161, 119, 149, 74, 445, 148, 152,
932	/* 870 */ 445, 74, 445, 148, 137, 113, 120, 161, 119, 525,
933	/* 880 */ 113, 120, 161, 119, 149, 74, 445, 148, 64, 63,
934	/* 890 */ 62, 61, 445, 527, 113, 120, 161, 119, 149, 445,
935	/* 900 */ 445, 391, 445, 149, 445, 445, 445, 445, 445, 445,
936	/* 910 */ 74, 445, 148, 445, 445, 162, 445, 149, 524, 113,
937	/* 920 */ 120, 161, 119, 118, 445, 74, 445, 148, 445, 445,
938	/* 930 */ 445, 445, 445, 526, 113, 120, 161, 119, 445, 74,
939	/* 940 */ 445, 148, 149, 445, 445, 445, 445, 523, 113, 120,
940	/* 950 */ 161, 119, 74, 445, 148, 445, 445, 149, 445, 445,
941	/* 960 */ 522, 113, 120, 161, 119, 445, 74, 445, 148, 445,
942	/* 970 */ 445, 149, 445, 445, 521, 113, 120, 161, 119, 74,
943	/* 980 */ 445, 148, 445, 445, 149, 445, 445, 520, 113, 120,
944	/* 990 */ 161, 119, 445, 74, 445, 148, 445, 445, 149, 445,
945	/* 1000 */ 445, 519, 113, 120, 161, 119, 445, 445, 445, 445,
946	/* 1010 */ 445, 149, 445, 445, 445, 445, 445, 445, 74, 445,
947	/* 1020 */ 148, 445, 445, 445, 445, 149, 150, 113, 120, 161,
948	/* 1030 */ 119, 74, 445, 148, 445, 445, 445, 445, 445, 151,
949	/* 1040 */ 113, 120, 161, 119, 445, 74, 445, 148, 445, 445,
950	/* 1050 */ 149, 445, 445, 136, 113, 120, 161, 119, 74, 445,
951	/* 1060 */ 148, 445, 445, 149, 445, 445, 135, 113, 120, 161,
952	/* 1070 */ 119, 445, 88, 445, 445, 445, 445, 149, 445, 445,
953	/* 1080 */ 445, 90, 120, 161, 119, 445, 445, 445, 445, 82,
954	/* 1090 */ 149, 120, 161, 119, 445, 87, 466, 445, 34, 99,
955	/* 1100 */ 445, 445, 445, 445, 152, 120, 161, 119, 100, 120,
956	/* 1110 */ 161, 119, 445, 152, 445, 445, 445, 445, 120, 161,
957	/* 1120 */ 119, 445, 445, 445, 101, 445, 445, 152, 445, 445,
958	/* 1130 */ 445, 152, 91, 445, 120, 161, 119, 103, 445, 445,
959	/* 1140 */ 152, 445, 120, 161, 119, 445, 445, 120, 161, 119,
960	/* 1150 */ 445, 92, 445, 445, 445, 445, 152, 445, 445, 445,
961	/* 1160 */ 93, 120, 161, 119, 152, 445, 104, 445, 445, 152,
962	/* 1170 */ 120, 161, 119, 445, 94, 445, 120, 161, 119, 445,
963	/* 1180 */ 445, 445, 445, 152, 120, 161, 119, 445, 445, 105,
964	/* 1190 */ 445, 445, 152, 445, 445, 445, 445, 95, 152, 120,
965	/* 1200 */ 161, 119, 96, 445, 445, 97, 152, 120, 161, 119,
966	/* 1210 */ 445, 445, 120, 161, 119, 120, 161, 119, 445, 445,
967	/* 1220 */ 445, 152, 445, 445, 445, 445, 445, 445, 445, 152,
968	/* 1230 */ 549, 445, 445, 548, 152, 445, 445, 152, 547, 445,
969	/* 1240 */ 120, 161, 119, 120, 161, 119, 546, 445, 120, 161,
970	/* 1250 */ 119, 445, 445, 445, 445, 445, 120, 161, 119, 445,
971	/* 1260 */ 445, 445, 152, 445, 445, 152, 445, 445, 445, 115,
972	/* 1270 */ 152, 445, 116, 445, 445, 445, 445, 445, 152, 120,
973	/* 1280 */ 161, 119, 120, 161, 119, 445, 445, 445, 445, 445,
974	/* 1290 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
975	/* 1300 */ 445, 152, 445, 445, 152,

976	};
977	static const YYCODETYPE yy_lookahead[] = {
978	/* 0 */ 0, 115, 116, 117, 136, 103, 104, 105, 107, 107,
979	/* 10 */ 10, 4, 5, 6, 7, 113, 114, 115, 116, 117,
980	/* 20 */ 20, 21, 22, 17, 24, 101, 102, 103, 104, 29,
981	/* 30 */ 107, 25, 25, 109, 34, 35, 36, 37, 38, 137,
982	/* 40 */ 40, 41, 42, 43, 120, 45, 46, 109, 124, 125,
983	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
984	/* 60 */ 60, 61, 62, 63, 64, 0, 4, 5, 6, 7,
985	/* 70 */ 4, 5, 105, 25, 107, 10, 115, 116, 117, 17,
986	/* 80 */ 113, 114, 115, 116, 117, 20, 21, 22, 128, 24,
987	/* 90 */ 101, 102, 103, 104, 29, 115, 116, 117, 109, 34,
988	/* 100 */ 35, 36, 37, 38, 137, 40, 41, 42, 43, 120,
989	/* 110 */ 45, 46, 49, 10, 125, 50, 51, 52, 53, 54,
990	/* 120 */ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
991	/* 130 */ 1, 2, 29, 4, 5, 4, 5, 6, 7, 8,
992	/* 140 */ 105, 12, 107, 3, 15, 115, 116, 117, 113, 114,
993	/* 150 */ 115, 116, 117, 24, 91, 130, 27, 28, 118, 105,
994	/* 160 */ 97, 32, 33, 100, 1, 2, 19, 4, 5, 115,
995	/* 170 */ 116, 117, 137, 119, 12, 12, 2, 118, 15, 1,
996	/* 180 */ 126, 127, 106, 20, 21, 22, 110, 111, 106, 2,
997	/* 190 */ 107, 137, 110, 111, 65, 32, 33, 65, 66, 67,
998	/* 200 */ 68, 69, 70, 71, 72, 73, 74, 75, 132, 133,
999	/* 210 */ 134, 131, 83, 39, 85, 86, 87, 88, 135, 90,
1000	/* 220 */ 17, 92, 93, 94, 95, 96, 39, 15, 65, 89,
1001	/* 230 */ 1, 2, 16, 4, 5, 30, 31, 32, 33, 98,
1002	/* 240 */ 99, 12, 6, 7, 15, 83, 83, 41, 85, 86,
1003	/* 250 */ 87, 88, 90, 90, 92, 92, 93, 94, 95, 96,
1004	/* 260 */ 49, 32, 33, 44, 41, 2, 3, 4, 5, 6,
1005	/* 270 */ 7, 27, 28, 42, 20, 21, 22, 27, 28, 16,
1006	/* 280 */ 42, 105, 48, 107, 115, 116, 117, 13, 25, 113,
1007	/* 290 */ 114, 115, 116, 117, 65, 32, 33, 4, 5, 6,
1008	/* 300 */ 7, 17, 39, 25, 50, 51, 52, 53, 54, 55,
1009	/* 310 */ 17, 100, 83, 137, 85, 86, 87, 88, 105, 90,
1010	/* 320 */ 107, 92, 93, 94, 95, 96, 113, 114, 115, 116,
1011	/* 330 */ 117, 68, 69, 76, 2, 3, 4, 5, 6, 7,
1012	/* 340 */ 77, 17, 79, 80, 81, 4, 5, 6, 7, 17,
1013	/* 350 */ 137, 102, 103, 104, 27, 28, 105, 25, 109, 1,
1014	/* 360 */ 81, 80, 4, 5, 32, 33, 115, 116, 117, 120,
1015	/* 370 */ 12, 39, 82, 15, 125, 81, 3, 36, 20, 21,
1016	/* 380 */ 22, 0, 24, 3, 39, 105, 3, 107, 137, 3,
1017	/* 390 */ 3, 10, 3, 113, 114, 115, 116, 117, 97, 78,
1018	/* 400 */ 68, 69, 25, 2, 3, 4, 5, 6, 7, 77,
1019	/* 410 */ 105, 79, 80, 81, 15, 15, 12, 137, 15, 92,
1020	/* 420 */ 115, 116, 117, 17, 119, 29, 25, 4, 5, 6,
1021	/* 430 */ 7, 29, 127, 32, 33, 91, 29, 2, 11, 3,
1022	/* 440 */ 39, 83, 137, 138, 138, 105, 138, 138, 90, 138,
1023	/* 450 */ 92, 93, 94, 95, 96, 115, 116, 117, 138, 36,
1024	/* 460 */ 138, 121, 122, 123, 138, 138, 2, 32, 33, 68,
1025	/* 470 */ 69, 138, 1, 4, 5, 6, 7, 137, 77, 138,
1026	/* 480 */ 79, 80, 81, 12, 49, 14, 17, 138, 138, 18,
1027	/* 490 */ 138, 20, 21, 22, 23, 24, 32, 33, 27, 28,
1028	/* 500 */ 65, 30, 31, 32, 33, 1, 138, 138, 4, 5,
1029	/* 510 */ 4, 5, 6, 7, 138, 138, 12, 138, 138, 15,
1030	/* 520 */ 85, 86, 87, 88, 20, 21, 22, 1, 138, 65,
1031	/* 530 */ 4, 5, 4, 5, 6, 7, 138, 138, 12, 138,
1032	/* 540 */ 138, 15, 138, 1, 2, 17, 4, 5, 138, 85,
1033	/* 550 */ 86, 87, 88, 25, 12, 138, 105, 15, 107, 138,
1034	/* 560 */ 105, 138, 138, 138, 113, 114, 115, 116, 117, 138,
1035	/* 570 */ 115, 116, 117, 47, 48, 1, 2, 122, 4, 5,
1036	/* 580 */ 138, 39, 4, 5, 6, 7, 12, 83, 137, 15,
1037	/* 590 */ 138, 138, 137, 138, 90, 17, 92, 93, 94, 95,
1038	/* 600 */ 96, 1, 2, 25, 4, 5, 138, 138, 138, 83,
1039	/* 610 */ 138, 138, 12, 138, 138, 15, 90, 138, 92, 93,
1040	/* 620 */ 94, 95, 96, 138, 138, 83, 4, 5, 6, 7,
1041	/* 630 */ 138, 138, 90, 138, 92, 93, 94, 95, 96, 1,
1042	/* 640 */ 138, 138, 4, 5, 105, 138, 138, 25, 138, 138,
1043	/* 650 */ 12, 138, 138, 15, 115, 116, 117, 83, 138, 138,
1044	/* 660 */ 138, 122, 123, 138, 90, 138, 92, 93, 94, 95,
1045	/* 670 */ 96, 1, 138, 138, 4, 5, 137, 105, 138, 138,
1046	/* 680 */ 138, 138, 12, 83, 138, 15, 138, 115, 116, 117,
1047	/* 690 */ 90, 119, 92, 93, 94, 95, 96, 1, 138, 138,
1048	/* 700 */ 4, 5, 4, 5, 6, 7, 138, 138, 12, 137,
1049	/* 710 */ 138, 15, 138, 1, 138, 17, 4, 5, 138, 138,
1050	/* 720 */ 138, 83, 138, 138, 12, 105, 138, 15, 90, 138,
1051	/* 730 */ 92, 93, 94, 95, 96, 115, 116, 117, 105, 138,
1052	/* 740 */ 107, 138, 122, 123, 105, 138, 113, 114, 115, 116,
1053	/* 750 */ 117, 138, 138, 83, 115, 116, 117, 137, 119, 138,
1054	/* 760 */ 90, 105, 92, 93, 94, 95, 96, 138, 138, 138,
1055	/* 770 */ 137, 115, 116, 117, 138, 138, 137, 138, 138, 83,
1056	/* 780 */ 138, 4, 5, 6, 7, 138, 90, 138, 92, 93,
1057	/* 790 */ 94, 95, 96, 137, 17, 83, 4, 5, 6, 7,
1058	/* 800 */ 105, 138, 90, 138, 92, 93, 94, 95, 96, 138,
1059	/* 810 */ 115, 116, 117, 138, 105, 138, 107, 25, 138, 105,
1060	/* 820 */ 138, 107, 113, 114, 115, 116, 117, 113, 114, 115,
1061	/* 830 */ 116, 117, 137, 105, 138, 107, 138, 105, 138, 138,
1062	/* 840 */ 138, 113, 114, 115, 116, 117, 137, 115, 116, 117,
1063	/* 850 */ 138, 137, 105, 138, 107, 138, 138, 138, 27, 28,
1064	/* 860 */ 113, 114, 115, 116, 117, 137, 105, 138, 107, 137,
1065	/* 870 */ 138, 105, 138, 107, 113, 114, 115, 116, 117, 113,
1066	/* 880 */ 114, 115, 116, 117, 137, 105, 138, 107, 4, 5,
1067	/* 890 */ 6, 7, 138, 113, 114, 115, 116, 117, 137, 138,
1068	/* 900 */ 138, 17, 138, 137, 138, 138, 138, 138, 138, 138,
1069	/* 910 */ 105, 138, 107, 138, 138, 84, 138, 137, 113, 114,
1070	/* 920 */ 115, 116, 117, 92, 138, 105, 138, 107, 138, 138,
1071	/* 930 */ 138, 138, 138, 113, 114, 115, 116, 117, 138, 105,
1072	/* 940 */ 138, 107, 137, 138, 138, 138, 138, 113, 114, 115,
1073	/* 950 */ 116, 117, 105, 138, 107, 138, 138, 137, 138, 138,
1074	/* 960 */ 113, 114, 115, 116, 117, 138, 105, 138, 107, 138,
1075	/* 970 */ 138, 137, 138, 138, 113, 114, 115, 116, 117, 105,
1076	/* 980 */ 138, 107, 138, 138, 137, 138, 138, 113, 114, 115,
1077	/* 990 */ 116, 117, 138, 105, 138, 107, 138, 138, 137, 138,
1078	/* 1000 */ 138, 113, 114, 115, 116, 117, 138, 138, 138, 138,
1079	/* 1010 */ 138, 137, 138, 138, 138, 138, 138, 138, 105, 138,
1080	/* 1020 */ 107, 138, 138, 138, 138, 137, 113, 114, 115, 116,
1081	/* 1030 */ 117, 105, 138, 107, 138, 138, 138, 138, 138, 113,
1082	/* 1040 */ 114, 115, 116, 117, 138, 105, 138, 107, 138, 138,
1083	/* 1050 */ 137, 138, 138, 113, 114, 115, 116, 117, 105, 138,
1084	/* 1060 */ 107, 138, 138, 137, 138, 138, 113, 114, 115, 116,
1085	/* 1070 */ 117, 138, 105, 138, 138, 138, 138, 137, 138, 138,
1086	/* 1080 */ 138, 105, 115, 116, 117, 138, 138, 138, 138, 122,
1087	/* 1090 */ 137, 115, 116, 117, 138, 105, 129, 138, 131, 105,
1088	/* 1100 */ 138, 138, 138, 138, 137, 115, 116, 117, 105, 115,
1089	/* 1110 */ 116, 117, 138, 137, 138, 138, 138, 138, 115, 116,
1090	/* 1120 */ 117, 138, 138, 138, 105, 138, 138, 137, 138, 138,
1091	/* 1130 */ 138, 137, 105, 138, 115, 116, 117, 105, 138, 138,
1092	/* 1140 */ 137, 138, 115, 116, 117, 138, 138, 115, 116, 117,
1093	/* 1150 */ 138, 105, 138, 138, 138, 138, 137, 138, 138, 138,
1094	/* 1160 */ 105, 115, 116, 117, 137, 138, 105, 138, 138, 137,
1095	/* 1170 */ 115, 116, 117, 138, 105, 138, 115, 116, 117, 138,
1096	/* 1180 */ 138, 138, 138, 137, 115, 116, 117, 138, 138, 105,
1097	/* 1190 */ 138, 138, 137, 138, 138, 138, 138, 105, 137, 115,
1098	/* 1200 */ 116, 117, 105, 138, 138, 105, 137, 115, 116, 117,
1099	/* 1210 */ 138, 138, 115, 116, 117, 115, 116, 117, 138, 138,
1100	/* 1220 */ 138, 137, 138, 138, 138, 138, 138, 138, 138, 137,
1101	/* 1230 */ 105, 138, 138, 105, 137, 138, 138, 137, 105, 138,
1102	/* 1240 */ 115, 116, 117, 115, 116, 117, 105, 138, 115, 116,
1103	/* 1250 */ 117, 138, 138, 138, 138, 138, 115, 116, 117, 138,
1104	/* 1260 */ 138, 138, 137, 138, 138, 137, 138, 138, 138, 105,
1105	/* 1270 */ 137, 138, 105, 138, 138, 138, 138, 138, 137, 115,
1106	/* 1280 */ 116, 117, 115, 116, 117, 138, 138, 138, 138, 138,
1107	/* 1290 */ 138, 138, 138, 138, 138, 138, 138, 138, 138, 138,
1108	/* 1300 */ 138, 137, 138, 138, 137, 101, 101, 101, 101, 101,
1109	/* 1310 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1110	/* 1320 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1111	/* 1330 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1112	/* 1340 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1113	/* 1350 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1114	/* 1360 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1115	/* 1370 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1116	/* 1380 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1117	/* 1390 */ 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
1118	/* 1400 */ 101, 101, 101, 101, 101, 101,

1119	};
1120	#define YY_SHIFT_COUNT (163)
1121	#define YY_SHIFT_MIN (0)
1122	#define YY_SHIFT_MAX (884)
1123	static const unsigned short int yy_shift_ofst[] = {
1124	/* 0 */ 471, 129, 163, 229, 229, 229, 229, 229, 229, 229,
1125	/* 10 */ 229, 229, 229, 229, 229, 229, 229, 229, 229, 229,
1126	/* 20 */ 229, 229, 229, 229, 229, 229, 229, 358, 526, 638,
1127	/* 30 */ 358, 471, 542, 542, 0, 65, 471, 670, 638, 670,
1128	/* 40 */ 504, 504, 504, 574, 600, 638, 638, 638, 638, 638,
1129	/* 50 */ 638, 696, 638, 638, 712, 638, 638, 638, 638, 638,
1130	/* 60 */ 638, 638, 638, 638, 638, 254, 162, 162, 162, 162,
1131	/* 70 */ 162, 435, 263, 332, 401, 464, 464, 205, 48, 1305,
1132	/* 80 */ 1305, 1305, 1305, 132, 132, 528, 578, 62, 131, 341,
1133	/* 90 */ 423, 293, 7, 469, 622, 698, 792, 777, 884, 506,
1134	/* 100 */ 506, 506, 63, 506, 506, 506, 831, 506, 327, 103,
1135	/* 110 */ 174, 187, 6, 66, 141, 236, 236, 244, 250, 140,
1136	/* 120 */ 211, 381, 147, 178, 203, 216, 212, 219, 206, 223,
1137	/* 130 */ 231, 238, 234, 274, 284, 278, 257, 324, 279, 281,
1138	/* 140 */ 290, 294, 373, 380, 383, 345, 386, 387, 389, 301,
1139	/* 150 */ 321, 377, 301, 399, 400, 403, 406, 396, 402, 407,
1140	/* 160 */ 404, 344, 436, 427,
1141	};
1142	#define YY_REDUCE_COUNT (82)
1143	#define YY_REDUCE_MIN (-132)
1144	#define YY_REDUCE_MAX (1167)
1145	static const short yy_reduce_ofst[] = {
1146	/* 0 */ -76, -98, -33, 35, 176, 213, 280, 451, 633, 709,
1147	/* 10 */ 714, 728, 747, 761, 766, 780, 805, 820, 834, 847,
1148	/* 20 */ 861, 874, 888, 913, 926, 940, 953, 54, 340, 967,
1149	/* 30 */ 305, -11, 539, 620, 76, 76, 249, 639, 455, 572,
1150	/* 40 */ 251, 656, 695, 732, 976, 990, 994, 1003, 1019, 1027,
1151	/* 50 */ 1032, 1046, 1055, 1061, 1069, 1084, 1092, 1097, 1100, 1125,
1152	/* 60 */ 1128, 1133, 1141, 1164, 1167, 82, -114, -39, -20, 30,
1153	/* 70 */ 169, 83, -132, -132, -132, -99, -77, -62, -40, 25,
1154	/* 80 */ 40, 59, 80,
1155	};
1156	static const YYACTIONTYPE yy_default[] = {
1157	/* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1158	/* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1159	/* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
	@@ -1176,10 +1214,11 @@
1214	0, /* COLOR => nothing */
1215	0, /* THICKNESS => nothing */
1216	0, /* PRINT => nothing */
1217	0, /* STRING => nothing */
1218	0, /* COMMA => nothing */
1219	0, /* ISODATE => nothing */
1220	0, /* CLASSNAME => nothing */
1221	0, /* LB => nothing */
1222	0, /* RB => nothing */
1223	0, /* UP => nothing */
1224	0, /* DOWN => nothing */
	@@ -1359,120 +1398,122 @@
1398	/* 21 */ "COLOR",
1399	/* 22 */ "THICKNESS",
1400	/* 23 */ "PRINT",
1401	/* 24 */ "STRING",
1402	/* 25 */ "COMMA",
1403	/* 26 */ "ISODATE",
1404	/* 27 */ "CLASSNAME",
1405	/* 28 */ "LB",
1406	/* 29 */ "RB",
1407	/* 30 */ "UP",
1408	/* 31 */ "DOWN",
1409	/* 32 */ "LEFT",
1410	/* 33 */ "RIGHT",
1411	/* 34 */ "CLOSE",
1412	/* 35 */ "CHOP",
1413	/* 36 */ "FROM",
1414	/* 37 */ "TO",
1415	/* 38 */ "THEN",
1416	/* 39 */ "HEADING",
1417	/* 40 */ "GO",
1418	/* 41 */ "AT",
1419	/* 42 */ "WITH",
1420	/* 43 */ "SAME",
1421	/* 44 */ "AS",
1422	/* 45 */ "FIT",
1423	/* 46 */ "BEHIND",
1424	/* 47 */ "UNTIL",
1425	/* 48 */ "EVEN",
1426	/* 49 */ "DOT_E",
1427	/* 50 */ "HEIGHT",
1428	/* 51 */ "WIDTH",
1429	/* 52 */ "RADIUS",
1430	/* 53 */ "DIAMETER",
1431	/* 54 */ "DOTTED",
1432	/* 55 */ "DASHED",
1433	/* 56 */ "CW",
1434	/* 57 */ "CCW",
1435	/* 58 */ "LARROW",
1436	/* 59 */ "RARROW",
1437	/* 60 */ "LRARROW",
1438	/* 61 */ "INVIS",
1439	/* 62 */ "THICK",
1440	/* 63 */ "THIN",
1441	/* 64 */ "SOLID",
1442	/* 65 */ "CENTER",
1443	/* 66 */ "LJUST",
1444	/* 67 */ "RJUST",
1445	/* 68 */ "ABOVE",
1446	/* 69 */ "BELOW",
1447	/* 70 */ "ITALIC",
1448	/* 71 */ "BOLD",
1449	/* 72 */ "MONO",
1450	/* 73 */ "ALIGNED",
1451	/* 74 */ "BIG",
1452	/* 75 */ "SMALL",
1453	/* 76 */ "AND",
1454	/* 77 */ "LT",
1455	/* 78 */ "GT",
1456	/* 79 */ "ON",
1457	/* 80 */ "WAY",
1458	/* 81 */ "BETWEEN",
1459	/* 82 */ "THE",
1460	/* 83 */ "NTH",
1461	/* 84 */ "VERTEX",
1462	/* 85 */ "TOP",
1463	/* 86 */ "BOTTOM",
1464	/* 87 */ "START",
1465	/* 88 */ "END",
1466	/* 89 */ "IN",
1467	/* 90 */ "THIS",
1468	/* 91 */ "DOT_U",
1469	/* 92 */ "LAST",
1470	/* 93 */ "NUMBER",
1471	/* 94 */ "FUNC1",
1472	/* 95 */ "FUNC2",
1473	/* 96 */ "DIST",
1474	/* 97 */ "DOT_XY",
1475	/* 98 */ "X",
1476	/* 99 */ "Y",
1477	/* 100 */ "DOT_L",
1478	/* 101 */ "statement_list",
1479	/* 102 */ "statement",
1480	/* 103 */ "unnamed_statement",
1481	/* 104 */ "basetype",
1482	/* 105 */ "expr",
1483	/* 106 */ "numproperty",
1484	/* 107 */ "edge",
1485	/* 108 */ "isodate",
1486	/* 109 */ "direction",
1487	/* 110 */ "dashproperty",
1488	/* 111 */ "colorproperty",
1489	/* 112 */ "locproperty",
1490	/* 113 */ "position",
1491	/* 114 */ "place",
1492	/* 115 */ "object",
1493	/* 116 */ "objectname",
1494	/* 117 */ "nth",
1495	/* 118 */ "textposition",
1496	/* 119 */ "rvalue",
1497	/* 120 */ "lvalue",
1498	/* 121 */ "even",
1499	/* 122 */ "relexpr",
1500	/* 123 */ "optrelexpr",
1501	/* 124 */ "document",
1502	/* 125 */ "print",
1503	/* 126 */ "prlist",
1504	/* 127 */ "pritem",
1505	/* 128 */ "prsep",
1506	/* 129 */ "attribute_list",
1507	/* 130 */ "savelist",
1508	/* 131 */ "alist",
1509	/* 132 */ "attribute",
1510	/* 133 */ "go",
1511	/* 134 */ "boolproperty",
1512	/* 135 */ "withclause",
1513	/* 136 */ "between",
1514	/* 137 */ "place2",
1515	};
1516	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1517
1518	#ifndef NDEBUG
1519	/* For tracing reduce actions, the names of all rules are required.
	@@ -1755,24 +1796,24 @@
1796	** Note: during a reduce, the only symbols destroyed are those
1797	** which appear on the RHS of the rule, but which are not used
1798	** inside the C code.
1799	*/
1800	/******* Begin destructor definitions *************************************/
1801	case 101: /* statement_list */
1802	{
1803	#line 524 "pikchr.y"
1804	pik_elist_free(p,(yypminor->yy23));
1805	#line 1805 "pikchr.c"
1806	}
1807	break;
1808	case 102: /* statement */
1809	case 103: /* unnamed_statement */
1810	case 104: /* basetype */
1811	{
1812	#line 526 "pikchr.y"
1813	pik_elem_free(p,(yypminor->yy54));
1814	#line 1814 "pikchr.c"
1815	}
1816	break;
1817	/******* End destructor definitions ***************************************/
1818	default: break; /* If no destructor action specified: do nothing */
1819	}
	@@ -2003,14 +2044,14 @@
2044	#endif
2045	while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser);
2046	/* Here code is inserted which will execute if the parser
2047	** stack every overflows */
2048	/****** Begin %stack_overflow code ****************************************/
2049	#line 559 "pikchr.y"
2050
2051	pik_error(p, 0, "parser stack overflow");
2052	#line 2052 "pikchr.c"
2053	/****** End %stack_overflow code ******************************************/
2054	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
2055	pik_parserCTX_STORE
2056	}
2057
	@@ -2072,166 +2113,166 @@
2113	}
2114
2115	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
2116	** of that rule */
2117	static const YYCODETYPE yyRuleInfoLhs[] = {
2118	124, /* (0) document ::= statement_list */
2119	101, /* (1) statement_list ::= statement */
2120	101, /* (2) statement_list ::= statement_list EOL statement */
2121	102, /* (3) statement ::= */
2122	102, /* (4) statement ::= direction */
2123	102, /* (5) statement ::= lvalue ASSIGN rvalue */
2124	102, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2125	102, /* (7) statement ::= PLACENAME COLON position */
2126	102, /* (8) statement ::= unnamed_statement */
2127	102, /* (9) statement ::= print prlist */
2128	102, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2129	102, /* (11) statement ::= ASSERT LP position EQ position RP */
2130	102, /* (12) statement ::= DEFINE ID CODEBLOCK */
2131	119, /* (13) rvalue ::= PLACENAME */
2132	127, /* (14) pritem ::= FILL */
2133	127, /* (15) pritem ::= COLOR */
2134	127, /* (16) pritem ::= THICKNESS */
2135	127, /* (17) pritem ::= rvalue */
2136	127, /* (18) pritem ::= STRING */
2137	128, /* (19) prsep ::= COMMA */
2138	103, /* (20) unnamed_statement ::= basetype attribute_list */
2139	104, /* (21) basetype ::= CLASSNAME */
2140	104, /* (22) basetype ::= STRING textposition */
2141	104, /* (23) basetype ::= LB savelist statement_list RB */
2142	130, /* (24) savelist ::= */
2143	122, /* (25) relexpr ::= expr */
2144	122, /* (26) relexpr ::= expr PERCENT */
2145	123, /* (27) optrelexpr ::= */
2146	129, /* (28) attribute_list ::= relexpr alist */
2147	132, /* (29) attribute ::= numproperty relexpr */
2148	132, /* (30) attribute ::= dashproperty expr */
2149	132, /* (31) attribute ::= dashproperty */
2150	132, /* (32) attribute ::= colorproperty rvalue */
2151	132, /* (33) attribute ::= go direction optrelexpr */
2152	132, /* (34) attribute ::= go direction even position */
2153	132, /* (35) attribute ::= CLOSE */
2154	132, /* (36) attribute ::= CHOP */
2155	132, /* (37) attribute ::= FROM position */
2156	132, /* (38) attribute ::= TO position */
2157	132, /* (39) attribute ::= THEN */
2158	132, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2159	132, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2160	132, /* (42) attribute ::= GO optrelexpr HEADING expr */
2161	132, /* (43) attribute ::= GO optrelexpr EDGEPT */
2162	132, /* (44) attribute ::= AT position */
2163	132, /* (45) attribute ::= SAME */
2164	132, /* (46) attribute ::= SAME AS object */
2165	132, /* (47) attribute ::= STRING textposition */
2166	132, /* (48) attribute ::= FIT */
2167	132, /* (49) attribute ::= BEHIND object */
2168	135, /* (50) withclause ::= DOT_E edge AT position */
2169	135, /* (51) withclause ::= edge AT position */
2170	106, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2171	134, /* (53) boolproperty ::= CW */
2172	134, /* (54) boolproperty ::= CCW */
2173	134, /* (55) boolproperty ::= LARROW */
2174	134, /* (56) boolproperty ::= RARROW */
2175	134, /* (57) boolproperty ::= LRARROW */
2176	134, /* (58) boolproperty ::= INVIS */
2177	134, /* (59) boolproperty ::= THICK */
2178	134, /* (60) boolproperty ::= THIN */
2179	134, /* (61) boolproperty ::= SOLID */
2180	118, /* (62) textposition ::= */
2181	118, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
2182	113, /* (64) position ::= expr COMMA expr */
2183	113, /* (65) position ::= place PLUS expr COMMA expr */
2184	113, /* (66) position ::= place MINUS expr COMMA expr */
2185	113, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2186	113, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2187	113, /* (69) position ::= LP position COMMA position RP */
2188	113, /* (70) position ::= LP position RP */
2189	113, /* (71) position ::= expr between position AND position */
2190	113, /* (72) position ::= expr LT position COMMA position GT */
2191	113, /* (73) position ::= expr ABOVE position */
2192	113, /* (74) position ::= expr BELOW position */
2193	113, /* (75) position ::= expr LEFT OF position */
2194	113, /* (76) position ::= expr RIGHT OF position */
2195	113, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2196	113, /* (78) position ::= expr HEADING EDGEPT OF position */
2197	113, /* (79) position ::= expr EDGEPT OF position */
2198	113, /* (80) position ::= expr ON HEADING expr FROM position */
2199	113, /* (81) position ::= expr HEADING expr FROM position */
2200	114, /* (82) place ::= edge OF object */
2201	137, /* (83) place2 ::= object */
2202	137, /* (84) place2 ::= object DOT_E edge */
2203	137, /* (85) place2 ::= NTH VERTEX OF object */
2204	115, /* (86) object ::= nth */
2205	115, /* (87) object ::= nth OF\|IN object */
2206	116, /* (88) objectname ::= THIS */
2207	116, /* (89) objectname ::= PLACENAME */
2208	116, /* (90) objectname ::= objectname DOT_U PLACENAME */
2209	117, /* (91) nth ::= NTH CLASSNAME */
2210	117, /* (92) nth ::= NTH LAST CLASSNAME */
2211	117, /* (93) nth ::= LAST CLASSNAME */
2212	117, /* (94) nth ::= LAST */
2213	117, /* (95) nth ::= NTH LB RB */
2214	117, /* (96) nth ::= NTH LAST LB RB */
2215	117, /* (97) nth ::= LAST LB RB */
2216	105, /* (98) expr ::= expr PLUS expr */
2217	105, /* (99) expr ::= expr MINUS expr */
2218	105, /* (100) expr ::= expr STAR expr */
2219	105, /* (101) expr ::= expr SLASH expr */
2220	105, /* (102) expr ::= MINUS expr */
2221	105, /* (103) expr ::= PLUS expr */
2222	105, /* (104) expr ::= LP expr RP */
2223	105, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2224	105, /* (106) expr ::= NUMBER */
2225	105, /* (107) expr ::= ID */
2226	105, /* (108) expr ::= FUNC1 LP expr RP */
2227	105, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2228	105, /* (110) expr ::= DIST LP position COMMA position RP */
2229	105, /* (111) expr ::= place2 DOT_XY X */
2230	105, /* (112) expr ::= place2 DOT_XY Y */
2231	105, /* (113) expr ::= object DOT_L numproperty */
2232	105, /* (114) expr ::= object DOT_L dashproperty */
2233	105, /* (115) expr ::= object DOT_L colorproperty */
2234	120, /* (116) lvalue ::= ID */
2235	120, /* (117) lvalue ::= FILL */
2236	120, /* (118) lvalue ::= COLOR */
2237	120, /* (119) lvalue ::= THICKNESS */
2238	119, /* (120) rvalue ::= expr */
2239	125, /* (121) print ::= PRINT */
2240	126, /* (122) prlist ::= pritem */
2241	126, /* (123) prlist ::= prlist prsep pritem */
2242	109, /* (124) direction ::= UP */
2243	109, /* (125) direction ::= DOWN */
2244	109, /* (126) direction ::= LEFT */
2245	109, /* (127) direction ::= RIGHT */
2246	123, /* (128) optrelexpr ::= relexpr */
2247	129, /* (129) attribute_list ::= alist */
2248	131, /* (130) alist ::= */
2249	131, /* (131) alist ::= alist attribute */
2250	132, /* (132) attribute ::= boolproperty */
2251	132, /* (133) attribute ::= WITH withclause */
2252	133, /* (134) go ::= GO */
2253	133, /* (135) go ::= */
2254	121, /* (136) even ::= UNTIL EVEN WITH */
2255	121, /* (137) even ::= EVEN WITH */
2256	110, /* (138) dashproperty ::= DOTTED */
2257	110, /* (139) dashproperty ::= DASHED */
2258	111, /* (140) colorproperty ::= FILL */
2259	111, /* (141) colorproperty ::= COLOR */
2260	113, /* (142) position ::= place */
2261	136, /* (143) between ::= WAY BETWEEN */
2262	136, /* (144) between ::= BETWEEN */
2263	136, /* (145) between ::= OF THE WAY BETWEEN */
2264	114, /* (146) place ::= place2 */
2265	107, /* (147) edge ::= CENTER */
2266	107, /* (148) edge ::= EDGEPT */
2267	107, /* (149) edge ::= TOP */
2268	107, /* (150) edge ::= BOTTOM */
2269	107, /* (151) edge ::= START */
2270	107, /* (152) edge ::= END */
2271	107, /* (153) edge ::= RIGHT */
2272	107, /* (154) edge ::= LEFT */
2273	115, /* (155) object ::= objectname */
2274	};
2275
2276	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2277	** of symbols on the right-hand side of that rule. */
2278	static const signed char yyRuleInfoNRhs[] = {
	@@ -2431,620 +2472,620 @@
2472	** break;
2473	*/
2474	/******** Begin reduce actions ********************************************/
2475	YYMINORTYPE yylhsminor;
2476	case 0: /* document ::= statement_list */
2477	#line 563 "pikchr.y"
2478	{pik_render(p,yymsp[0].minor.yy23);}
2479	#line 2479 "pikchr.c"
2480	break;
2481	case 1: /* statement_list ::= statement */
2482	#line 566 "pikchr.y"
2483	{ yylhsminor.yy23 = pik_elist_append(p,0,yymsp[0].minor.yy54); }
2484	#line 2484 "pikchr.c"
2485	yymsp[0].minor.yy23 = yylhsminor.yy23;
2486	break;
2487	case 2: /* statement_list ::= statement_list EOL statement */
2488	#line 568 "pikchr.y"
2489	{ yylhsminor.yy23 = pik_elist_append(p,yymsp[-2].minor.yy23,yymsp[0].minor.yy54); }
2490	#line 2490 "pikchr.c"
2491	yymsp[-2].minor.yy23 = yylhsminor.yy23;
2492	break;
2493	case 3: /* statement ::= */
2494	#line 571 "pikchr.y"
2495	{ yymsp[1].minor.yy54 = 0; }
2496	#line 2496 "pikchr.c"
2497	break;
2498	case 4: /* statement ::= direction */
2499	#line 572 "pikchr.y"
2500	{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy54=0; }
2501	#line 2501 "pikchr.c"
2502	yymsp[0].minor.yy54 = yylhsminor.yy54;
2503	break;
2504	case 5: /* statement ::= lvalue ASSIGN rvalue */
2505	#line 573 "pikchr.y"
2506	{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy129,&yymsp[-1].minor.yy0); yylhsminor.yy54=0;}
2507	#line 2507 "pikchr.c"
2508	yymsp[-2].minor.yy54 = yylhsminor.yy54;
2509	break;
2510	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2511	#line 575 "pikchr.y"
2512	{ yylhsminor.yy54 = yymsp[0].minor.yy54; pik_elem_setname(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0); }
2513	#line 2513 "pikchr.c"
2514	yymsp[-2].minor.yy54 = yylhsminor.yy54;
2515	break;
2516	case 7: /* statement ::= PLACENAME COLON position */
2517	#line 577 "pikchr.y"
2518	{ yylhsminor.yy54 = pik_elem_new(p,0,0,0);
2519	if(yylhsminor.yy54){ yylhsminor.yy54->ptAt = yymsp[0].minor.yy187; pik_elem_setname(p,yylhsminor.yy54,&yymsp[-2].minor.yy0); }}
2520	#line 2520 "pikchr.c"
2521	yymsp[-2].minor.yy54 = yylhsminor.yy54;
2522	break;
2523	case 8: /* statement ::= unnamed_statement */
2524	#line 579 "pikchr.y"
2525	{yylhsminor.yy54 = yymsp[0].minor.yy54;}
2526	#line 2526 "pikchr.c"
2527	yymsp[0].minor.yy54 = yylhsminor.yy54;
2528	break;
2529	case 9: /* statement ::= print prlist */
2530	#line 580 "pikchr.y"
2531	{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy54=0;}
2532	#line 2532 "pikchr.c"
2533	break;
2534	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2535	#line 585 "pikchr.y"
2536	{yymsp[-5].minor.yy54=pik_assert(p,yymsp[-3].minor.yy129,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy129);}
2537	#line 2537 "pikchr.c"
2538	break;
2539	case 11: /* statement ::= ASSERT LP position EQ position RP */
2540	#line 587 "pikchr.y"
2541	{yymsp[-5].minor.yy54=pik_position_assert(p,&yymsp[-3].minor.yy187,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy187);}
2542	#line 2542 "pikchr.c"
2543	break;
2544	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2545	#line 588 "pikchr.y"
2546	{yymsp[-2].minor.yy54=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2547	#line 2547 "pikchr.c"
2548	break;
2549	case 13: /* rvalue ::= PLACENAME */
2550	#line 599 "pikchr.y"
2551	{yylhsminor.yy129 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2552	#line 2552 "pikchr.c"
2553	yymsp[0].minor.yy129 = yylhsminor.yy129;
2554	break;
2555	case 14: /* pritem ::= FILL */
2556	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2557	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2558	#line 604 "pikchr.y"
2559	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2560	#line 2560 "pikchr.c"
2561	break;
2562	case 17: /* pritem ::= rvalue */
2563	#line 607 "pikchr.y"
2564	{pik_append_num(p,"",yymsp[0].minor.yy129);}
2565	#line 2565 "pikchr.c"
2566	break;
2567	case 18: /* pritem ::= STRING */
2568	#line 608 "pikchr.y"
2569	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2570	#line 2570 "pikchr.c"
2571	break;
2572	case 19: /* prsep ::= COMMA */
2573	#line 609 "pikchr.y"
2574	{pik_append(p, " ", 1);}
2575	#line 2575 "pikchr.c"
2576	break;
2577	case 20: /* unnamed_statement ::= basetype attribute_list */
2578	#line 614 "pikchr.y"
2579	{yylhsminor.yy54 = yymsp[-1].minor.yy54; pik_after_adding_attributes(p,yylhsminor.yy54);}
2580	#line 2580 "pikchr.c"
2581	yymsp[-1].minor.yy54 = yylhsminor.yy54;
2582	break;
2583	case 21: /* basetype ::= CLASSNAME */
2584	#line 616 "pikchr.y"
2585	{yylhsminor.yy54 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2586	#line 2586 "pikchr.c"
2587	yymsp[0].minor.yy54 = yylhsminor.yy54;
2588	break;
2589	case 22: /* basetype ::= STRING textposition */
2590	#line 618 "pikchr.y"
2591	{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy272; yylhsminor.yy54 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2592	#line 2592 "pikchr.c"
2593	yymsp[-1].minor.yy54 = yylhsminor.yy54;
2594	break;
2595	case 23: /* basetype ::= LB savelist statement_list RB */
2596	#line 620 "pikchr.y"
2597	{ p->list = yymsp[-2].minor.yy23; yymsp[-3].minor.yy54 = pik_elem_new(p,0,0,yymsp[-1].minor.yy23); if(yymsp[-3].minor.yy54) yymsp[-3].minor.yy54->errTok = yymsp[0].minor.yy0; }
2598	#line 2598 "pikchr.c"
2599	break;
2600	case 24: /* savelist ::= */
2601	#line 625 "pikchr.y"
2602	{yymsp[1].minor.yy23 = p->list; p->list = 0;}
2603	#line 2603 "pikchr.c"
2604	break;
2605	case 25: /* relexpr ::= expr */
2606	#line 632 "pikchr.y"
2607	{yylhsminor.yy28.rAbs = yymsp[0].minor.yy129; yylhsminor.yy28.rRel = 0;}
2608	#line 2608 "pikchr.c"
2609	yymsp[0].minor.yy28 = yylhsminor.yy28;
2610	break;
2611	case 26: /* relexpr ::= expr PERCENT */
2612	#line 633 "pikchr.y"
2613	{yylhsminor.yy28.rAbs = 0; yylhsminor.yy28.rRel = yymsp[-1].minor.yy129/100;}
2614	#line 2614 "pikchr.c"
2615	yymsp[-1].minor.yy28 = yylhsminor.yy28;
2616	break;
2617	case 27: /* optrelexpr ::= */
2618	#line 635 "pikchr.y"
2619	{yymsp[1].minor.yy28.rAbs = 0; yymsp[1].minor.yy28.rRel = 1.0;}
2620	#line 2620 "pikchr.c"
2621	break;
2622	case 28: /* attribute_list ::= relexpr alist */
2623	#line 637 "pikchr.y"
2624	{pik_add_direction(p,0,&yymsp[-1].minor.yy28);}
2625	#line 2625 "pikchr.c"
2626	break;
2627	case 29: /* attribute ::= numproperty relexpr */
2628	#line 641 "pikchr.y"
2629	{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy28); }
2630	#line 2630 "pikchr.c"
2631	break;
2632	case 30: /* attribute ::= dashproperty expr */
2633	#line 642 "pikchr.y"
2634	{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy129); }
2635	#line 2635 "pikchr.c"
2636	break;
2637	case 31: /* attribute ::= dashproperty */
2638	#line 643 "pikchr.y"
2639	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2640	#line 2640 "pikchr.c"
2641	break;
2642	case 32: /* attribute ::= colorproperty rvalue */
2643	#line 644 "pikchr.y"
2644	{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy129); }
2645	#line 2645 "pikchr.c"
2646	break;
2647	case 33: /* attribute ::= go direction optrelexpr */
2648	#line 645 "pikchr.y"
2649	{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy28);}
2650	#line 2650 "pikchr.c"
2651	break;
2652	case 34: /* attribute ::= go direction even position */
2653	#line 646 "pikchr.y"
2654	{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy187);}
2655	#line 2655 "pikchr.c"
2656	break;
2657	case 35: /* attribute ::= CLOSE */
2658	#line 647 "pikchr.y"
2659	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2660	#line 2660 "pikchr.c"
2661	break;
2662	case 36: /* attribute ::= CHOP */
2663	#line 648 "pikchr.y"
2664	{ p->cur->bChop = 1; }
2665	#line 2665 "pikchr.c"
2666	break;
2667	case 37: /* attribute ::= FROM position */
2668	#line 649 "pikchr.y"
2669	{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy187); }
2670	#line 2670 "pikchr.c"
2671	break;
2672	case 38: /* attribute ::= TO position */
2673	#line 650 "pikchr.y"
2674	{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy187); }
2675	#line 2675 "pikchr.c"
2676	break;
2677	case 39: /* attribute ::= THEN */
2678	#line 651 "pikchr.y"
2679	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2680	#line 2680 "pikchr.c"
2681	break;
2682	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2683	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2684	#line 653 "pikchr.y"
2685	{pik_move_hdg(p,&yymsp[-2].minor.yy28,&yymsp[-1].minor.yy0,yymsp[0].minor.yy129,0,&yymsp[-3].minor.yy0);}
2686	#line 2686 "pikchr.c"
2687	break;
2688	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2689	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2690	#line 654 "pikchr.y"
2691	{pik_move_hdg(p,&yymsp[-1].minor.yy28,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2692	#line 2692 "pikchr.c"
2693	break;
2694	case 44: /* attribute ::= AT position */
2695	#line 659 "pikchr.y"
2696	{ pik_set_at(p,0,&yymsp[0].minor.yy187,&yymsp[-1].minor.yy0); }
2697	#line 2697 "pikchr.c"
2698	break;
2699	case 45: /* attribute ::= SAME */
2700	#line 661 "pikchr.y"
2701	{pik_same(p,0,&yymsp[0].minor.yy0);}
2702	#line 2702 "pikchr.c"
2703	break;
2704	case 46: /* attribute ::= SAME AS object */
2705	#line 662 "pikchr.y"
2706	{pik_same(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0);}
2707	#line 2707 "pikchr.c"
2708	break;
2709	case 47: /* attribute ::= STRING textposition */
2710	#line 663 "pikchr.y"
2711	{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy272);}
2712	#line 2712 "pikchr.c"
2713	break;
2714	case 48: /* attribute ::= FIT */
2715	#line 664 "pikchr.y"
2716	{pik_size_to_fit(p,0,&yymsp[0].minor.yy0,3); }
2717	#line 2717 "pikchr.c"
2718	break;
2719	case 49: /* attribute ::= BEHIND object */
2720	#line 665 "pikchr.y"
2721	{pik_behind(p,yymsp[0].minor.yy54);}
2722	#line 2722 "pikchr.c"
2723	break;
2724	case 50: /* withclause ::= DOT_E edge AT position */
2725	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2726	#line 673 "pikchr.y"
2727	{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy187,&yymsp[-1].minor.yy0); }
2728	#line 2728 "pikchr.c"
2729	break;
2730	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2731	#line 677 "pikchr.y"
2732	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2733	#line 2733 "pikchr.c"
2734	yymsp[0].minor.yy0 = yylhsminor.yy0;
2735	break;
2736	case 53: /* boolproperty ::= CW */
2737	#line 688 "pikchr.y"
2738	{p->cur->cw = 1;}
2739	#line 2739 "pikchr.c"
2740	break;
2741	case 54: /* boolproperty ::= CCW */
2742	#line 689 "pikchr.y"
2743	{p->cur->cw = 0;}
2744	#line 2744 "pikchr.c"
2745	break;
2746	case 55: /* boolproperty ::= LARROW */
2747	#line 690 "pikchr.y"
2748	{p->cur->larrow=1; p->cur->rarrow=0; }
2749	#line 2749 "pikchr.c"
2750	break;
2751	case 56: /* boolproperty ::= RARROW */
2752	#line 691 "pikchr.y"
2753	{p->cur->larrow=0; p->cur->rarrow=1; }
2754	#line 2754 "pikchr.c"
2755	break;
2756	case 57: /* boolproperty ::= LRARROW */
2757	#line 692 "pikchr.y"
2758	{p->cur->larrow=1; p->cur->rarrow=1; }
2759	#line 2759 "pikchr.c"
2760	break;
2761	case 58: /* boolproperty ::= INVIS */
2762	#line 693 "pikchr.y"
2763	{p->cur->sw = -0.00001;}
2764	#line 2764 "pikchr.c"
2765	break;
2766	case 59: /* boolproperty ::= THICK */
2767	#line 694 "pikchr.y"
2768	{p->cur->sw *= 1.5;}
2769	#line 2769 "pikchr.c"
2770	break;
2771	case 60: /* boolproperty ::= THIN */
2772	#line 695 "pikchr.y"
2773	{p->cur->sw *= 0.67;}
2774	#line 2774 "pikchr.c"
2775	break;
2776	case 61: /* boolproperty ::= SOLID */
2777	#line 696 "pikchr.y"
2778	{p->cur->sw = pik_value(p,"thickness",9,0);
2779	p->cur->dotted = p->cur->dashed = 0.0;}
2780	#line 2780 "pikchr.c"
2781	break;
2782	case 62: /* textposition ::= */
2783	#line 699 "pikchr.y"
2784	{yymsp[1].minor.yy272 = 0;}
2785	#line 2785 "pikchr.c"
2786	break;
2787	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|MONO\|ALIGNED\|BIG\|SMALL */
2788	#line 702 "pikchr.y"
2789	{yylhsminor.yy272 = (short int)pik_text_position(yymsp[-1].minor.yy272,&yymsp[0].minor.yy0);}
2790	#line 2790 "pikchr.c"
2791	yymsp[-1].minor.yy272 = yylhsminor.yy272;
2792	break;
2793	case 64: /* position ::= expr COMMA expr */
2794	#line 705 "pikchr.y"
2795	{yylhsminor.yy187.x=yymsp[-2].minor.yy129; yylhsminor.yy187.y=yymsp[0].minor.yy129;}
2796	#line 2796 "pikchr.c"
2797	yymsp[-2].minor.yy187 = yylhsminor.yy187;
2798	break;
2799	case 65: /* position ::= place PLUS expr COMMA expr */
2800	#line 707 "pikchr.y"
2801	{yylhsminor.yy187.x=yymsp[-4].minor.yy187.x+yymsp[-2].minor.yy129; yylhsminor.yy187.y=yymsp[-4].minor.yy187.y+yymsp[0].minor.yy129;}
2802	#line 2802 "pikchr.c"
2803	yymsp[-4].minor.yy187 = yylhsminor.yy187;
2804	break;
2805	case 66: /* position ::= place MINUS expr COMMA expr */
2806	#line 708 "pikchr.y"
2807	{yylhsminor.yy187.x=yymsp[-4].minor.yy187.x-yymsp[-2].minor.yy129; yylhsminor.yy187.y=yymsp[-4].minor.yy187.y-yymsp[0].minor.yy129;}
2808	#line 2808 "pikchr.c"
2809	yymsp[-4].minor.yy187 = yylhsminor.yy187;
2810	break;
2811	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2812	#line 710 "pikchr.y"
2813	{yylhsminor.yy187.x=yymsp[-6].minor.yy187.x+yymsp[-3].minor.yy129; yylhsminor.yy187.y=yymsp[-6].minor.yy187.y+yymsp[-1].minor.yy129;}
2814	#line 2814 "pikchr.c"
2815	yymsp[-6].minor.yy187 = yylhsminor.yy187;
2816	break;
2817	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2818	#line 712 "pikchr.y"
2819	{yylhsminor.yy187.x=yymsp[-6].minor.yy187.x-yymsp[-3].minor.yy129; yylhsminor.yy187.y=yymsp[-6].minor.yy187.y-yymsp[-1].minor.yy129;}
2820	#line 2820 "pikchr.c"
2821	yymsp[-6].minor.yy187 = yylhsminor.yy187;
2822	break;
2823	case 69: /* position ::= LP position COMMA position RP */
2824	#line 713 "pikchr.y"
2825	{yymsp[-4].minor.yy187.x=yymsp[-3].minor.yy187.x; yymsp[-4].minor.yy187.y=yymsp[-1].minor.yy187.y;}
2826	#line 2826 "pikchr.c"
2827	break;
2828	case 70: /* position ::= LP position RP */
2829	#line 714 "pikchr.y"
2830	{yymsp[-2].minor.yy187=yymsp[-1].minor.yy187;}
2831	#line 2831 "pikchr.c"
2832	break;
2833	case 71: /* position ::= expr between position AND position */
2834	#line 716 "pikchr.y"
2835	{yylhsminor.yy187 = pik_position_between(yymsp[-4].minor.yy129,yymsp[-2].minor.yy187,yymsp[0].minor.yy187);}
2836	#line 2836 "pikchr.c"
2837	yymsp[-4].minor.yy187 = yylhsminor.yy187;
2838	break;
2839	case 72: /* position ::= expr LT position COMMA position GT */
2840	#line 718 "pikchr.y"
2841	{yylhsminor.yy187 = pik_position_between(yymsp[-5].minor.yy129,yymsp[-3].minor.yy187,yymsp[-1].minor.yy187);}
2842	#line 2842 "pikchr.c"
2843	yymsp[-5].minor.yy187 = yylhsminor.yy187;
2844	break;
2845	case 73: /* position ::= expr ABOVE position */
2846	#line 719 "pikchr.y"
2847	{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.y += yymsp[-2].minor.yy129;}
2848	#line 2848 "pikchr.c"
2849	yymsp[-2].minor.yy187 = yylhsminor.yy187;
2850	break;
2851	case 74: /* position ::= expr BELOW position */
2852	#line 720 "pikchr.y"
2853	{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.y -= yymsp[-2].minor.yy129;}
2854	#line 2854 "pikchr.c"
2855	yymsp[-2].minor.yy187 = yylhsminor.yy187;
2856	break;
2857	case 75: /* position ::= expr LEFT OF position */
2858	#line 721 "pikchr.y"
2859	{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.x -= yymsp[-3].minor.yy129;}
2860	#line 2860 "pikchr.c"
2861	yymsp[-3].minor.yy187 = yylhsminor.yy187;
2862	break;
2863	case 76: /* position ::= expr RIGHT OF position */
2864	#line 722 "pikchr.y"
2865	{yylhsminor.yy187=yymsp[0].minor.yy187; yylhsminor.yy187.x += yymsp[-3].minor.yy129;}
2866	#line 2866 "pikchr.c"
2867	yymsp[-3].minor.yy187 = yylhsminor.yy187;
2868	break;
2869	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2870	#line 724 "pikchr.y"
2871	{yylhsminor.yy187 = pik_position_at_hdg(yymsp[-5].minor.yy129,&yymsp[-2].minor.yy0,yymsp[0].minor.yy187);}
2872	#line 2872 "pikchr.c"
2873	yymsp[-5].minor.yy187 = yylhsminor.yy187;
2874	break;
2875	case 78: /* position ::= expr HEADING EDGEPT OF position */
2876	#line 726 "pikchr.y"
2877	{yylhsminor.yy187 = pik_position_at_hdg(yymsp[-4].minor.yy129,&yymsp[-2].minor.yy0,yymsp[0].minor.yy187);}
2878	#line 2878 "pikchr.c"
2879	yymsp[-4].minor.yy187 = yylhsminor.yy187;
2880	break;
2881	case 79: /* position ::= expr EDGEPT OF position */
2882	#line 728 "pikchr.y"
2883	{yylhsminor.yy187 = pik_position_at_hdg(yymsp[-3].minor.yy129,&yymsp[-2].minor.yy0,yymsp[0].minor.yy187);}
2884	#line 2884 "pikchr.c"
2885	yymsp[-3].minor.yy187 = yylhsminor.yy187;
2886	break;
2887	case 80: /* position ::= expr ON HEADING expr FROM position */
2888	#line 730 "pikchr.y"
2889	{yylhsminor.yy187 = pik_position_at_angle(yymsp[-5].minor.yy129,yymsp[-2].minor.yy129,yymsp[0].minor.yy187);}
2890	#line 2890 "pikchr.c"
2891	yymsp[-5].minor.yy187 = yylhsminor.yy187;
2892	break;
2893	case 81: /* position ::= expr HEADING expr FROM position */
2894	#line 732 "pikchr.y"
2895	{yylhsminor.yy187 = pik_position_at_angle(yymsp[-4].minor.yy129,yymsp[-2].minor.yy129,yymsp[0].minor.yy187);}
2896	#line 2896 "pikchr.c"
2897	yymsp[-4].minor.yy187 = yylhsminor.yy187;
2898	break;
2899	case 82: /* place ::= edge OF object */
2900	#line 744 "pikchr.y"
2901	{yylhsminor.yy187 = pik_place_of_elem(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0);}
2902	#line 2902 "pikchr.c"
2903	yymsp[-2].minor.yy187 = yylhsminor.yy187;
2904	break;
2905	case 83: /* place2 ::= object */
2906	#line 745 "pikchr.y"
2907	{yylhsminor.yy187 = pik_place_of_elem(p,yymsp[0].minor.yy54,0);}
2908	#line 2908 "pikchr.c"
2909	yymsp[0].minor.yy187 = yylhsminor.yy187;
2910	break;
2911	case 84: /* place2 ::= object DOT_E edge */
2912	#line 746 "pikchr.y"
2913	{yylhsminor.yy187 = pik_place_of_elem(p,yymsp[-2].minor.yy54,&yymsp[0].minor.yy0);}
2914	#line 2914 "pikchr.c"
2915	yymsp[-2].minor.yy187 = yylhsminor.yy187;
2916	break;
2917	case 85: /* place2 ::= NTH VERTEX OF object */
2918	#line 747 "pikchr.y"
2919	{yylhsminor.yy187 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy54);}
2920	#line 2920 "pikchr.c"
2921	yymsp[-3].minor.yy187 = yylhsminor.yy187;
2922	break;
2923	case 86: /* object ::= nth */
2924	#line 759 "pikchr.y"
2925	{yylhsminor.yy54 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2926	#line 2926 "pikchr.c"
2927	yymsp[0].minor.yy54 = yylhsminor.yy54;
2928	break;
2929	case 87: /* object ::= nth OF\|IN object */
2930	#line 760 "pikchr.y"
2931	{yylhsminor.yy54 = pik_find_nth(p,yymsp[0].minor.yy54,&yymsp[-2].minor.yy0);}
2932	#line 2932 "pikchr.c"
2933	yymsp[-2].minor.yy54 = yylhsminor.yy54;
2934	break;
2935	case 88: /* objectname ::= THIS */
2936	#line 762 "pikchr.y"
2937	{yymsp[0].minor.yy54 = p->cur;}
2938	#line 2938 "pikchr.c"
2939	break;
2940	case 89: /* objectname ::= PLACENAME */
2941	#line 763 "pikchr.y"
2942	{yylhsminor.yy54 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2943	#line 2943 "pikchr.c"
2944	yymsp[0].minor.yy54 = yylhsminor.yy54;
2945	break;
2946	case 90: /* objectname ::= objectname DOT_U PLACENAME */
2947	#line 765 "pikchr.y"
2948	{yylhsminor.yy54 = pik_find_byname(p,yymsp[-2].minor.yy54,&yymsp[0].minor.yy0);}
2949	#line 2949 "pikchr.c"
2950	yymsp[-2].minor.yy54 = yylhsminor.yy54;
2951	break;
2952	case 91: /* nth ::= NTH CLASSNAME */
2953	#line 767 "pikchr.y"
2954	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2955	#line 2955 "pikchr.c"
2956	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2957	break;
2958	case 92: /* nth ::= NTH LAST CLASSNAME */
2959	#line 768 "pikchr.y"
2960	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2961	#line 2961 "pikchr.c"
2962	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2963	break;
2964	case 93: /* nth ::= LAST CLASSNAME */
2965	#line 769 "pikchr.y"
2966	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2967	#line 2967 "pikchr.c"
2968	break;
2969	case 94: /* nth ::= LAST */
2970	#line 770 "pikchr.y"
2971	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2972	#line 2972 "pikchr.c"
2973	yymsp[0].minor.yy0 = yylhsminor.yy0;
2974	break;
2975	case 95: /* nth ::= NTH LB RB */
2976	#line 771 "pikchr.y"
2977	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2978	#line 2978 "pikchr.c"
2979	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2980	break;
2981	case 96: /* nth ::= NTH LAST LB RB */
2982	#line 772 "pikchr.y"
2983	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2984	#line 2984 "pikchr.c"
2985	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2986	break;
2987	case 97: /* nth ::= LAST LB RB */
2988	#line 773 "pikchr.y"
2989	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2990	#line 2990 "pikchr.c"
2991	break;
2992	case 98: /* expr ::= expr PLUS expr */
2993	#line 775 "pikchr.y"
2994	{yylhsminor.yy129=yymsp[-2].minor.yy129+yymsp[0].minor.yy129;}
2995	#line 2995 "pikchr.c"
2996	yymsp[-2].minor.yy129 = yylhsminor.yy129;
2997	break;
2998	case 99: /* expr ::= expr MINUS expr */
2999	#line 776 "pikchr.y"
3000	{yylhsminor.yy129=yymsp[-2].minor.yy129-yymsp[0].minor.yy129;}
3001	#line 3001 "pikchr.c"
3002	yymsp[-2].minor.yy129 = yylhsminor.yy129;
3003	break;
3004	case 100: /* expr ::= expr STAR expr */
3005	#line 777 "pikchr.y"
3006	{yylhsminor.yy129=yymsp[-2].minor.yy129*yymsp[0].minor.yy129;}
3007	#line 3007 "pikchr.c"
3008	yymsp[-2].minor.yy129 = yylhsminor.yy129;
3009	break;
3010	case 101: /* expr ::= expr SLASH expr */
3011	#line 778 "pikchr.y"
3012	{
3013	if( yymsp[0].minor.yy129==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy129 = 0.0; }
3014	else{ yylhsminor.yy129 = yymsp[-2].minor.yy129/yymsp[0].minor.yy129; }
3015	}
3016	#line 3016 "pikchr.c"
3017	yymsp[-2].minor.yy129 = yylhsminor.yy129;
3018	break;
3019	case 102: /* expr ::= MINUS expr */
3020	#line 782 "pikchr.y"
3021	{yymsp[-1].minor.yy129=-yymsp[0].minor.yy129;}
3022	#line 3022 "pikchr.c"
3023	break;
3024	case 103: /* expr ::= PLUS expr */
3025	#line 783 "pikchr.y"
3026	{yymsp[-1].minor.yy129=yymsp[0].minor.yy129;}
3027	#line 3027 "pikchr.c"
3028	break;
3029	case 104: /* expr ::= LP expr RP */
3030	#line 784 "pikchr.y"
3031	{yymsp[-2].minor.yy129=yymsp[-1].minor.yy129;}
3032	#line 3032 "pikchr.c"
3033	break;
3034	case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
3035	#line 785 "pikchr.y"
3036	{yymsp[-2].minor.yy129=pik_get_var(p,&yymsp[-1].minor.yy0);}
3037	#line 3037 "pikchr.c"
3038	break;
3039	case 106: /* expr ::= NUMBER */
3040	#line 786 "pikchr.y"
3041	{yylhsminor.yy129=pik_atof(&yymsp[0].minor.yy0);}
3042	#line 3042 "pikchr.c"
3043	yymsp[0].minor.yy129 = yylhsminor.yy129;
3044	break;
3045	case 107: /* expr ::= ID */
3046	#line 787 "pikchr.y"
3047	{yylhsminor.yy129=pik_get_var(p,&yymsp[0].minor.yy0);}
3048	#line 3048 "pikchr.c"
3049	yymsp[0].minor.yy129 = yylhsminor.yy129;
3050	break;
3051	case 108: /* expr ::= FUNC1 LP expr RP */
3052	#line 788 "pikchr.y"
3053	{yylhsminor.yy129 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy129,0.0);}
3054	#line 3054 "pikchr.c"
3055	yymsp[-3].minor.yy129 = yylhsminor.yy129;
3056	break;
3057	case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
3058	#line 789 "pikchr.y"
3059	{yylhsminor.yy129 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy129,yymsp[-1].minor.yy129);}
3060	#line 3060 "pikchr.c"
3061	yymsp[-5].minor.yy129 = yylhsminor.yy129;
3062	break;
3063	case 110: /* expr ::= DIST LP position COMMA position RP */
3064	#line 790 "pikchr.y"
3065	{yymsp[-5].minor.yy129 = pik_dist(&yymsp[-3].minor.yy187,&yymsp[-1].minor.yy187);}
3066	#line 3066 "pikchr.c"
3067	break;
3068	case 111: /* expr ::= place2 DOT_XY X */
3069	#line 791 "pikchr.y"
3070	{yylhsminor.yy129 = yymsp[-2].minor.yy187.x;}
3071	#line 3071 "pikchr.c"
3072	yymsp[-2].minor.yy129 = yylhsminor.yy129;
3073	break;
3074	case 112: /* expr ::= place2 DOT_XY Y */
3075	#line 792 "pikchr.y"
3076	{yylhsminor.yy129 = yymsp[-2].minor.yy187.y;}
3077	#line 3077 "pikchr.c"
3078	yymsp[-2].minor.yy129 = yylhsminor.yy129;
3079	break;
3080	case 113: /* expr ::= object DOT_L numproperty */
3081	case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
3082	case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
3083	#line 793 "pikchr.y"
3084	{yylhsminor.yy129=pik_property_of(yymsp[-2].minor.yy54,&yymsp[0].minor.yy0);}
3085	#line 3085 "pikchr.c"
3086	yymsp[-2].minor.yy129 = yylhsminor.yy129;
3087	break;
3088	default:
3089	/* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
3090	/* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
3091	/* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
	@@ -3142,19 +3183,19 @@
3183	){
3184	pik_parserARG_FETCH
3185	pik_parserCTX_FETCH
3186	#define TOKEN yyminor
3187	/********** Begin %syntax_error code **************************************/
3188	#line 551 "pikchr.y"
3189
3190	if( TOKEN.z && TOKEN.z[0] ){
3191	pik_error(p, &TOKEN, "syntax error");
3192	}else{
3193	pik_error(p, 0, "syntax error");
3194	}
3195	UNUSED_PARAMETER(yymajor);
3196	#line 3196 "pikchr.c"
3197	/********** End %syntax_error code ****************************************/
3198	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3199	pik_parserCTX_STORE
3200	}
3201
	@@ -3419,11 +3460,11 @@
3460	#else
3461	(void)iToken;
3462	return 0;
3463	#endif
3464	}
3465	#line 798 "pikchr.y"
3466
3467
3468
3469	/* Chart of the 148 official CSS color names with their
3470	** corresponding RGB values thru Color Module Level 4:
	@@ -7246,11 +7287,12 @@
7287	pik_append_num(p, " width=\"", p->wSVG);
7288	pik_append_num(p, "\" height=\"", p->hSVG);
7289	pik_append(p, "\"", 1);
7290	}
7291	pik_append_dis(p, " viewBox=\"0 0 ",w,"");
7292	pik_append_dis(p, " ",h,"\"");
7293	pik_append(p, " data-pikchr-date=\"" MANIFEST_ISODATE "\">\n", -1);
7294	pik_elist_render(p, pList);
7295	pik_append(p,"</svg>\n", -1);
7296	}else{
7297	p->wSVG = -1;
7298	p->hSVG = -1;
	@@ -7330,10 +7372,11 @@
7372	{ "n", 1, T_EDGEPT, 0, CP_N },
7373	{ "ne", 2, T_EDGEPT, 0, CP_NE },
7374	{ "north", 5, T_EDGEPT, 0, CP_N },
7375	{ "nw", 2, T_EDGEPT, 0, CP_NW },
7376	{ "of", 2, T_OF, 0, 0 },
7377	{ "pikchr_date",11, T_ISODATE, 0, 0, },
7378	{ "previous", 8, T_LAST, 0, 0, },
7379	{ "print", 5, T_PRINT, 0, 0 },
7380	{ "rad", 3, T_RADIUS, 0, 0 },
7381	{ "radius", 6, T_RADIUS, 0, 0 },
7382	{ "right", 5, T_RIGHT, DIR_RIGHT, CP_E },
	@@ -7913,15 +7956,30 @@
7956	#endif
7957	token.n = (unsigned short)(sz & 0xffff);
7958	if( p->nToken++ > PIKCHR_TOKEN_LIMIT ){
7959	pik_error(p, &token, "script is too complex");
7960	break;
7961	}
7962	if( token.eType==T_ISODATE ){
7963	token.z = "\"" MANIFEST_ISODATE "\"";
7964	token.n = sizeof(MANIFEST_ISODATE)+1;
7965	token.eType = T_STRING;
7966	}
7967	pik_parser(pParser, token.eType, token);
7968	}
7969	}
7970	}
7971
7972	/*
7973	** Return the version name.
7974	*/
7975	const char *pikchr_version(void)
7976	/* Emscripten workaround, else it chokes on the inlined version */;
7977
7978	const char *pikchr_version(void){
7979	return RELEASE_VERSION " " MANIFEST_ISODATE;
7980	}
7981
7982	/*
7983	** Parse the PIKCHR script contained in zText[]. Return a rendering. Or
7984	** if an error is encountered, return the error text. The error message
7985	** is HTML formatted. So regardless of what happens, the return text
	@@ -8141,10 +8199,14 @@
8199	exit(1);
8200	}
8201	bSvgOnly = 1;
8202	mFlags \|= PIKCHR_PLAINTEXT_ERRORS;
8203	}else
8204	if( strcmp(z,"version")==0 \|\| strcmp(z,"v")==0 ){
8205	printf("pikchr %s\n", pikchr_version());
8206	return 0;
8207	}else
8208	{
8209	fprintf(stderr,"unknown option: \"%s\"\n", argv[i]);
8210	usage(argv[0]);
8211	}
8212	continue;
	@@ -8253,6 +8315,6 @@
8315
8316
8317	#endif /* PIKCHR_TCL */
8318
8319
8320	#line 8320 "pikchr.c"
8321

M extsrc/pikchr.js

+170 -130

		--- extsrc/pikchr.js
		+++ extsrc/pikchr.js
		@@ -1,10 +1,11 @@
	1	+
1	2	var initPikchrModule = (() => {
2	3	var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
3	4
4	5	return (
5		-async function(moduleArg = {}) {
	6	+function(moduleArg = {}) {
6	7	var moduleRtn;
7	8
8	9	// include: shell.js
9	10	// The Module object: Our interface to the outside world. We import
10	11	// and export values on it. There are various ways Module can be used:
		@@ -88,25 +89,25 @@
88	89	// If scriptDirectory contains a query (starting with ?) or a fragment (starting with #),
89	90	// they are removed because they could contain a slash.
90	91	if (scriptDirectory.startsWith("blob:")) {
91	92	scriptDirectory = "";
92	93	} else {
93		- scriptDirectory = scriptDirectory.slice(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf("/") + 1);
	94	+ scriptDirectory = scriptDirectory.substr(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf("/") + 1);
94	95	}
95	96	{
96	97	// include: web_or_worker_shell_read.js
97		- readAsync = async url => {
98		- var response = await fetch(url, {
99		- credentials: "same-origin"
100		- });
	98	+ readAsync = url => fetch(url, {
	99	+ credentials: "same-origin"
	100	+ }).then(response => {
101	101	if (response.ok) {
102	102	return response.arrayBuffer();
103	103	}
104		- throw new Error(response.status + " : " + response.url);
105		- };
	104	+ return Promise.reject(new Error(response.status + " : " + response.url));
	105	+ });
106	106	}
107		-} else {}
	107	+} else // end include: web_or_worker_shell_read.js
	108	+{}
108	109
109	110	var out = Module["print"] \|\| console.log.bind(console);
110	111
111	112	var err = Module["printErr"] \|\| console.error.bind(console);
112	113
		@@ -152,25 +153,13 @@
152	153	// NOTE: This is also used as the process return code code in shell environments
153	154	// but only when noExitRuntime is false.
154	155	var EXITSTATUS;
155	156
156	157	// Memory management
157		-var /** @type {!Int8Array} / HEAP8, /* @type {!Uint8Array} / HEAPU8, /* @type {!Int16Array} / HEAP16, /* @type {!Uint16Array} / HEAPU16, /* @type {!Int32Array} / HEAP32, /* @type {!Uint32Array} / HEAPU32, /* @type {!Float32Array} / HEAPF32, / BigInt64Array type is not correctly defined in closure
158		-/** not-@type {!BigInt64Array} / HEAP64, / BigUint64Array type is not correctly defined in closure
159		-/** not-t@type {!BigUint64Array} / HEAPU64, /* @type {!Float64Array} */ HEAPF64;
160		-
161		-var runtimeInitialized = false;
	158	+var /** @type {!Int8Array} / HEAP8, /* @type {!Uint8Array} / HEAPU8, /* @type {!Int16Array} / HEAP16, /* @type {!Uint16Array} / HEAPU16, /* @type {!Int32Array} / HEAP32, /* @type {!Uint32Array} / HEAPU32, /* @type {!Float32Array} / HEAPF32, /* @type {!Float64Array} */ HEAPF64;
162	159
163	160	// include: runtime_shared.js
164		-// include: runtime_stack_check.js
165		-// end include: runtime_stack_check.js
166		-// include: runtime_exceptions.js
167		-// end include: runtime_exceptions.js
168		-// include: runtime_debug.js
169		-// end include: runtime_debug.js
170		-// include: memoryprofiler.js
171		-// end include: memoryprofiler.js
172	161	function updateMemoryViews() {
173	162	var b = wasmMemory.buffer;
174	163	Module["HEAP8"] = HEAP8 = new Int8Array(b);
175	164	Module["HEAP16"] = HEAP16 = new Int16Array(b);
176	165	Module["HEAPU8"] = HEAPU8 = new Uint8Array(b);
		@@ -177,48 +166,77 @@
177	166	Module["HEAPU16"] = HEAPU16 = new Uint16Array(b);
178	167	Module["HEAP32"] = HEAP32 = new Int32Array(b);
179	168	Module["HEAPU32"] = HEAPU32 = new Uint32Array(b);
180	169	Module["HEAPF32"] = HEAPF32 = new Float32Array(b);
181	170	Module["HEAPF64"] = HEAPF64 = new Float64Array(b);
182		- Module["HEAP64"] = HEAP64 = new BigInt64Array(b);
183		- Module["HEAPU64"] = HEAPU64 = new BigUint64Array(b);
184	171	}
185	172
186	173	// end include: runtime_shared.js
	174	+// include: runtime_stack_check.js
	175	+// end include: runtime_stack_check.js
	176	+var __ATPRERUN__ = [];
	177	+
	178	+// functions called before the runtime is initialized
	179	+var __ATINIT__ = [];
	180	+
	181	+// functions called during shutdown
	182	+var __ATPOSTRUN__ = [];
	183	+
	184	+// functions called after the main() is called
	185	+var runtimeInitialized = false;
	186	+
187	187	function preRun() {
188		- if (Module["preRun"]) {
189		- if (typeof Module["preRun"] == "function") Module["preRun"] = [ Module["preRun"] ];
190		- while (Module["preRun"].length) {
191		- addOnPreRun(Module["preRun"].shift());
192		- }
	188	+ var preRuns = Module["preRun"];
	189	+ if (preRuns) {
	190	+ if (typeof preRuns == "function") preRuns = [ preRuns ];
	191	+ preRuns.forEach(addOnPreRun);
193	192	}
194		- callRuntimeCallbacks(onPreRuns);
	193	+ callRuntimeCallbacks(__ATPRERUN__);
195	194	}
196	195
197	196	function initRuntime() {
198	197	runtimeInitialized = true;
199		- wasmExports["e"]();
	198	+ callRuntimeCallbacks(__ATINIT__);
200	199	}
201	200
202	201	function postRun() {
203		- if (Module["postRun"]) {
204		- if (typeof Module["postRun"] == "function") Module["postRun"] = [ Module["postRun"] ];
205		- while (Module["postRun"].length) {
206		- addOnPostRun(Module["postRun"].shift());
207		- }
	202	+ var postRuns = Module["postRun"];
	203	+ if (postRuns) {
	204	+ if (typeof postRuns == "function") postRuns = [ postRuns ];
	205	+ postRuns.forEach(addOnPostRun);
208	206	}
209		- callRuntimeCallbacks(onPostRuns);
	207	+ callRuntimeCallbacks(__ATPOSTRUN__);
	208	+}
	209	+
	210	+function addOnPreRun(cb) {
	211	+ __ATPRERUN__.unshift(cb);
	212	+}
	213	+
	214	+function addOnInit(cb) {
	215	+ __ATINIT__.unshift(cb);
	216	+}
	217	+
	218	+function addOnPostRun(cb) {
	219	+ __ATPOSTRUN__.unshift(cb);
210	220	}
211	221
	222	+// include: runtime_math.js
	223	+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul
	224	+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/fround
	225	+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
	226	+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc
	227	+// end include: runtime_math.js
212	228	// A counter of dependencies for calling run(). If we need to
213	229	// do asynchronous work before running, increment this and
214	230	// decrement it. Incrementing must happen in a place like
215	231	// Module.preRun (used by emcc to add file preloading).
216	232	// Note that you can add dependencies in preRun, even though
217	233	// it happens right before run - run will be postponed until
218	234	// the dependencies are met.
219	235	var runDependencies = 0;
	236	+
	237	+var runDependencyWatcher = null;
220	238
221	239	var dependenciesFulfilled = null;
222	240
223	241	function addRunDependency(id) {
224	242	runDependencies++;
		@@ -227,10 +245,14 @@
227	245
228	246	function removeRunDependency(id) {
229	247	runDependencies--;
230	248	Module["monitorRunDependencies"]?.(runDependencies);
231	249	if (runDependencies == 0) {
	250	+ if (runDependencyWatcher !== null) {
	251	+ clearInterval(runDependencyWatcher);
	252	+ runDependencyWatcher = null;
	253	+ }
232	254	if (dependenciesFulfilled) {
233	255	var callback = dependenciesFulfilled;
234	256	dependenciesFulfilled = null;
235	257	callback();
236	258	}
		@@ -263,15 +285,33 @@
263	285	// in code paths apart from instantiation where an exception is expected
264	286	// to be thrown when abort is called.
265	287	throw e;
266	288	}
267	289
268		-var wasmBinaryFile;
	290	+// include: memoryprofiler.js
	291	+// end include: memoryprofiler.js
	292	+// include: URIUtils.js
	293	+// Prefix of data URIs emitted by SINGLE_FILE and related options.
	294	+var dataURIPrefix = "data:application/octet-stream;base64,";
269	295
	296	+/**
	297	+ * Indicates whether filename is a base64 data URI.
	298	+ * @noinline
	299	+ */ var isDataURI = filename => filename.startsWith(dataURIPrefix);
	300	+
	301	+// end include: URIUtils.js
	302	+// include: runtime_exceptions.js
	303	+// end include: runtime_exceptions.js
270	304	function findWasmBinary() {
271		- return locateFile("pikchr.wasm");
	305	+ var f = "pikchr-v7583078860.wasm";
	306	+ if (!isDataURI(f)) {
	307	+ return locateFile(f);
	308	+ }
	309	+ return f;
272	310	}
	311	+
	312	+var wasmBinaryFile;
273	313
274	314	function getBinarySync(file) {
275	315	if (file == wasmBinaryFile && wasmBinary) {
276	316	return new Uint8Array(wasmBinary);
277	317	}
		@@ -279,50 +319,48 @@
279	319	return readBinary(file);
280	320	}
281	321	throw "both async and sync fetching of the wasm failed";
282	322	}
283	323
284		-async function getWasmBinary(binaryFile) {
	324	+function getBinaryPromise(binaryFile) {
285	325	// If we don't have the binary yet, load it asynchronously using readAsync.
286	326	if (!wasmBinary) {
287	327	// Fetch the binary using readAsync
288		- try {
289		- var response = await readAsync(binaryFile);
290		- return new Uint8Array(response);
291		- } catch {}
	328	+ return readAsync(binaryFile).then(response => new Uint8Array(/** @type{!ArrayBuffer} */ (response)), // Fall back to getBinarySync if readAsync fails
	329	+ () => getBinarySync(binaryFile));
292	330	}
293	331	// Otherwise, getBinarySync should be able to get it synchronously
294		- return getBinarySync(binaryFile);
	332	+ return Promise.resolve().then(() => getBinarySync(binaryFile));
295	333	}
296	334
297		-async function instantiateArrayBuffer(binaryFile, imports) {
298		- try {
299		- var binary = await getWasmBinary(binaryFile);
300		- var instance = await WebAssembly.instantiate(binary, imports);
301		- return instance;
302		- } catch (reason) {
	335	+function instantiateArrayBuffer(binaryFile, imports, receiver) {
	336	+ return getBinaryPromise(binaryFile).then(binary => WebAssembly.instantiate(binary, imports)).then(receiver, reason => {
303	337	err(`failed to asynchronously prepare wasm: ${reason}`);
304	338	abort(reason);
305		- }
	339	+ });
306	340	}
307	341
308		-async function instantiateAsync(binary, binaryFile, imports) {
309		- if (!binary && typeof WebAssembly.instantiateStreaming == "function") {
310		- try {
311		- var response = fetch(binaryFile, {
312		- credentials: "same-origin"
	342	+function instantiateAsync(binary, binaryFile, imports, callback) {
	343	+ if (!binary && typeof WebAssembly.instantiateStreaming == "function" && !isDataURI(binaryFile) && typeof fetch == "function") {
	344	+ return fetch(binaryFile, {
	345	+ credentials: "same-origin"
	346	+ }).then(response => {
	347	+ // Suppress closure warning here since the upstream definition for
	348	+ // instantiateStreaming only allows Promise<Repsponse> rather than
	349	+ // an actual Response.
	350	+ // TODO(https://github.com/google/closure-compiler/pull/3913): Remove if/when upstream closure is fixed.
	351	+ /** @suppress {checkTypes} */ var result = WebAssembly.instantiateStreaming(response, imports);
	352	+ return result.then(callback, function(reason) {
	353	+ // We expect the most common failure cause to be a bad MIME type for the binary,
	354	+ // in which case falling back to ArrayBuffer instantiation should work.
	355	+ err(`wasm streaming compile failed: ${reason}`);
	356	+ err("falling back to ArrayBuffer instantiation");
	357	+ return instantiateArrayBuffer(binaryFile, imports, callback);
313	358	});
314		- var instantiationResult = await WebAssembly.instantiateStreaming(response, imports);
315		- return instantiationResult;
316		- } catch (reason) {
317		- // We expect the most common failure cause to be a bad MIME type for the binary,
318		- // in which case falling back to ArrayBuffer instantiation should work.
319		- err(`wasm streaming compile failed: ${reason}`);
320		- err("falling back to ArrayBuffer instantiation");
321		- }
322		- }
323		- return instantiateArrayBuffer(binaryFile, imports);
	359	+ });
	360	+ }
	361	+ return instantiateArrayBuffer(binaryFile, imports, callback);
324	362	}
325	363
326	364	function getWasmImports() {
327	365	// prepare imports
328	366	return {
		@@ -330,18 +368,20 @@
330	368	};
331	369	}
332	370
333	371	// Create the wasm instance.
334	372	// Receives the wasm imports, returns the exports.
335		-async function createWasm() {
	373	+function createWasm() {
	374	+ var info = getWasmImports();
336	375	// Load the wasm module and create an instance of using native support in the JS engine.
337	376	// handle a generated wasm instance, receiving its exports and
338	377	// performing other necessary setup
339	378	/** @param {WebAssembly.Module=} module*/ function receiveInstance(instance, module) {
340	379	wasmExports = instance.exports;
341	380	wasmMemory = wasmExports["d"];
342	381	updateMemoryViews();
	382	+ addOnInit(wasmExports["e"]);
343	383	removeRunDependency("wasm-instantiate");
344	384	return wasmExports;
345	385	}
346	386	// wait for the pthread pool (if any)
347	387	addRunDependency("wasm-instantiate");
		@@ -349,64 +389,48 @@
349	389	function receiveInstantiationResult(result) {
350	390	// 'result' is a ResultObject object which has both the module and instance.
351	391	// receiveInstance() will swap in the exports (to Module.asm) so they can be called
352	392	// TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193, the above line no longer optimizes out down to the following line.
353	393	// When the regression is fixed, can restore the above PTHREADS-enabled path.
354		- return receiveInstance(result["instance"]);
	394	+ receiveInstance(result["instance"]);
355	395	}
356		- var info = getWasmImports();
357	396	// User shell pages can write their own Module.instantiateWasm = function(imports, successCallback) callback
358	397	// to manually instantiate the Wasm module themselves. This allows pages to
359	398	// run the instantiation parallel to any other async startup actions they are
360	399	// performing.
361	400	// Also pthreads and wasm workers initialize the wasm instance through this
362	401	// path.
363	402	if (Module["instantiateWasm"]) {
364		- return new Promise((resolve, reject) => {
365		- Module["instantiateWasm"](info, (mod, inst) => {
366		- receiveInstance(mod, inst);
367		- resolve(mod.exports);
368		- });
369		- });
	403	+ try {
	404	+ return Module["instantiateWasm"](info, receiveInstance);
	405	+ } catch (e) {
	406	+ err(`Module.instantiateWasm callback failed with error: ${e}`);
	407	+ // If instantiation fails, reject the module ready promise.
	408	+ readyPromiseReject(e);
	409	+ }
370	410	}
371	411	wasmBinaryFile ??= findWasmBinary();
372		- try {
373		- var result = await instantiateAsync(wasmBinary, wasmBinaryFile, info);
374		- var exports = receiveInstantiationResult(result);
375		- return exports;
376		- } catch (e) {
377		- // If instantiation fails, reject the module ready promise.
378		- readyPromiseReject(e);
379		- return Promise.reject(e);
380		- }
	412	+ // If instantiation fails, reject the module ready promise.
	413	+ instantiateAsync(wasmBinary, wasmBinaryFile, info, receiveInstantiationResult).catch(readyPromiseReject);
	414	+ return {};
381	415	}
382	416
	417	+// include: runtime_debug.js
	418	+// end include: runtime_debug.js
383	419	// === Body ===
384	420	// end include: preamble.js
385		-class ExitStatus {
386		- name="ExitStatus";
387		- constructor(status) {
388		- this.message = `Program terminated with exit(${status})`;
389		- this.status = status;
390		- }
	421	+/** @constructor */ function ExitStatus(status) {
	422	+ this.name = "ExitStatus";
	423	+ this.message = `Program terminated with exit(${status})`;
	424	+ this.status = status;
391	425	}
392	426
393	427	var callRuntimeCallbacks = callbacks => {
394		- while (callbacks.length > 0) {
395		- // Pass the module as the first argument.
396		- callbacks.shift()(Module);
397		- }
	428	+ // Pass the module as the first argument.
	429	+ callbacks.forEach(f => f(Module));
398	430	};
399	431
400		-var onPostRuns = [];
401		-
402		-var addOnPostRun = cb => onPostRuns.unshift(cb);
403		-
404		-var onPreRuns = [];
405		-
406		-var addOnPreRun = cb => onPreRuns.unshift(cb);
407		-
408	432	/**
409	433	* @param {number} ptr
410	434	* @param {string} type
411	435	*/ function getValue(ptr, type = "i8") {
412	436	if (type.endsWith("")) type = "";
		@@ -422,11 +446,11 @@
422	446
423	447	case "i32":
424	448	return HEAP32[((ptr) >> 2)];
425	449
426	450	case "i64":
427		- return HEAP64[((ptr) >> 3)];
	451	+ abort("to do getValue(i64) use WASM_BIGINT");
428	452
429	453	case "float":
430	454	return HEAPF32[((ptr) >> 2)];
431	455
432	456	case "double":
		@@ -464,12 +488,11 @@
464	488	case "i32":
465	489	HEAP32[((ptr) >> 2)] = value;
466	490	break;
467	491
468	492	case "i64":
469		- HEAP64[((ptr) >> 3)] = BigInt(value);
470		- break;
	493	+ abort("to do setValue(i64) use WASM_BIGINT");
471	494
472	495	case "float":
473	496	HEAPF32[((ptr) >> 2)] = value;
474	497	break;
475	498
		@@ -560,11 +583,13 @@
560	583	* frequent uses of UTF8ToString() with and without maxBytesToRead may throw
561	584	* JS JIT optimizations off, so it is worth to consider consistently using one
562	585	* @return {string}
563	586	*/ var UTF8ToString = (ptr, maxBytesToRead) => ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : "";
564	587
565		-var ___assert_fail = (condition, filename, line, func) => abort(`Assertion failed: ${UTF8ToString(condition)}, at: ` + [ filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function" ]);
	588	+var ___assert_fail = (condition, filename, line, func) => {
	589	+ abort(`Assertion failed: ${UTF8ToString(condition)}, at: ` + [ filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function" ]);
	590	+};
566	591
567	592	var abortOnCannotGrowMemory = requestedSize => {
568	593	abort("OOM");
569	594	};
570	595
		@@ -756,51 +781,69 @@
756	781	/** @export */ a: ___assert_fail,
757	782	/** @export */ b: _emscripten_resize_heap,
758	783	/** @export */ c: _exit
759	784	};
760	785
761		-var wasmExports = await createWasm();
762		-
763		-var ___wasm_call_ctors = wasmExports["e"];
764		-
765		-var _pikchr = Module["_pikchr"] = wasmExports["g"];
766		-
767		-var __emscripten_stack_restore = wasmExports["h"];
768		-
769		-var __emscripten_stack_alloc = wasmExports["i"];
770		-
771		-var _emscripten_stack_get_current = wasmExports["j"];
	786	+var wasmExports = createWasm();
	787	+
	788	+var ___wasm_call_ctors = () => (___wasm_call_ctors = wasmExports["e"])();
	789	+
	790	+var _pikchr_version = Module["_pikchr_version"] = () => (_pikchr_version = Module["_pikchr_version"] = wasmExports["g"])();
	791	+
	792	+var _pikchr = Module["_pikchr"] = (a0, a1, a2, a3, a4) => (_pikchr = Module["_pikchr"] = wasmExports["h"])(a0, a1, a2, a3, a4);
	793	+
	794	+var __emscripten_stack_restore = a0 => (__emscripten_stack_restore = wasmExports["i"])(a0);
	795	+
	796	+var __emscripten_stack_alloc = a0 => (__emscripten_stack_alloc = wasmExports["j"])(a0);
	797	+
	798	+var _emscripten_stack_get_current = () => (_emscripten_stack_get_current = wasmExports["k"])();
772	799
773	800	// include: postamble.js
774	801	// === Auto-generated postamble setup entry stuff ===
775	802	Module["stackSave"] = stackSave;
776	803
777	804	Module["stackRestore"] = stackRestore;
778	805
779	806	Module["stackAlloc"] = stackAlloc;
780	807
	808	+Module["ccall"] = ccall;
	809	+
781	810	Module["cwrap"] = cwrap;
782	811
783	812	Module["setValue"] = setValue;
784	813
785	814	Module["getValue"] = getValue;
786	815
	816	+var calledRun;
	817	+
	818	+var calledPrerun;
	819	+
	820	+dependenciesFulfilled = function runCaller() {
	821	+ // If run has never been called, and we should call run (INVOKE_RUN is true, and Module.noInitialRun is not false)
	822	+ if (!calledRun) run();
	823	+ if (!calledRun) dependenciesFulfilled = runCaller;
	824	+};
	825	+
	826	+// try this again later, after new deps are fulfilled
787	827	function run() {
788	828	if (runDependencies > 0) {
789		- dependenciesFulfilled = run;
790	829	return;
791	830	}
792		- preRun();
793		- // a preRun added a dependency, run will be called later
794		- if (runDependencies > 0) {
795		- dependenciesFulfilled = run;
796		- return;
	831	+ if (!calledPrerun) {
	832	+ calledPrerun = 1;
	833	+ preRun();
	834	+ // a preRun added a dependency, run will be called later
	835	+ if (runDependencies > 0) {
	836	+ return;
	837	+ }
797	838	}
798	839	function doRun() {
799	840	// run may have just been called through dependencies being fulfilled just in this very frame,
800	841	// or while the async setStatus time below was happening
801		- Module["calledRun"] = true;
	842	+ if (calledRun) return;
	843	+ calledRun = 1;
	844	+ Module["calledRun"] = 1;
802	845	if (ABORT) return;
803	846	initRuntime();
804	847	readyPromiseResolve(Module);
805	848	Module["onRuntimeInitialized"]?.();
806	849	postRun();
		@@ -836,12 +879,9 @@
836	879
837	880	return moduleRtn;
838	881	}
839	882	);
840	883	})();
841		-if (typeof exports === 'object' && typeof module === 'object') {
	884	+if (typeof exports === 'object' && typeof module === 'object')
842	885	module.exports = initPikchrModule;
843		- // This default export looks redundant, but it allows TS to import this
844		- // commonjs style module.
845		- module.exports.default = initPikchrModule;
846		-} else if (typeof define === 'function' && define['amd'])
	886	+else if (typeof define === 'function' && define['amd'])
847	887	define([], () => initPikchrModule);
848	888

	--- extsrc/pikchr.js
	+++ extsrc/pikchr.js
	@@ -1,10 +1,11 @@

1	var initPikchrModule = (() => {
2	var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
3
4	return (
5	async function(moduleArg = {}) {
6	var moduleRtn;
7
8	// include: shell.js
9	// The Module object: Our interface to the outside world. We import
10	// and export values on it. There are various ways Module can be used:
	@@ -88,25 +89,25 @@
88	// If scriptDirectory contains a query (starting with ?) or a fragment (starting with #),
89	// they are removed because they could contain a slash.
90	if (scriptDirectory.startsWith("blob:")) {
91	scriptDirectory = "";
92	} else {
93	scriptDirectory = scriptDirectory.slice(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf("/") + 1);
94	}
95	{
96	// include: web_or_worker_shell_read.js
97	readAsync = async url => {
98	var response = await fetch(url, {
99	credentials: "same-origin"
100	});
101	if (response.ok) {
102	return response.arrayBuffer();
103	}
104	throw new Error(response.status + " : " + response.url);
105	};
106	}
107	} else {}

108
109	var out = Module["print"] \|\| console.log.bind(console);
110
111	var err = Module["printErr"] \|\| console.error.bind(console);
112
	@@ -152,25 +153,13 @@
152	// NOTE: This is also used as the process return code code in shell environments
153	// but only when noExitRuntime is false.
154	var EXITSTATUS;
155
156	// Memory management
157	var /** @type {!Int8Array} / HEAP8, /* @type {!Uint8Array} / HEAPU8, /* @type {!Int16Array} / HEAP16, /* @type {!Uint16Array} / HEAPU16, /* @type {!Int32Array} / HEAP32, /* @type {!Uint32Array} / HEAPU32, /* @type {!Float32Array} / HEAPF32, / BigInt64Array type is not correctly defined in closure
158	/** not-@type {!BigInt64Array} / HEAP64, / BigUint64Array type is not correctly defined in closure
159	/** not-t@type {!BigUint64Array} / HEAPU64, /* @type {!Float64Array} */ HEAPF64;
160
161	var runtimeInitialized = false;
162
163	// include: runtime_shared.js
164	// include: runtime_stack_check.js
165	// end include: runtime_stack_check.js
166	// include: runtime_exceptions.js
167	// end include: runtime_exceptions.js
168	// include: runtime_debug.js
169	// end include: runtime_debug.js
170	// include: memoryprofiler.js
171	// end include: memoryprofiler.js
172	function updateMemoryViews() {
173	var b = wasmMemory.buffer;
174	Module["HEAP8"] = HEAP8 = new Int8Array(b);
175	Module["HEAP16"] = HEAP16 = new Int16Array(b);
176	Module["HEAPU8"] = HEAPU8 = new Uint8Array(b);
	@@ -177,48 +166,77 @@
177	Module["HEAPU16"] = HEAPU16 = new Uint16Array(b);
178	Module["HEAP32"] = HEAP32 = new Int32Array(b);
179	Module["HEAPU32"] = HEAPU32 = new Uint32Array(b);
180	Module["HEAPF32"] = HEAPF32 = new Float32Array(b);
181	Module["HEAPF64"] = HEAPF64 = new Float64Array(b);
182	Module["HEAP64"] = HEAP64 = new BigInt64Array(b);
183	Module["HEAPU64"] = HEAPU64 = new BigUint64Array(b);
184	}
185
186	// end include: runtime_shared.js













187	function preRun() {
188	if (Module["preRun"]) {
189	if (typeof Module["preRun"] == "function") Module["preRun"] = [ Module["preRun"] ];
190	while (Module["preRun"].length) {
191	addOnPreRun(Module["preRun"].shift());
192	}
193	}
194	callRuntimeCallbacks(onPreRuns);
195	}
196
197	function initRuntime() {
198	runtimeInitialized = true;
199	wasmExports["e"]();
200	}
201
202	function postRun() {
203	if (Module["postRun"]) {
204	if (typeof Module["postRun"] == "function") Module["postRun"] = [ Module["postRun"] ];
205	while (Module["postRun"].length) {
206	addOnPostRun(Module["postRun"].shift());
207	}
208	}
209	callRuntimeCallbacks(onPostRuns);












210	}
211






212	// A counter of dependencies for calling run(). If we need to
213	// do asynchronous work before running, increment this and
214	// decrement it. Incrementing must happen in a place like
215	// Module.preRun (used by emcc to add file preloading).
216	// Note that you can add dependencies in preRun, even though
217	// it happens right before run - run will be postponed until
218	// the dependencies are met.
219	var runDependencies = 0;


220
221	var dependenciesFulfilled = null;
222
223	function addRunDependency(id) {
224	runDependencies++;
	@@ -227,10 +245,14 @@
227
228	function removeRunDependency(id) {
229	runDependencies--;
230	Module["monitorRunDependencies"]?.(runDependencies);
231	if (runDependencies == 0) {




232	if (dependenciesFulfilled) {
233	var callback = dependenciesFulfilled;
234	dependenciesFulfilled = null;
235	callback();
236	}
	@@ -263,15 +285,33 @@
263	// in code paths apart from instantiation where an exception is expected
264	// to be thrown when abort is called.
265	throw e;
266	}
267
268	var wasmBinaryFile;




269








270	function findWasmBinary() {
271	return locateFile("pikchr.wasm");




272	}


273
274	function getBinarySync(file) {
275	if (file == wasmBinaryFile && wasmBinary) {
276	return new Uint8Array(wasmBinary);
277	}
	@@ -279,50 +319,48 @@
279	return readBinary(file);
280	}
281	throw "both async and sync fetching of the wasm failed";
282	}
283
284	async function getWasmBinary(binaryFile) {
285	// If we don't have the binary yet, load it asynchronously using readAsync.
286	if (!wasmBinary) {
287	// Fetch the binary using readAsync
288	try {
289	var response = await readAsync(binaryFile);
290	return new Uint8Array(response);
291	} catch {}
292	}
293	// Otherwise, getBinarySync should be able to get it synchronously
294	return getBinarySync(binaryFile);
295	}
296
297	async function instantiateArrayBuffer(binaryFile, imports) {
298	try {
299	var binary = await getWasmBinary(binaryFile);
300	var instance = await WebAssembly.instantiate(binary, imports);
301	return instance;
302	} catch (reason) {
303	err(`failed to asynchronously prepare wasm: ${reason}`);
304	abort(reason);
305	}
306	}
307
308	async function instantiateAsync(binary, binaryFile, imports) {
309	if (!binary && typeof WebAssembly.instantiateStreaming == "function") {
310	try {
311	var response = fetch(binaryFile, {
312	credentials: "same-origin"











313	});
314	var instantiationResult = await WebAssembly.instantiateStreaming(response, imports);
315	return instantiationResult;
316	} catch (reason) {
317	// We expect the most common failure cause to be a bad MIME type for the binary,
318	// in which case falling back to ArrayBuffer instantiation should work.
319	err(`wasm streaming compile failed: ${reason}`);
320	err("falling back to ArrayBuffer instantiation");
321	}
322	}
323	return instantiateArrayBuffer(binaryFile, imports);
324	}
325
326	function getWasmImports() {
327	// prepare imports
328	return {
	@@ -330,18 +368,20 @@
330	};
331	}
332
333	// Create the wasm instance.
334	// Receives the wasm imports, returns the exports.
335	async function createWasm() {

336	// Load the wasm module and create an instance of using native support in the JS engine.
337	// handle a generated wasm instance, receiving its exports and
338	// performing other necessary setup
339	/** @param {WebAssembly.Module=} module*/ function receiveInstance(instance, module) {
340	wasmExports = instance.exports;
341	wasmMemory = wasmExports["d"];
342	updateMemoryViews();

343	removeRunDependency("wasm-instantiate");
344	return wasmExports;
345	}
346	// wait for the pthread pool (if any)
347	addRunDependency("wasm-instantiate");
	@@ -349,64 +389,48 @@
349	function receiveInstantiationResult(result) {
350	// 'result' is a ResultObject object which has both the module and instance.
351	// receiveInstance() will swap in the exports (to Module.asm) so they can be called
352	// TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193, the above line no longer optimizes out down to the following line.
353	// When the regression is fixed, can restore the above PTHREADS-enabled path.
354	return receiveInstance(result["instance"]);
355	}
356	var info = getWasmImports();
357	// User shell pages can write their own Module.instantiateWasm = function(imports, successCallback) callback
358	// to manually instantiate the Wasm module themselves. This allows pages to
359	// run the instantiation parallel to any other async startup actions they are
360	// performing.
361	// Also pthreads and wasm workers initialize the wasm instance through this
362	// path.
363	if (Module["instantiateWasm"]) {
364	return new Promise((resolve, reject) => {
365	Module["instantiateWasm"](info, (mod, inst) => {
366	receiveInstance(mod, inst);
367	resolve(mod.exports);
368	});
369	});

370	}
371	wasmBinaryFile ??= findWasmBinary();
372	try {
373	var result = await instantiateAsync(wasmBinary, wasmBinaryFile, info);
374	var exports = receiveInstantiationResult(result);
375	return exports;
376	} catch (e) {
377	// If instantiation fails, reject the module ready promise.
378	readyPromiseReject(e);
379	return Promise.reject(e);
380	}
381	}
382


383	// === Body ===
384	// end include: preamble.js
385	class ExitStatus {
386	name="ExitStatus";
387	constructor(status) {
388	this.message = `Program terminated with exit(${status})`;
389	this.status = status;
390	}
391	}
392
393	var callRuntimeCallbacks = callbacks => {
394	while (callbacks.length > 0) {
395	// Pass the module as the first argument.
396	callbacks.shift()(Module);
397	}
398	};
399
400	var onPostRuns = [];
401
402	var addOnPostRun = cb => onPostRuns.unshift(cb);
403
404	var onPreRuns = [];
405
406	var addOnPreRun = cb => onPreRuns.unshift(cb);
407
408	/**
409	* @param {number} ptr
410	* @param {string} type
411	*/ function getValue(ptr, type = "i8") {
412	if (type.endsWith("")) type = "";
	@@ -422,11 +446,11 @@
422
423	case "i32":
424	return HEAP32[((ptr) >> 2)];
425
426	case "i64":
427	return HEAP64[((ptr) >> 3)];
428
429	case "float":
430	return HEAPF32[((ptr) >> 2)];
431
432	case "double":
	@@ -464,12 +488,11 @@
464	case "i32":
465	HEAP32[((ptr) >> 2)] = value;
466	break;
467
468	case "i64":
469	HEAP64[((ptr) >> 3)] = BigInt(value);
470	break;
471
472	case "float":
473	HEAPF32[((ptr) >> 2)] = value;
474	break;
475
	@@ -560,11 +583,13 @@
560	* frequent uses of UTF8ToString() with and without maxBytesToRead may throw
561	* JS JIT optimizations off, so it is worth to consider consistently using one
562	* @return {string}
563	*/ var UTF8ToString = (ptr, maxBytesToRead) => ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : "";
564
565	var ___assert_fail = (condition, filename, line, func) => abort(`Assertion failed: ${UTF8ToString(condition)}, at: ` + [ filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function" ]);


566
567	var abortOnCannotGrowMemory = requestedSize => {
568	abort("OOM");
569	};
570
	@@ -756,51 +781,69 @@
756	/** @export */ a: ___assert_fail,
757	/** @export */ b: _emscripten_resize_heap,
758	/** @export */ c: _exit
759	};
760
761	var wasmExports = await createWasm();
762
763	var ___wasm_call_ctors = wasmExports["e"];
764
765	var _pikchr = Module["_pikchr"] = wasmExports["g"];
766
767	var __emscripten_stack_restore = wasmExports["h"];
768
769	var __emscripten_stack_alloc = wasmExports["i"];
770
771	var _emscripten_stack_get_current = wasmExports["j"];


772
773	// include: postamble.js
774	// === Auto-generated postamble setup entry stuff ===
775	Module["stackSave"] = stackSave;
776
777	Module["stackRestore"] = stackRestore;
778
779	Module["stackAlloc"] = stackAlloc;
780


781	Module["cwrap"] = cwrap;
782
783	Module["setValue"] = setValue;
784
785	Module["getValue"] = getValue;
786











787	function run() {
788	if (runDependencies > 0) {
789	dependenciesFulfilled = run;
790	return;
791	}
792	preRun();
793	// a preRun added a dependency, run will be called later
794	if (runDependencies > 0) {
795	dependenciesFulfilled = run;
796	return;


797	}
798	function doRun() {
799	// run may have just been called through dependencies being fulfilled just in this very frame,
800	// or while the async setStatus time below was happening
801	Module["calledRun"] = true;


802	if (ABORT) return;
803	initRuntime();
804	readyPromiseResolve(Module);
805	Module["onRuntimeInitialized"]?.();
806	postRun();
	@@ -836,12 +879,9 @@
836
837	return moduleRtn;
838	}
839	);
840	})();
841	if (typeof exports === 'object' && typeof module === 'object') {
842	module.exports = initPikchrModule;
843	// This default export looks redundant, but it allows TS to import this
844	// commonjs style module.
845	module.exports.default = initPikchrModule;
846	} else if (typeof define === 'function' && define['amd'])
847	define([], () => initPikchrModule);
848

	--- extsrc/pikchr.js
	+++ extsrc/pikchr.js
	@@ -1,10 +1,11 @@
1
2	var initPikchrModule = (() => {
3	var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
4
5	return (
6	function(moduleArg = {}) {
7	var moduleRtn;
8
9	// include: shell.js
10	// The Module object: Our interface to the outside world. We import
11	// and export values on it. There are various ways Module can be used:
	@@ -88,25 +89,25 @@
89	// If scriptDirectory contains a query (starting with ?) or a fragment (starting with #),
90	// they are removed because they could contain a slash.
91	if (scriptDirectory.startsWith("blob:")) {
92	scriptDirectory = "";
93	} else {
94	scriptDirectory = scriptDirectory.substr(0, scriptDirectory.replace(/[?#].*/, "").lastIndexOf("/") + 1);
95	}
96	{
97	// include: web_or_worker_shell_read.js
98	readAsync = url => fetch(url, {
99	credentials: "same-origin"
100	}).then(response => {

101	if (response.ok) {
102	return response.arrayBuffer();
103	}
104	return Promise.reject(new Error(response.status + " : " + response.url));
105	});
106	}
107	} else // end include: web_or_worker_shell_read.js
108	{}
109
110	var out = Module["print"] \|\| console.log.bind(console);
111
112	var err = Module["printErr"] \|\| console.error.bind(console);
113
	@@ -152,25 +153,13 @@
153	// NOTE: This is also used as the process return code code in shell environments
154	// but only when noExitRuntime is false.
155	var EXITSTATUS;
156
157	// Memory management
158	var /** @type {!Int8Array} / HEAP8, /* @type {!Uint8Array} / HEAPU8, /* @type {!Int16Array} / HEAP16, /* @type {!Uint16Array} / HEAPU16, /* @type {!Int32Array} / HEAP32, /* @type {!Uint32Array} / HEAPU32, /* @type {!Float32Array} / HEAPF32, /* @type {!Float64Array} */ HEAPF64;




159
160	// include: runtime_shared.js








161	function updateMemoryViews() {
162	var b = wasmMemory.buffer;
163	Module["HEAP8"] = HEAP8 = new Int8Array(b);
164	Module["HEAP16"] = HEAP16 = new Int16Array(b);
165	Module["HEAPU8"] = HEAPU8 = new Uint8Array(b);
	@@ -177,48 +166,77 @@
166	Module["HEAPU16"] = HEAPU16 = new Uint16Array(b);
167	Module["HEAP32"] = HEAP32 = new Int32Array(b);
168	Module["HEAPU32"] = HEAPU32 = new Uint32Array(b);
169	Module["HEAPF32"] = HEAPF32 = new Float32Array(b);
170	Module["HEAPF64"] = HEAPF64 = new Float64Array(b);


171	}
172
173	// end include: runtime_shared.js
174	// include: runtime_stack_check.js
175	// end include: runtime_stack_check.js
176	var __ATPRERUN__ = [];
177
178	// functions called before the runtime is initialized
179	var __ATINIT__ = [];
180
181	// functions called during shutdown
182	var __ATPOSTRUN__ = [];
183
184	// functions called after the main() is called
185	var runtimeInitialized = false;
186
187	function preRun() {
188	var preRuns = Module["preRun"];
189	if (preRuns) {
190	if (typeof preRuns == "function") preRuns = [ preRuns ];
191	preRuns.forEach(addOnPreRun);

192	}
193	callRuntimeCallbacks(__ATPRERUN__);
194	}
195
196	function initRuntime() {
197	runtimeInitialized = true;
198	callRuntimeCallbacks(__ATINIT__);
199	}
200
201	function postRun() {
202	var postRuns = Module["postRun"];
203	if (postRuns) {
204	if (typeof postRuns == "function") postRuns = [ postRuns ];
205	postRuns.forEach(addOnPostRun);

206	}
207	callRuntimeCallbacks(__ATPOSTRUN__);
208	}
209
210	function addOnPreRun(cb) {
211	__ATPRERUN__.unshift(cb);
212	}
213
214	function addOnInit(cb) {
215	__ATINIT__.unshift(cb);
216	}
217
218	function addOnPostRun(cb) {
219	__ATPOSTRUN__.unshift(cb);
220	}
221
222	// include: runtime_math.js
223	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul
224	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/fround
225	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32
226	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc
227	// end include: runtime_math.js
228	// A counter of dependencies for calling run(). If we need to
229	// do asynchronous work before running, increment this and
230	// decrement it. Incrementing must happen in a place like
231	// Module.preRun (used by emcc to add file preloading).
232	// Note that you can add dependencies in preRun, even though
233	// it happens right before run - run will be postponed until
234	// the dependencies are met.
235	var runDependencies = 0;
236
237	var runDependencyWatcher = null;
238
239	var dependenciesFulfilled = null;
240
241	function addRunDependency(id) {
242	runDependencies++;
	@@ -227,10 +245,14 @@
245
246	function removeRunDependency(id) {
247	runDependencies--;
248	Module["monitorRunDependencies"]?.(runDependencies);
249	if (runDependencies == 0) {
250	if (runDependencyWatcher !== null) {
251	clearInterval(runDependencyWatcher);
252	runDependencyWatcher = null;
253	}
254	if (dependenciesFulfilled) {
255	var callback = dependenciesFulfilled;
256	dependenciesFulfilled = null;
257	callback();
258	}
	@@ -263,15 +285,33 @@
285	// in code paths apart from instantiation where an exception is expected
286	// to be thrown when abort is called.
287	throw e;
288	}
289
290	// include: memoryprofiler.js
291	// end include: memoryprofiler.js
292	// include: URIUtils.js
293	// Prefix of data URIs emitted by SINGLE_FILE and related options.
294	var dataURIPrefix = "data:application/octet-stream;base64,";
295
296	/**
297	* Indicates whether filename is a base64 data URI.
298	* @noinline
299	*/ var isDataURI = filename => filename.startsWith(dataURIPrefix);
300
301	// end include: URIUtils.js
302	// include: runtime_exceptions.js
303	// end include: runtime_exceptions.js
304	function findWasmBinary() {
305	var f = "pikchr-v7583078860.wasm";
306	if (!isDataURI(f)) {
307	return locateFile(f);
308	}
309	return f;
310	}
311
312	var wasmBinaryFile;
313
314	function getBinarySync(file) {
315	if (file == wasmBinaryFile && wasmBinary) {
316	return new Uint8Array(wasmBinary);
317	}
	@@ -279,50 +319,48 @@
319	return readBinary(file);
320	}
321	throw "both async and sync fetching of the wasm failed";
322	}
323
324	function getBinaryPromise(binaryFile) {
325	// If we don't have the binary yet, load it asynchronously using readAsync.
326	if (!wasmBinary) {
327	// Fetch the binary using readAsync
328	return readAsync(binaryFile).then(response => new Uint8Array(/** @type{!ArrayBuffer} */ (response)), // Fall back to getBinarySync if readAsync fails
329	() => getBinarySync(binaryFile));


330	}
331	// Otherwise, getBinarySync should be able to get it synchronously
332	return Promise.resolve().then(() => getBinarySync(binaryFile));
333	}
334
335	function instantiateArrayBuffer(binaryFile, imports, receiver) {
336	return getBinaryPromise(binaryFile).then(binary => WebAssembly.instantiate(binary, imports)).then(receiver, reason => {




337	err(`failed to asynchronously prepare wasm: ${reason}`);
338	abort(reason);
339	});
340	}
341
342	function instantiateAsync(binary, binaryFile, imports, callback) {
343	if (!binary && typeof WebAssembly.instantiateStreaming == "function" && !isDataURI(binaryFile) && typeof fetch == "function") {
344	return fetch(binaryFile, {
345	credentials: "same-origin"
346	}).then(response => {
347	// Suppress closure warning here since the upstream definition for
348	// instantiateStreaming only allows Promise<Repsponse> rather than
349	// an actual Response.
350	// TODO(https://github.com/google/closure-compiler/pull/3913): Remove if/when upstream closure is fixed.
351	/** @suppress {checkTypes} */ var result = WebAssembly.instantiateStreaming(response, imports);
352	return result.then(callback, function(reason) {
353	// We expect the most common failure cause to be a bad MIME type for the binary,
354	// in which case falling back to ArrayBuffer instantiation should work.
355	err(`wasm streaming compile failed: ${reason}`);
356	err("falling back to ArrayBuffer instantiation");
357	return instantiateArrayBuffer(binaryFile, imports, callback);
358	});
359	});
360	}
361	return instantiateArrayBuffer(binaryFile, imports, callback);







362	}
363
364	function getWasmImports() {
365	// prepare imports
366	return {
	@@ -330,18 +368,20 @@
368	};
369	}
370
371	// Create the wasm instance.
372	// Receives the wasm imports, returns the exports.
373	function createWasm() {
374	var info = getWasmImports();
375	// Load the wasm module and create an instance of using native support in the JS engine.
376	// handle a generated wasm instance, receiving its exports and
377	// performing other necessary setup
378	/** @param {WebAssembly.Module=} module*/ function receiveInstance(instance, module) {
379	wasmExports = instance.exports;
380	wasmMemory = wasmExports["d"];
381	updateMemoryViews();
382	addOnInit(wasmExports["e"]);
383	removeRunDependency("wasm-instantiate");
384	return wasmExports;
385	}
386	// wait for the pthread pool (if any)
387	addRunDependency("wasm-instantiate");
	@@ -349,64 +389,48 @@
389	function receiveInstantiationResult(result) {
390	// 'result' is a ResultObject object which has both the module and instance.
391	// receiveInstance() will swap in the exports (to Module.asm) so they can be called
392	// TODO: Due to Closure regression https://github.com/google/closure-compiler/issues/3193, the above line no longer optimizes out down to the following line.
393	// When the regression is fixed, can restore the above PTHREADS-enabled path.
394	receiveInstance(result["instance"]);
395	}

396	// User shell pages can write their own Module.instantiateWasm = function(imports, successCallback) callback
397	// to manually instantiate the Wasm module themselves. This allows pages to
398	// run the instantiation parallel to any other async startup actions they are
399	// performing.
400	// Also pthreads and wasm workers initialize the wasm instance through this
401	// path.
402	if (Module["instantiateWasm"]) {
403	try {
404	return Module["instantiateWasm"](info, receiveInstance);
405	} catch (e) {
406	err(`Module.instantiateWasm callback failed with error: ${e}`);
407	// If instantiation fails, reject the module ready promise.
408	readyPromiseReject(e);
409	}
410	}
411	wasmBinaryFile ??= findWasmBinary();
412	// If instantiation fails, reject the module ready promise.
413	instantiateAsync(wasmBinary, wasmBinaryFile, info, receiveInstantiationResult).catch(readyPromiseReject);
414	return {};






415	}
416
417	// include: runtime_debug.js
418	// end include: runtime_debug.js
419	// === Body ===
420	// end include: preamble.js
421	/** @constructor */ function ExitStatus(status) {
422	this.name = "ExitStatus";
423	this.message = `Program terminated with exit(${status})`;
424	this.status = status;


425	}
426
427	var callRuntimeCallbacks = callbacks => {
428	// Pass the module as the first argument.
429	callbacks.forEach(f => f(Module));


430	};
431








432	/**
433	* @param {number} ptr
434	* @param {string} type
435	*/ function getValue(ptr, type = "i8") {
436	if (type.endsWith("")) type = "";
	@@ -422,11 +446,11 @@
446
447	case "i32":
448	return HEAP32[((ptr) >> 2)];
449
450	case "i64":
451	abort("to do getValue(i64) use WASM_BIGINT");
452
453	case "float":
454	return HEAPF32[((ptr) >> 2)];
455
456	case "double":
	@@ -464,12 +488,11 @@
488	case "i32":
489	HEAP32[((ptr) >> 2)] = value;
490	break;
491
492	case "i64":
493	abort("to do setValue(i64) use WASM_BIGINT");

494
495	case "float":
496	HEAPF32[((ptr) >> 2)] = value;
497	break;
498
	@@ -560,11 +583,13 @@
583	* frequent uses of UTF8ToString() with and without maxBytesToRead may throw
584	* JS JIT optimizations off, so it is worth to consider consistently using one
585	* @return {string}
586	*/ var UTF8ToString = (ptr, maxBytesToRead) => ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : "";
587
588	var ___assert_fail = (condition, filename, line, func) => {
589	abort(`Assertion failed: ${UTF8ToString(condition)}, at: ` + [ filename ? UTF8ToString(filename) : "unknown filename", line, func ? UTF8ToString(func) : "unknown function" ]);
590	};
591
592	var abortOnCannotGrowMemory = requestedSize => {
593	abort("OOM");
594	};
595
	@@ -756,51 +781,69 @@
781	/** @export */ a: ___assert_fail,
782	/** @export */ b: _emscripten_resize_heap,
783	/** @export */ c: _exit
784	};
785
786	var wasmExports = createWasm();
787
788	var ___wasm_call_ctors = () => (___wasm_call_ctors = wasmExports["e"])();
789
790	var _pikchr_version = Module["_pikchr_version"] = () => (_pikchr_version = Module["_pikchr_version"] = wasmExports["g"])();
791
792	var _pikchr = Module["_pikchr"] = (a0, a1, a2, a3, a4) => (_pikchr = Module["_pikchr"] = wasmExports["h"])(a0, a1, a2, a3, a4);
793
794	var __emscripten_stack_restore = a0 => (__emscripten_stack_restore = wasmExports["i"])(a0);
795
796	var __emscripten_stack_alloc = a0 => (__emscripten_stack_alloc = wasmExports["j"])(a0);
797
798	var _emscripten_stack_get_current = () => (_emscripten_stack_get_current = wasmExports["k"])();
799
800	// include: postamble.js
801	// === Auto-generated postamble setup entry stuff ===
802	Module["stackSave"] = stackSave;
803
804	Module["stackRestore"] = stackRestore;
805
806	Module["stackAlloc"] = stackAlloc;
807
808	Module["ccall"] = ccall;
809
810	Module["cwrap"] = cwrap;
811
812	Module["setValue"] = setValue;
813
814	Module["getValue"] = getValue;
815
816	var calledRun;
817
818	var calledPrerun;
819
820	dependenciesFulfilled = function runCaller() {
821	// If run has never been called, and we should call run (INVOKE_RUN is true, and Module.noInitialRun is not false)
822	if (!calledRun) run();
823	if (!calledRun) dependenciesFulfilled = runCaller;
824	};
825
826	// try this again later, after new deps are fulfilled
827	function run() {
828	if (runDependencies > 0) {

829	return;
830	}
831	if (!calledPrerun) {
832	calledPrerun = 1;
833	preRun();
834	// a preRun added a dependency, run will be called later
835	if (runDependencies > 0) {
836	return;
837	}
838	}
839	function doRun() {
840	// run may have just been called through dependencies being fulfilled just in this very frame,
841	// or while the async setStatus time below was happening
842	if (calledRun) return;
843	calledRun = 1;
844	Module["calledRun"] = 1;
845	if (ABORT) return;
846	initRuntime();
847	readyPromiseResolve(Module);
848	Module["onRuntimeInitialized"]?.();
849	postRun();
	@@ -836,12 +879,9 @@
879
880	return moduleRtn;
881	}
882	);
883	})();
884	if (typeof exports === 'object' && typeof module === 'object')
885	module.exports = initPikchrModule;
886	else if (typeof define === 'function' && define['amd'])



887	define([], () => initPikchrModule);
888

M extsrc/pikchr.wasm

		--- extsrc/pikchr.wasm
		+++ extsrc/pikchr.wasm
		cannot compute difference between binary files
1	1

	--- extsrc/pikchr.wasm
	+++ extsrc/pikchr.wasm
0	annot compute difference between binary files
1

	--- extsrc/pikchr.wasm
	+++ extsrc/pikchr.wasm
0	annot compute difference between binary files
1

M src/builtin.c

+16

		--- src/builtin.c
		+++ src/builtin.c
		@@ -52,17 +52,33 @@
52	52	return -1;
53	53	}
54	54
55	55	/*
56	56	** Return a pointer to built-in content
	57	+**
	58	+** If the filename contains "-vNNNNNNNN" just before the final file
	59	+** suffix, where each N is a random digit, then omit that part of the
	60	+** filename before doing the lookup. The extra -vNNNNNNNN was added
	61	+** to defeat overly aggressive caching by web browsers. There must be
	62	+** at least 8 digits in NNNNNNNN but more than 8 are allowed.
57	63	*/
58	64	const unsigned char builtin_file(const char zFilename, int *piSize){
59	65	int i = builtin_file_index(zFilename);
60	66	if( i>=0 ){
61	67	if( piSize ) *piSize = aBuiltinFiles[i].nByte;
62	68	return aBuiltinFiles[i].pData;
63	69	}else{
	70	+ char *zV = strstr(zFilename, "-v");
	71	+ if( zV!=0 ){
	72	+ for(i=0; fossil_isdigit(zV[i+2]); i++){}
	73	+ if( i>=8 && zV[i+2]=='.' ){
	74	+ char zNew = mprintf("%.s%s", (int)(zV-zFilename), zFilename, zV+i+2);
	75	+ const unsigned char *pRes = builtin_file(zNew, piSize);
	76	+ fossil_free(zNew);
	77	+ return pRes;
	78	+ }
	79	+ }
64	80	if( piSize ) *piSize = 0;
65	81	return 0;
66	82	}
67	83	}
68	84	const char builtin_text(const char zFilename){
69	85

	--- src/builtin.c
	+++ src/builtin.c
	@@ -52,17 +52,33 @@
52	return -1;
53	}
54
55	/*
56	** Return a pointer to built-in content






57	*/
58	const unsigned char builtin_file(const char zFilename, int *piSize){
59	int i = builtin_file_index(zFilename);
60	if( i>=0 ){
61	if( piSize ) *piSize = aBuiltinFiles[i].nByte;
62	return aBuiltinFiles[i].pData;
63	}else{










64	if( piSize ) *piSize = 0;
65	return 0;
66	}
67	}
68	const char builtin_text(const char zFilename){
69

	--- src/builtin.c
	+++ src/builtin.c
	@@ -52,17 +52,33 @@
52	return -1;
53	}
54
55	/*
56	** Return a pointer to built-in content
57	**
58	** If the filename contains "-vNNNNNNNN" just before the final file
59	** suffix, where each N is a random digit, then omit that part of the
60	** filename before doing the lookup. The extra -vNNNNNNNN was added
61	** to defeat overly aggressive caching by web browsers. There must be
62	** at least 8 digits in NNNNNNNN but more than 8 are allowed.
63	*/
64	const unsigned char builtin_file(const char zFilename, int *piSize){
65	int i = builtin_file_index(zFilename);
66	if( i>=0 ){
67	if( piSize ) *piSize = aBuiltinFiles[i].nByte;
68	return aBuiltinFiles[i].pData;
69	}else{
70	char *zV = strstr(zFilename, "-v");
71	if( zV!=0 ){
72	for(i=0; fossil_isdigit(zV[i+2]); i++){}
73	if( i>=8 && zV[i+2]=='.' ){
74	char zNew = mprintf("%.s%s", (int)(zV-zFilename), zFilename, zV+i+2);
75	const unsigned char *pRes = builtin_file(zNew, piSize);
76	fossil_free(zNew);
77	return pRes;
78	}
79	}
80	if( piSize ) *piSize = 0;
81	return 0;
82	}
83	}
84	const char builtin_text(const char zFilename){
85

M src/fossil.page.pikchrshowasm.js

+12 -4

		--- src/fossil.page.pikchrshowasm.js
		+++ src/fossil.page.pikchrshowasm.js
		@@ -120,11 +120,16 @@
120	120	}
121	121	});
122	122	delete PS._config;
123	123	}
124	124
125		- PS.worker = new Worker('builtin/extsrc/pikchr-worker.js');
	125	+ /* Randomize the name of the worker script so that it is never cached.
	126	+ ** The Fossil /builtin method will automatically remove the "-v000000000"
	127	+ ** part of the filename, resolving it to just "pikchr-worker.js". */
	128	+ PS.worker = new Worker('builtin/extsrc/pikchr-worker-v'+
	129	+ (Math.floor(Math.random()*10000000000) + 1000000000)+
	130	+ '.js');
126	131	PS.worker.onmessage = (ev)=>PS.runMsgHandlers(ev.data);
127	132	PS.addMsgHandler('stdout', console.log.bind(console));
128	133	PS.addMsgHandler('stderr', console.error.bind(console));
129	134
130	135	/** Handles status updates from the Module object. */
		@@ -172,21 +177,21 @@
172	177	PS.renderModeLabels[PS.renderModes[PS.renderModes.selectedIndex]];
173	178
174	179	/**
175	180	The 'pikchr-ready' event is fired (with no payload) when the
176	181	wasm module has finished loading. */
177		- PS.addMsgHandler('pikchr-ready', function(){
	182	+ PS.addMsgHandler('pikchr-ready', function(event){
178	183	PS.clearMsgHandlers('pikchr-ready');
179		- F.page.onPikchrshowLoaded();
	184	+ F.page.onPikchrshowLoaded(event.data);
180	185	});
181	186
182	187	/**
183	188	Performs all app initialization which must wait until after the
184	189	worker module is loaded. This function removes itself when it's
185	190	called.
186	191	*/
187		- F.page.onPikchrshowLoaded = function(){
	192	+ F.page.onPikchrshowLoaded = function(pikchrVersion){
188	193	delete this.onPikchrshowLoaded;
189	194	// Unhide all elements which start out hidden
190	195	EAll('.initially-hidden').forEach((e)=>e.classList.remove('initially-hidden'));
191	196	const taInput = E('#input');
192	197	const btnClearIn = E('#btn-clear');
		@@ -439,10 +444,13 @@
439	444	if( src && (new URL(self.location.href).searchParams).has('fromSession') ){
440	445	taInput.value = src;
441	446	window.sessionStorage.removeItem('pikchr-xfer');
442	447	}
443	448	}
	449	+ D.append(E('fieldset.options > div'),
	450	+ D.append(D.addClass(D.span(), 'labeled-input'),
	451	+ 'pikchr v. '+pikchrVersion));
444	452
445	453	PS.e.btnRender.click();
446	454
447	455	/** Debounce handler for auto-rendering while typing. */
448	456	const debounceAutoRender = F.debounce(function f(){
449	457

	--- src/fossil.page.pikchrshowasm.js
	+++ src/fossil.page.pikchrshowasm.js
	@@ -120,11 +120,16 @@
120	}
121	});
122	delete PS._config;
123	}
124
125	PS.worker = new Worker('builtin/extsrc/pikchr-worker.js');





126	PS.worker.onmessage = (ev)=>PS.runMsgHandlers(ev.data);
127	PS.addMsgHandler('stdout', console.log.bind(console));
128	PS.addMsgHandler('stderr', console.error.bind(console));
129
130	/** Handles status updates from the Module object. */
	@@ -172,21 +177,21 @@
172	PS.renderModeLabels[PS.renderModes[PS.renderModes.selectedIndex]];
173
174	/**
175	The 'pikchr-ready' event is fired (with no payload) when the
176	wasm module has finished loading. */
177	PS.addMsgHandler('pikchr-ready', function(){
178	PS.clearMsgHandlers('pikchr-ready');
179	F.page.onPikchrshowLoaded();
180	});
181
182	/**
183	Performs all app initialization which must wait until after the
184	worker module is loaded. This function removes itself when it's
185	called.
186	*/
187	F.page.onPikchrshowLoaded = function(){
188	delete this.onPikchrshowLoaded;
189	// Unhide all elements which start out hidden
190	EAll('.initially-hidden').forEach((e)=>e.classList.remove('initially-hidden'));
191	const taInput = E('#input');
192	const btnClearIn = E('#btn-clear');
	@@ -439,10 +444,13 @@
439	if( src && (new URL(self.location.href).searchParams).has('fromSession') ){
440	taInput.value = src;
441	window.sessionStorage.removeItem('pikchr-xfer');
442	}
443	}



444
445	PS.e.btnRender.click();
446
447	/** Debounce handler for auto-rendering while typing. */
448	const debounceAutoRender = F.debounce(function f(){
449

	--- src/fossil.page.pikchrshowasm.js
	+++ src/fossil.page.pikchrshowasm.js
	@@ -120,11 +120,16 @@
120	}
121	});
122	delete PS._config;
123	}
124
125	/* Randomize the name of the worker script so that it is never cached.
126	** The Fossil /builtin method will automatically remove the "-v000000000"
127	** part of the filename, resolving it to just "pikchr-worker.js". */
128	PS.worker = new Worker('builtin/extsrc/pikchr-worker-v'+
129	(Math.floor(Math.random()*10000000000) + 1000000000)+
130	'.js');
131	PS.worker.onmessage = (ev)=>PS.runMsgHandlers(ev.data);
132	PS.addMsgHandler('stdout', console.log.bind(console));
133	PS.addMsgHandler('stderr', console.error.bind(console));
134
135	/** Handles status updates from the Module object. */
	@@ -172,21 +177,21 @@
177	PS.renderModeLabels[PS.renderModes[PS.renderModes.selectedIndex]];
178
179	/**
180	The 'pikchr-ready' event is fired (with no payload) when the
181	wasm module has finished loading. */
182	PS.addMsgHandler('pikchr-ready', function(event){
183	PS.clearMsgHandlers('pikchr-ready');
184	F.page.onPikchrshowLoaded(event.data);
185	});
186
187	/**
188	Performs all app initialization which must wait until after the
189	worker module is loaded. This function removes itself when it's
190	called.
191	*/
192	F.page.onPikchrshowLoaded = function(pikchrVersion){
193	delete this.onPikchrshowLoaded;
194	// Unhide all elements which start out hidden
195	EAll('.initially-hidden').forEach((e)=>e.classList.remove('initially-hidden'));
196	const taInput = E('#input');
197	const btnClearIn = E('#btn-clear');
	@@ -439,10 +444,13 @@
444	if( src && (new URL(self.location.href).searchParams).has('fromSession') ){
445	taInput.value = src;
446	window.sessionStorage.removeItem('pikchr-xfer');
447	}
448	}
449	D.append(E('fieldset.options > div'),
450	D.append(D.addClass(D.span(), 'labeled-input'),
451	'pikchr v. '+pikchrVersion));
452
453	PS.e.btnRender.click();
454
455	/** Debounce handler for auto-rendering while typing. */
456	const debounceAutoRender = F.debounce(function f(){
457

M src/main.mk

+4 -3

		--- src/main.mk
		+++ src/main.mk
		@@ -2134,18 +2134,19 @@
2134	2134	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2135	2135
2136	2136	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2137	2137	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2138	2138
2139		-$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c
	2139	+$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2140	2140	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2141		- -sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackAlloc,stackRestore \
2142		- -sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c \
	2141	+ -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
	2142	+ -sEXPORTED_FUNCTIONS=_pikchr,_pikchr_version $(SRCDIR_extsrc)/pikchr.c \
2143	2143	-sENVIRONMENT=web \
2144	2144	-sMODULARIZE \
2145	2145	-sEXPORT_NAME=initPikchrModule \
2146	2146	--minify 0
	2147	+ $(TCLSH) $(TOPDIR)/tools/randomize-js-names.tcl $(SRCDIR_extsrc)
2147	2148	@chmod -x $(SRCDIR_extsrc)/pikchr.wasm
2148	2149	wasm: $(SRCDIR_extsrc)/pikchr.js
2149	2150
2150	2151	#
2151	2152	# compile_commands.json support...
2152	2153

	--- src/main.mk
	+++ src/main.mk
	@@ -2134,18 +2134,19 @@
2134	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2135
2136	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2137	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2138
2139	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c
2140	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2141	-sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackAlloc,stackRestore \
2142	-sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c \
2143	-sENVIRONMENT=web \
2144	-sMODULARIZE \
2145	-sEXPORT_NAME=initPikchrModule \
2146	--minify 0

2147	@chmod -x $(SRCDIR_extsrc)/pikchr.wasm
2148	wasm: $(SRCDIR_extsrc)/pikchr.js
2149
2150	#
2151	# compile_commands.json support...
2152

	--- src/main.mk
	+++ src/main.mk
	@@ -2134,18 +2134,19 @@
2134	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2135
2136	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2137	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2138
2139	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
2140	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry \
2141	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore \
2142	-sEXPORTED_FUNCTIONS=_pikchr,_pikchr_version $(SRCDIR_extsrc)/pikchr.c \
2143	-sENVIRONMENT=web \
2144	-sMODULARIZE \
2145	-sEXPORT_NAME=initPikchrModule \
2146	--minify 0
2147	$(TCLSH) $(TOPDIR)/tools/randomize-js-names.tcl $(SRCDIR_extsrc)
2148	@chmod -x $(SRCDIR_extsrc)/pikchr.wasm
2149	wasm: $(SRCDIR_extsrc)/pikchr.js
2150
2151	#
2152	# compile_commands.json support...
2153

M tools/makemake.tcl

+4 -3

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -567,18 +567,19 @@
567	567	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568	568
569	569	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
570	570	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571	571
572		-$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c
	572	+$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
573	573	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574		- -sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackRestore <<<NEXT_LINE>>>
575		- -sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c <<<NEXT_LINE>>>
	574	+ -sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
	575	+ -sEXPORTED_FUNCTIONS=_pikchr,_pikchr_version $(SRCDIR_extsrc)/pikchr.c <<<NEXT_LINE>>>
576	576	-sENVIRONMENT=web <<<NEXT_LINE>>>
577	577	-sMODULARIZE <<<NEXT_LINE>>>
578	578	-sEXPORT_NAME=initPikchrModule <<<NEXT_LINE>>>
579	579	--minify 0
	580	+ $(TCLSH) $(TOPDIR)/tools/randomize-js-names.tcl $(SRCDIR_extsrc)
580	581	@chmod -x $(SRCDIR_extsrc)/pikchr.wasm
581	582	wasm: $(SRCDIR_extsrc)/pikchr.js
582	583
583	584	#
584	585	# compile_commands.json support...
585	586
586	587	ADDED tools/randomize-js-names.tcl

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -567,18 +567,19 @@
567	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568
569	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
570	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571
572	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c
573	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574	-sEXPORTED_RUNTIME_METHODS=cwrap,setValue,getValue,stackSave,stackRestore <<<NEXT_LINE>>>
575	-sEXPORTED_FUNCTIONS=_pikchr $(SRCDIR_extsrc)/pikchr.c <<<NEXT_LINE>>>
576	-sENVIRONMENT=web <<<NEXT_LINE>>>
577	-sMODULARIZE <<<NEXT_LINE>>>
578	-sEXPORT_NAME=initPikchrModule <<<NEXT_LINE>>>
579	--minify 0

580	@chmod -x $(SRCDIR_extsrc)/pikchr.wasm
581	wasm: $(SRCDIR_extsrc)/pikchr.js
582
583	#
584	# compile_commands.json support...
585
586	DDED tools/randomize-js-names.tcl

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -567,18 +567,19 @@
567	$(XTCC) $(PIKCHR_OPTIONS) -c $(SRCDIR_extsrc)/pikchr.c -o $@
568
569	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
570	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
571
572	$(SRCDIR_extsrc)/pikchr.js: $(SRCDIR_extsrc)/pikchr.c $(MAKEFILE_LIST)
573	$(EMCC_WRAPPER) -o $@ $(EMCC_OPT) --no-entry <<<NEXT_LINE>>>
574	-sEXPORTED_RUNTIME_METHODS=cwrap,ccall,setValue,getValue,stackSave,stackAlloc,stackRestore <<<NEXT_LINE>>>
575	-sEXPORTED_FUNCTIONS=_pikchr,_pikchr_version $(SRCDIR_extsrc)/pikchr.c <<<NEXT_LINE>>>
576	-sENVIRONMENT=web <<<NEXT_LINE>>>
577	-sMODULARIZE <<<NEXT_LINE>>>
578	-sEXPORT_NAME=initPikchrModule <<<NEXT_LINE>>>
579	--minify 0
580	$(TCLSH) $(TOPDIR)/tools/randomize-js-names.tcl $(SRCDIR_extsrc)
581	@chmod -x $(SRCDIR_extsrc)/pikchr.wasm
582	wasm: $(SRCDIR_extsrc)/pikchr.js
583
584	#
585	# compile_commands.json support...
586
587	DDED tools/randomize-js-names.tcl

M tools/randomize-js-names.tcl

+36

		--- a/tools/randomize-js-names.tcl
		+++ b/tools/randomize-js-names.tcl
		@@ -0,0 +1,36 @@
	1	+#!/usr/bin/tclsh
	2	+#
	3	+# This script is run as part of "make wasm". After emcc has
	4	+# run to generate extsrc/pikchr.wasm and extsrc/pikchr.js from
	5	+# extsrc/pikchr.c, we need to make changes to these filenames to
	6	+# work around caching problems.
	7	+#
	8	+# (1) in extsrc/pikchr.js -> change "pikchr.wasm" into
	9	+# "pikchr-vNNNNNNNN.wasm" where Ns are random digits.
	10	+#
	11	+# (2) in extsrc/pikchr-worker.js -> change "pikchr-vNNNNNNNN.js"
	12	+# by altering the random digits N.
	13	+#
	14	+set DIR extsrc
	15	+if {[llength $argv]>0} {
	16	+ set DIR [lindex $argv 0]
	17	+}
	18	+
	19	+set R [expr {int(rand()*10000000000)+1000000000}]
	20	+set in [open $DIR/pikchr.js rb]
	21	+set f1 [read $in]
	22	+close $in
	23	+set f1mod [regsub {\ypikchr(-v\d+)?\.wasm\y} $f1 "pikchr-v$R.wasm"]
	24	+set out [open $DIR/pikchr.js wb]
	25	+puts -nonewline $out $f1mod
	26	+close $out
	27	+puts "modified $DIR/pikchr.js to reference \"pikchr-v$R.wasm\""
	28	+
	29	+set in [open $DIR/pikchr-worker.js rb]
	30	+set f1 [read $in]
	31	+close $in
	32	+set f1mod [regsub {\ypikchr(-v\d+)?\.js\y} $f1 "pikchr-v$R.js"]
	33	+set out [open $DIR/pikchr-worker.js wb]
	34	+puts -nonewline $out $f1mod
	35	+close $out
	36	+puts "modified $DIR/pikchr-worker.js to reference \"pikchr-v$R.js\""

	--- a/tools/randomize-js-names.tcl
	+++ b/tools/randomize-js-names.tcl
	@@ -0,0 +1,36 @@

	--- a/tools/randomize-js-names.tcl
	+++ b/tools/randomize-js-names.tcl
	@@ -0,0 +1,36 @@
1	#!/usr/bin/tclsh
2	#
3	# This script is run as part of "make wasm". After emcc has
4	# run to generate extsrc/pikchr.wasm and extsrc/pikchr.js from
5	# extsrc/pikchr.c, we need to make changes to these filenames to
6	# work around caching problems.
7	#
8	# (1) in extsrc/pikchr.js -> change "pikchr.wasm" into
9	# "pikchr-vNNNNNNNN.wasm" where Ns are random digits.
10	#
11	# (2) in extsrc/pikchr-worker.js -> change "pikchr-vNNNNNNNN.js"
12	# by altering the random digits N.
13	#
14	set DIR extsrc
15	if {[llength $argv]>0} {
16	set DIR [lindex $argv 0]
17	}
18
19	set R [expr {int(rand()*10000000000)+1000000000}]
20	set in [open $DIR/pikchr.js rb]
21	set f1 [read $in]
22	close $in
23	set f1mod [regsub {\ypikchr(-v\d+)?\.wasm\y} $f1 "pikchr-v$R.wasm"]
24	set out [open $DIR/pikchr.js wb]
25	puts -nonewline $out $f1mod
26	close $out
27	puts "modified $DIR/pikchr.js to reference \"pikchr-v$R.wasm\""
28
29	set in [open $DIR/pikchr-worker.js rb]
30	set f1 [read $in]
31	close $in
32	set f1mod [regsub {\ypikchr(-v\d+)?\.js\y} $f1 "pikchr-v$R.js"]
33	set out [open $DIR/pikchr-worker.js wb]
34	puts -nonewline $out $f1mod
35	close $out
36	puts "modified $DIR/pikchr-worker.js to reference \"pikchr-v$R.js\""

Fossil SCM

Keyboard Shortcuts