Fossil SCM

Merge from trunk

larrybr 2021-02-15 01:56 msvc_make_fixup merge

Commit 3f496aa752ccc71bfec9e5a9e6a93d72adcdf2c26d213633ec424064274ab131

Parent 6095d54ee746bfb…

10 files changed +4 -1 +85 -97 +85 -97 +85 -97 +1041 -1021 +1041 -1021 +10 -7 +722 -425 +722 -425 +722 -425

~ src/chat.c ~ src/makemake.tcl ~ src/makemake.tcl ~ src/makemake.tcl ~ src/pikchr.c ~ src/pikchr.c ~ src/wikiformat.c ~ win/Makefile.msc ~ win/Makefile.msc ~ win/Makefile.msc

M src/chat.c

+4 -1

		--- src/chat.c
		+++ src/chat.c
		@@ -371,16 +371,19 @@
371	371	zSafe[k] = 0;
372	372	if( j<i ){
373	373	blob_append(&out, zSafe + j, i-j);
374	374	j = i;
375	375	}
376		- wiki_resolve_hyperlink(&out, WIKI_NOBADLINKS\|WIKI_TARGET_BLANK,
	376	+ blob_append_char(&out, '[');
	377	+ wiki_resolve_hyperlink(&out,
	378	+ WIKI_NOBADLINKS\|WIKI_TARGET_BLANK\|WIKI_NOBRACKET,
377	379	zSafe+i+1, zClose, sizeof(zClose), zSafe, 0);
378	380	zSafe[k] = ']';
379	381	j++;
380	382	blob_append(&out, zSafe + j, k - j);
381	383	blob_append(&out, zClose, -1);
	384	+ blob_append_char(&out, ']');
382	385	i = k;
383	386	j = k+1;
384	387	continue;
385	388	}
386	389	}else if( zSafe[i]=='h'
387	390

	--- src/chat.c
	+++ src/chat.c
	@@ -371,16 +371,19 @@
371	zSafe[k] = 0;
372	if( j<i ){
373	blob_append(&out, zSafe + j, i-j);
374	j = i;
375	}
376	wiki_resolve_hyperlink(&out, WIKI_NOBADLINKS\|WIKI_TARGET_BLANK,


377	zSafe+i+1, zClose, sizeof(zClose), zSafe, 0);
378	zSafe[k] = ']';
379	j++;
380	blob_append(&out, zSafe + j, k - j);
381	blob_append(&out, zClose, -1);

382	i = k;
383	j = k+1;
384	continue;
385	}
386	}else if( zSafe[i]=='h'
387

	--- src/chat.c
	+++ src/chat.c
	@@ -371,16 +371,19 @@
371	zSafe[k] = 0;
372	if( j<i ){
373	blob_append(&out, zSafe + j, i-j);
374	j = i;
375	}
376	blob_append_char(&out, '[');
377	wiki_resolve_hyperlink(&out,
378	WIKI_NOBADLINKS\|WIKI_TARGET_BLANK\|WIKI_NOBRACKET,
379	zSafe+i+1, zClose, sizeof(zClose), zSafe, 0);
380	zSafe[k] = ']';
381	j++;
382	blob_append(&out, zSafe + j, k - j);
383	blob_append(&out, zClose, -1);
384	blob_append_char(&out, ']');
385	i = k;
386	j = k+1;
387	continue;
388	}
389	}else if( zSafe[i]=='h'
390

M src/makemake.tcl

+85 -97

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1466,13 +1466,17 @@
1466	1466	SRCDIR = $(B)\src
1467	1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	1468	BUILDDIR = Build
1469	1469	!message Using default build directory, $(BUILDDIR)
1470	1470	!endif
	1471	+# Top of build/staging/object directory subtree
1471	1472	T = $(BUILDDIR)
	1473	+# Where object and other intermediate binary files will go
1472	1474	OBJDIR = $(T)
	1475	+# Staging area for translated or generated sources
1473	1476	OX = $(OBJDIR)
	1477	+# Extensions for this platform
1474	1478	O = .obj
1475	1479	E = .exe
1476	1480	P = .pdb
1477	1481
1478	1482	!ifndef INSTALLDIR
		@@ -1491,20 +1495,32 @@
1491	1495	#
1492	1496	!if !exist("$(B)\.fossil-settings")
1493	1497	!error Please specify path to project base directory: B="path/to/fossil"
1494	1498	!endif
1495	1499
1496		-# Create build directory during preprocessing if needed.
	1500	+# Create build, object and staging directory during preprocessing if needed.
1497	1501	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
	1502	+!endif
	1503	+!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
	1504	+!endif
	1505	+!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
1498	1506	!endif
1499	1507
1500	1508	# Perl is only necessary if OpenSSL support is enabled and it is built from
1501	1509	# source code. The PERLDIR environment variable, if it exists, should point
1502	1510	# to the directory containing the main Perl executable specified here (i.e.
1503	1511	# "perl.exe").
1504		-!ifndef PERL
	1512	+!if $(FOSSIL_BUILD_SSL)!=0
	1513	+! if !defined(PERL) && [where PERL.exe > nul 2>&1]
	1514	+PERL = perl.exe
	1515	+!undef PERLDIR
	1516	+! elseif !defined(PERL)
	1517	+! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
1505	1518	PERL = perl.exe
	1519	+! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
	1520	+! endif
	1521	+! endif
1506	1522	!endif
1507	1523
1508	1524	# Enable debugging symbols?
1509	1525	!ifndef DEBUG
1510	1526	DEBUG = 0
		@@ -1653,30 +1669,30 @@
1653	1669	!endif
1654	1670
1655	1671	!if $(FOSSIL_ENABLE_WINXP)!=0
1656	1672	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1657	1673	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1658		-!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	1674	+! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1659	1675	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1660		-!else
	1676	+! else
1661	1677	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1662		-!endif
	1678	+! endif
1663	1679	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1664	1680	!endif
1665	1681
1666	1682	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1667		-!if $(DEBUG)!=0
1668		-CRTFLAGS = /MDd
1669		-!else
1670		-CRTFLAGS = /MD
1671		-!endif
1672		-!else
1673		-!if $(DEBUG)!=0
1674		-CRTFLAGS = /MTd
1675		-!else
1676		-CRTFLAGS = /MT
1677		-!endif
	1683	+! if $(DEBUG)!=0
	1684	+CRTFLAGS = /MDd
	1685	+! else
	1686	+CRTFLAGS = /MD
	1687	+! endif
	1688	+!else
	1689	+! if $(DEBUG)!=0
	1690	+CRTFLAGS = /MTd
	1691	+! else
	1692	+CRTFLAGS = /MT
	1693	+! endif
1678	1694	!endif
1679	1695
1680	1696	!if $(DEBUG)!=0
1681	1697	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1682	1698	LDFLAGS = $(LDFLAGS) /DEBUG
		@@ -1769,49 +1785,41 @@
1769	1785	writeln -nonewline " "
1770	1786	}
1771	1787	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1772	1788	}
1773	1789	writeln "\n"
1774		-writeln -nonewline "EXTRA_FILES = "
	1790	+writeln -nonewline "EXTRA_FILES ="
1775	1791	set i 0
1776	1792	foreach s [lsort $extra_files] {
1777		- if {$i > 0} {
1778		- writeln " \\"
1779		- writeln -nonewline " "
1780		- }
1781	1793	set s [regsub -all / $s \\]
1782		- writeln -nonewline "\"\$(SRCDIR)\\${s}\""; incr i
	1794	+ writeln -nonewline " \\\n \"\$(SRCDIR)\\${s}\""; incr i
1783	1795	}
1784	1796	writeln "\n"
1785	1797	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1786	1798	writeln -nonewline "OBJ = "
1787	1799	set i 0
1788	1800	foreach s [lsort [concat $src $AdditionalObj]] {
1789		- if {$i > 0} {
1790		- writeln " \\"
1791		- writeln -nonewline " "
1792		- }
1793		- writeln -nonewline "\"\$(OX)\\$s\$O\""; incr i
1794		-}
1795		-if {$i > 0} {
1796		- writeln " \\"
1797		-}
1798		-writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1799		-writeln -nonewline " "
1800		-writeln "\"\$(OX)\\miniz\$O\" \\"; incr i
1801		-writeln "!endif"
1802		-writeln -nonewline " \"\$(OX)\\fossil.res\"\n\n"
	1801	+ writeln -nonewline " \\\n \"\$(OX)\\$s\$O\""
	1802	+ incr i
	1803	+}
	1804	+writeln {
	1805	+!if $(FOSSIL_ENABLE_MINIZ)!=0
	1806	+OBJ = $(OBJ) "$(OX)\miniz$O"
	1807	+!endif
	1808	+OBJ = $(OBJ) "$(OX)\fossil.res"
	1809	+}
	1810	+
1803	1811	writeln [string map [list <<<NEXT_LINE>>> \\] {
1804	1812	!ifndef BASEAPPNAME
1805	1813	BASEAPPNAME = fossil
1806	1814	!endif
1807	1815
1808	1816	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1809	1817	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1810	1818	APPTARGETS =
1811	1819
1812		-all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
	1820	+all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
1813	1821
1814	1822	$(BASEAPPNAME): "$(APPNAME)"
1815	1823
1816	1824	$(BASEAPPNAME)$(E): "$(APPNAME)"
1817	1825
		@@ -1823,55 +1831,49 @@
1823	1831	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1824	1832	!if $(DEBUG)!=0
1825	1833	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1826	1834	!endif
1827	1835
1828		-$(OX):
1829		- if not exist $@\. mkdir $@
1830		-
1831		-!if "$(BUILDDIR)"!="$(OX)"
1832		-$(BUILDDIR):
1833		- if not exist $@\. mkdir $@
1834		-!endif
1835		-
	1836	+ZLIB_X = "$(OX)\zlib_built"
1836	1837	!if $(FOSSIL_BUILD_ZLIB)
1837	1838	zlib $(ZLIB_X):
1838	1839	@echo Building zlib from "$(ZLIBDIR)"...
1839	1840	!if $(FOSSIL_ENABLE_WINXP)!=0
1840	1841	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1841	1842	!else
1842	1843	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1843	1844	!endif
1844		- copy nul $(ZLIB_X)
	1845	+ cmd /E:ON /c date /T > $(ZLIB_X)
1845	1846
1846	1847	clean-zlib:
1847	1848	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1848	1849	!endif
1849	1850
1850	1851	!if $(FOSSIL_ENABLE_SSL)!=0
1851	1852	OPENSSL_X = "$(OX)\openssl.opts"
1852	1853	openssl $(OPENSSL_X):
1853	1854	@echo Building OpenSSL from "$(SSLDIR)"...
1854		-!ifdef PERLDIR
	1855	+! ifdef PERLDIR
1855	1856	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1856		-!else
	1857	+! else
1857	1858	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1858		-!endif
1859		-!if $(FOSSIL_ENABLE_WINXP)!=0
	1859	+! endif
	1860	+! if $(FOSSIL_ENABLE_WINXP)!=0
1860	1861	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1861		-!else
	1862	+! else
1862	1863	@pushd "$(SSLDIR)" && $(MAKE) && popd
1863		- echo $(SSLCONFIG) > $(OPENSSL_X)
1864		-!endif
	1864	+! endif
	1865	+ echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
	1866	+ cmd /E:ON /c date /T >> $(OPENSSL_X)
1865	1867
1866	1868	clean-openssl:
1867	1869	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1868	1870	-del $(OPENSSL_X)
1869	1871
1870		-!if $(FOSSIL_BUILD_SSL)!=0
	1872	+! if $(FOSSIL_BUILD_SSL)!=0
1871	1873	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1872		-!endif
	1874	+! endif
1873	1875
1874	1876	!endif
1875	1877
1876	1878	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1877	1879	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
		@@ -1894,37 +1896,22 @@
1894	1896	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1895	1897	writeln "!endif"
1896	1898	writeln "\techo \$(LIBS) $redir \$@"
1897	1899	writeln {
1898	1900
	1901	+{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
	1902	+ $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1903	+
1899	1904	# This target gets the project tools built.
1900	1905	toolset: \
1901	1906	"$(OBJDIR)\translate$E" \
1902	1907	"$(OBJDIR)\makeheaders$E" \
1903	1908	"$(OBJDIR)\mkindex$E" \
1904	1909	"$(OBJDIR)\mkbuiltin$E" \
1905	1910	"$(OBJDIR)\mkversion$E" \
1906	1911	"$(OBJDIR)\codecheck1$E"
1907	1912
1908		-"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1909		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1910		-
1911		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1912		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1913		-
1914		-"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1915		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1916		-
1917		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1918		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1919		-
1920		-"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1921		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1922		-
1923		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1924		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1925		-
1926	1913	!if $(USE_SEE)!=0
1927	1914	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1928	1915	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1929	1916	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1930	1917	!else
		@@ -2015,49 +2002,50 @@
2015	2002	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2016	2003	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2017	2004	}
2018	2005
2019	2006	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2020		-set redir {>}
	2007	+writeln "\t-echo. > \$@"
2021	2008	foreach s [lsort $extra_files] {
2022		- writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2023		- set redir {>>}
	2009	+ writeln "\t@echo \"\$(SRCDIR)\\${s}\" >> \$@"
2024	2010	}
2025	2011
2026		-writeln ""
2027		-writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2028		-writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2029		-
2030		-writeln "{\$(OX)}.c{\$(OX)}.h :"
	2012	+writeln "{\$(OX)\\}.c{\$(OX)\\}.h:"
2031	2013	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2032	2014
2033		-writeln ""
	2015	+writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
	2016	+writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@"
	2017	+
2034	2018	foreach s [lsort $src] {
2035	2019	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2036	2020	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"
	2021	+ writeln "\"\$(OX)\\${s}.c\" : \"\$(SRCDIR)\\${s}.c\""
	2022	+ writeln "\"\$(OX)\\${s}.h\" : \"\$(OX)\\${s}.c\""
2037	2023	}
2038	2024
2039	2025	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2040	2026	writeln "\t\$(RCC) /fo \$@ \$**\n"
2041	2027
2042		-writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\VERSION.h\""
2043		-writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" "
	2028	+writeln {
	2029	+DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
	2030	+GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" \
	2031	+ "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
	2032	+}
	2033	+
	2034	+writeln "!if \$(DEPHEADERGEN)==0"
	2035	+writeln -nonewline "GEN_HEADERS = \$(GEN_HEADERS)"
2044	2036	set i 0
2045	2037	foreach s [lsort $src] {
2046		- if {$i > 0} {
2047		- writeln " \\"
2048		- writeln -nonewline "\t\t\t"
2049		- }
2050		- writeln -nonewline "\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2051		-}
2052		-writeln " \\\n\t\t\t\"\$(SRCDIR)\\sqlite3.h\" \\"
2053		-writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2054		-writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2055		-writeln "\t\t\t\"\$(SRCDIR)\\cson_amalgamation.h\""
2056		-writeln "\t@copy /Y nul: $@"
2057		-
2058		-
	2038	+ writeln -nonewline " \\\n\t\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""
	2039	+}
	2040	+writeln "\n!endif"
	2041	+
	2042	+writeln {
	2043	+"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
	2044	+ "$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
	2045	+ @copy /Y NUL $@
	2046	+}
2059	2047	close $output_file
2060	2048	#
2061	2049	# End of the win/Makefile.msc output
2062	2050	##############################################################################
2063	2051	##############################################################################
2064	2052

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1466,13 +1466,17 @@
1466	SRCDIR = $(B)\src
1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	BUILDDIR = Build
1469	!message Using default build directory, $(BUILDDIR)
1470	!endif

1471	T = $(BUILDDIR)

1472	OBJDIR = $(T)

1473	OX = $(OBJDIR)

1474	O = .obj
1475	E = .exe
1476	P = .pdb
1477
1478	!ifndef INSTALLDIR
	@@ -1491,20 +1495,32 @@
1491	#
1492	!if !exist("$(B)\.fossil-settings")
1493	!error Please specify path to project base directory: B="path/to/fossil"
1494	!endif
1495
1496	# Create build directory during preprocessing if needed.
1497	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]




1498	!endif
1499
1500	# Perl is only necessary if OpenSSL support is enabled and it is built from
1501	# source code. The PERLDIR environment variable, if it exists, should point
1502	# to the directory containing the main Perl executable specified here (i.e.
1503	# "perl.exe").
1504	!ifndef PERL





1505	PERL = perl.exe



1506	!endif
1507
1508	# Enable debugging symbols?
1509	!ifndef DEBUG
1510	DEBUG = 0
	@@ -1653,30 +1669,30 @@
1653	!endif
1654
1655	!if $(FOSSIL_ENABLE_WINXP)!=0
1656	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1657	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1658	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1659	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1660	!else
1661	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1662	!endif
1663	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1664	!endif
1665
1666	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1667	!if $(DEBUG)!=0
1668	CRTFLAGS = /MDd
1669	!else
1670	CRTFLAGS = /MD
1671	!endif
1672	!else
1673	!if $(DEBUG)!=0
1674	CRTFLAGS = /MTd
1675	!else
1676	CRTFLAGS = /MT
1677	!endif
1678	!endif
1679
1680	!if $(DEBUG)!=0
1681	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1682	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -1769,49 +1785,41 @@
1769	writeln -nonewline " "
1770	}
1771	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1772	}
1773	writeln "\n"
1774	writeln -nonewline "EXTRA_FILES = "
1775	set i 0
1776	foreach s [lsort $extra_files] {
1777	if {$i > 0} {
1778	writeln " \\"
1779	writeln -nonewline " "
1780	}
1781	set s [regsub -all / $s \\]
1782	writeln -nonewline "\"\$(SRCDIR)\\${s}\""; incr i
1783	}
1784	writeln "\n"
1785	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1786	writeln -nonewline "OBJ = "
1787	set i 0
1788	foreach s [lsort [concat $src $AdditionalObj]] {
1789	if {$i > 0} {
1790	writeln " \\"
1791	writeln -nonewline " "
1792	}
1793	writeln -nonewline "\"\$(OX)\\$s\$O\""; incr i
1794	}
1795	if {$i > 0} {
1796	writeln " \\"
1797	}
1798	writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1799	writeln -nonewline " "
1800	writeln "\"\$(OX)\\miniz\$O\" \\"; incr i
1801	writeln "!endif"
1802	writeln -nonewline " \"\$(OX)\\fossil.res\"\n\n"
1803	writeln [string map [list <<<NEXT_LINE>>> \\] {
1804	!ifndef BASEAPPNAME
1805	BASEAPPNAME = fossil
1806	!endif
1807
1808	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1809	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1810	APPTARGETS =
1811
1812	all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
1813
1814	$(BASEAPPNAME): "$(APPNAME)"
1815
1816	$(BASEAPPNAME)$(E): "$(APPNAME)"
1817
	@@ -1823,55 +1831,49 @@
1823	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1824	!if $(DEBUG)!=0
1825	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1826	!endif
1827
1828	$(OX):
1829	if not exist $@\. mkdir $@
1830
1831	!if "$(BUILDDIR)"!="$(OX)"
1832	$(BUILDDIR):
1833	if not exist $@\. mkdir $@
1834	!endif
1835
1836	!if $(FOSSIL_BUILD_ZLIB)
1837	zlib $(ZLIB_X):
1838	@echo Building zlib from "$(ZLIBDIR)"...
1839	!if $(FOSSIL_ENABLE_WINXP)!=0
1840	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1841	!else
1842	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1843	!endif
1844	copy nul $(ZLIB_X)
1845
1846	clean-zlib:
1847	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1848	!endif
1849
1850	!if $(FOSSIL_ENABLE_SSL)!=0
1851	OPENSSL_X = "$(OX)\openssl.opts"
1852	openssl $(OPENSSL_X):
1853	@echo Building OpenSSL from "$(SSLDIR)"...
1854	!ifdef PERLDIR
1855	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1856	!else
1857	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1858	!endif
1859	!if $(FOSSIL_ENABLE_WINXP)!=0
1860	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1861	!else
1862	@pushd "$(SSLDIR)" && $(MAKE) && popd
1863	echo $(SSLCONFIG) > $(OPENSSL_X)
1864	!endif

1865
1866	clean-openssl:
1867	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1868	-del $(OPENSSL_X)
1869
1870	!if $(FOSSIL_BUILD_SSL)!=0
1871	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1872	!endif
1873
1874	!endif
1875
1876	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1877	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1894,37 +1896,22 @@
1894	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1895	writeln "!endif"
1896	writeln "\techo \$(LIBS) $redir \$@"
1897	writeln {
1898



1899	# This target gets the project tools built.
1900	toolset: \
1901	"$(OBJDIR)\translate$E" \
1902	"$(OBJDIR)\makeheaders$E" \
1903	"$(OBJDIR)\mkindex$E" \
1904	"$(OBJDIR)\mkbuiltin$E" \
1905	"$(OBJDIR)\mkversion$E" \
1906	"$(OBJDIR)\codecheck1$E"
1907
1908	"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1909	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1910
1911	"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1912	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1913
1914	"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1915	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1916
1917	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1918	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1919
1920	"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1921	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1922
1923	"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1924	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1925
1926	!if $(USE_SEE)!=0
1927	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1928	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1929	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1930	!else
	@@ -2015,49 +2002,50 @@
2015	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2016	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2017	}
2018
2019	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2020	set redir {>}
2021	foreach s [lsort $extra_files] {
2022	writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2023	set redir {>>}
2024	}
2025
2026	writeln ""
2027	writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2028	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2029
2030	writeln "{\$(OX)}.c{\$(OX)}.h :"
2031	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2032
2033	writeln ""


2034	foreach s [lsort $src] {
2035	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2036	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"


2037	}
2038
2039	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2040	writeln "\t\$(RCC) /fo \$@ \$**\n"
2041
2042	writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\VERSION.h\""
2043	writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" "






2044	set i 0
2045	foreach s [lsort $src] {
2046	if {$i > 0} {
2047	writeln " \\"
2048	writeln -nonewline "\t\t\t"
2049	}
2050	writeln -nonewline "\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2051	}
2052	writeln " \\\n\t\t\t\"\$(SRCDIR)\\sqlite3.h\" \\"
2053	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2054	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2055	writeln "\t\t\t\"\$(SRCDIR)\\cson_amalgamation.h\""
2056	writeln "\t@copy /Y nul: $@"
2057
2058
2059	close $output_file
2060	#
2061	# End of the win/Makefile.msc output
2062	##############################################################################
2063	##############################################################################
2064

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1466,13 +1466,17 @@
1466	SRCDIR = $(B)\src
1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	BUILDDIR = Build
1469	!message Using default build directory, $(BUILDDIR)
1470	!endif
1471	# Top of build/staging/object directory subtree
1472	T = $(BUILDDIR)
1473	# Where object and other intermediate binary files will go
1474	OBJDIR = $(T)
1475	# Staging area for translated or generated sources
1476	OX = $(OBJDIR)
1477	# Extensions for this platform
1478	O = .obj
1479	E = .exe
1480	P = .pdb
1481
1482	!ifndef INSTALLDIR
	@@ -1491,20 +1495,32 @@
1495	#
1496	!if !exist("$(B)\.fossil-settings")
1497	!error Please specify path to project base directory: B="path/to/fossil"
1498	!endif
1499
1500	# Create build, object and staging directory during preprocessing if needed.
1501	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
1502	!endif
1503	!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
1504	!endif
1505	!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
1506	!endif
1507
1508	# Perl is only necessary if OpenSSL support is enabled and it is built from
1509	# source code. The PERLDIR environment variable, if it exists, should point
1510	# to the directory containing the main Perl executable specified here (i.e.
1511	# "perl.exe").
1512	!if $(FOSSIL_BUILD_SSL)!=0
1513	! if !defined(PERL) && [where PERL.exe > nul 2>&1]
1514	PERL = perl.exe
1515	!undef PERLDIR
1516	! elseif !defined(PERL)
1517	! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
1518	PERL = perl.exe
1519	! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
1520	! endif
1521	! endif
1522	!endif
1523
1524	# Enable debugging symbols?
1525	!ifndef DEBUG
1526	DEBUG = 0
	@@ -1653,30 +1669,30 @@
1669	!endif
1670
1671	!if $(FOSSIL_ENABLE_WINXP)!=0
1672	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1673	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1674	! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1675	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1676	! else
1677	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1678	! endif
1679	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1680	!endif
1681
1682	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1683	! if $(DEBUG)!=0
1684	CRTFLAGS = /MDd
1685	! else
1686	CRTFLAGS = /MD
1687	! endif
1688	!else
1689	! if $(DEBUG)!=0
1690	CRTFLAGS = /MTd
1691	! else
1692	CRTFLAGS = /MT
1693	! endif
1694	!endif
1695
1696	!if $(DEBUG)!=0
1697	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1698	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -1769,49 +1785,41 @@
1785	writeln -nonewline " "
1786	}
1787	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1788	}
1789	writeln "\n"
1790	writeln -nonewline "EXTRA_FILES ="
1791	set i 0
1792	foreach s [lsort $extra_files] {




1793	set s [regsub -all / $s \\]
1794	writeln -nonewline " \\\n \"\$(SRCDIR)\\${s}\""; incr i
1795	}
1796	writeln "\n"
1797	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1798	writeln -nonewline "OBJ = "
1799	set i 0
1800	foreach s [lsort [concat $src $AdditionalObj]] {
1801	writeln -nonewline " \\\n \"\$(OX)\\$s\$O\""
1802	incr i
1803	}
1804	writeln {
1805	!if $(FOSSIL_ENABLE_MINIZ)!=0
1806	OBJ = $(OBJ) "$(OX)\miniz$O"
1807	!endif
1808	OBJ = $(OBJ) "$(OX)\fossil.res"
1809	}
1810




1811	writeln [string map [list <<<NEXT_LINE>>> \\] {
1812	!ifndef BASEAPPNAME
1813	BASEAPPNAME = fossil
1814	!endif
1815
1816	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1817	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1818	APPTARGETS =
1819
1820	all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
1821
1822	$(BASEAPPNAME): "$(APPNAME)"
1823
1824	$(BASEAPPNAME)$(E): "$(APPNAME)"
1825
	@@ -1823,55 +1831,49 @@
1831	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1832	!if $(DEBUG)!=0
1833	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1834	!endif
1835
1836	ZLIB_X = "$(OX)\zlib_built"







1837	!if $(FOSSIL_BUILD_ZLIB)
1838	zlib $(ZLIB_X):
1839	@echo Building zlib from "$(ZLIBDIR)"...
1840	!if $(FOSSIL_ENABLE_WINXP)!=0
1841	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1842	!else
1843	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1844	!endif
1845	cmd /E:ON /c date /T > $(ZLIB_X)
1846
1847	clean-zlib:
1848	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1849	!endif
1850
1851	!if $(FOSSIL_ENABLE_SSL)!=0
1852	OPENSSL_X = "$(OX)\openssl.opts"
1853	openssl $(OPENSSL_X):
1854	@echo Building OpenSSL from "$(SSLDIR)"...
1855	! ifdef PERLDIR
1856	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1857	! else
1858	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1859	! endif
1860	! if $(FOSSIL_ENABLE_WINXP)!=0
1861	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1862	! else
1863	@pushd "$(SSLDIR)" && $(MAKE) && popd
1864	! endif
1865	echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
1866	cmd /E:ON /c date /T >> $(OPENSSL_X)
1867
1868	clean-openssl:
1869	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1870	-del $(OPENSSL_X)
1871
1872	! if $(FOSSIL_BUILD_SSL)!=0
1873	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1874	! endif
1875
1876	!endif
1877
1878	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1879	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1894,37 +1896,22 @@
1896	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1897	writeln "!endif"
1898	writeln "\techo \$(LIBS) $redir \$@"
1899	writeln {
1900
1901	{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
1902	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1903
1904	# This target gets the project tools built.
1905	toolset: \
1906	"$(OBJDIR)\translate$E" \
1907	"$(OBJDIR)\makeheaders$E" \
1908	"$(OBJDIR)\mkindex$E" \
1909	"$(OBJDIR)\mkbuiltin$E" \
1910	"$(OBJDIR)\mkversion$E" \
1911	"$(OBJDIR)\codecheck1$E"
1912


















1913	!if $(USE_SEE)!=0
1914	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1915	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1916	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1917	!else
	@@ -2015,49 +2002,50 @@
2002	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2003	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2004	}
2005
2006	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2007	writeln "\t-echo. > \$@"
2008	foreach s [lsort $extra_files] {
2009	writeln "\t@echo \"\$(SRCDIR)\\${s}\" >> \$@"

2010	}
2011
2012	writeln "{\$(OX)\\}.c{\$(OX)\\}.h:"




2013	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2014
2015	writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2016	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@"
2017
2018	foreach s [lsort $src] {
2019	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2020	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"
2021	writeln "\"\$(OX)\\${s}.c\" : \"\$(SRCDIR)\\${s}.c\""
2022	writeln "\"\$(OX)\\${s}.h\" : \"\$(OX)\\${s}.c\""
2023	}
2024
2025	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2026	writeln "\t\$(RCC) /fo \$@ \$**\n"
2027
2028	writeln {
2029	DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
2030	GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" \
2031	"$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
2032	}
2033
2034	writeln "!if \$(DEPHEADERGEN)==0"
2035	writeln -nonewline "GEN_HEADERS = \$(GEN_HEADERS)"
2036	set i 0
2037	foreach s [lsort $src] {
2038	writeln -nonewline " \\\n\t\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""
2039	}
2040	writeln "\n!endif"
2041
2042	writeln {
2043	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
2044	"$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
2045	@copy /Y NUL $@
2046	}




2047	close $output_file
2048	#
2049	# End of the win/Makefile.msc output
2050	##############################################################################
2051	##############################################################################
2052

M src/makemake.tcl

+85 -97

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1466,13 +1466,17 @@
1466	1466	SRCDIR = $(B)\src
1467	1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	1468	BUILDDIR = Build
1469	1469	!message Using default build directory, $(BUILDDIR)
1470	1470	!endif
	1471	+# Top of build/staging/object directory subtree
1471	1472	T = $(BUILDDIR)
	1473	+# Where object and other intermediate binary files will go
1472	1474	OBJDIR = $(T)
	1475	+# Staging area for translated or generated sources
1473	1476	OX = $(OBJDIR)
	1477	+# Extensions for this platform
1474	1478	O = .obj
1475	1479	E = .exe
1476	1480	P = .pdb
1477	1481
1478	1482	!ifndef INSTALLDIR
		@@ -1491,20 +1495,32 @@
1491	1495	#
1492	1496	!if !exist("$(B)\.fossil-settings")
1493	1497	!error Please specify path to project base directory: B="path/to/fossil"
1494	1498	!endif
1495	1499
1496		-# Create build directory during preprocessing if needed.
	1500	+# Create build, object and staging directory during preprocessing if needed.
1497	1501	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
	1502	+!endif
	1503	+!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
	1504	+!endif
	1505	+!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
1498	1506	!endif
1499	1507
1500	1508	# Perl is only necessary if OpenSSL support is enabled and it is built from
1501	1509	# source code. The PERLDIR environment variable, if it exists, should point
1502	1510	# to the directory containing the main Perl executable specified here (i.e.
1503	1511	# "perl.exe").
1504		-!ifndef PERL
	1512	+!if $(FOSSIL_BUILD_SSL)!=0
	1513	+! if !defined(PERL) && [where PERL.exe > nul 2>&1]
	1514	+PERL = perl.exe
	1515	+!undef PERLDIR
	1516	+! elseif !defined(PERL)
	1517	+! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
1505	1518	PERL = perl.exe
	1519	+! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
	1520	+! endif
	1521	+! endif
1506	1522	!endif
1507	1523
1508	1524	# Enable debugging symbols?
1509	1525	!ifndef DEBUG
1510	1526	DEBUG = 0
		@@ -1653,30 +1669,30 @@
1653	1669	!endif
1654	1670
1655	1671	!if $(FOSSIL_ENABLE_WINXP)!=0
1656	1672	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1657	1673	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1658		-!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	1674	+! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1659	1675	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1660		-!else
	1676	+! else
1661	1677	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1662		-!endif
	1678	+! endif
1663	1679	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1664	1680	!endif
1665	1681
1666	1682	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1667		-!if $(DEBUG)!=0
1668		-CRTFLAGS = /MDd
1669		-!else
1670		-CRTFLAGS = /MD
1671		-!endif
1672		-!else
1673		-!if $(DEBUG)!=0
1674		-CRTFLAGS = /MTd
1675		-!else
1676		-CRTFLAGS = /MT
1677		-!endif
	1683	+! if $(DEBUG)!=0
	1684	+CRTFLAGS = /MDd
	1685	+! else
	1686	+CRTFLAGS = /MD
	1687	+! endif
	1688	+!else
	1689	+! if $(DEBUG)!=0
	1690	+CRTFLAGS = /MTd
	1691	+! else
	1692	+CRTFLAGS = /MT
	1693	+! endif
1678	1694	!endif
1679	1695
1680	1696	!if $(DEBUG)!=0
1681	1697	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1682	1698	LDFLAGS = $(LDFLAGS) /DEBUG
		@@ -1769,49 +1785,41 @@
1769	1785	writeln -nonewline " "
1770	1786	}
1771	1787	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1772	1788	}
1773	1789	writeln "\n"
1774		-writeln -nonewline "EXTRA_FILES = "
	1790	+writeln -nonewline "EXTRA_FILES ="
1775	1791	set i 0
1776	1792	foreach s [lsort $extra_files] {
1777		- if {$i > 0} {
1778		- writeln " \\"
1779		- writeln -nonewline " "
1780		- }
1781	1793	set s [regsub -all / $s \\]
1782		- writeln -nonewline "\"\$(SRCDIR)\\${s}\""; incr i
	1794	+ writeln -nonewline " \\\n \"\$(SRCDIR)\\${s}\""; incr i
1783	1795	}
1784	1796	writeln "\n"
1785	1797	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1786	1798	writeln -nonewline "OBJ = "
1787	1799	set i 0
1788	1800	foreach s [lsort [concat $src $AdditionalObj]] {
1789		- if {$i > 0} {
1790		- writeln " \\"
1791		- writeln -nonewline " "
1792		- }
1793		- writeln -nonewline "\"\$(OX)\\$s\$O\""; incr i
1794		-}
1795		-if {$i > 0} {
1796		- writeln " \\"
1797		-}
1798		-writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1799		-writeln -nonewline " "
1800		-writeln "\"\$(OX)\\miniz\$O\" \\"; incr i
1801		-writeln "!endif"
1802		-writeln -nonewline " \"\$(OX)\\fossil.res\"\n\n"
	1801	+ writeln -nonewline " \\\n \"\$(OX)\\$s\$O\""
	1802	+ incr i
	1803	+}
	1804	+writeln {
	1805	+!if $(FOSSIL_ENABLE_MINIZ)!=0
	1806	+OBJ = $(OBJ) "$(OX)\miniz$O"
	1807	+!endif
	1808	+OBJ = $(OBJ) "$(OX)\fossil.res"
	1809	+}
	1810	+
1803	1811	writeln [string map [list <<<NEXT_LINE>>> \\] {
1804	1812	!ifndef BASEAPPNAME
1805	1813	BASEAPPNAME = fossil
1806	1814	!endif
1807	1815
1808	1816	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1809	1817	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1810	1818	APPTARGETS =
1811	1819
1812		-all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
	1820	+all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
1813	1821
1814	1822	$(BASEAPPNAME): "$(APPNAME)"
1815	1823
1816	1824	$(BASEAPPNAME)$(E): "$(APPNAME)"
1817	1825
		@@ -1823,55 +1831,49 @@
1823	1831	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1824	1832	!if $(DEBUG)!=0
1825	1833	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1826	1834	!endif
1827	1835
1828		-$(OX):
1829		- if not exist $@\. mkdir $@
1830		-
1831		-!if "$(BUILDDIR)"!="$(OX)"
1832		-$(BUILDDIR):
1833		- if not exist $@\. mkdir $@
1834		-!endif
1835		-
	1836	+ZLIB_X = "$(OX)\zlib_built"
1836	1837	!if $(FOSSIL_BUILD_ZLIB)
1837	1838	zlib $(ZLIB_X):
1838	1839	@echo Building zlib from "$(ZLIBDIR)"...
1839	1840	!if $(FOSSIL_ENABLE_WINXP)!=0
1840	1841	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1841	1842	!else
1842	1843	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1843	1844	!endif
1844		- copy nul $(ZLIB_X)
	1845	+ cmd /E:ON /c date /T > $(ZLIB_X)
1845	1846
1846	1847	clean-zlib:
1847	1848	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1848	1849	!endif
1849	1850
1850	1851	!if $(FOSSIL_ENABLE_SSL)!=0
1851	1852	OPENSSL_X = "$(OX)\openssl.opts"
1852	1853	openssl $(OPENSSL_X):
1853	1854	@echo Building OpenSSL from "$(SSLDIR)"...
1854		-!ifdef PERLDIR
	1855	+! ifdef PERLDIR
1855	1856	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1856		-!else
	1857	+! else
1857	1858	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1858		-!endif
1859		-!if $(FOSSIL_ENABLE_WINXP)!=0
	1859	+! endif
	1860	+! if $(FOSSIL_ENABLE_WINXP)!=0
1860	1861	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1861		-!else
	1862	+! else
1862	1863	@pushd "$(SSLDIR)" && $(MAKE) && popd
1863		- echo $(SSLCONFIG) > $(OPENSSL_X)
1864		-!endif
	1864	+! endif
	1865	+ echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
	1866	+ cmd /E:ON /c date /T >> $(OPENSSL_X)
1865	1867
1866	1868	clean-openssl:
1867	1869	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1868	1870	-del $(OPENSSL_X)
1869	1871
1870		-!if $(FOSSIL_BUILD_SSL)!=0
	1872	+! if $(FOSSIL_BUILD_SSL)!=0
1871	1873	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1872		-!endif
	1874	+! endif
1873	1875
1874	1876	!endif
1875	1877
1876	1878	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1877	1879	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
		@@ -1894,37 +1896,22 @@
1894	1896	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1895	1897	writeln "!endif"
1896	1898	writeln "\techo \$(LIBS) $redir \$@"
1897	1899	writeln {
1898	1900
	1901	+{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
	1902	+ $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1903	+
1899	1904	# This target gets the project tools built.
1900	1905	toolset: \
1901	1906	"$(OBJDIR)\translate$E" \
1902	1907	"$(OBJDIR)\makeheaders$E" \
1903	1908	"$(OBJDIR)\mkindex$E" \
1904	1909	"$(OBJDIR)\mkbuiltin$E" \
1905	1910	"$(OBJDIR)\mkversion$E" \
1906	1911	"$(OBJDIR)\codecheck1$E"
1907	1912
1908		-"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1909		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1910		-
1911		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1912		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1913		-
1914		-"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1915		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1916		-
1917		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1918		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1919		-
1920		-"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1921		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1922		-
1923		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1924		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1925		-
1926	1913	!if $(USE_SEE)!=0
1927	1914	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1928	1915	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1929	1916	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1930	1917	!else
		@@ -2015,49 +2002,50 @@
2015	2002	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2016	2003	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2017	2004	}
2018	2005
2019	2006	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2020		-set redir {>}
	2007	+writeln "\t-echo. > \$@"
2021	2008	foreach s [lsort $extra_files] {
2022		- writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2023		- set redir {>>}
	2009	+ writeln "\t@echo \"\$(SRCDIR)\\${s}\" >> \$@"
2024	2010	}
2025	2011
2026		-writeln ""
2027		-writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2028		-writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2029		-
2030		-writeln "{\$(OX)}.c{\$(OX)}.h :"
	2012	+writeln "{\$(OX)\\}.c{\$(OX)\\}.h:"
2031	2013	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2032	2014
2033		-writeln ""
	2015	+writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
	2016	+writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@"
	2017	+
2034	2018	foreach s [lsort $src] {
2035	2019	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2036	2020	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"
	2021	+ writeln "\"\$(OX)\\${s}.c\" : \"\$(SRCDIR)\\${s}.c\""
	2022	+ writeln "\"\$(OX)\\${s}.h\" : \"\$(OX)\\${s}.c\""
2037	2023	}
2038	2024
2039	2025	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2040	2026	writeln "\t\$(RCC) /fo \$@ \$**\n"
2041	2027
2042		-writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\VERSION.h\""
2043		-writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" "
	2028	+writeln {
	2029	+DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
	2030	+GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" \
	2031	+ "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
	2032	+}
	2033	+
	2034	+writeln "!if \$(DEPHEADERGEN)==0"
	2035	+writeln -nonewline "GEN_HEADERS = \$(GEN_HEADERS)"
2044	2036	set i 0
2045	2037	foreach s [lsort $src] {
2046		- if {$i > 0} {
2047		- writeln " \\"
2048		- writeln -nonewline "\t\t\t"
2049		- }
2050		- writeln -nonewline "\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2051		-}
2052		-writeln " \\\n\t\t\t\"\$(SRCDIR)\\sqlite3.h\" \\"
2053		-writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2054		-writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2055		-writeln "\t\t\t\"\$(SRCDIR)\\cson_amalgamation.h\""
2056		-writeln "\t@copy /Y nul: $@"
2057		-
2058		-
	2038	+ writeln -nonewline " \\\n\t\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""
	2039	+}
	2040	+writeln "\n!endif"
	2041	+
	2042	+writeln {
	2043	+"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
	2044	+ "$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
	2045	+ @copy /Y NUL $@
	2046	+}
2059	2047	close $output_file
2060	2048	#
2061	2049	# End of the win/Makefile.msc output
2062	2050	##############################################################################
2063	2051	##############################################################################
2064	2052

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1466,13 +1466,17 @@
1466	SRCDIR = $(B)\src
1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	BUILDDIR = Build
1469	!message Using default build directory, $(BUILDDIR)
1470	!endif

1471	T = $(BUILDDIR)

1472	OBJDIR = $(T)

1473	OX = $(OBJDIR)

1474	O = .obj
1475	E = .exe
1476	P = .pdb
1477
1478	!ifndef INSTALLDIR
	@@ -1491,20 +1495,32 @@
1491	#
1492	!if !exist("$(B)\.fossil-settings")
1493	!error Please specify path to project base directory: B="path/to/fossil"
1494	!endif
1495
1496	# Create build directory during preprocessing if needed.
1497	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]




1498	!endif
1499
1500	# Perl is only necessary if OpenSSL support is enabled and it is built from
1501	# source code. The PERLDIR environment variable, if it exists, should point
1502	# to the directory containing the main Perl executable specified here (i.e.
1503	# "perl.exe").
1504	!ifndef PERL





1505	PERL = perl.exe



1506	!endif
1507
1508	# Enable debugging symbols?
1509	!ifndef DEBUG
1510	DEBUG = 0
	@@ -1653,30 +1669,30 @@
1653	!endif
1654
1655	!if $(FOSSIL_ENABLE_WINXP)!=0
1656	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1657	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1658	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1659	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1660	!else
1661	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1662	!endif
1663	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1664	!endif
1665
1666	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1667	!if $(DEBUG)!=0
1668	CRTFLAGS = /MDd
1669	!else
1670	CRTFLAGS = /MD
1671	!endif
1672	!else
1673	!if $(DEBUG)!=0
1674	CRTFLAGS = /MTd
1675	!else
1676	CRTFLAGS = /MT
1677	!endif
1678	!endif
1679
1680	!if $(DEBUG)!=0
1681	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1682	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -1769,49 +1785,41 @@
1769	writeln -nonewline " "
1770	}
1771	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1772	}
1773	writeln "\n"
1774	writeln -nonewline "EXTRA_FILES = "
1775	set i 0
1776	foreach s [lsort $extra_files] {
1777	if {$i > 0} {
1778	writeln " \\"
1779	writeln -nonewline " "
1780	}
1781	set s [regsub -all / $s \\]
1782	writeln -nonewline "\"\$(SRCDIR)\\${s}\""; incr i
1783	}
1784	writeln "\n"
1785	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1786	writeln -nonewline "OBJ = "
1787	set i 0
1788	foreach s [lsort [concat $src $AdditionalObj]] {
1789	if {$i > 0} {
1790	writeln " \\"
1791	writeln -nonewline " "
1792	}
1793	writeln -nonewline "\"\$(OX)\\$s\$O\""; incr i
1794	}
1795	if {$i > 0} {
1796	writeln " \\"
1797	}
1798	writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1799	writeln -nonewline " "
1800	writeln "\"\$(OX)\\miniz\$O\" \\"; incr i
1801	writeln "!endif"
1802	writeln -nonewline " \"\$(OX)\\fossil.res\"\n\n"
1803	writeln [string map [list <<<NEXT_LINE>>> \\] {
1804	!ifndef BASEAPPNAME
1805	BASEAPPNAME = fossil
1806	!endif
1807
1808	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1809	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1810	APPTARGETS =
1811
1812	all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
1813
1814	$(BASEAPPNAME): "$(APPNAME)"
1815
1816	$(BASEAPPNAME)$(E): "$(APPNAME)"
1817
	@@ -1823,55 +1831,49 @@
1823	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1824	!if $(DEBUG)!=0
1825	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1826	!endif
1827
1828	$(OX):
1829	if not exist $@\. mkdir $@
1830
1831	!if "$(BUILDDIR)"!="$(OX)"
1832	$(BUILDDIR):
1833	if not exist $@\. mkdir $@
1834	!endif
1835
1836	!if $(FOSSIL_BUILD_ZLIB)
1837	zlib $(ZLIB_X):
1838	@echo Building zlib from "$(ZLIBDIR)"...
1839	!if $(FOSSIL_ENABLE_WINXP)!=0
1840	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1841	!else
1842	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1843	!endif
1844	copy nul $(ZLIB_X)
1845
1846	clean-zlib:
1847	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1848	!endif
1849
1850	!if $(FOSSIL_ENABLE_SSL)!=0
1851	OPENSSL_X = "$(OX)\openssl.opts"
1852	openssl $(OPENSSL_X):
1853	@echo Building OpenSSL from "$(SSLDIR)"...
1854	!ifdef PERLDIR
1855	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1856	!else
1857	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1858	!endif
1859	!if $(FOSSIL_ENABLE_WINXP)!=0
1860	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1861	!else
1862	@pushd "$(SSLDIR)" && $(MAKE) && popd
1863	echo $(SSLCONFIG) > $(OPENSSL_X)
1864	!endif

1865
1866	clean-openssl:
1867	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1868	-del $(OPENSSL_X)
1869
1870	!if $(FOSSIL_BUILD_SSL)!=0
1871	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1872	!endif
1873
1874	!endif
1875
1876	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1877	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1894,37 +1896,22 @@
1894	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1895	writeln "!endif"
1896	writeln "\techo \$(LIBS) $redir \$@"
1897	writeln {
1898



1899	# This target gets the project tools built.
1900	toolset: \
1901	"$(OBJDIR)\translate$E" \
1902	"$(OBJDIR)\makeheaders$E" \
1903	"$(OBJDIR)\mkindex$E" \
1904	"$(OBJDIR)\mkbuiltin$E" \
1905	"$(OBJDIR)\mkversion$E" \
1906	"$(OBJDIR)\codecheck1$E"
1907
1908	"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1909	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1910
1911	"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1912	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1913
1914	"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1915	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1916
1917	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1918	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1919
1920	"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1921	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1922
1923	"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1924	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1925
1926	!if $(USE_SEE)!=0
1927	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1928	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1929	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1930	!else
	@@ -2015,49 +2002,50 @@
2015	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2016	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2017	}
2018
2019	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2020	set redir {>}
2021	foreach s [lsort $extra_files] {
2022	writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2023	set redir {>>}
2024	}
2025
2026	writeln ""
2027	writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2028	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2029
2030	writeln "{\$(OX)}.c{\$(OX)}.h :"
2031	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2032
2033	writeln ""


2034	foreach s [lsort $src] {
2035	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2036	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"


2037	}
2038
2039	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2040	writeln "\t\$(RCC) /fo \$@ \$**\n"
2041
2042	writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\VERSION.h\""
2043	writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" "






2044	set i 0
2045	foreach s [lsort $src] {
2046	if {$i > 0} {
2047	writeln " \\"
2048	writeln -nonewline "\t\t\t"
2049	}
2050	writeln -nonewline "\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2051	}
2052	writeln " \\\n\t\t\t\"\$(SRCDIR)\\sqlite3.h\" \\"
2053	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2054	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2055	writeln "\t\t\t\"\$(SRCDIR)\\cson_amalgamation.h\""
2056	writeln "\t@copy /Y nul: $@"
2057
2058
2059	close $output_file
2060	#
2061	# End of the win/Makefile.msc output
2062	##############################################################################
2063	##############################################################################
2064

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1466,13 +1466,17 @@
1466	SRCDIR = $(B)\src
1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	BUILDDIR = Build
1469	!message Using default build directory, $(BUILDDIR)
1470	!endif
1471	# Top of build/staging/object directory subtree
1472	T = $(BUILDDIR)
1473	# Where object and other intermediate binary files will go
1474	OBJDIR = $(T)
1475	# Staging area for translated or generated sources
1476	OX = $(OBJDIR)
1477	# Extensions for this platform
1478	O = .obj
1479	E = .exe
1480	P = .pdb
1481
1482	!ifndef INSTALLDIR
	@@ -1491,20 +1495,32 @@
1495	#
1496	!if !exist("$(B)\.fossil-settings")
1497	!error Please specify path to project base directory: B="path/to/fossil"
1498	!endif
1499
1500	# Create build, object and staging directory during preprocessing if needed.
1501	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
1502	!endif
1503	!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
1504	!endif
1505	!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
1506	!endif
1507
1508	# Perl is only necessary if OpenSSL support is enabled and it is built from
1509	# source code. The PERLDIR environment variable, if it exists, should point
1510	# to the directory containing the main Perl executable specified here (i.e.
1511	# "perl.exe").
1512	!if $(FOSSIL_BUILD_SSL)!=0
1513	! if !defined(PERL) && [where PERL.exe > nul 2>&1]
1514	PERL = perl.exe
1515	!undef PERLDIR
1516	! elseif !defined(PERL)
1517	! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
1518	PERL = perl.exe
1519	! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
1520	! endif
1521	! endif
1522	!endif
1523
1524	# Enable debugging symbols?
1525	!ifndef DEBUG
1526	DEBUG = 0
	@@ -1653,30 +1669,30 @@
1669	!endif
1670
1671	!if $(FOSSIL_ENABLE_WINXP)!=0
1672	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1673	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1674	! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1675	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1676	! else
1677	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1678	! endif
1679	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1680	!endif
1681
1682	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1683	! if $(DEBUG)!=0
1684	CRTFLAGS = /MDd
1685	! else
1686	CRTFLAGS = /MD
1687	! endif
1688	!else
1689	! if $(DEBUG)!=0
1690	CRTFLAGS = /MTd
1691	! else
1692	CRTFLAGS = /MT
1693	! endif
1694	!endif
1695
1696	!if $(DEBUG)!=0
1697	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1698	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -1769,49 +1785,41 @@
1785	writeln -nonewline " "
1786	}
1787	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1788	}
1789	writeln "\n"
1790	writeln -nonewline "EXTRA_FILES ="
1791	set i 0
1792	foreach s [lsort $extra_files] {




1793	set s [regsub -all / $s \\]
1794	writeln -nonewline " \\\n \"\$(SRCDIR)\\${s}\""; incr i
1795	}
1796	writeln "\n"
1797	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1798	writeln -nonewline "OBJ = "
1799	set i 0
1800	foreach s [lsort [concat $src $AdditionalObj]] {
1801	writeln -nonewline " \\\n \"\$(OX)\\$s\$O\""
1802	incr i
1803	}
1804	writeln {
1805	!if $(FOSSIL_ENABLE_MINIZ)!=0
1806	OBJ = $(OBJ) "$(OX)\miniz$O"
1807	!endif
1808	OBJ = $(OBJ) "$(OX)\fossil.res"
1809	}
1810




1811	writeln [string map [list <<<NEXT_LINE>>> \\] {
1812	!ifndef BASEAPPNAME
1813	BASEAPPNAME = fossil
1814	!endif
1815
1816	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1817	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1818	APPTARGETS =
1819
1820	all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
1821
1822	$(BASEAPPNAME): "$(APPNAME)"
1823
1824	$(BASEAPPNAME)$(E): "$(APPNAME)"
1825
	@@ -1823,55 +1831,49 @@
1831	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1832	!if $(DEBUG)!=0
1833	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1834	!endif
1835
1836	ZLIB_X = "$(OX)\zlib_built"







1837	!if $(FOSSIL_BUILD_ZLIB)
1838	zlib $(ZLIB_X):
1839	@echo Building zlib from "$(ZLIBDIR)"...
1840	!if $(FOSSIL_ENABLE_WINXP)!=0
1841	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1842	!else
1843	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1844	!endif
1845	cmd /E:ON /c date /T > $(ZLIB_X)
1846
1847	clean-zlib:
1848	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1849	!endif
1850
1851	!if $(FOSSIL_ENABLE_SSL)!=0
1852	OPENSSL_X = "$(OX)\openssl.opts"
1853	openssl $(OPENSSL_X):
1854	@echo Building OpenSSL from "$(SSLDIR)"...
1855	! ifdef PERLDIR
1856	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1857	! else
1858	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1859	! endif
1860	! if $(FOSSIL_ENABLE_WINXP)!=0
1861	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1862	! else
1863	@pushd "$(SSLDIR)" && $(MAKE) && popd
1864	! endif
1865	echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
1866	cmd /E:ON /c date /T >> $(OPENSSL_X)
1867
1868	clean-openssl:
1869	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1870	-del $(OPENSSL_X)
1871
1872	! if $(FOSSIL_BUILD_SSL)!=0
1873	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1874	! endif
1875
1876	!endif
1877
1878	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1879	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1894,37 +1896,22 @@
1896	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1897	writeln "!endif"
1898	writeln "\techo \$(LIBS) $redir \$@"
1899	writeln {
1900
1901	{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
1902	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1903
1904	# This target gets the project tools built.
1905	toolset: \
1906	"$(OBJDIR)\translate$E" \
1907	"$(OBJDIR)\makeheaders$E" \
1908	"$(OBJDIR)\mkindex$E" \
1909	"$(OBJDIR)\mkbuiltin$E" \
1910	"$(OBJDIR)\mkversion$E" \
1911	"$(OBJDIR)\codecheck1$E"
1912


















1913	!if $(USE_SEE)!=0
1914	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1915	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1916	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1917	!else
	@@ -2015,49 +2002,50 @@
2002	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2003	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2004	}
2005
2006	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2007	writeln "\t-echo. > \$@"
2008	foreach s [lsort $extra_files] {
2009	writeln "\t@echo \"\$(SRCDIR)\\${s}\" >> \$@"

2010	}
2011
2012	writeln "{\$(OX)\\}.c{\$(OX)\\}.h:"




2013	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2014
2015	writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2016	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@"
2017
2018	foreach s [lsort $src] {
2019	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2020	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"
2021	writeln "\"\$(OX)\\${s}.c\" : \"\$(SRCDIR)\\${s}.c\""
2022	writeln "\"\$(OX)\\${s}.h\" : \"\$(OX)\\${s}.c\""
2023	}
2024
2025	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2026	writeln "\t\$(RCC) /fo \$@ \$**\n"
2027
2028	writeln {
2029	DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
2030	GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" \
2031	"$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
2032	}
2033
2034	writeln "!if \$(DEPHEADERGEN)==0"
2035	writeln -nonewline "GEN_HEADERS = \$(GEN_HEADERS)"
2036	set i 0
2037	foreach s [lsort $src] {
2038	writeln -nonewline " \\\n\t\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""
2039	}
2040	writeln "\n!endif"
2041
2042	writeln {
2043	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
2044	"$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
2045	@copy /Y NUL $@
2046	}




2047	close $output_file
2048	#
2049	# End of the win/Makefile.msc output
2050	##############################################################################
2051	##############################################################################
2052

M src/makemake.tcl

+85 -97

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1466,13 +1466,17 @@
1466	1466	SRCDIR = $(B)\src
1467	1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	1468	BUILDDIR = Build
1469	1469	!message Using default build directory, $(BUILDDIR)
1470	1470	!endif
	1471	+# Top of build/staging/object directory subtree
1471	1472	T = $(BUILDDIR)
	1473	+# Where object and other intermediate binary files will go
1472	1474	OBJDIR = $(T)
	1475	+# Staging area for translated or generated sources
1473	1476	OX = $(OBJDIR)
	1477	+# Extensions for this platform
1474	1478	O = .obj
1475	1479	E = .exe
1476	1480	P = .pdb
1477	1481
1478	1482	!ifndef INSTALLDIR
		@@ -1491,20 +1495,32 @@
1491	1495	#
1492	1496	!if !exist("$(B)\.fossil-settings")
1493	1497	!error Please specify path to project base directory: B="path/to/fossil"
1494	1498	!endif
1495	1499
1496		-# Create build directory during preprocessing if needed.
	1500	+# Create build, object and staging directory during preprocessing if needed.
1497	1501	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
	1502	+!endif
	1503	+!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
	1504	+!endif
	1505	+!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
1498	1506	!endif
1499	1507
1500	1508	# Perl is only necessary if OpenSSL support is enabled and it is built from
1501	1509	# source code. The PERLDIR environment variable, if it exists, should point
1502	1510	# to the directory containing the main Perl executable specified here (i.e.
1503	1511	# "perl.exe").
1504		-!ifndef PERL
	1512	+!if $(FOSSIL_BUILD_SSL)!=0
	1513	+! if !defined(PERL) && [where PERL.exe > nul 2>&1]
	1514	+PERL = perl.exe
	1515	+!undef PERLDIR
	1516	+! elseif !defined(PERL)
	1517	+! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
1505	1518	PERL = perl.exe
	1519	+! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
	1520	+! endif
	1521	+! endif
1506	1522	!endif
1507	1523
1508	1524	# Enable debugging symbols?
1509	1525	!ifndef DEBUG
1510	1526	DEBUG = 0
		@@ -1653,30 +1669,30 @@
1653	1669	!endif
1654	1670
1655	1671	!if $(FOSSIL_ENABLE_WINXP)!=0
1656	1672	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1657	1673	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1658		-!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	1674	+! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1659	1675	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1660		-!else
	1676	+! else
1661	1677	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1662		-!endif
	1678	+! endif
1663	1679	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1664	1680	!endif
1665	1681
1666	1682	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1667		-!if $(DEBUG)!=0
1668		-CRTFLAGS = /MDd
1669		-!else
1670		-CRTFLAGS = /MD
1671		-!endif
1672		-!else
1673		-!if $(DEBUG)!=0
1674		-CRTFLAGS = /MTd
1675		-!else
1676		-CRTFLAGS = /MT
1677		-!endif
	1683	+! if $(DEBUG)!=0
	1684	+CRTFLAGS = /MDd
	1685	+! else
	1686	+CRTFLAGS = /MD
	1687	+! endif
	1688	+!else
	1689	+! if $(DEBUG)!=0
	1690	+CRTFLAGS = /MTd
	1691	+! else
	1692	+CRTFLAGS = /MT
	1693	+! endif
1678	1694	!endif
1679	1695
1680	1696	!if $(DEBUG)!=0
1681	1697	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1682	1698	LDFLAGS = $(LDFLAGS) /DEBUG
		@@ -1769,49 +1785,41 @@
1769	1785	writeln -nonewline " "
1770	1786	}
1771	1787	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1772	1788	}
1773	1789	writeln "\n"
1774		-writeln -nonewline "EXTRA_FILES = "
	1790	+writeln -nonewline "EXTRA_FILES ="
1775	1791	set i 0
1776	1792	foreach s [lsort $extra_files] {
1777		- if {$i > 0} {
1778		- writeln " \\"
1779		- writeln -nonewline " "
1780		- }
1781	1793	set s [regsub -all / $s \\]
1782		- writeln -nonewline "\"\$(SRCDIR)\\${s}\""; incr i
	1794	+ writeln -nonewline " \\\n \"\$(SRCDIR)\\${s}\""; incr i
1783	1795	}
1784	1796	writeln "\n"
1785	1797	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1786	1798	writeln -nonewline "OBJ = "
1787	1799	set i 0
1788	1800	foreach s [lsort [concat $src $AdditionalObj]] {
1789		- if {$i > 0} {
1790		- writeln " \\"
1791		- writeln -nonewline " "
1792		- }
1793		- writeln -nonewline "\"\$(OX)\\$s\$O\""; incr i
1794		-}
1795		-if {$i > 0} {
1796		- writeln " \\"
1797		-}
1798		-writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1799		-writeln -nonewline " "
1800		-writeln "\"\$(OX)\\miniz\$O\" \\"; incr i
1801		-writeln "!endif"
1802		-writeln -nonewline " \"\$(OX)\\fossil.res\"\n\n"
	1801	+ writeln -nonewline " \\\n \"\$(OX)\\$s\$O\""
	1802	+ incr i
	1803	+}
	1804	+writeln {
	1805	+!if $(FOSSIL_ENABLE_MINIZ)!=0
	1806	+OBJ = $(OBJ) "$(OX)\miniz$O"
	1807	+!endif
	1808	+OBJ = $(OBJ) "$(OX)\fossil.res"
	1809	+}
	1810	+
1803	1811	writeln [string map [list <<<NEXT_LINE>>> \\] {
1804	1812	!ifndef BASEAPPNAME
1805	1813	BASEAPPNAME = fossil
1806	1814	!endif
1807	1815
1808	1816	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1809	1817	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1810	1818	APPTARGETS =
1811	1819
1812		-all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
	1820	+all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
1813	1821
1814	1822	$(BASEAPPNAME): "$(APPNAME)"
1815	1823
1816	1824	$(BASEAPPNAME)$(E): "$(APPNAME)"
1817	1825
		@@ -1823,55 +1831,49 @@
1823	1831	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1824	1832	!if $(DEBUG)!=0
1825	1833	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1826	1834	!endif
1827	1835
1828		-$(OX):
1829		- if not exist $@\. mkdir $@
1830		-
1831		-!if "$(BUILDDIR)"!="$(OX)"
1832		-$(BUILDDIR):
1833		- if not exist $@\. mkdir $@
1834		-!endif
1835		-
	1836	+ZLIB_X = "$(OX)\zlib_built"
1836	1837	!if $(FOSSIL_BUILD_ZLIB)
1837	1838	zlib $(ZLIB_X):
1838	1839	@echo Building zlib from "$(ZLIBDIR)"...
1839	1840	!if $(FOSSIL_ENABLE_WINXP)!=0
1840	1841	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1841	1842	!else
1842	1843	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1843	1844	!endif
1844		- copy nul $(ZLIB_X)
	1845	+ cmd /E:ON /c date /T > $(ZLIB_X)
1845	1846
1846	1847	clean-zlib:
1847	1848	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1848	1849	!endif
1849	1850
1850	1851	!if $(FOSSIL_ENABLE_SSL)!=0
1851	1852	OPENSSL_X = "$(OX)\openssl.opts"
1852	1853	openssl $(OPENSSL_X):
1853	1854	@echo Building OpenSSL from "$(SSLDIR)"...
1854		-!ifdef PERLDIR
	1855	+! ifdef PERLDIR
1855	1856	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1856		-!else
	1857	+! else
1857	1858	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1858		-!endif
1859		-!if $(FOSSIL_ENABLE_WINXP)!=0
	1859	+! endif
	1860	+! if $(FOSSIL_ENABLE_WINXP)!=0
1860	1861	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1861		-!else
	1862	+! else
1862	1863	@pushd "$(SSLDIR)" && $(MAKE) && popd
1863		- echo $(SSLCONFIG) > $(OPENSSL_X)
1864		-!endif
	1864	+! endif
	1865	+ echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
	1866	+ cmd /E:ON /c date /T >> $(OPENSSL_X)
1865	1867
1866	1868	clean-openssl:
1867	1869	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1868	1870	-del $(OPENSSL_X)
1869	1871
1870		-!if $(FOSSIL_BUILD_SSL)!=0
	1872	+! if $(FOSSIL_BUILD_SSL)!=0
1871	1873	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1872		-!endif
	1874	+! endif
1873	1875
1874	1876	!endif
1875	1877
1876	1878	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1877	1879	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
		@@ -1894,37 +1896,22 @@
1894	1896	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1895	1897	writeln "!endif"
1896	1898	writeln "\techo \$(LIBS) $redir \$@"
1897	1899	writeln {
1898	1900
	1901	+{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
	1902	+ $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1903	+
1899	1904	# This target gets the project tools built.
1900	1905	toolset: \
1901	1906	"$(OBJDIR)\translate$E" \
1902	1907	"$(OBJDIR)\makeheaders$E" \
1903	1908	"$(OBJDIR)\mkindex$E" \
1904	1909	"$(OBJDIR)\mkbuiltin$E" \
1905	1910	"$(OBJDIR)\mkversion$E" \
1906	1911	"$(OBJDIR)\codecheck1$E"
1907	1912
1908		-"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1909		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1910		-
1911		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1912		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1913		-
1914		-"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1915		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1916		-
1917		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1918		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1919		-
1920		-"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1921		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1922		-
1923		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1924		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1925		-
1926	1913	!if $(USE_SEE)!=0
1927	1914	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1928	1915	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1929	1916	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1930	1917	!else
		@@ -2015,49 +2002,50 @@
2015	2002	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2016	2003	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2017	2004	}
2018	2005
2019	2006	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2020		-set redir {>}
	2007	+writeln "\t-echo. > \$@"
2021	2008	foreach s [lsort $extra_files] {
2022		- writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2023		- set redir {>>}
	2009	+ writeln "\t@echo \"\$(SRCDIR)\\${s}\" >> \$@"
2024	2010	}
2025	2011
2026		-writeln ""
2027		-writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2028		-writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2029		-
2030		-writeln "{\$(OX)}.c{\$(OX)}.h :"
	2012	+writeln "{\$(OX)\\}.c{\$(OX)\\}.h:"
2031	2013	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2032	2014
2033		-writeln ""
	2015	+writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
	2016	+writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@"
	2017	+
2034	2018	foreach s [lsort $src] {
2035	2019	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2036	2020	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"
	2021	+ writeln "\"\$(OX)\\${s}.c\" : \"\$(SRCDIR)\\${s}.c\""
	2022	+ writeln "\"\$(OX)\\${s}.h\" : \"\$(OX)\\${s}.c\""
2037	2023	}
2038	2024
2039	2025	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2040	2026	writeln "\t\$(RCC) /fo \$@ \$**\n"
2041	2027
2042		-writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\VERSION.h\""
2043		-writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" "
	2028	+writeln {
	2029	+DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
	2030	+GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" \
	2031	+ "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
	2032	+}
	2033	+
	2034	+writeln "!if \$(DEPHEADERGEN)==0"
	2035	+writeln -nonewline "GEN_HEADERS = \$(GEN_HEADERS)"
2044	2036	set i 0
2045	2037	foreach s [lsort $src] {
2046		- if {$i > 0} {
2047		- writeln " \\"
2048		- writeln -nonewline "\t\t\t"
2049		- }
2050		- writeln -nonewline "\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2051		-}
2052		-writeln " \\\n\t\t\t\"\$(SRCDIR)\\sqlite3.h\" \\"
2053		-writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2054		-writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2055		-writeln "\t\t\t\"\$(SRCDIR)\\cson_amalgamation.h\""
2056		-writeln "\t@copy /Y nul: $@"
2057		-
2058		-
	2038	+ writeln -nonewline " \\\n\t\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""
	2039	+}
	2040	+writeln "\n!endif"
	2041	+
	2042	+writeln {
	2043	+"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
	2044	+ "$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
	2045	+ @copy /Y NUL $@
	2046	+}
2059	2047	close $output_file
2060	2048	#
2061	2049	# End of the win/Makefile.msc output
2062	2050	##############################################################################
2063	2051	##############################################################################
2064	2052

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1466,13 +1466,17 @@
1466	SRCDIR = $(B)\src
1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	BUILDDIR = Build
1469	!message Using default build directory, $(BUILDDIR)
1470	!endif

1471	T = $(BUILDDIR)

1472	OBJDIR = $(T)

1473	OX = $(OBJDIR)

1474	O = .obj
1475	E = .exe
1476	P = .pdb
1477
1478	!ifndef INSTALLDIR
	@@ -1491,20 +1495,32 @@
1491	#
1492	!if !exist("$(B)\.fossil-settings")
1493	!error Please specify path to project base directory: B="path/to/fossil"
1494	!endif
1495
1496	# Create build directory during preprocessing if needed.
1497	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]




1498	!endif
1499
1500	# Perl is only necessary if OpenSSL support is enabled and it is built from
1501	# source code. The PERLDIR environment variable, if it exists, should point
1502	# to the directory containing the main Perl executable specified here (i.e.
1503	# "perl.exe").
1504	!ifndef PERL





1505	PERL = perl.exe



1506	!endif
1507
1508	# Enable debugging symbols?
1509	!ifndef DEBUG
1510	DEBUG = 0
	@@ -1653,30 +1669,30 @@
1653	!endif
1654
1655	!if $(FOSSIL_ENABLE_WINXP)!=0
1656	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1657	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1658	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1659	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1660	!else
1661	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1662	!endif
1663	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1664	!endif
1665
1666	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1667	!if $(DEBUG)!=0
1668	CRTFLAGS = /MDd
1669	!else
1670	CRTFLAGS = /MD
1671	!endif
1672	!else
1673	!if $(DEBUG)!=0
1674	CRTFLAGS = /MTd
1675	!else
1676	CRTFLAGS = /MT
1677	!endif
1678	!endif
1679
1680	!if $(DEBUG)!=0
1681	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1682	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -1769,49 +1785,41 @@
1769	writeln -nonewline " "
1770	}
1771	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1772	}
1773	writeln "\n"
1774	writeln -nonewline "EXTRA_FILES = "
1775	set i 0
1776	foreach s [lsort $extra_files] {
1777	if {$i > 0} {
1778	writeln " \\"
1779	writeln -nonewline " "
1780	}
1781	set s [regsub -all / $s \\]
1782	writeln -nonewline "\"\$(SRCDIR)\\${s}\""; incr i
1783	}
1784	writeln "\n"
1785	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1786	writeln -nonewline "OBJ = "
1787	set i 0
1788	foreach s [lsort [concat $src $AdditionalObj]] {
1789	if {$i > 0} {
1790	writeln " \\"
1791	writeln -nonewline " "
1792	}
1793	writeln -nonewline "\"\$(OX)\\$s\$O\""; incr i
1794	}
1795	if {$i > 0} {
1796	writeln " \\"
1797	}
1798	writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1799	writeln -nonewline " "
1800	writeln "\"\$(OX)\\miniz\$O\" \\"; incr i
1801	writeln "!endif"
1802	writeln -nonewline " \"\$(OX)\\fossil.res\"\n\n"
1803	writeln [string map [list <<<NEXT_LINE>>> \\] {
1804	!ifndef BASEAPPNAME
1805	BASEAPPNAME = fossil
1806	!endif
1807
1808	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1809	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1810	APPTARGETS =
1811
1812	all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
1813
1814	$(BASEAPPNAME): "$(APPNAME)"
1815
1816	$(BASEAPPNAME)$(E): "$(APPNAME)"
1817
	@@ -1823,55 +1831,49 @@
1823	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1824	!if $(DEBUG)!=0
1825	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1826	!endif
1827
1828	$(OX):
1829	if not exist $@\. mkdir $@
1830
1831	!if "$(BUILDDIR)"!="$(OX)"
1832	$(BUILDDIR):
1833	if not exist $@\. mkdir $@
1834	!endif
1835
1836	!if $(FOSSIL_BUILD_ZLIB)
1837	zlib $(ZLIB_X):
1838	@echo Building zlib from "$(ZLIBDIR)"...
1839	!if $(FOSSIL_ENABLE_WINXP)!=0
1840	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1841	!else
1842	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1843	!endif
1844	copy nul $(ZLIB_X)
1845
1846	clean-zlib:
1847	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1848	!endif
1849
1850	!if $(FOSSIL_ENABLE_SSL)!=0
1851	OPENSSL_X = "$(OX)\openssl.opts"
1852	openssl $(OPENSSL_X):
1853	@echo Building OpenSSL from "$(SSLDIR)"...
1854	!ifdef PERLDIR
1855	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1856	!else
1857	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1858	!endif
1859	!if $(FOSSIL_ENABLE_WINXP)!=0
1860	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1861	!else
1862	@pushd "$(SSLDIR)" && $(MAKE) && popd
1863	echo $(SSLCONFIG) > $(OPENSSL_X)
1864	!endif

1865
1866	clean-openssl:
1867	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1868	-del $(OPENSSL_X)
1869
1870	!if $(FOSSIL_BUILD_SSL)!=0
1871	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1872	!endif
1873
1874	!endif
1875
1876	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1877	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1894,37 +1896,22 @@
1894	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1895	writeln "!endif"
1896	writeln "\techo \$(LIBS) $redir \$@"
1897	writeln {
1898



1899	# This target gets the project tools built.
1900	toolset: \
1901	"$(OBJDIR)\translate$E" \
1902	"$(OBJDIR)\makeheaders$E" \
1903	"$(OBJDIR)\mkindex$E" \
1904	"$(OBJDIR)\mkbuiltin$E" \
1905	"$(OBJDIR)\mkversion$E" \
1906	"$(OBJDIR)\codecheck1$E"
1907
1908	"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1909	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1910
1911	"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1912	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1913
1914	"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1915	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1916
1917	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1918	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1919
1920	"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1921	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1922
1923	"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1924	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1925
1926	!if $(USE_SEE)!=0
1927	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1928	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1929	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1930	!else
	@@ -2015,49 +2002,50 @@
2015	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2016	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2017	}
2018
2019	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2020	set redir {>}
2021	foreach s [lsort $extra_files] {
2022	writeln "\techo \"\$(SRCDIR)\\${s}\" $redir \$@"
2023	set redir {>>}
2024	}
2025
2026	writeln ""
2027	writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2028	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@\n"
2029
2030	writeln "{\$(OX)}.c{\$(OX)}.h :"
2031	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2032
2033	writeln ""


2034	foreach s [lsort $src] {
2035	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2036	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"


2037	}
2038
2039	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2040	writeln "\t\$(RCC) /fo \$@ \$**\n"
2041
2042	writeln "\"\$(OX)\\headers\": \"\$(OBJDIR)\\makeheaders\$E\" \"\$(OX)\\page_index.h\" \"\$(OX)\\builtin_data.h\" \"\$(OX)\\VERSION.h\""
2043	writeln -nonewline "\t\"\$(OBJDIR)\\makeheaders\$E\" "






2044	set i 0
2045	foreach s [lsort $src] {
2046	if {$i > 0} {
2047	writeln " \\"
2048	writeln -nonewline "\t\t\t"
2049	}
2050	writeln -nonewline "\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""; incr i
2051	}
2052	writeln " \\\n\t\t\t\"\$(SRCDIR)\\sqlite3.h\" \\"
2053	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2054	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2055	writeln "\t\t\t\"\$(SRCDIR)\\cson_amalgamation.h\""
2056	writeln "\t@copy /Y nul: $@"
2057
2058
2059	close $output_file
2060	#
2061	# End of the win/Makefile.msc output
2062	##############################################################################
2063	##############################################################################
2064

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1466,13 +1466,17 @@
1466	SRCDIR = $(B)\src
1467	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
1468	BUILDDIR = Build
1469	!message Using default build directory, $(BUILDDIR)
1470	!endif
1471	# Top of build/staging/object directory subtree
1472	T = $(BUILDDIR)
1473	# Where object and other intermediate binary files will go
1474	OBJDIR = $(T)
1475	# Staging area for translated or generated sources
1476	OX = $(OBJDIR)
1477	# Extensions for this platform
1478	O = .obj
1479	E = .exe
1480	P = .pdb
1481
1482	!ifndef INSTALLDIR
	@@ -1491,20 +1495,32 @@
1495	#
1496	!if !exist("$(B)\.fossil-settings")
1497	!error Please specify path to project base directory: B="path/to/fossil"
1498	!endif
1499
1500	# Create build, object and staging directory during preprocessing if needed.
1501	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
1502	!endif
1503	!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
1504	!endif
1505	!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
1506	!endif
1507
1508	# Perl is only necessary if OpenSSL support is enabled and it is built from
1509	# source code. The PERLDIR environment variable, if it exists, should point
1510	# to the directory containing the main Perl executable specified here (i.e.
1511	# "perl.exe").
1512	!if $(FOSSIL_BUILD_SSL)!=0
1513	! if !defined(PERL) && [where PERL.exe > nul 2>&1]
1514	PERL = perl.exe
1515	!undef PERLDIR
1516	! elseif !defined(PERL)
1517	! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
1518	PERL = perl.exe
1519	! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
1520	! endif
1521	! endif
1522	!endif
1523
1524	# Enable debugging symbols?
1525	!ifndef DEBUG
1526	DEBUG = 0
	@@ -1653,30 +1669,30 @@
1669	!endif
1670
1671	!if $(FOSSIL_ENABLE_WINXP)!=0
1672	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
1673	CFLAGS = $(CFLAGS) $(XPCFLAGS)
1674	! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1675	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
1676	! else
1677	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
1678	! endif
1679	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
1680	!endif
1681
1682	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1683	! if $(DEBUG)!=0
1684	CRTFLAGS = /MDd
1685	! else
1686	CRTFLAGS = /MD
1687	! endif
1688	!else
1689	! if $(DEBUG)!=0
1690	CRTFLAGS = /MTd
1691	! else
1692	CRTFLAGS = /MT
1693	! endif
1694	!endif
1695
1696	!if $(DEBUG)!=0
1697	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1698	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -1769,49 +1785,41 @@
1785	writeln -nonewline " "
1786	}
1787	writeln -nonewline "\"\$(OX)\\${s}.c\""; incr i
1788	}
1789	writeln "\n"
1790	writeln -nonewline "EXTRA_FILES ="
1791	set i 0
1792	foreach s [lsort $extra_files] {




1793	set s [regsub -all / $s \\]
1794	writeln -nonewline " \\\n \"\$(SRCDIR)\\${s}\""; incr i
1795	}
1796	writeln "\n"
1797	set AdditionalObj [list shell sqlite3 th th_lang th_tcl cson_amalgamation]
1798	writeln -nonewline "OBJ = "
1799	set i 0
1800	foreach s [lsort [concat $src $AdditionalObj]] {
1801	writeln -nonewline " \\\n \"\$(OX)\\$s\$O\""
1802	incr i
1803	}
1804	writeln {
1805	!if $(FOSSIL_ENABLE_MINIZ)!=0
1806	OBJ = $(OBJ) "$(OX)\miniz$O"
1807	!endif
1808	OBJ = $(OBJ) "$(OX)\fossil.res"
1809	}
1810




1811	writeln [string map [list <<<NEXT_LINE>>> \\] {
1812	!ifndef BASEAPPNAME
1813	BASEAPPNAME = fossil
1814	!endif
1815
1816	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
1817	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
1818	APPTARGETS =
1819
1820	all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
1821
1822	$(BASEAPPNAME): "$(APPNAME)"
1823
1824	$(BASEAPPNAME)$(E): "$(APPNAME)"
1825
	@@ -1823,55 +1831,49 @@
1831	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
1832	!if $(DEBUG)!=0
1833	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
1834	!endif
1835
1836	ZLIB_X = "$(OX)\zlib_built"







1837	!if $(FOSSIL_BUILD_ZLIB)
1838	zlib $(ZLIB_X):
1839	@echo Building zlib from "$(ZLIBDIR)"...
1840	!if $(FOSSIL_ENABLE_WINXP)!=0
1841	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
1842	!else
1843	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1844	!endif
1845	cmd /E:ON /c date /T > $(ZLIB_X)
1846
1847	clean-zlib:
1848	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
1849	!endif
1850
1851	!if $(FOSSIL_ENABLE_SSL)!=0
1852	OPENSSL_X = "$(OX)\openssl.opts"
1853	openssl $(OPENSSL_X):
1854	@echo Building OpenSSL from "$(SSLDIR)"...
1855	! ifdef PERLDIR
1856	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
1857	! else
1858	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
1859	! endif
1860	! if $(FOSSIL_ENABLE_WINXP)!=0
1861	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1862	! else
1863	@pushd "$(SSLDIR)" && $(MAKE) && popd
1864	! endif
1865	echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
1866	cmd /E:ON /c date /T >> $(OPENSSL_X)
1867
1868	clean-openssl:
1869	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
1870	-del $(OPENSSL_X)
1871
1872	! if $(FOSSIL_BUILD_SSL)!=0
1873	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
1874	! endif
1875
1876	!endif
1877
1878	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
1879	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1894,37 +1896,22 @@
1896	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1897	writeln "!endif"
1898	writeln "\techo \$(LIBS) $redir \$@"
1899	writeln {
1900
1901	{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
1902	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1903
1904	# This target gets the project tools built.
1905	toolset: \
1906	"$(OBJDIR)\translate$E" \
1907	"$(OBJDIR)\makeheaders$E" \
1908	"$(OBJDIR)\mkindex$E" \
1909	"$(OBJDIR)\mkbuiltin$E" \
1910	"$(OBJDIR)\mkversion$E" \
1911	"$(OBJDIR)\codecheck1$E"
1912


















1913	!if $(USE_SEE)!=0
1914	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1915	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1916	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1917	!else
	@@ -2015,49 +2002,50 @@
2002	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
2003	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
2004	}
2005
2006	writeln {"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"}
2007	writeln "\t-echo. > \$@"
2008	foreach s [lsort $extra_files] {
2009	writeln "\t@echo \"\$(SRCDIR)\\${s}\" >> \$@"

2010	}
2011
2012	writeln "{\$(OX)\\}.c{\$(OX)\\}.h:"




2013	writeln "\t\"\$(OBJDIR)\\makeheaders\$E\" \$**:\$@"
2014
2015	writeln "{\$(SRCDIR)\\}.c{\$(OX)\\}.c:"
2016	writeln "\t\"\$(OBJDIR)\\translate\$E\" \$** > \$@"
2017
2018	foreach s [lsort $src] {
2019	writeln "\"\$(OX)\\$s\$O\" : \"\$(OX)\\${s}.c\" \"\$(OX)\\${s}.h\""
2020	writeln "\t\$(TCC) /Fo\$@ /Fd\$(@D)\\ -c \"\$(OX)\\${s}.c\"\n"
2021	writeln "\"\$(OX)\\${s}.c\" : \"\$(SRCDIR)\\${s}.c\""
2022	writeln "\"\$(OX)\\${s}.h\" : \"\$(OX)\\${s}.c\""
2023	}
2024
2025	writeln "\"\$(OX)\\fossil.res\" : \"\$(B)\\win\\fossil.rc\""
2026	writeln "\t\$(RCC) /fo \$@ \$**\n"
2027
2028	writeln {
2029	DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
2030	GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" \
2031	"$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
2032	}
2033
2034	writeln "!if \$(DEPHEADERGEN)==0"
2035	writeln -nonewline "GEN_HEADERS = \$(GEN_HEADERS)"
2036	set i 0
2037	foreach s [lsort $src] {
2038	writeln -nonewline " \\\n\t\"\$(OX)\\${s}.c\":\"\$(OX)\\$s.h\""
2039	}
2040	writeln "\n!endif"
2041
2042	writeln {
2043	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
2044	"$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
2045	@copy /Y NUL $@
2046	}




2047	close $output_file
2048	#
2049	# End of the win/Makefile.msc output
2050	##############################################################################
2051	##############################################################################
2052

M src/pikchr.c

+1041 -1021

		--- src/pikchr.c
		+++ src/pikchr.c
		@@ -566,20 +566,21 @@
566	566	#define T_TOP 83
567	567	#define T_BOTTOM 84
568	568	#define T_START 85
569	569	#define T_END 86
570	570	#define T_IN 87
571		-#define T_DOT_U 88
572		-#define T_LAST 89
573		-#define T_NUMBER 90
574		-#define T_FUNC1 91
575		-#define T_FUNC2 92
576		-#define T_DIST 93
577		-#define T_DOT_XY 94
578		-#define T_X 95
579		-#define T_Y 96
580		-#define T_DOT_L 97
	571	+#define T_THIS 88
	572	+#define T_DOT_U 89
	573	+#define T_LAST 90
	574	+#define T_NUMBER 91
	575	+#define T_FUNC1 92
	576	+#define T_FUNC2 93
	577	+#define T_DIST 94
	578	+#define T_DOT_XY 95
	579	+#define T_X 96
	580	+#define T_Y 97
	581	+#define T_DOT_L 98
581	582	#endif
582	583	/************** End token definitions *************************************/
583	584
584	585	/* The next sections is a series of control #defines.
585	586	** various aspects of the generated parser.
		@@ -635,22 +636,22 @@
635	636	#ifndef INTERFACE
636	637	# define INTERFACE 1
637	638	#endif
638	639	/*********** Begin control #defines ***************************************/
639	640	#define YYCODETYPE unsigned char
640		-#define YYNOCODE 134
	641	+#define YYNOCODE 135
641	642	#define YYACTIONTYPE unsigned short int
642	643	#define pik_parserTOKENTYPE PToken
643	644	typedef union {
644	645	int yyinit;
645	646	pik_parserTOKENTYPE yy0;
646		- PObj* yy38;
647		- PPoint yy43;
648		- short int yy44;
649		- PList* yy119;
650		- PRel yy200;
651		- PNum yy265;
	647	+ PRel yy10;
	648	+ PObj* yy36;
	649	+ PPoint yy79;
	650	+ PNum yy153;
	651	+ short int yy164;
	652	+ PList* yy227;
652	653	} YYMINORTYPE;
653	654	#ifndef YYSTACKDEPTH
654	655	#define YYSTACKDEPTH 100
655	656	#endif
656	657	#define pik_parserARG_SDECL
		@@ -663,21 +664,21 @@
663	664	#define pik_parserCTX_PARAM ,p
664	665	#define pik_parserCTX_FETCH Pik *p=yypParser->p;
665	666	#define pik_parserCTX_STORE yypParser->p=p;
666	667	#define YYFALLBACK 1
667	668	#define YYNSTATE 164
668		-#define YYNRULE 155
669		-#define YYNRULE_WITH_ACTION 115
670		-#define YYNTOKEN 98
	669	+#define YYNRULE 156
	670	+#define YYNRULE_WITH_ACTION 116
	671	+#define YYNTOKEN 99
671	672	#define YY_MAX_SHIFT 163
672		-#define YY_MIN_SHIFTREDUCE 286
673		-#define YY_MAX_SHIFTREDUCE 440
674		-#define YY_ERROR_ACTION 441
675		-#define YY_ACCEPT_ACTION 442
676		-#define YY_NO_ACTION 443
677		-#define YY_MIN_REDUCE 444
678		-#define YY_MAX_REDUCE 598
	673	+#define YY_MIN_SHIFTREDUCE 287
	674	+#define YY_MAX_SHIFTREDUCE 442
	675	+#define YY_ERROR_ACTION 443
	676	+#define YY_ACCEPT_ACTION 444
	677	+#define YY_NO_ACTION 445
	678	+#define YY_MIN_REDUCE 446
	679	+#define YY_MAX_REDUCE 601
679	680	/*********** End control #defines *****************************************/
680	681	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
681	682
682	683	/* Define the yytestcase() macro to be a no-op if is not already defined
683	684	** otherwise.
		@@ -740,333 +741,341 @@
740	741	** yy_reduce_ofst[] For each state, the offset into yy_action for
741	742	** shifting non-terminals after a reduce.
742	743	** yy_default[] Default action for each state.
743	744	**
744	745	********* Begin parsing tables ********************************************/
745		-#define YY_ACTTAB_COUNT (1263)
	746	+#define YY_ACTTAB_COUNT (1303)
746	747	static const YYACTIONTYPE yy_action[] = {
747		- /* 0 */ 572, 493, 161, 119, 25, 450, 29, 74, 129, 148,
748		- /* 10 */ 572, 490, 161, 119, 451, 113, 120, 161, 119, 528,
749		- /* 20 */ 425, 426, 338, 556, 81, 30, 557, 558, 572, 64,
750		- /* 30 */ 63, 62, 61, 321, 322, 9, 8, 33, 149, 32,
751		- /* 40 */ 7, 71, 127, 38, 334, 66, 48, 37, 28, 338,
752		- /* 50 */ 338, 338, 338, 423, 424, 339, 340, 341, 342, 343,
753		- /* 60 */ 344, 345, 346, 347, 472, 526, 161, 119, 574, 77,
754		- /* 70 */ 574, 73, 374, 148, 472, 531, 161, 119, 112, 113,
755		- /* 80 */ 120, 161, 119, 128, 425, 426, 338, 305, 81, 376,
756		- /* 90 */ 158, 76, 472, 529, 161, 119, 31, 321, 322, 9,
757		- /* 100 */ 8, 33, 149, 32, 7, 71, 127, 329, 334, 66,
758		- /* 110 */ 576, 83, 36, 338, 338, 338, 338, 423, 424, 339,
759		- /* 120 */ 340, 341, 342, 343, 344, 345, 346, 347, 392, 433,
760		- /* 130 */ 309, 59, 60, 409, 410, 411, 412, 107, 84, 374,
761		- /* 140 */ 65, 108, 2, 46, 401, 162, 120, 161, 119, 117,
762		- /* 150 */ 476, 80, 118, 307, 79, 133, 35, 126, 439, 438,
763		- /* 160 */ 298, 123, 122, 402, 403, 404, 406, 80, 152, 307,
764		- /* 170 */ 79, 327, 409, 410, 411, 412, 392, 54, 51, 59,
765		- /* 180 */ 60, 64, 63, 62, 61, 312, 3, 102, 378, 157,
766		- /* 190 */ 42, 432, 446, 452, 29, 300, 301, 302, 448, 304,
767		- /* 200 */ 62, 61, 64, 63, 62, 61, 297, 47, 106, 163,
768		- /* 210 */ 434, 435, 436, 437, 27, 389, 117, 391, 155, 154,
769		- /* 220 */ 153, 392, 433, 49, 59, 60, 64, 63, 62, 61,
770		- /* 230 */ 532, 69, 374, 396, 397, 2, 376, 158, 356, 296,
771		- /* 240 */ 156, 156, 156, 67, 392, 433, 13, 59, 60, 4,
772		- /* 250 */ 107, 439, 438, 377, 159, 374, 106, 5, 2, 120,
773		- /* 260 */ 161, 119, 131, 449, 117, 391, 155, 154, 153, 392,
774		- /* 270 */ 532, 6, 59, 60, 439, 438, 532, 444, 422, 532,
775		- /* 280 */ 374, 152, 421, 42, 432, 1, 395, 36, 156, 156,
776		- /* 290 */ 156, 11, 12, 355, 64, 63, 62, 61, 430, 118,
777		- /* 300 */ 14, 106, 138, 434, 435, 436, 437, 432, 428, 117,
778		- /* 310 */ 391, 155, 154, 153, 16, 69, 142, 140, 64, 63,
779		- /* 320 */ 62, 61, 139, 18, 106, 15, 434, 435, 436, 437,
780		- /* 330 */ 45, 44, 117, 391, 155, 154, 153, 358, 19, 55,
781		- /* 340 */ 64, 63, 62, 61, 20, 147, 146, 68, 114, 106,
782		- /* 350 */ 23, 382, 43, 26, 425, 426, 338, 117, 391, 155,
783		- /* 360 */ 154, 153, 392, 57, 58, 59, 60, 390, 380, 375,
784		- /* 370 */ 381, 17, 160, 374, 70, 39, 42, 443, 443, 443,
785		- /* 380 */ 443, 22, 21, 338, 338, 338, 338, 423, 424, 24,
786		- /* 390 */ 443, 145, 141, 429, 142, 140, 64, 63, 62, 61,
787		- /* 400 */ 392, 471, 443, 59, 60, 443, 443, 132, 130, 389,
788		- /* 410 */ 443, 374, 443, 443, 42, 443, 443, 55, 443, 64,
789		- /* 420 */ 63, 62, 61, 147, 146, 392, 143, 443, 59, 60,
790		- /* 430 */ 43, 443, 389, 443, 443, 443, 374, 471, 443, 42,
791		- /* 440 */ 52, 443, 106, 443, 392, 144, 443, 59, 60, 443,
792		- /* 450 */ 117, 391, 155, 154, 153, 374, 443, 443, 42, 22,
793		- /* 460 */ 21, 121, 445, 452, 29, 443, 443, 24, 448, 145,
794		- /* 470 */ 141, 429, 142, 140, 64, 63, 62, 61, 443, 163,
795		- /* 480 */ 106, 443, 392, 442, 27, 59, 60, 443, 117, 391,
796		- /* 490 */ 155, 154, 153, 374, 443, 55, 42, 443, 443, 443,
797		- /* 500 */ 443, 147, 146, 443, 443, 106, 443, 392, 43, 443,
798		- /* 510 */ 59, 60, 443, 117, 391, 155, 154, 153, 102, 443,
799		- /* 520 */ 74, 42, 148, 443, 106, 443, 443, 124, 113, 120,
800		- /* 530 */ 161, 119, 117, 391, 155, 154, 153, 22, 21, 392,
801		- /* 540 */ 443, 443, 59, 60, 443, 24, 443, 145, 141, 429,
802		- /* 550 */ 374, 149, 392, 40, 443, 59, 60, 443, 85, 443,
803		- /* 560 */ 443, 443, 106, 374, 443, 443, 41, 120, 161, 119,
804		- /* 570 */ 117, 391, 155, 154, 153, 349, 349, 349, 349, 349,
805		- /* 580 */ 349, 349, 349, 349, 349, 443, 443, 106, 443, 152,
806		- /* 590 */ 443, 443, 88, 443, 443, 117, 391, 155, 154, 153,
807		- /* 600 */ 443, 120, 161, 119, 72, 443, 148, 10, 477, 477,
808		- /* 610 */ 443, 125, 113, 120, 161, 119, 443, 443, 443, 106,
809		- /* 620 */ 443, 443, 433, 152, 443, 443, 443, 117, 391, 155,
810		- /* 630 */ 154, 153, 106, 443, 443, 149, 64, 63, 62, 61,
811		- /* 640 */ 117, 391, 155, 154, 153, 443, 74, 443, 148, 354,
812		- /* 650 */ 107, 439, 438, 495, 113, 120, 161, 119, 443, 120,
813		- /* 660 */ 161, 119, 443, 461, 443, 74, 443, 148, 75, 443,
814		- /* 670 */ 78, 78, 494, 113, 120, 161, 119, 149, 74, 443,
815		- /* 680 */ 148, 152, 443, 443, 432, 488, 113, 120, 161, 119,
816		- /* 690 */ 74, 443, 148, 443, 443, 443, 149, 482, 113, 120,
817		- /* 700 */ 161, 119, 88, 434, 435, 436, 437, 443, 443, 149,
818		- /* 710 */ 443, 120, 161, 119, 443, 74, 443, 148, 110, 110,
819		- /* 720 */ 443, 149, 481, 113, 120, 161, 119, 443, 443, 443,
820		- /* 730 */ 74, 443, 148, 152, 443, 443, 443, 478, 113, 120,
821		- /* 740 */ 161, 119, 443, 74, 443, 148, 149, 443, 443, 443,
822		- /* 750 */ 134, 113, 120, 161, 119, 74, 443, 148, 443, 443,
823		- /* 760 */ 443, 149, 515, 113, 120, 161, 119, 443, 74, 443,
824		- /* 770 */ 148, 443, 443, 443, 149, 137, 113, 120, 161, 119,
825		- /* 780 */ 74, 443, 148, 443, 443, 443, 149, 523, 113, 120,
826		- /* 790 */ 161, 119, 443, 74, 443, 148, 443, 443, 443, 149,
827		- /* 800 */ 525, 113, 120, 161, 119, 443, 74, 443, 148, 443,
828		- /* 810 */ 443, 149, 443, 522, 113, 120, 161, 119, 74, 443,
829		- /* 820 */ 148, 86, 443, 443, 149, 524, 113, 120, 161, 119,
830		- /* 830 */ 120, 161, 119, 74, 443, 148, 443, 149, 443, 443,
831		- /* 840 */ 521, 113, 120, 161, 119, 443, 74, 443, 148, 149,
832		- /* 850 */ 443, 443, 152, 520, 113, 120, 161, 119, 74, 443,
833		- /* 860 */ 148, 443, 443, 443, 149, 519, 113, 120, 161, 119,
834		- /* 870 */ 443, 74, 443, 148, 443, 443, 443, 149, 518, 113,
835		- /* 880 */ 120, 161, 119, 74, 443, 148, 443, 443, 443, 149,
836		- /* 890 */ 517, 113, 120, 161, 119, 433, 74, 443, 148, 443,
837		- /* 900 */ 443, 443, 149, 150, 113, 120, 161, 119, 443, 74,
838		- /* 910 */ 443, 148, 443, 443, 149, 443, 151, 113, 120, 161,
839		- /* 920 */ 119, 74, 443, 148, 439, 438, 443, 149, 136, 113,
840		- /* 930 */ 120, 161, 119, 443, 443, 443, 74, 443, 148, 443,
841		- /* 940 */ 149, 443, 443, 135, 113, 120, 161, 119, 443, 88,
842		- /* 950 */ 443, 443, 149, 443, 443, 443, 443, 432, 120, 161,
843		- /* 960 */ 119, 443, 443, 443, 443, 82, 443, 149, 443, 443,
844		- /* 970 */ 443, 443, 464, 443, 34, 443, 434, 435, 436, 437,
845		- /* 980 */ 152, 107, 109, 445, 452, 29, 443, 443, 443, 448,
846		- /* 990 */ 120, 161, 119, 443, 461, 443, 443, 88, 443, 443,
847		- /* 1000 */ 163, 443, 566, 443, 443, 27, 120, 161, 119, 88,
848		- /* 1010 */ 443, 443, 152, 111, 111, 443, 443, 443, 120, 161,
849		- /* 1020 */ 119, 98, 443, 443, 89, 473, 443, 90, 152, 443,
850		- /* 1030 */ 120, 161, 119, 120, 161, 119, 120, 161, 119, 87,
851		- /* 1040 */ 152, 443, 443, 64, 63, 62, 61, 443, 120, 161,
852		- /* 1050 */ 119, 443, 152, 443, 443, 152, 443, 443, 152, 443,
853		- /* 1060 */ 443, 443, 99, 443, 50, 443, 443, 443, 100, 443,
854		- /* 1070 */ 152, 120, 161, 119, 443, 101, 443, 120, 161, 119,
855		- /* 1080 */ 91, 443, 443, 443, 120, 161, 119, 103, 443, 120,
856		- /* 1090 */ 161, 119, 92, 152, 443, 443, 120, 161, 119, 152,
857		- /* 1100 */ 443, 120, 161, 119, 443, 93, 152, 443, 443, 443,
858		- /* 1110 */ 104, 152, 443, 443, 120, 161, 119, 94, 152, 120,
859		- /* 1120 */ 161, 119, 105, 152, 443, 443, 120, 161, 119, 443,
860		- /* 1130 */ 443, 120, 161, 119, 95, 443, 152, 443, 443, 443,
861		- /* 1140 */ 96, 152, 443, 120, 161, 119, 443, 443, 152, 120,
862		- /* 1150 */ 161, 119, 97, 152, 443, 443, 443, 443, 546, 443,
863		- /* 1160 */ 443, 120, 161, 119, 443, 152, 443, 120, 161, 119,
864		- /* 1170 */ 443, 152, 443, 443, 443, 545, 443, 443, 443, 443,
865		- /* 1180 */ 443, 544, 443, 152, 120, 161, 119, 543, 443, 152,
866		- /* 1190 */ 120, 161, 119, 115, 443, 443, 120, 161, 119, 116,
867		- /* 1200 */ 443, 443, 120, 161, 119, 443, 152, 443, 120, 161,
868		- /* 1210 */ 119, 443, 152, 64, 63, 62, 61, 443, 152, 64,
869		- /* 1220 */ 63, 62, 61, 443, 152, 443, 353, 443, 443, 443,
870		- /* 1230 */ 152, 64, 63, 62, 61, 64, 63, 62, 61, 443,
871		- /* 1240 */ 53, 443, 443, 443, 394, 64, 63, 62, 61, 64,
872		- /* 1250 */ 63, 62, 61, 443, 443, 443, 56, 443, 393, 443,
873		- /* 1260 */ 443, 443, 389,
	748	+ /* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
	749	+ /* 10 */ 575, 492, 161, 119, 453, 113, 120, 161, 119, 530,
	750	+ /* 20 */ 427, 428, 339, 559, 81, 30, 560, 561, 575, 64,
	751	+ /* 30 */ 63, 62, 61, 322, 323, 9, 8, 33, 149, 32,
	752	+ /* 40 */ 7, 71, 127, 38, 335, 66, 48, 37, 28, 339,
	753	+ /* 50 */ 339, 339, 339, 425, 426, 340, 341, 342, 343, 344,
	754	+ /* 60 */ 345, 346, 347, 348, 474, 528, 161, 119, 577, 77,
	755	+ /* 70 */ 577, 73, 376, 148, 474, 533, 161, 119, 112, 113,
	756	+ /* 80 */ 120, 161, 119, 128, 427, 428, 339, 357, 81, 531,
	757	+ /* 90 */ 161, 119, 474, 36, 330, 13, 306, 322, 323, 9,
	758	+ /* 100 */ 8, 33, 149, 32, 7, 71, 127, 328, 335, 66,
	759	+ /* 110 */ 579, 310, 31, 339, 339, 339, 339, 425, 426, 340,
	760	+ /* 120 */ 341, 342, 343, 344, 345, 346, 347, 348, 394, 435,
	761	+ /* 130 */ 46, 59, 60, 64, 63, 62, 61, 54, 51, 376,
	762	+ /* 140 */ 69, 108, 2, 47, 403, 83, 297, 435, 375, 84,
	763	+ /* 150 */ 117, 80, 35, 308, 79, 133, 122, 126, 441, 440,
	764	+ /* 160 */ 299, 123, 3, 404, 405, 406, 408, 80, 298, 308,
	765	+ /* 170 */ 79, 4, 411, 412, 413, 414, 441, 440, 350, 350,
	766	+ /* 180 */ 350, 350, 350, 350, 350, 350, 350, 350, 62, 61,
	767	+ /* 190 */ 67, 434, 1, 75, 378, 158, 74, 76, 148, 411,
	768	+ /* 200 */ 412, 413, 414, 124, 113, 120, 161, 119, 106, 434,
	769	+ /* 210 */ 436, 437, 438, 439, 5, 375, 6, 117, 393, 155,
	770	+ /* 220 */ 154, 153, 394, 435, 69, 59, 60, 149, 436, 437,
	771	+ /* 230 */ 438, 439, 535, 376, 398, 399, 2, 424, 427, 428,
	772	+ /* 240 */ 339, 156, 156, 156, 423, 394, 435, 65, 59, 60,
	773	+ /* 250 */ 162, 131, 441, 440, 397, 72, 376, 148, 118, 2,
	774	+ /* 260 */ 380, 157, 125, 113, 120, 161, 119, 339, 339, 339,
	775	+ /* 270 */ 339, 425, 426, 535, 11, 441, 440, 394, 356, 535,
	776	+ /* 280 */ 59, 60, 535, 379, 159, 434, 149, 12, 102, 446,
	777	+ /* 290 */ 432, 42, 138, 14, 435, 139, 301, 302, 303, 36,
	778	+ /* 300 */ 305, 430, 106, 16, 436, 437, 438, 439, 434, 375,
	779	+ /* 310 */ 18, 117, 393, 155, 154, 153, 44, 142, 140, 64,
	780	+ /* 320 */ 63, 62, 61, 441, 440, 106, 19, 436, 437, 438,
	781	+ /* 330 */ 439, 45, 375, 20, 117, 393, 155, 154, 153, 68,
	782	+ /* 340 */ 55, 114, 64, 63, 62, 61, 147, 146, 394, 473,
	783	+ /* 350 */ 359, 59, 60, 43, 23, 391, 434, 106, 26, 376,
	784	+ /* 360 */ 57, 58, 42, 49, 375, 392, 117, 393, 155, 154,
	785	+ /* 370 */ 153, 64, 63, 62, 61, 436, 437, 438, 439, 384,
	786	+ /* 380 */ 382, 383, 22, 21, 377, 473, 160, 70, 39, 445,
	787	+ /* 390 */ 24, 445, 145, 141, 431, 142, 140, 64, 63, 62,
	788	+ /* 400 */ 61, 394, 15, 445, 59, 60, 64, 63, 62, 61,
	789	+ /* 410 */ 391, 445, 376, 445, 445, 42, 445, 445, 55, 391,
	790	+ /* 420 */ 156, 156, 156, 445, 147, 146, 445, 52, 106, 445,
	791	+ /* 430 */ 445, 43, 445, 445, 445, 375, 445, 117, 393, 155,
	792	+ /* 440 */ 154, 153, 445, 394, 143, 445, 59, 60, 64, 63,
	793	+ /* 450 */ 62, 61, 313, 445, 376, 378, 158, 42, 445, 445,
	794	+ /* 460 */ 22, 21, 121, 447, 454, 29, 445, 445, 24, 450,
	795	+ /* 470 */ 145, 141, 431, 142, 140, 64, 63, 62, 61, 445,
	796	+ /* 480 */ 163, 106, 445, 445, 444, 27, 445, 445, 375, 445,
	797	+ /* 490 */ 117, 393, 155, 154, 153, 445, 55, 74, 445, 148,
	798	+ /* 500 */ 445, 445, 147, 146, 497, 113, 120, 161, 119, 43,
	799	+ /* 510 */ 445, 394, 445, 445, 59, 60, 445, 445, 445, 118,
	800	+ /* 520 */ 445, 445, 376, 106, 445, 42, 445, 445, 149, 445,
	801	+ /* 530 */ 375, 445, 117, 393, 155, 154, 153, 445, 22, 21,
	802	+ /* 540 */ 394, 144, 445, 59, 60, 445, 24, 445, 145, 141,
	803	+ /* 550 */ 431, 376, 445, 445, 42, 445, 132, 130, 394, 445,
	804	+ /* 560 */ 445, 59, 60, 109, 447, 454, 29, 445, 445, 376,
	805	+ /* 570 */ 450, 445, 42, 445, 394, 445, 445, 59, 60, 445,
	806	+ /* 580 */ 445, 163, 445, 445, 445, 102, 27, 445, 42, 445,
	807	+ /* 590 */ 445, 106, 445, 64, 63, 62, 61, 445, 375, 445,
	808	+ /* 600 */ 117, 393, 155, 154, 153, 394, 355, 445, 59, 60,
	809	+ /* 610 */ 445, 445, 445, 445, 445, 74, 376, 148, 445, 40,
	810	+ /* 620 */ 106, 445, 496, 113, 120, 161, 119, 375, 445, 117,
	811	+ /* 630 */ 393, 155, 154, 153, 445, 448, 454, 29, 106, 445,
	812	+ /* 640 */ 445, 450, 445, 445, 445, 375, 149, 117, 393, 155,
	813	+ /* 650 */ 154, 153, 163, 445, 106, 445, 445, 27, 445, 445,
	814	+ /* 660 */ 445, 375, 445, 117, 393, 155, 154, 153, 394, 445,
	815	+ /* 670 */ 445, 59, 60, 64, 63, 62, 61, 445, 445, 376,
	816	+ /* 680 */ 445, 445, 41, 445, 445, 106, 354, 64, 63, 62,
	817	+ /* 690 */ 61, 445, 375, 445, 117, 393, 155, 154, 153, 445,
	818	+ /* 700 */ 445, 445, 74, 445, 148, 445, 88, 445, 445, 490,
	819	+ /* 710 */ 113, 120, 161, 119, 445, 120, 161, 119, 17, 74,
	820	+ /* 720 */ 445, 148, 110, 110, 445, 445, 484, 113, 120, 161,
	821	+ /* 730 */ 119, 445, 445, 149, 74, 445, 148, 152, 445, 445,
	822	+ /* 740 */ 445, 483, 113, 120, 161, 119, 445, 445, 106, 445,
	823	+ /* 750 */ 149, 445, 445, 107, 445, 375, 445, 117, 393, 155,
	824	+ /* 760 */ 154, 153, 120, 161, 119, 149, 478, 74, 445, 148,
	825	+ /* 770 */ 445, 88, 445, 445, 480, 113, 120, 161, 119, 445,
	826	+ /* 780 */ 120, 161, 119, 74, 152, 148, 10, 479, 479, 445,
	827	+ /* 790 */ 134, 113, 120, 161, 119, 445, 445, 445, 149, 74,
	828	+ /* 800 */ 445, 148, 152, 445, 445, 445, 517, 113, 120, 161,
	829	+ /* 810 */ 119, 445, 445, 74, 149, 148, 445, 445, 445, 445,
	830	+ /* 820 */ 137, 113, 120, 161, 119, 74, 445, 148, 445, 445,
	831	+ /* 830 */ 149, 445, 525, 113, 120, 161, 119, 445, 74, 445,
	832	+ /* 840 */ 148, 445, 445, 445, 149, 527, 113, 120, 161, 119,
	833	+ /* 850 */ 445, 445, 74, 445, 148, 445, 149, 445, 445, 524,
	834	+ /* 860 */ 113, 120, 161, 119, 74, 445, 148, 445, 445, 149,
	835	+ /* 870 */ 445, 526, 113, 120, 161, 119, 445, 445, 74, 445,
	836	+ /* 880 */ 148, 445, 88, 149, 445, 523, 113, 120, 161, 119,
	837	+ /* 890 */ 445, 120, 161, 119, 74, 149, 148, 85, 111, 111,
	838	+ /* 900 */ 445, 522, 113, 120, 161, 119, 120, 161, 119, 149,
	839	+ /* 910 */ 74, 445, 148, 152, 445, 445, 445, 521, 113, 120,
	840	+ /* 920 */ 161, 119, 445, 445, 74, 149, 148, 445, 152, 445,
	841	+ /* 930 */ 445, 520, 113, 120, 161, 119, 74, 445, 148, 445,
	842	+ /* 940 */ 445, 149, 445, 519, 113, 120, 161, 119, 445, 74,
	843	+ /* 950 */ 445, 148, 445, 445, 445, 149, 150, 113, 120, 161,
	844	+ /* 960 */ 119, 445, 445, 74, 445, 148, 445, 149, 445, 445,
	845	+ /* 970 */ 151, 113, 120, 161, 119, 74, 445, 148, 445, 445,
	846	+ /* 980 */ 149, 445, 136, 113, 120, 161, 119, 445, 445, 74,
	847	+ /* 990 */ 445, 148, 107, 445, 149, 445, 135, 113, 120, 161,
	848	+ /* 1000 */ 119, 120, 161, 119, 445, 463, 149, 445, 88, 445,
	849	+ /* 1010 */ 445, 445, 78, 78, 445, 445, 107, 120, 161, 119,
	850	+ /* 1020 */ 149, 445, 445, 152, 82, 120, 161, 119, 445, 463,
	851	+ /* 1030 */ 445, 466, 86, 34, 445, 88, 445, 569, 445, 152,
	852	+ /* 1040 */ 445, 120, 161, 119, 120, 161, 119, 152, 107, 445,
	853	+ /* 1050 */ 445, 475, 64, 63, 62, 61, 445, 120, 161, 119,
	854	+ /* 1060 */ 98, 451, 445, 152, 89, 396, 152, 90, 445, 120,
	855	+ /* 1070 */ 161, 119, 445, 120, 161, 119, 120, 161, 119, 152,
	856	+ /* 1080 */ 445, 64, 63, 62, 61, 445, 445, 445, 445, 445,
	857	+ /* 1090 */ 87, 152, 445, 99, 395, 152, 100, 445, 152, 120,
	858	+ /* 1100 */ 161, 119, 120, 161, 119, 120, 161, 119, 445, 101,
	859	+ /* 1110 */ 64, 63, 62, 61, 445, 445, 445, 445, 120, 161,
	860	+ /* 1120 */ 119, 152, 91, 391, 152, 445, 445, 152, 103, 445,
	861	+ /* 1130 */ 445, 120, 161, 119, 445, 92, 445, 120, 161, 119,
	862	+ /* 1140 */ 152, 93, 445, 445, 120, 161, 119, 104, 445, 445,
	863	+ /* 1150 */ 120, 161, 119, 152, 445, 445, 120, 161, 119, 152,
	864	+ /* 1160 */ 445, 445, 445, 445, 94, 445, 152, 445, 445, 445,
	865	+ /* 1170 */ 105, 445, 152, 120, 161, 119, 445, 95, 152, 120,
	866	+ /* 1180 */ 161, 119, 96, 445, 445, 445, 120, 161, 119, 445,
	867	+ /* 1190 */ 445, 120, 161, 119, 97, 152, 445, 445, 445, 445,
	868	+ /* 1200 */ 549, 152, 445, 120, 161, 119, 548, 445, 152, 120,
	869	+ /* 1210 */ 161, 119, 445, 152, 445, 120, 161, 119, 445, 445,
	870	+ /* 1220 */ 445, 445, 445, 547, 445, 152, 445, 445, 445, 445,
	871	+ /* 1230 */ 445, 152, 120, 161, 119, 546, 445, 152, 445, 115,
	872	+ /* 1240 */ 445, 445, 116, 445, 120, 161, 119, 445, 120, 161,
	873	+ /* 1250 */ 119, 120, 161, 119, 152, 64, 63, 62, 61, 64,
	874	+ /* 1260 */ 63, 62, 61, 445, 445, 445, 152, 445, 445, 445,
	875	+ /* 1270 */ 152, 445, 445, 152, 445, 445, 50, 445, 445, 445,
	876	+ /* 1280 */ 53, 64, 63, 62, 61, 445, 445, 445, 445, 445,
	877	+ /* 1290 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
	878	+ /* 1300 */ 445, 445, 56,
874	879	};
875	880	static const YYCODETYPE yy_lookahead[] = {
876		- /* 0 */ 0, 111, 112, 113, 132, 100, 101, 102, 104, 104,
877		- /* 10 */ 10, 111, 112, 113, 109, 110, 111, 112, 113, 104,
878		- /* 20 */ 20, 21, 22, 103, 24, 124, 106, 107, 28, 4,
879		- /* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 133, 39,
880		- /* 40 */ 40, 41, 42, 103, 44, 45, 106, 107, 105, 49,
	881	+ /* 0 */ 0, 112, 113, 114, 133, 101, 102, 103, 105, 105,
	882	+ /* 10 */ 10, 112, 113, 114, 110, 111, 112, 113, 114, 105,
	883	+ /* 20 */ 20, 21, 22, 104, 24, 125, 107, 108, 28, 4,
	884	+ /* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 134, 39,
	885	+ /* 40 */ 40, 41, 42, 104, 44, 45, 107, 108, 106, 49,
881	886	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
882		- /* 60 */ 60, 61, 62, 63, 0, 111, 112, 113, 128, 129,
883		- /* 70 */ 130, 102, 12, 104, 10, 111, 112, 113, 109, 110,
884		- /* 80 */ 111, 112, 113, 104, 20, 21, 22, 25, 24, 26,
885		- /* 90 */ 27, 48, 28, 111, 112, 113, 126, 33, 34, 35,
886		- /* 100 */ 36, 37, 133, 39, 40, 41, 42, 2, 44, 45,
887		- /* 110 */ 131, 114, 10, 49, 50, 51, 52, 53, 54, 55,
	887	+ /* 60 */ 60, 61, 62, 63, 0, 112, 113, 114, 129, 130,
	888	+ /* 70 */ 131, 103, 12, 105, 10, 112, 113, 114, 110, 111,
	889	+ /* 80 */ 112, 113, 114, 105, 20, 21, 22, 17, 24, 112,
	890	+ /* 90 */ 113, 114, 28, 10, 2, 25, 25, 33, 34, 35,
	891	+ /* 100 */ 36, 37, 134, 39, 40, 41, 42, 2, 44, 45,
	892	+ /* 110 */ 132, 28, 127, 49, 50, 51, 52, 53, 54, 55,
888	893	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
889		- /* 130 */ 28, 4, 5, 29, 30, 31, 32, 102, 114, 12,
890		- /* 140 */ 97, 81, 15, 38, 1, 82, 111, 112, 113, 89,
891		- /* 150 */ 115, 24, 89, 26, 27, 12, 127, 14, 31, 32,
892		- /* 160 */ 19, 18, 1, 20, 21, 22, 23, 24, 133, 26,
893		- /* 170 */ 27, 2, 29, 30, 31, 32, 1, 4, 5, 4,
894		- /* 180 */ 5, 4, 5, 6, 7, 8, 16, 12, 26, 27,
895		- /* 190 */ 15, 64, 99, 100, 101, 20, 21, 22, 105, 24,
896		- /* 200 */ 6, 7, 4, 5, 6, 7, 17, 38, 81, 116,
897		- /* 210 */ 83, 84, 85, 86, 121, 17, 89, 90, 91, 92,
898		- /* 220 */ 93, 1, 2, 25, 4, 5, 4, 5, 6, 7,
899		- /* 230 */ 48, 3, 12, 95, 96, 15, 26, 27, 17, 17,
900		- /* 240 */ 20, 21, 22, 43, 1, 2, 25, 4, 5, 15,
901		- /* 250 */ 102, 31, 32, 26, 27, 12, 81, 40, 15, 111,
902		- /* 260 */ 112, 113, 47, 115, 89, 90, 91, 92, 93, 1,
903		- /* 270 */ 88, 40, 4, 5, 31, 32, 94, 0, 41, 97,
904		- /* 280 */ 12, 133, 41, 15, 64, 13, 17, 10, 20, 21,
905		- /* 290 */ 22, 25, 74, 17, 4, 5, 6, 7, 79, 89,
906		- /* 300 */ 3, 81, 78, 83, 84, 85, 86, 64, 79, 89,
907		- /* 310 */ 90, 91, 92, 93, 3, 87, 2, 3, 4, 5,
908		- /* 320 */ 6, 7, 80, 3, 81, 35, 83, 84, 85, 86,
909		- /* 330 */ 16, 38, 89, 90, 91, 92, 93, 76, 3, 25,
910		- /* 340 */ 4, 5, 6, 7, 3, 31, 32, 3, 94, 81,
911		- /* 350 */ 25, 28, 38, 15, 20, 21, 22, 89, 90, 91,
912		- /* 360 */ 92, 93, 1, 15, 15, 4, 5, 17, 28, 12,
913		- /* 370 */ 28, 35, 88, 12, 3, 11, 15, 134, 134, 134,
914		- /* 380 */ 134, 67, 68, 49, 50, 51, 52, 53, 54, 75,
915		- /* 390 */ 134, 77, 78, 79, 2, 3, 4, 5, 6, 7,
916		- /* 400 */ 1, 2, 134, 4, 5, 134, 134, 46, 47, 17,
917		- /* 410 */ 134, 12, 134, 134, 15, 134, 134, 25, 134, 4,
918		- /* 420 */ 5, 6, 7, 31, 32, 1, 2, 134, 4, 5,
919		- /* 430 */ 38, 134, 17, 134, 134, 134, 12, 38, 134, 15,
920		- /* 440 */ 25, 134, 81, 134, 1, 2, 134, 4, 5, 134,
921		- /* 450 */ 89, 90, 91, 92, 93, 12, 134, 134, 15, 67,
922		- /* 460 */ 68, 98, 99, 100, 101, 134, 134, 75, 105, 77,
923		- /* 470 */ 78, 79, 2, 3, 4, 5, 6, 7, 134, 116,
924		- /* 480 */ 81, 134, 1, 120, 121, 4, 5, 134, 89, 90,
925		- /* 490 */ 91, 92, 93, 12, 134, 25, 15, 134, 134, 134,
926		- /* 500 */ 134, 31, 32, 134, 134, 81, 134, 1, 38, 134,
927		- /* 510 */ 4, 5, 134, 89, 90, 91, 92, 93, 12, 134,
928		- /* 520 */ 102, 15, 104, 134, 81, 134, 134, 109, 110, 111,
929		- /* 530 */ 112, 113, 89, 90, 91, 92, 93, 67, 68, 1,
930		- /* 540 */ 134, 134, 4, 5, 134, 75, 134, 77, 78, 79,
931		- /* 550 */ 12, 133, 1, 15, 134, 4, 5, 134, 102, 134,
932		- /* 560 */ 134, 134, 81, 12, 134, 134, 15, 111, 112, 113,
933		- /* 570 */ 89, 90, 91, 92, 93, 64, 65, 66, 67, 68,
934		- /* 580 */ 69, 70, 71, 72, 73, 134, 134, 81, 134, 133,
935		- /* 590 */ 134, 134, 102, 134, 134, 89, 90, 91, 92, 93,
936		- /* 600 */ 134, 111, 112, 113, 102, 134, 104, 117, 118, 119,
937		- /* 610 */ 134, 109, 110, 111, 112, 113, 134, 134, 134, 81,
938		- /* 620 */ 134, 134, 2, 133, 134, 134, 134, 89, 90, 91,
939		- /* 630 */ 92, 93, 81, 134, 134, 133, 4, 5, 6, 7,
940		- /* 640 */ 89, 90, 91, 92, 93, 134, 102, 134, 104, 17,
941		- /* 650 */ 102, 31, 32, 109, 110, 111, 112, 113, 134, 111,
942		- /* 660 */ 112, 113, 134, 115, 134, 102, 134, 104, 48, 134,
943		- /* 670 */ 122, 123, 109, 110, 111, 112, 113, 133, 102, 134,
944		- /* 680 */ 104, 133, 134, 134, 64, 109, 110, 111, 112, 113,
945		- /* 690 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
946		- /* 700 */ 112, 113, 102, 83, 84, 85, 86, 134, 134, 133,
947		- /* 710 */ 134, 111, 112, 113, 134, 102, 134, 104, 118, 119,
948		- /* 720 */ 134, 133, 109, 110, 111, 112, 113, 134, 134, 134,
949		- /* 730 */ 102, 134, 104, 133, 134, 134, 134, 109, 110, 111,
950		- /* 740 */ 112, 113, 134, 102, 134, 104, 133, 134, 134, 134,
951		- /* 750 */ 109, 110, 111, 112, 113, 102, 134, 104, 134, 134,
952		- /* 760 */ 134, 133, 109, 110, 111, 112, 113, 134, 102, 134,
953		- /* 770 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
954		- /* 780 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
955		- /* 790 */ 112, 113, 134, 102, 134, 104, 134, 134, 134, 133,
956		- /* 800 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 134,
957		- /* 810 */ 134, 133, 134, 109, 110, 111, 112, 113, 102, 134,
958		- /* 820 */ 104, 102, 134, 134, 133, 109, 110, 111, 112, 113,
959		- /* 830 */ 111, 112, 113, 102, 134, 104, 134, 133, 134, 134,
960		- /* 840 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 133,
961		- /* 850 */ 134, 134, 133, 109, 110, 111, 112, 113, 102, 134,
962		- /* 860 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
963		- /* 870 */ 134, 102, 134, 104, 134, 134, 134, 133, 109, 110,
964		- /* 880 */ 111, 112, 113, 102, 134, 104, 134, 134, 134, 133,
965		- /* 890 */ 109, 110, 111, 112, 113, 2, 102, 134, 104, 134,
966		- /* 900 */ 134, 134, 133, 109, 110, 111, 112, 113, 134, 102,
967		- /* 910 */ 134, 104, 134, 134, 133, 134, 109, 110, 111, 112,
968		- /* 920 */ 113, 102, 134, 104, 31, 32, 134, 133, 109, 110,
969		- /* 930 */ 111, 112, 113, 134, 134, 134, 102, 134, 104, 134,
970		- /* 940 */ 133, 134, 134, 109, 110, 111, 112, 113, 134, 102,
971		- /* 950 */ 134, 134, 133, 134, 134, 134, 134, 64, 111, 112,
972		- /* 960 */ 113, 134, 134, 134, 134, 118, 134, 133, 134, 134,
973		- /* 970 */ 134, 134, 125, 134, 127, 134, 83, 84, 85, 86,
974		- /* 980 */ 133, 102, 98, 99, 100, 101, 134, 134, 134, 105,
975		- /* 990 */ 111, 112, 113, 134, 115, 134, 134, 102, 134, 134,
976		- /* 1000 */ 116, 134, 123, 134, 134, 121, 111, 112, 113, 102,
977		- /* 1010 */ 134, 134, 133, 118, 119, 134, 134, 134, 111, 112,
978		- /* 1020 */ 113, 102, 134, 134, 102, 118, 134, 102, 133, 134,
979		- /* 1030 */ 111, 112, 113, 111, 112, 113, 111, 112, 113, 102,
980		- /* 1040 */ 133, 134, 134, 4, 5, 6, 7, 134, 111, 112,
981		- /* 1050 */ 113, 134, 133, 134, 134, 133, 134, 134, 133, 134,
982		- /* 1060 */ 134, 134, 102, 134, 25, 134, 134, 134, 102, 134,
983		- /* 1070 */ 133, 111, 112, 113, 134, 102, 134, 111, 112, 113,
984		- /* 1080 */ 102, 134, 134, 134, 111, 112, 113, 102, 134, 111,
985		- /* 1090 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 133,
986		- /* 1100 */ 134, 111, 112, 113, 134, 102, 133, 134, 134, 134,
987		- /* 1110 */ 102, 133, 134, 134, 111, 112, 113, 102, 133, 111,
988		- /* 1120 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 134,
989		- /* 1130 */ 134, 111, 112, 113, 102, 134, 133, 134, 134, 134,
990		- /* 1140 */ 102, 133, 134, 111, 112, 113, 134, 134, 133, 111,
991		- /* 1150 */ 112, 113, 102, 133, 134, 134, 134, 134, 102, 134,
992		- /* 1160 */ 134, 111, 112, 113, 134, 133, 134, 111, 112, 113,
993		- /* 1170 */ 134, 133, 134, 134, 134, 102, 134, 134, 134, 134,
994		- /* 1180 */ 134, 102, 134, 133, 111, 112, 113, 102, 134, 133,
995		- /* 1190 */ 111, 112, 113, 102, 134, 134, 111, 112, 113, 102,
996		- /* 1200 */ 134, 134, 111, 112, 113, 134, 133, 134, 111, 112,
997		- /* 1210 */ 113, 134, 133, 4, 5, 6, 7, 134, 133, 4,
998		- /* 1220 */ 5, 6, 7, 134, 133, 134, 17, 134, 134, 134,
999		- /* 1230 */ 133, 4, 5, 6, 7, 4, 5, 6, 7, 134,
1000		- /* 1240 */ 25, 134, 134, 134, 17, 4, 5, 6, 7, 4,
1001		- /* 1250 */ 5, 6, 7, 134, 134, 134, 25, 134, 17, 134,
1002		- /* 1260 */ 134, 134, 17, 134, 134, 134, 134, 134, 134, 134,
1003		- /* 1270 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1004		- /* 1280 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1005		- /* 1290 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1006		- /* 1300 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1007		- /* 1310 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1008		- /* 1320 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1009		- /* 1330 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1010		- /* 1340 */ 134, 134, 134, 134, 134, 134, 134, 134, 98, 98,
1011		- /* 1350 */ 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
1012		- /* 1360 */ 98,
	894	+ /* 130 */ 38, 4, 5, 4, 5, 6, 7, 4, 5, 12,
	895	+ /* 140 */ 3, 81, 15, 38, 1, 115, 17, 2, 88, 115,
	896	+ /* 150 */ 90, 24, 128, 26, 27, 12, 1, 14, 31, 32,
	897	+ /* 160 */ 19, 18, 16, 20, 21, 22, 23, 24, 17, 26,
	898	+ /* 170 */ 27, 15, 29, 30, 31, 32, 31, 32, 64, 65,
	899	+ /* 180 */ 66, 67, 68, 69, 70, 71, 72, 73, 6, 7,
	900	+ /* 190 */ 43, 64, 13, 48, 26, 27, 103, 48, 105, 29,
	901	+ /* 200 */ 30, 31, 32, 110, 111, 112, 113, 114, 81, 64,
	902	+ /* 210 */ 83, 84, 85, 86, 40, 88, 40, 90, 91, 92,
	903	+ /* 220 */ 93, 94, 1, 2, 87, 4, 5, 134, 83, 84,
	904	+ /* 230 */ 85, 86, 48, 12, 96, 97, 15, 41, 20, 21,
	905	+ /* 240 */ 22, 20, 21, 22, 41, 1, 2, 98, 4, 5,
	906	+ /* 250 */ 82, 47, 31, 32, 17, 103, 12, 105, 90, 15,
	907	+ /* 260 */ 26, 27, 110, 111, 112, 113, 114, 49, 50, 51,
	908	+ /* 270 */ 52, 53, 54, 89, 25, 31, 32, 1, 17, 95,
	909	+ /* 280 */ 4, 5, 98, 26, 27, 64, 134, 74, 12, 0,
	910	+ /* 290 */ 79, 15, 78, 3, 2, 80, 20, 21, 22, 10,
	911	+ /* 300 */ 24, 79, 81, 3, 83, 84, 85, 86, 64, 88,
	912	+ /* 310 */ 3, 90, 91, 92, 93, 94, 38, 2, 3, 4,
	913	+ /* 320 */ 5, 6, 7, 31, 32, 81, 3, 83, 84, 85,
	914	+ /* 330 */ 86, 16, 88, 3, 90, 91, 92, 93, 94, 3,
	915	+ /* 340 */ 25, 95, 4, 5, 6, 7, 31, 32, 1, 2,
	916	+ /* 350 */ 76, 4, 5, 38, 25, 17, 64, 81, 15, 12,
	917	+ /* 360 */ 15, 15, 15, 25, 88, 17, 90, 91, 92, 93,
	918	+ /* 370 */ 94, 4, 5, 6, 7, 83, 84, 85, 86, 28,
	919	+ /* 380 */ 28, 28, 67, 68, 12, 38, 89, 3, 11, 135,
	920	+ /* 390 */ 75, 135, 77, 78, 79, 2, 3, 4, 5, 6,
	921	+ /* 400 */ 7, 1, 35, 135, 4, 5, 4, 5, 6, 7,
	922	+ /* 410 */ 17, 135, 12, 135, 135, 15, 135, 135, 25, 17,
	923	+ /* 420 */ 20, 21, 22, 135, 31, 32, 135, 25, 81, 135,
	924	+ /* 430 */ 135, 38, 135, 135, 135, 88, 135, 90, 91, 92,
	925	+ /* 440 */ 93, 94, 135, 1, 2, 135, 4, 5, 4, 5,
	926	+ /* 450 */ 6, 7, 8, 135, 12, 26, 27, 15, 135, 135,
	927	+ /* 460 */ 67, 68, 99, 100, 101, 102, 135, 135, 75, 106,
	928	+ /* 470 */ 77, 78, 79, 2, 3, 4, 5, 6, 7, 135,
	929	+ /* 480 */ 117, 81, 135, 135, 121, 122, 135, 135, 88, 135,
	930	+ /* 490 */ 90, 91, 92, 93, 94, 135, 25, 103, 135, 105,
	931	+ /* 500 */ 135, 135, 31, 32, 110, 111, 112, 113, 114, 38,
	932	+ /* 510 */ 135, 1, 135, 135, 4, 5, 135, 135, 135, 90,
	933	+ /* 520 */ 135, 135, 12, 81, 135, 15, 135, 135, 134, 135,
	934	+ /* 530 */ 88, 135, 90, 91, 92, 93, 94, 135, 67, 68,
	935	+ /* 540 */ 1, 2, 135, 4, 5, 135, 75, 135, 77, 78,
	936	+ /* 550 */ 79, 12, 135, 135, 15, 135, 46, 47, 1, 135,
	937	+ /* 560 */ 135, 4, 5, 99, 100, 101, 102, 135, 135, 12,
	938	+ /* 570 */ 106, 135, 15, 135, 1, 135, 135, 4, 5, 135,
	939	+ /* 580 */ 135, 117, 135, 135, 135, 12, 122, 135, 15, 135,
	940	+ /* 590 */ 135, 81, 135, 4, 5, 6, 7, 135, 88, 135,
	941	+ /* 600 */ 90, 91, 92, 93, 94, 1, 17, 135, 4, 5,
	942	+ /* 610 */ 135, 135, 135, 135, 135, 103, 12, 105, 135, 15,
	943	+ /* 620 */ 81, 135, 110, 111, 112, 113, 114, 88, 135, 90,
	944	+ /* 630 */ 91, 92, 93, 94, 135, 100, 101, 102, 81, 135,
	945	+ /* 640 */ 135, 106, 135, 135, 135, 88, 134, 90, 91, 92,
	946	+ /* 650 */ 93, 94, 117, 135, 81, 135, 135, 122, 135, 135,
	947	+ /* 660 */ 135, 88, 135, 90, 91, 92, 93, 94, 1, 135,
	948	+ /* 670 */ 135, 4, 5, 4, 5, 6, 7, 135, 135, 12,
	949	+ /* 680 */ 135, 135, 15, 135, 135, 81, 17, 4, 5, 6,
	950	+ /* 690 */ 7, 135, 88, 135, 90, 91, 92, 93, 94, 135,
	951	+ /* 700 */ 135, 135, 103, 135, 105, 135, 103, 135, 135, 110,
	952	+ /* 710 */ 111, 112, 113, 114, 135, 112, 113, 114, 35, 103,
	953	+ /* 720 */ 135, 105, 119, 120, 135, 135, 110, 111, 112, 113,
	954	+ /* 730 */ 114, 135, 135, 134, 103, 135, 105, 134, 135, 135,
	955	+ /* 740 */ 135, 110, 111, 112, 113, 114, 135, 135, 81, 135,
	956	+ /* 750 */ 134, 135, 135, 103, 135, 88, 135, 90, 91, 92,
	957	+ /* 760 */ 93, 94, 112, 113, 114, 134, 116, 103, 135, 105,
	958	+ /* 770 */ 135, 103, 135, 135, 110, 111, 112, 113, 114, 135,
	959	+ /* 780 */ 112, 113, 114, 103, 134, 105, 118, 119, 120, 135,
	960	+ /* 790 */ 110, 111, 112, 113, 114, 135, 135, 135, 134, 103,
	961	+ /* 800 */ 135, 105, 134, 135, 135, 135, 110, 111, 112, 113,
	962	+ /* 810 */ 114, 135, 135, 103, 134, 105, 135, 135, 135, 135,
	963	+ /* 820 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
	964	+ /* 830 */ 134, 135, 110, 111, 112, 113, 114, 135, 103, 135,
	965	+ /* 840 */ 105, 135, 135, 135, 134, 110, 111, 112, 113, 114,
	966	+ /* 850 */ 135, 135, 103, 135, 105, 135, 134, 135, 135, 110,
	967	+ /* 860 */ 111, 112, 113, 114, 103, 135, 105, 135, 135, 134,
	968	+ /* 870 */ 135, 110, 111, 112, 113, 114, 135, 135, 103, 135,
	969	+ /* 880 */ 105, 135, 103, 134, 135, 110, 111, 112, 113, 114,
	970	+ /* 890 */ 135, 112, 113, 114, 103, 134, 105, 103, 119, 120,
	971	+ /* 900 */ 135, 110, 111, 112, 113, 114, 112, 113, 114, 134,
	972	+ /* 910 */ 103, 135, 105, 134, 135, 135, 135, 110, 111, 112,
	973	+ /* 920 */ 113, 114, 135, 135, 103, 134, 105, 135, 134, 135,
	974	+ /* 930 */ 135, 110, 111, 112, 113, 114, 103, 135, 105, 135,
	975	+ /* 940 */ 135, 134, 135, 110, 111, 112, 113, 114, 135, 103,
	976	+ /* 950 */ 135, 105, 135, 135, 135, 134, 110, 111, 112, 113,
	977	+ /* 960 */ 114, 135, 135, 103, 135, 105, 135, 134, 135, 135,
	978	+ /* 970 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
	979	+ /* 980 */ 134, 135, 110, 111, 112, 113, 114, 135, 135, 103,
	980	+ /* 990 */ 135, 105, 103, 135, 134, 135, 110, 111, 112, 113,
	981	+ /* 1000 */ 114, 112, 113, 114, 135, 116, 134, 135, 103, 135,
	982	+ /* 1010 */ 135, 135, 123, 124, 135, 135, 103, 112, 113, 114,
	983	+ /* 1020 */ 134, 135, 135, 134, 119, 112, 113, 114, 135, 116,
	984	+ /* 1030 */ 135, 126, 103, 128, 135, 103, 135, 124, 135, 134,
	985	+ /* 1040 */ 135, 112, 113, 114, 112, 113, 114, 134, 103, 135,
	986	+ /* 1050 */ 135, 119, 4, 5, 6, 7, 135, 112, 113, 114,
	987	+ /* 1060 */ 103, 116, 135, 134, 103, 17, 134, 103, 135, 112,
	988	+ /* 1070 */ 113, 114, 135, 112, 113, 114, 112, 113, 114, 134,
	989	+ /* 1080 */ 135, 4, 5, 6, 7, 135, 135, 135, 135, 135,
	990	+ /* 1090 */ 103, 134, 135, 103, 17, 134, 103, 135, 134, 112,
	991	+ /* 1100 */ 113, 114, 112, 113, 114, 112, 113, 114, 135, 103,
	992	+ /* 1110 */ 4, 5, 6, 7, 135, 135, 135, 135, 112, 113,
	993	+ /* 1120 */ 114, 134, 103, 17, 134, 135, 135, 134, 103, 135,
	994	+ /* 1130 */ 135, 112, 113, 114, 135, 103, 135, 112, 113, 114,
	995	+ /* 1140 */ 134, 103, 135, 135, 112, 113, 114, 103, 135, 135,
	996	+ /* 1150 */ 112, 113, 114, 134, 135, 135, 112, 113, 114, 134,
	997	+ /* 1160 */ 135, 135, 135, 135, 103, 135, 134, 135, 135, 135,
	998	+ /* 1170 */ 103, 135, 134, 112, 113, 114, 135, 103, 134, 112,
	999	+ /* 1180 */ 113, 114, 103, 135, 135, 135, 112, 113, 114, 135,
	1000	+ /* 1190 */ 135, 112, 113, 114, 103, 134, 135, 135, 135, 135,
	1001	+ /* 1200 */ 103, 134, 135, 112, 113, 114, 103, 135, 134, 112,
	1002	+ /* 1210 */ 113, 114, 135, 134, 135, 112, 113, 114, 135, 135,
	1003	+ /* 1220 */ 135, 135, 135, 103, 135, 134, 135, 135, 135, 135,
	1004	+ /* 1230 */ 135, 134, 112, 113, 114, 103, 135, 134, 135, 103,
	1005	+ /* 1240 */ 135, 135, 103, 135, 112, 113, 114, 135, 112, 113,
	1006	+ /* 1250 */ 114, 112, 113, 114, 134, 4, 5, 6, 7, 4,
	1007	+ /* 1260 */ 5, 6, 7, 135, 135, 135, 134, 135, 135, 135,
	1008	+ /* 1270 */ 134, 135, 135, 134, 135, 135, 25, 135, 135, 135,
	1009	+ /* 1280 */ 25, 4, 5, 6, 7, 135, 135, 135, 135, 135,
	1010	+ /* 1290 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1011	+ /* 1300 */ 135, 135, 25, 135, 135, 135, 135, 135, 135, 135,
	1012	+ /* 1310 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1013	+ /* 1320 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1014	+ /* 1330 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1015	+ /* 1340 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1016	+ /* 1350 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1017	+ /* 1360 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1018	+ /* 1370 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1019	+ /* 1380 */ 135, 99, 99, 99, 99, 99, 99, 99, 99, 99,
	1020	+ /* 1390 */ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
	1021	+ /* 1400 */ 99, 99,
1013	1022	};
1014	1023	#define YY_SHIFT_COUNT (163)
1015	1024	#define YY_SHIFT_MIN (0)
1016		-#define YY_SHIFT_MAX (1245)
	1025	+#define YY_SHIFT_MAX (1277)
1017	1026	static const unsigned short int yy_shift_ofst[] = {
1018		- /* 0 */ 143, 127, 220, 243, 243, 243, 243, 243, 243, 243,
1019		- /* 10 */ 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
1020		- /* 20 */ 243, 243, 243, 243, 243, 243, 243, 175, 361, 481,
1021		- /* 30 */ 175, 143, 399, 399, 0, 64, 143, 506, 481, 506,
1022		- /* 40 */ 268, 268, 268, 424, 443, 481, 481, 481, 481, 481,
1023		- /* 50 */ 481, 538, 481, 481, 551, 481, 481, 481, 481, 481,
1024		- /* 60 */ 481, 481, 481, 481, 481, 334, 60, 60, 60, 60,
1025		- /* 70 */ 60, 620, 314, 392, 470, 893, 893, 104, 62, 1263,
1026		- /* 80 */ 1263, 1263, 1263, 511, 511, 198, 415, 222, 177, 290,
1027		- /* 90 */ 336, 632, 1039, 1209, 1215, 1227, 1231, 1241, 1245, 25,
1028		- /* 100 */ 25, 25, 182, 25, 25, 25, 63, 25, 210, 102,
1029		- /* 110 */ 105, 169, 221, 173, 138, 194, 194, 162, 227, 228,
1030		- /* 120 */ 43, 277, 141, 161, 189, 170, 234, 200, 217, 231,
1031		- /* 130 */ 237, 241, 215, 272, 269, 266, 218, 276, 219, 224,
1032		- /* 140 */ 242, 229, 297, 311, 320, 293, 335, 341, 344, 254,
1033		- /* 150 */ 261, 325, 254, 338, 348, 349, 350, 323, 340, 342,
1034		- /* 160 */ 357, 284, 371, 364,
	1027	+ /* 0 */ 143, 127, 221, 244, 244, 244, 244, 244, 244, 244,
	1028	+ /* 10 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244,
	1029	+ /* 20 */ 244, 244, 244, 244, 244, 244, 244, 276, 510, 557,
	1030	+ /* 30 */ 276, 143, 347, 347, 0, 64, 143, 573, 557, 573,
	1031	+ /* 40 */ 400, 400, 400, 442, 539, 557, 557, 557, 557, 557,
	1032	+ /* 50 */ 557, 604, 557, 557, 667, 557, 557, 557, 557, 557,
	1033	+ /* 60 */ 557, 557, 557, 557, 557, 218, 60, 60, 60, 60,
	1034	+ /* 70 */ 60, 145, 315, 393, 471, 292, 292, 170, 71, 1303,
	1035	+ /* 80 */ 1303, 1303, 1303, 114, 114, 338, 402, 129, 444, 367,
	1036	+ /* 90 */ 683, 589, 1251, 669, 1255, 1048, 1277, 1077, 1106, 25,
	1037	+ /* 100 */ 25, 25, 184, 25, 25, 25, 168, 25, 429, 83,
	1038	+ /* 110 */ 92, 105, 70, 133, 138, 182, 182, 234, 257, 137,
	1039	+ /* 120 */ 149, 289, 141, 155, 151, 146, 156, 147, 174, 176,
	1040	+ /* 130 */ 196, 203, 204, 179, 237, 249, 213, 261, 211, 214,
	1041	+ /* 140 */ 215, 222, 290, 300, 307, 278, 323, 330, 336, 246,
	1042	+ /* 150 */ 274, 329, 246, 343, 345, 346, 348, 351, 352, 353,
	1043	+ /* 160 */ 372, 297, 384, 377,
1035	1044	};
1036	1045	#define YY_REDUCE_COUNT (82)
1037		-#define YY_REDUCE_MIN (-128)
1038		-#define YY_REDUCE_MAX (1097)
	1046	+#define YY_REDUCE_MIN (-129)
	1047	+#define YY_REDUCE_MAX (1139)
1039	1048	static const short yy_reduce_ofst[] = {
1040		- /* 0 */ 363, -95, -31, 418, 502, 544, 563, 576, 588, 613,
1041		- /* 10 */ 628, 641, 653, 666, 678, 691, 704, 716, 731, 744,
1042		- /* 20 */ 756, 769, 781, 794, 807, 819, 834, 548, 490, 847,
1043		- /* 30 */ 879, 884, 600, 895, -60, -60, 93, 35, 907, 148,
1044		- /* 40 */ 456, 719, 919, 922, 925, 937, 960, 966, 973, 978,
1045		- /* 50 */ 985, 990, 1003, 1008, 1015, 1020, 1032, 1038, 1050, 1056,
1046		- /* 60 */ 1073, 1079, 1085, 1091, 1097, -80, -110, -100, -46, -36,
1047		- /* 70 */ -18, -21, -128, -128, -128, -96, -85, -57, -99, -30,
1048		- /* 80 */ -3, 24, 29,
	1049	+ /* 0 */ 363, -96, -32, 93, 152, 394, 512, 599, 616, 631,
	1050	+ /* 10 */ 664, 680, 696, 710, 722, 735, 749, 761, 775, 791,
	1051	+ /* 20 */ 807, 821, 833, 846, 860, 872, 886, 889, 668, 905,
	1052	+ /* 30 */ 913, 464, 603, 779, -61, -61, 535, 650, 932, 945,
	1053	+ /* 40 */ 794, 929, 957, 961, 964, 987, 990, 993, 1006, 1019,
	1054	+ /* 50 */ 1025, 1032, 1038, 1044, 1061, 1067, 1074, 1079, 1091, 1097,
	1055	+ /* 60 */ 1103, 1120, 1132, 1136, 1139, -81, -111, -101, -47, -37,
	1056	+ /* 70 */ -23, -22, -129, -129, -129, -97, -86, -58, -100, -15,
	1057	+ /* 80 */ 30, 34, 24,
1049	1058	};
1050	1059	static const YYACTIONTYPE yy_default[] = {
1051		- /* 0 */ 447, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1052		- /* 10 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1053		- /* 20 */ 441, 441, 441, 441, 441, 441, 441, 441, 471, 573,
1054		- /* 30 */ 441, 447, 577, 483, 578, 578, 447, 441, 441, 441,
1055		- /* 40 */ 441, 441, 441, 441, 441, 441, 441, 441, 475, 441,
1056		- /* 50 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1057		- /* 60 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1058		- /* 70 */ 441, 441, 441, 441, 441, 441, 441, 441, 453, 468,
1059		- /* 80 */ 506, 506, 573, 466, 491, 441, 441, 441, 469, 441,
1060		- /* 90 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 486,
1061		- /* 100 */ 484, 474, 457, 510, 509, 508, 441, 563, 441, 441,
1062		- /* 110 */ 441, 441, 441, 585, 441, 542, 541, 537, 441, 530,
1063		- /* 120 */ 527, 441, 441, 441, 441, 441, 441, 489, 441, 441,
1064		- /* 130 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1065		- /* 140 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 589,
1066		- /* 150 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1067		- /* 160 */ 441, 598, 441, 441,
	1060	+ /* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1061	+ /* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1062	+ /* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
	1063	+ /* 30 */ 443, 449, 580, 485, 581, 581, 449, 443, 443, 443,
	1064	+ /* 40 */ 443, 443, 443, 443, 443, 443, 443, 443, 477, 443,
	1065	+ /* 50 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1066	+ /* 60 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1067	+ /* 70 */ 443, 443, 443, 443, 443, 443, 443, 443, 455, 470,
	1068	+ /* 80 */ 508, 508, 576, 468, 493, 443, 443, 443, 471, 443,
	1069	+ /* 90 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 488,
	1070	+ /* 100 */ 486, 476, 459, 512, 511, 510, 443, 566, 443, 443,
	1071	+ /* 110 */ 443, 443, 443, 588, 443, 545, 544, 540, 443, 532,
	1072	+ /* 120 */ 529, 443, 443, 443, 443, 443, 443, 491, 443, 443,
	1073	+ /* 130 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1074	+ /* 140 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 592,
	1075	+ /* 150 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1076	+ /* 160 */ 443, 601, 443, 443,
1068	1077	};
1069	1078	/******** End of lemon-generated parsing tables ***************************/
1070	1079
1071	1080	/* The next table maps tokens (terminal symbols) into fallback tokens.
1072	1081	** If a construct like the following:
		@@ -1170,10 +1179,11 @@
1170	1179	0, /* TOP => nothing */
1171	1180	0, /* BOTTOM => nothing */
1172	1181	0, /* START => nothing */
1173	1182	0, /* END => nothing */
1174	1183	0, /* IN => nothing */
	1184	+ 0, /* THIS => nothing */
1175	1185	0, /* DOT_U => nothing */
1176	1186	0, /* LAST => nothing */
1177	1187	0, /* NUMBER => nothing */
1178	1188	0, /* FUNC1 => nothing */
1179	1189	0, /* FUNC2 => nothing */
		@@ -1356,56 +1366,57 @@
1356	1366	/* 83 */ "TOP",
1357	1367	/* 84 */ "BOTTOM",
1358	1368	/* 85 */ "START",
1359	1369	/* 86 */ "END",
1360	1370	/* 87 */ "IN",
1361		- /* 88 */ "DOT_U",
1362		- /* 89 */ "LAST",
1363		- /* 90 */ "NUMBER",
1364		- /* 91 */ "FUNC1",
1365		- /* 92 */ "FUNC2",
1366		- /* 93 */ "DIST",
1367		- /* 94 */ "DOT_XY",
1368		- /* 95 */ "X",
1369		- /* 96 */ "Y",
1370		- /* 97 */ "DOT_L",
1371		- /* 98 */ "statement_list",
1372		- /* 99 */ "statement",
1373		- /* 100 */ "unnamed_statement",
1374		- /* 101 */ "basetype",
1375		- /* 102 */ "expr",
1376		- /* 103 */ "numproperty",
1377		- /* 104 */ "edge",
1378		- /* 105 */ "direction",
1379		- /* 106 */ "dashproperty",
1380		- /* 107 */ "colorproperty",
1381		- /* 108 */ "locproperty",
1382		- /* 109 */ "position",
1383		- /* 110 */ "place",
1384		- /* 111 */ "object",
1385		- /* 112 */ "objectname",
1386		- /* 113 */ "nth",
1387		- /* 114 */ "textposition",
1388		- /* 115 */ "rvalue",
1389		- /* 116 */ "lvalue",
1390		- /* 117 */ "even",
1391		- /* 118 */ "relexpr",
1392		- /* 119 */ "optrelexpr",
1393		- /* 120 */ "document",
1394		- /* 121 */ "print",
1395		- /* 122 */ "prlist",
1396		- /* 123 */ "pritem",
1397		- /* 124 */ "prsep",
1398		- /* 125 */ "attribute_list",
1399		- /* 126 */ "savelist",
1400		- /* 127 */ "alist",
1401		- /* 128 */ "attribute",
1402		- /* 129 */ "go",
1403		- /* 130 */ "boolproperty",
1404		- /* 131 */ "withclause",
1405		- /* 132 */ "between",
1406		- /* 133 */ "place2",
	1371	+ /* 88 */ "THIS",
	1372	+ /* 89 */ "DOT_U",
	1373	+ /* 90 */ "LAST",
	1374	+ /* 91 */ "NUMBER",
	1375	+ /* 92 */ "FUNC1",
	1376	+ /* 93 */ "FUNC2",
	1377	+ /* 94 */ "DIST",
	1378	+ /* 95 */ "DOT_XY",
	1379	+ /* 96 */ "X",
	1380	+ /* 97 */ "Y",
	1381	+ /* 98 */ "DOT_L",
	1382	+ /* 99 */ "statement_list",
	1383	+ /* 100 */ "statement",
	1384	+ /* 101 */ "unnamed_statement",
	1385	+ /* 102 */ "basetype",
	1386	+ /* 103 */ "expr",
	1387	+ /* 104 */ "numproperty",
	1388	+ /* 105 */ "edge",
	1389	+ /* 106 */ "direction",
	1390	+ /* 107 */ "dashproperty",
	1391	+ /* 108 */ "colorproperty",
	1392	+ /* 109 */ "locproperty",
	1393	+ /* 110 */ "position",
	1394	+ /* 111 */ "place",
	1395	+ /* 112 */ "object",
	1396	+ /* 113 */ "objectname",
	1397	+ /* 114 */ "nth",
	1398	+ /* 115 */ "textposition",
	1399	+ /* 116 */ "rvalue",
	1400	+ /* 117 */ "lvalue",
	1401	+ /* 118 */ "even",
	1402	+ /* 119 */ "relexpr",
	1403	+ /* 120 */ "optrelexpr",
	1404	+ /* 121 */ "document",
	1405	+ /* 122 */ "print",
	1406	+ /* 123 */ "prlist",
	1407	+ /* 124 */ "pritem",
	1408	+ /* 125 */ "prsep",
	1409	+ /* 126 */ "attribute_list",
	1410	+ /* 127 */ "savelist",
	1411	+ /* 128 */ "alist",
	1412	+ /* 129 */ "attribute",
	1413	+ /* 130 */ "go",
	1414	+ /* 131 */ "boolproperty",
	1415	+ /* 132 */ "withclause",
	1416	+ /* 133 */ "between",
	1417	+ /* 134 */ "place2",
1407	1418	};
1408	1419	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1409	1420
1410	1421	#ifndef NDEBUG
1411	1422	/* For tracing reduce actions, the names of all rules are required.
		@@ -1497,77 +1508,78 @@
1497	1508	/* 83 */ "place2 ::= object",
1498	1509	/* 84 */ "place2 ::= object DOT_E edge",
1499	1510	/* 85 */ "place2 ::= NTH VERTEX OF object",
1500	1511	/* 86 */ "object ::= nth",
1501	1512	/* 87 */ "object ::= nth OF\|IN object",
1502		- /* 88 */ "objectname ::= PLACENAME",
1503		- /* 89 */ "objectname ::= objectname DOT_U PLACENAME",
1504		- /* 90 */ "nth ::= NTH CLASSNAME",
1505		- /* 91 */ "nth ::= NTH LAST CLASSNAME",
1506		- /* 92 */ "nth ::= LAST CLASSNAME",
1507		- /* 93 */ "nth ::= LAST",
1508		- /* 94 */ "nth ::= NTH LB RB",
1509		- /* 95 */ "nth ::= NTH LAST LB RB",
1510		- /* 96 */ "nth ::= LAST LB RB",
1511		- /* 97 */ "expr ::= expr PLUS expr",
1512		- /* 98 */ "expr ::= expr MINUS expr",
1513		- /* 99 */ "expr ::= expr STAR expr",
1514		- /* 100 */ "expr ::= expr SLASH expr",
1515		- /* 101 */ "expr ::= MINUS expr",
1516		- /* 102 */ "expr ::= PLUS expr",
1517		- /* 103 */ "expr ::= LP expr RP",
1518		- /* 104 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
1519		- /* 105 */ "expr ::= NUMBER",
1520		- /* 106 */ "expr ::= ID",
1521		- /* 107 */ "expr ::= FUNC1 LP expr RP",
1522		- /* 108 */ "expr ::= FUNC2 LP expr COMMA expr RP",
1523		- /* 109 */ "expr ::= DIST LP position COMMA position RP",
1524		- /* 110 */ "expr ::= place2 DOT_XY X",
1525		- /* 111 */ "expr ::= place2 DOT_XY Y",
1526		- /* 112 */ "expr ::= object DOT_L numproperty",
1527		- /* 113 */ "expr ::= object DOT_L dashproperty",
1528		- /* 114 */ "expr ::= object DOT_L colorproperty",
1529		- /* 115 */ "lvalue ::= ID",
1530		- /* 116 */ "lvalue ::= FILL",
1531		- /* 117 */ "lvalue ::= COLOR",
1532		- /* 118 */ "lvalue ::= THICKNESS",
1533		- /* 119 */ "rvalue ::= expr",
1534		- /* 120 */ "print ::= PRINT",
1535		- /* 121 */ "prlist ::= pritem",
1536		- /* 122 */ "prlist ::= prlist prsep pritem",
1537		- /* 123 */ "direction ::= UP",
1538		- /* 124 */ "direction ::= DOWN",
1539		- /* 125 */ "direction ::= LEFT",
1540		- /* 126 */ "direction ::= RIGHT",
1541		- /* 127 */ "optrelexpr ::= relexpr",
1542		- /* 128 */ "attribute_list ::= alist",
1543		- /* 129 */ "alist ::=",
1544		- /* 130 */ "alist ::= alist attribute",
1545		- /* 131 */ "attribute ::= boolproperty",
1546		- /* 132 */ "attribute ::= WITH withclause",
1547		- /* 133 */ "go ::= GO",
1548		- /* 134 */ "go ::=",
1549		- /* 135 */ "even ::= UNTIL EVEN WITH",
1550		- /* 136 */ "even ::= EVEN WITH",
1551		- /* 137 */ "dashproperty ::= DOTTED",
1552		- /* 138 */ "dashproperty ::= DASHED",
1553		- /* 139 */ "colorproperty ::= FILL",
1554		- /* 140 */ "colorproperty ::= COLOR",
1555		- /* 141 */ "position ::= place",
1556		- /* 142 */ "between ::= WAY BETWEEN",
1557		- /* 143 */ "between ::= BETWEEN",
1558		- /* 144 */ "between ::= OF THE WAY BETWEEN",
1559		- /* 145 */ "place ::= place2",
1560		- /* 146 */ "edge ::= CENTER",
1561		- /* 147 */ "edge ::= EDGEPT",
1562		- /* 148 */ "edge ::= TOP",
1563		- /* 149 */ "edge ::= BOTTOM",
1564		- /* 150 */ "edge ::= START",
1565		- /* 151 */ "edge ::= END",
1566		- /* 152 */ "edge ::= RIGHT",
1567		- /* 153 */ "edge ::= LEFT",
1568		- /* 154 */ "object ::= objectname",
	1513	+ /* 88 */ "objectname ::= THIS",
	1514	+ /* 89 */ "objectname ::= PLACENAME",
	1515	+ /* 90 */ "objectname ::= objectname DOT_U PLACENAME",
	1516	+ /* 91 */ "nth ::= NTH CLASSNAME",
	1517	+ /* 92 */ "nth ::= NTH LAST CLASSNAME",
	1518	+ /* 93 */ "nth ::= LAST CLASSNAME",
	1519	+ /* 94 */ "nth ::= LAST",
	1520	+ /* 95 */ "nth ::= NTH LB RB",
	1521	+ /* 96 */ "nth ::= NTH LAST LB RB",
	1522	+ /* 97 */ "nth ::= LAST LB RB",
	1523	+ /* 98 */ "expr ::= expr PLUS expr",
	1524	+ /* 99 */ "expr ::= expr MINUS expr",
	1525	+ /* 100 */ "expr ::= expr STAR expr",
	1526	+ /* 101 */ "expr ::= expr SLASH expr",
	1527	+ /* 102 */ "expr ::= MINUS expr",
	1528	+ /* 103 */ "expr ::= PLUS expr",
	1529	+ /* 104 */ "expr ::= LP expr RP",
	1530	+ /* 105 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
	1531	+ /* 106 */ "expr ::= NUMBER",
	1532	+ /* 107 */ "expr ::= ID",
	1533	+ /* 108 */ "expr ::= FUNC1 LP expr RP",
	1534	+ /* 109 */ "expr ::= FUNC2 LP expr COMMA expr RP",
	1535	+ /* 110 */ "expr ::= DIST LP position COMMA position RP",
	1536	+ /* 111 */ "expr ::= place2 DOT_XY X",
	1537	+ /* 112 */ "expr ::= place2 DOT_XY Y",
	1538	+ /* 113 */ "expr ::= object DOT_L numproperty",
	1539	+ /* 114 */ "expr ::= object DOT_L dashproperty",
	1540	+ /* 115 */ "expr ::= object DOT_L colorproperty",
	1541	+ /* 116 */ "lvalue ::= ID",
	1542	+ /* 117 */ "lvalue ::= FILL",
	1543	+ /* 118 */ "lvalue ::= COLOR",
	1544	+ /* 119 */ "lvalue ::= THICKNESS",
	1545	+ /* 120 */ "rvalue ::= expr",
	1546	+ /* 121 */ "print ::= PRINT",
	1547	+ /* 122 */ "prlist ::= pritem",
	1548	+ /* 123 */ "prlist ::= prlist prsep pritem",
	1549	+ /* 124 */ "direction ::= UP",
	1550	+ /* 125 */ "direction ::= DOWN",
	1551	+ /* 126 */ "direction ::= LEFT",
	1552	+ /* 127 */ "direction ::= RIGHT",
	1553	+ /* 128 */ "optrelexpr ::= relexpr",
	1554	+ /* 129 */ "attribute_list ::= alist",
	1555	+ /* 130 */ "alist ::=",
	1556	+ /* 131 */ "alist ::= alist attribute",
	1557	+ /* 132 */ "attribute ::= boolproperty",
	1558	+ /* 133 */ "attribute ::= WITH withclause",
	1559	+ /* 134 */ "go ::= GO",
	1560	+ /* 135 */ "go ::=",
	1561	+ /* 136 */ "even ::= UNTIL EVEN WITH",
	1562	+ /* 137 */ "even ::= EVEN WITH",
	1563	+ /* 138 */ "dashproperty ::= DOTTED",
	1564	+ /* 139 */ "dashproperty ::= DASHED",
	1565	+ /* 140 */ "colorproperty ::= FILL",
	1566	+ /* 141 */ "colorproperty ::= COLOR",
	1567	+ /* 142 */ "position ::= place",
	1568	+ /* 143 */ "between ::= WAY BETWEEN",
	1569	+ /* 144 */ "between ::= BETWEEN",
	1570	+ /* 145 */ "between ::= OF THE WAY BETWEEN",
	1571	+ /* 146 */ "place ::= place2",
	1572	+ /* 147 */ "edge ::= CENTER",
	1573	+ /* 148 */ "edge ::= EDGEPT",
	1574	+ /* 149 */ "edge ::= TOP",
	1575	+ /* 150 */ "edge ::= BOTTOM",
	1576	+ /* 151 */ "edge ::= START",
	1577	+ /* 152 */ "edge ::= END",
	1578	+ /* 153 */ "edge ::= RIGHT",
	1579	+ /* 154 */ "edge ::= LEFT",
	1580	+ /* 155 */ "object ::= objectname",
1569	1581	};
1570	1582	#endif /* NDEBUG */
1571	1583
1572	1584
1573	1585	#if YYSTACKDEPTH<=0
		@@ -1689,24 +1701,24 @@
1689	1701	** Note: during a reduce, the only symbols destroyed are those
1690	1702	** which appear on the RHS of the rule, but which are not used
1691	1703	** inside the C code.
1692	1704	*/
1693	1705	/******* Begin destructor definitions *************************************/
1694		- case 98: /* statement_list */
	1706	+ case 99: /* statement_list */
1695	1707	{
1696	1708	#line 494 "pikchr.y"
1697		-pik_elist_free(p,(yypminor->yy119));
1698		-#line 1723 "pikchr.c"
	1709	+pik_elist_free(p,(yypminor->yy227));
	1710	+#line 1735 "pikchr.c"
1699	1711	}
1700	1712	break;
1701		- case 99: /* statement */
1702		- case 100: /* unnamed_statement */
1703		- case 101: /* basetype */
	1713	+ case 100: /* statement */
	1714	+ case 101: /* unnamed_statement */
	1715	+ case 102: /* basetype */
1704	1716	{
1705	1717	#line 496 "pikchr.y"
1706		-pik_elem_free(p,(yypminor->yy38));
1707		-#line 1732 "pikchr.c"
	1718	+pik_elem_free(p,(yypminor->yy36));
	1719	+#line 1744 "pikchr.c"
1708	1720	}
1709	1721	break;
1710	1722	/******* End destructor definitions ***************************************/
1711	1723	default: break; /* If no destructor action specified: do nothing */
1712	1724	}
		@@ -1923,11 +1935,11 @@
1923	1935	** stack every overflows */
1924	1936	/****** Begin %stack_overflow code ****************************************/
1925	1937	#line 528 "pikchr.y"
1926	1938
1927	1939	pik_error(p, 0, "parser stack overflow");
1928		-#line 1953 "pikchr.c"
	1940	+#line 1965 "pikchr.c"
1929	1941	/****** End %stack_overflow code ******************************************/
1930	1942	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
1931	1943	pik_parserCTX_STORE
1932	1944	}
1933	1945
		@@ -1995,165 +2007,166 @@
1995	2007	}
1996	2008
1997	2009	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
1998	2010	** of that rule */
1999	2011	static const YYCODETYPE yyRuleInfoLhs[] = {
2000		- 120, /* (0) document ::= statement_list */
2001		- 98, /* (1) statement_list ::= statement */
2002		- 98, /* (2) statement_list ::= statement_list EOL statement */
2003		- 99, /* (3) statement ::= */
2004		- 99, /* (4) statement ::= direction */
2005		- 99, /* (5) statement ::= lvalue ASSIGN rvalue */
2006		- 99, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2007		- 99, /* (7) statement ::= PLACENAME COLON position */
2008		- 99, /* (8) statement ::= unnamed_statement */
2009		- 99, /* (9) statement ::= print prlist */
2010		- 99, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2011		- 99, /* (11) statement ::= ASSERT LP position EQ position RP */
2012		- 99, /* (12) statement ::= DEFINE ID CODEBLOCK */
2013		- 115, /* (13) rvalue ::= PLACENAME */
2014		- 123, /* (14) pritem ::= FILL */
2015		- 123, /* (15) pritem ::= COLOR */
2016		- 123, /* (16) pritem ::= THICKNESS */
2017		- 123, /* (17) pritem ::= rvalue */
2018		- 123, /* (18) pritem ::= STRING */
2019		- 124, /* (19) prsep ::= COMMA */
2020		- 100, /* (20) unnamed_statement ::= basetype attribute_list */
2021		- 101, /* (21) basetype ::= CLASSNAME */
2022		- 101, /* (22) basetype ::= STRING textposition */
2023		- 101, /* (23) basetype ::= LB savelist statement_list RB */
2024		- 126, /* (24) savelist ::= */
2025		- 118, /* (25) relexpr ::= expr */
2026		- 118, /* (26) relexpr ::= expr PERCENT */
2027		- 119, /* (27) optrelexpr ::= */
2028		- 125, /* (28) attribute_list ::= relexpr alist */
2029		- 128, /* (29) attribute ::= numproperty relexpr */
2030		- 128, /* (30) attribute ::= dashproperty expr */
2031		- 128, /* (31) attribute ::= dashproperty */
2032		- 128, /* (32) attribute ::= colorproperty rvalue */
2033		- 128, /* (33) attribute ::= go direction optrelexpr */
2034		- 128, /* (34) attribute ::= go direction even position */
2035		- 128, /* (35) attribute ::= CLOSE */
2036		- 128, /* (36) attribute ::= CHOP */
2037		- 128, /* (37) attribute ::= FROM position */
2038		- 128, /* (38) attribute ::= TO position */
2039		- 128, /* (39) attribute ::= THEN */
2040		- 128, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2041		- 128, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2042		- 128, /* (42) attribute ::= GO optrelexpr HEADING expr */
2043		- 128, /* (43) attribute ::= GO optrelexpr EDGEPT */
2044		- 128, /* (44) attribute ::= AT position */
2045		- 128, /* (45) attribute ::= SAME */
2046		- 128, /* (46) attribute ::= SAME AS object */
2047		- 128, /* (47) attribute ::= STRING textposition */
2048		- 128, /* (48) attribute ::= FIT */
2049		- 128, /* (49) attribute ::= BEHIND object */
2050		- 131, /* (50) withclause ::= DOT_E edge AT position */
2051		- 131, /* (51) withclause ::= edge AT position */
2052		- 103, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2053		- 130, /* (53) boolproperty ::= CW */
2054		- 130, /* (54) boolproperty ::= CCW */
2055		- 130, /* (55) boolproperty ::= LARROW */
2056		- 130, /* (56) boolproperty ::= RARROW */
2057		- 130, /* (57) boolproperty ::= LRARROW */
2058		- 130, /* (58) boolproperty ::= INVIS */
2059		- 130, /* (59) boolproperty ::= THICK */
2060		- 130, /* (60) boolproperty ::= THIN */
2061		- 130, /* (61) boolproperty ::= SOLID */
2062		- 114, /* (62) textposition ::= */
2063		- 114, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2064		- 109, /* (64) position ::= expr COMMA expr */
2065		- 109, /* (65) position ::= place PLUS expr COMMA expr */
2066		- 109, /* (66) position ::= place MINUS expr COMMA expr */
2067		- 109, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2068		- 109, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2069		- 109, /* (69) position ::= LP position COMMA position RP */
2070		- 109, /* (70) position ::= LP position RP */
2071		- 109, /* (71) position ::= expr between position AND position */
2072		- 109, /* (72) position ::= expr LT position COMMA position GT */
2073		- 109, /* (73) position ::= expr ABOVE position */
2074		- 109, /* (74) position ::= expr BELOW position */
2075		- 109, /* (75) position ::= expr LEFT OF position */
2076		- 109, /* (76) position ::= expr RIGHT OF position */
2077		- 109, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2078		- 109, /* (78) position ::= expr HEADING EDGEPT OF position */
2079		- 109, /* (79) position ::= expr EDGEPT OF position */
2080		- 109, /* (80) position ::= expr ON HEADING expr FROM position */
2081		- 109, /* (81) position ::= expr HEADING expr FROM position */
2082		- 110, /* (82) place ::= edge OF object */
2083		- 133, /* (83) place2 ::= object */
2084		- 133, /* (84) place2 ::= object DOT_E edge */
2085		- 133, /* (85) place2 ::= NTH VERTEX OF object */
2086		- 111, /* (86) object ::= nth */
2087		- 111, /* (87) object ::= nth OF\|IN object */
2088		- 112, /* (88) objectname ::= PLACENAME */
2089		- 112, /* (89) objectname ::= objectname DOT_U PLACENAME */
2090		- 113, /* (90) nth ::= NTH CLASSNAME */
2091		- 113, /* (91) nth ::= NTH LAST CLASSNAME */
2092		- 113, /* (92) nth ::= LAST CLASSNAME */
2093		- 113, /* (93) nth ::= LAST */
2094		- 113, /* (94) nth ::= NTH LB RB */
2095		- 113, /* (95) nth ::= NTH LAST LB RB */
2096		- 113, /* (96) nth ::= LAST LB RB */
2097		- 102, /* (97) expr ::= expr PLUS expr */
2098		- 102, /* (98) expr ::= expr MINUS expr */
2099		- 102, /* (99) expr ::= expr STAR expr */
2100		- 102, /* (100) expr ::= expr SLASH expr */
2101		- 102, /* (101) expr ::= MINUS expr */
2102		- 102, /* (102) expr ::= PLUS expr */
2103		- 102, /* (103) expr ::= LP expr RP */
2104		- 102, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2105		- 102, /* (105) expr ::= NUMBER */
2106		- 102, /* (106) expr ::= ID */
2107		- 102, /* (107) expr ::= FUNC1 LP expr RP */
2108		- 102, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2109		- 102, /* (109) expr ::= DIST LP position COMMA position RP */
2110		- 102, /* (110) expr ::= place2 DOT_XY X */
2111		- 102, /* (111) expr ::= place2 DOT_XY Y */
2112		- 102, /* (112) expr ::= object DOT_L numproperty */
2113		- 102, /* (113) expr ::= object DOT_L dashproperty */
2114		- 102, /* (114) expr ::= object DOT_L colorproperty */
2115		- 116, /* (115) lvalue ::= ID */
2116		- 116, /* (116) lvalue ::= FILL */
2117		- 116, /* (117) lvalue ::= COLOR */
2118		- 116, /* (118) lvalue ::= THICKNESS */
2119		- 115, /* (119) rvalue ::= expr */
2120		- 121, /* (120) print ::= PRINT */
2121		- 122, /* (121) prlist ::= pritem */
2122		- 122, /* (122) prlist ::= prlist prsep pritem */
2123		- 105, /* (123) direction ::= UP */
2124		- 105, /* (124) direction ::= DOWN */
2125		- 105, /* (125) direction ::= LEFT */
2126		- 105, /* (126) direction ::= RIGHT */
2127		- 119, /* (127) optrelexpr ::= relexpr */
2128		- 125, /* (128) attribute_list ::= alist */
2129		- 127, /* (129) alist ::= */
2130		- 127, /* (130) alist ::= alist attribute */
2131		- 128, /* (131) attribute ::= boolproperty */
2132		- 128, /* (132) attribute ::= WITH withclause */
2133		- 129, /* (133) go ::= GO */
2134		- 129, /* (134) go ::= */
2135		- 117, /* (135) even ::= UNTIL EVEN WITH */
2136		- 117, /* (136) even ::= EVEN WITH */
2137		- 106, /* (137) dashproperty ::= DOTTED */
2138		- 106, /* (138) dashproperty ::= DASHED */
2139		- 107, /* (139) colorproperty ::= FILL */
2140		- 107, /* (140) colorproperty ::= COLOR */
2141		- 109, /* (141) position ::= place */
2142		- 132, /* (142) between ::= WAY BETWEEN */
2143		- 132, /* (143) between ::= BETWEEN */
2144		- 132, /* (144) between ::= OF THE WAY BETWEEN */
2145		- 110, /* (145) place ::= place2 */
2146		- 104, /* (146) edge ::= CENTER */
2147		- 104, /* (147) edge ::= EDGEPT */
2148		- 104, /* (148) edge ::= TOP */
2149		- 104, /* (149) edge ::= BOTTOM */
2150		- 104, /* (150) edge ::= START */
2151		- 104, /* (151) edge ::= END */
2152		- 104, /* (152) edge ::= RIGHT */
2153		- 104, /* (153) edge ::= LEFT */
2154		- 111, /* (154) object ::= objectname */
	2012	+ 121, /* (0) document ::= statement_list */
	2013	+ 99, /* (1) statement_list ::= statement */
	2014	+ 99, /* (2) statement_list ::= statement_list EOL statement */
	2015	+ 100, /* (3) statement ::= */
	2016	+ 100, /* (4) statement ::= direction */
	2017	+ 100, /* (5) statement ::= lvalue ASSIGN rvalue */
	2018	+ 100, /* (6) statement ::= PLACENAME COLON unnamed_statement */
	2019	+ 100, /* (7) statement ::= PLACENAME COLON position */
	2020	+ 100, /* (8) statement ::= unnamed_statement */
	2021	+ 100, /* (9) statement ::= print prlist */
	2022	+ 100, /* (10) statement ::= ASSERT LP expr EQ expr RP */
	2023	+ 100, /* (11) statement ::= ASSERT LP position EQ position RP */
	2024	+ 100, /* (12) statement ::= DEFINE ID CODEBLOCK */
	2025	+ 116, /* (13) rvalue ::= PLACENAME */
	2026	+ 124, /* (14) pritem ::= FILL */
	2027	+ 124, /* (15) pritem ::= COLOR */
	2028	+ 124, /* (16) pritem ::= THICKNESS */
	2029	+ 124, /* (17) pritem ::= rvalue */
	2030	+ 124, /* (18) pritem ::= STRING */
	2031	+ 125, /* (19) prsep ::= COMMA */
	2032	+ 101, /* (20) unnamed_statement ::= basetype attribute_list */
	2033	+ 102, /* (21) basetype ::= CLASSNAME */
	2034	+ 102, /* (22) basetype ::= STRING textposition */
	2035	+ 102, /* (23) basetype ::= LB savelist statement_list RB */
	2036	+ 127, /* (24) savelist ::= */
	2037	+ 119, /* (25) relexpr ::= expr */
	2038	+ 119, /* (26) relexpr ::= expr PERCENT */
	2039	+ 120, /* (27) optrelexpr ::= */
	2040	+ 126, /* (28) attribute_list ::= relexpr alist */
	2041	+ 129, /* (29) attribute ::= numproperty relexpr */
	2042	+ 129, /* (30) attribute ::= dashproperty expr */
	2043	+ 129, /* (31) attribute ::= dashproperty */
	2044	+ 129, /* (32) attribute ::= colorproperty rvalue */
	2045	+ 129, /* (33) attribute ::= go direction optrelexpr */
	2046	+ 129, /* (34) attribute ::= go direction even position */
	2047	+ 129, /* (35) attribute ::= CLOSE */
	2048	+ 129, /* (36) attribute ::= CHOP */
	2049	+ 129, /* (37) attribute ::= FROM position */
	2050	+ 129, /* (38) attribute ::= TO position */
	2051	+ 129, /* (39) attribute ::= THEN */
	2052	+ 129, /* (40) attribute ::= THEN optrelexpr HEADING expr */
	2053	+ 129, /* (41) attribute ::= THEN optrelexpr EDGEPT */
	2054	+ 129, /* (42) attribute ::= GO optrelexpr HEADING expr */
	2055	+ 129, /* (43) attribute ::= GO optrelexpr EDGEPT */
	2056	+ 129, /* (44) attribute ::= AT position */
	2057	+ 129, /* (45) attribute ::= SAME */
	2058	+ 129, /* (46) attribute ::= SAME AS object */
	2059	+ 129, /* (47) attribute ::= STRING textposition */
	2060	+ 129, /* (48) attribute ::= FIT */
	2061	+ 129, /* (49) attribute ::= BEHIND object */
	2062	+ 132, /* (50) withclause ::= DOT_E edge AT position */
	2063	+ 132, /* (51) withclause ::= edge AT position */
	2064	+ 104, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
	2065	+ 131, /* (53) boolproperty ::= CW */
	2066	+ 131, /* (54) boolproperty ::= CCW */
	2067	+ 131, /* (55) boolproperty ::= LARROW */
	2068	+ 131, /* (56) boolproperty ::= RARROW */
	2069	+ 131, /* (57) boolproperty ::= LRARROW */
	2070	+ 131, /* (58) boolproperty ::= INVIS */
	2071	+ 131, /* (59) boolproperty ::= THICK */
	2072	+ 131, /* (60) boolproperty ::= THIN */
	2073	+ 131, /* (61) boolproperty ::= SOLID */
	2074	+ 115, /* (62) textposition ::= */
	2075	+ 115, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
	2076	+ 110, /* (64) position ::= expr COMMA expr */
	2077	+ 110, /* (65) position ::= place PLUS expr COMMA expr */
	2078	+ 110, /* (66) position ::= place MINUS expr COMMA expr */
	2079	+ 110, /* (67) position ::= place PLUS LP expr COMMA expr RP */
	2080	+ 110, /* (68) position ::= place MINUS LP expr COMMA expr RP */
	2081	+ 110, /* (69) position ::= LP position COMMA position RP */
	2082	+ 110, /* (70) position ::= LP position RP */
	2083	+ 110, /* (71) position ::= expr between position AND position */
	2084	+ 110, /* (72) position ::= expr LT position COMMA position GT */
	2085	+ 110, /* (73) position ::= expr ABOVE position */
	2086	+ 110, /* (74) position ::= expr BELOW position */
	2087	+ 110, /* (75) position ::= expr LEFT OF position */
	2088	+ 110, /* (76) position ::= expr RIGHT OF position */
	2089	+ 110, /* (77) position ::= expr ON HEADING EDGEPT OF position */
	2090	+ 110, /* (78) position ::= expr HEADING EDGEPT OF position */
	2091	+ 110, /* (79) position ::= expr EDGEPT OF position */
	2092	+ 110, /* (80) position ::= expr ON HEADING expr FROM position */
	2093	+ 110, /* (81) position ::= expr HEADING expr FROM position */
	2094	+ 111, /* (82) place ::= edge OF object */
	2095	+ 134, /* (83) place2 ::= object */
	2096	+ 134, /* (84) place2 ::= object DOT_E edge */
	2097	+ 134, /* (85) place2 ::= NTH VERTEX OF object */
	2098	+ 112, /* (86) object ::= nth */
	2099	+ 112, /* (87) object ::= nth OF\|IN object */
	2100	+ 113, /* (88) objectname ::= THIS */
	2101	+ 113, /* (89) objectname ::= PLACENAME */
	2102	+ 113, /* (90) objectname ::= objectname DOT_U PLACENAME */
	2103	+ 114, /* (91) nth ::= NTH CLASSNAME */
	2104	+ 114, /* (92) nth ::= NTH LAST CLASSNAME */
	2105	+ 114, /* (93) nth ::= LAST CLASSNAME */
	2106	+ 114, /* (94) nth ::= LAST */
	2107	+ 114, /* (95) nth ::= NTH LB RB */
	2108	+ 114, /* (96) nth ::= NTH LAST LB RB */
	2109	+ 114, /* (97) nth ::= LAST LB RB */
	2110	+ 103, /* (98) expr ::= expr PLUS expr */
	2111	+ 103, /* (99) expr ::= expr MINUS expr */
	2112	+ 103, /* (100) expr ::= expr STAR expr */
	2113	+ 103, /* (101) expr ::= expr SLASH expr */
	2114	+ 103, /* (102) expr ::= MINUS expr */
	2115	+ 103, /* (103) expr ::= PLUS expr */
	2116	+ 103, /* (104) expr ::= LP expr RP */
	2117	+ 103, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2118	+ 103, /* (106) expr ::= NUMBER */
	2119	+ 103, /* (107) expr ::= ID */
	2120	+ 103, /* (108) expr ::= FUNC1 LP expr RP */
	2121	+ 103, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
	2122	+ 103, /* (110) expr ::= DIST LP position COMMA position RP */
	2123	+ 103, /* (111) expr ::= place2 DOT_XY X */
	2124	+ 103, /* (112) expr ::= place2 DOT_XY Y */
	2125	+ 103, /* (113) expr ::= object DOT_L numproperty */
	2126	+ 103, /* (114) expr ::= object DOT_L dashproperty */
	2127	+ 103, /* (115) expr ::= object DOT_L colorproperty */
	2128	+ 117, /* (116) lvalue ::= ID */
	2129	+ 117, /* (117) lvalue ::= FILL */
	2130	+ 117, /* (118) lvalue ::= COLOR */
	2131	+ 117, /* (119) lvalue ::= THICKNESS */
	2132	+ 116, /* (120) rvalue ::= expr */
	2133	+ 122, /* (121) print ::= PRINT */
	2134	+ 123, /* (122) prlist ::= pritem */
	2135	+ 123, /* (123) prlist ::= prlist prsep pritem */
	2136	+ 106, /* (124) direction ::= UP */
	2137	+ 106, /* (125) direction ::= DOWN */
	2138	+ 106, /* (126) direction ::= LEFT */
	2139	+ 106, /* (127) direction ::= RIGHT */
	2140	+ 120, /* (128) optrelexpr ::= relexpr */
	2141	+ 126, /* (129) attribute_list ::= alist */
	2142	+ 128, /* (130) alist ::= */
	2143	+ 128, /* (131) alist ::= alist attribute */
	2144	+ 129, /* (132) attribute ::= boolproperty */
	2145	+ 129, /* (133) attribute ::= WITH withclause */
	2146	+ 130, /* (134) go ::= GO */
	2147	+ 130, /* (135) go ::= */
	2148	+ 118, /* (136) even ::= UNTIL EVEN WITH */
	2149	+ 118, /* (137) even ::= EVEN WITH */
	2150	+ 107, /* (138) dashproperty ::= DOTTED */
	2151	+ 107, /* (139) dashproperty ::= DASHED */
	2152	+ 108, /* (140) colorproperty ::= FILL */
	2153	+ 108, /* (141) colorproperty ::= COLOR */
	2154	+ 110, /* (142) position ::= place */
	2155	+ 133, /* (143) between ::= WAY BETWEEN */
	2156	+ 133, /* (144) between ::= BETWEEN */
	2157	+ 133, /* (145) between ::= OF THE WAY BETWEEN */
	2158	+ 111, /* (146) place ::= place2 */
	2159	+ 105, /* (147) edge ::= CENTER */
	2160	+ 105, /* (148) edge ::= EDGEPT */
	2161	+ 105, /* (149) edge ::= TOP */
	2162	+ 105, /* (150) edge ::= BOTTOM */
	2163	+ 105, /* (151) edge ::= START */
	2164	+ 105, /* (152) edge ::= END */
	2165	+ 105, /* (153) edge ::= RIGHT */
	2166	+ 105, /* (154) edge ::= LEFT */
	2167	+ 112, /* (155) object ::= objectname */
2155	2168	};
2156	2169
2157	2170	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2158	2171	** of symbols on the right-hand side of that rule. */
2159	2172	static const signed char yyRuleInfoNRhs[] = {
		@@ -2243,77 +2256,78 @@
2243	2256	-1, /* (83) place2 ::= object */
2244	2257	-3, /* (84) place2 ::= object DOT_E edge */
2245	2258	-4, /* (85) place2 ::= NTH VERTEX OF object */
2246	2259	-1, /* (86) object ::= nth */
2247	2260	-3, /* (87) object ::= nth OF\|IN object */
2248		- -1, /* (88) objectname ::= PLACENAME */
2249		- -3, /* (89) objectname ::= objectname DOT_U PLACENAME */
2250		- -2, /* (90) nth ::= NTH CLASSNAME */
2251		- -3, /* (91) nth ::= NTH LAST CLASSNAME */
2252		- -2, /* (92) nth ::= LAST CLASSNAME */
2253		- -1, /* (93) nth ::= LAST */
2254		- -3, /* (94) nth ::= NTH LB RB */
2255		- -4, /* (95) nth ::= NTH LAST LB RB */
2256		- -3, /* (96) nth ::= LAST LB RB */
2257		- -3, /* (97) expr ::= expr PLUS expr */
2258		- -3, /* (98) expr ::= expr MINUS expr */
2259		- -3, /* (99) expr ::= expr STAR expr */
2260		- -3, /* (100) expr ::= expr SLASH expr */
2261		- -2, /* (101) expr ::= MINUS expr */
2262		- -2, /* (102) expr ::= PLUS expr */
2263		- -3, /* (103) expr ::= LP expr RP */
2264		- -3, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2265		- -1, /* (105) expr ::= NUMBER */
2266		- -1, /* (106) expr ::= ID */
2267		- -4, /* (107) expr ::= FUNC1 LP expr RP */
2268		- -6, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2269		- -6, /* (109) expr ::= DIST LP position COMMA position RP */
2270		- -3, /* (110) expr ::= place2 DOT_XY X */
2271		- -3, /* (111) expr ::= place2 DOT_XY Y */
2272		- -3, /* (112) expr ::= object DOT_L numproperty */
2273		- -3, /* (113) expr ::= object DOT_L dashproperty */
2274		- -3, /* (114) expr ::= object DOT_L colorproperty */
2275		- -1, /* (115) lvalue ::= ID */
2276		- -1, /* (116) lvalue ::= FILL */
2277		- -1, /* (117) lvalue ::= COLOR */
2278		- -1, /* (118) lvalue ::= THICKNESS */
2279		- -1, /* (119) rvalue ::= expr */
2280		- -1, /* (120) print ::= PRINT */
2281		- -1, /* (121) prlist ::= pritem */
2282		- -3, /* (122) prlist ::= prlist prsep pritem */
2283		- -1, /* (123) direction ::= UP */
2284		- -1, /* (124) direction ::= DOWN */
2285		- -1, /* (125) direction ::= LEFT */
2286		- -1, /* (126) direction ::= RIGHT */
2287		- -1, /* (127) optrelexpr ::= relexpr */
2288		- -1, /* (128) attribute_list ::= alist */
2289		- 0, /* (129) alist ::= */
2290		- -2, /* (130) alist ::= alist attribute */
2291		- -1, /* (131) attribute ::= boolproperty */
2292		- -2, /* (132) attribute ::= WITH withclause */
2293		- -1, /* (133) go ::= GO */
2294		- 0, /* (134) go ::= */
2295		- -3, /* (135) even ::= UNTIL EVEN WITH */
2296		- -2, /* (136) even ::= EVEN WITH */
2297		- -1, /* (137) dashproperty ::= DOTTED */
2298		- -1, /* (138) dashproperty ::= DASHED */
2299		- -1, /* (139) colorproperty ::= FILL */
2300		- -1, /* (140) colorproperty ::= COLOR */
2301		- -1, /* (141) position ::= place */
2302		- -2, /* (142) between ::= WAY BETWEEN */
2303		- -1, /* (143) between ::= BETWEEN */
2304		- -4, /* (144) between ::= OF THE WAY BETWEEN */
2305		- -1, /* (145) place ::= place2 */
2306		- -1, /* (146) edge ::= CENTER */
2307		- -1, /* (147) edge ::= EDGEPT */
2308		- -1, /* (148) edge ::= TOP */
2309		- -1, /* (149) edge ::= BOTTOM */
2310		- -1, /* (150) edge ::= START */
2311		- -1, /* (151) edge ::= END */
2312		- -1, /* (152) edge ::= RIGHT */
2313		- -1, /* (153) edge ::= LEFT */
2314		- -1, /* (154) object ::= objectname */
	2261	+ -1, /* (88) objectname ::= THIS */
	2262	+ -1, /* (89) objectname ::= PLACENAME */
	2263	+ -3, /* (90) objectname ::= objectname DOT_U PLACENAME */
	2264	+ -2, /* (91) nth ::= NTH CLASSNAME */
	2265	+ -3, /* (92) nth ::= NTH LAST CLASSNAME */
	2266	+ -2, /* (93) nth ::= LAST CLASSNAME */
	2267	+ -1, /* (94) nth ::= LAST */
	2268	+ -3, /* (95) nth ::= NTH LB RB */
	2269	+ -4, /* (96) nth ::= NTH LAST LB RB */
	2270	+ -3, /* (97) nth ::= LAST LB RB */
	2271	+ -3, /* (98) expr ::= expr PLUS expr */
	2272	+ -3, /* (99) expr ::= expr MINUS expr */
	2273	+ -3, /* (100) expr ::= expr STAR expr */
	2274	+ -3, /* (101) expr ::= expr SLASH expr */
	2275	+ -2, /* (102) expr ::= MINUS expr */
	2276	+ -2, /* (103) expr ::= PLUS expr */
	2277	+ -3, /* (104) expr ::= LP expr RP */
	2278	+ -3, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2279	+ -1, /* (106) expr ::= NUMBER */
	2280	+ -1, /* (107) expr ::= ID */
	2281	+ -4, /* (108) expr ::= FUNC1 LP expr RP */
	2282	+ -6, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
	2283	+ -6, /* (110) expr ::= DIST LP position COMMA position RP */
	2284	+ -3, /* (111) expr ::= place2 DOT_XY X */
	2285	+ -3, /* (112) expr ::= place2 DOT_XY Y */
	2286	+ -3, /* (113) expr ::= object DOT_L numproperty */
	2287	+ -3, /* (114) expr ::= object DOT_L dashproperty */
	2288	+ -3, /* (115) expr ::= object DOT_L colorproperty */
	2289	+ -1, /* (116) lvalue ::= ID */
	2290	+ -1, /* (117) lvalue ::= FILL */
	2291	+ -1, /* (118) lvalue ::= COLOR */
	2292	+ -1, /* (119) lvalue ::= THICKNESS */
	2293	+ -1, /* (120) rvalue ::= expr */
	2294	+ -1, /* (121) print ::= PRINT */
	2295	+ -1, /* (122) prlist ::= pritem */
	2296	+ -3, /* (123) prlist ::= prlist prsep pritem */
	2297	+ -1, /* (124) direction ::= UP */
	2298	+ -1, /* (125) direction ::= DOWN */
	2299	+ -1, /* (126) direction ::= LEFT */
	2300	+ -1, /* (127) direction ::= RIGHT */
	2301	+ -1, /* (128) optrelexpr ::= relexpr */
	2302	+ -1, /* (129) attribute_list ::= alist */
	2303	+ 0, /* (130) alist ::= */
	2304	+ -2, /* (131) alist ::= alist attribute */
	2305	+ -1, /* (132) attribute ::= boolproperty */
	2306	+ -2, /* (133) attribute ::= WITH withclause */
	2307	+ -1, /* (134) go ::= GO */
	2308	+ 0, /* (135) go ::= */
	2309	+ -3, /* (136) even ::= UNTIL EVEN WITH */
	2310	+ -2, /* (137) even ::= EVEN WITH */
	2311	+ -1, /* (138) dashproperty ::= DOTTED */
	2312	+ -1, /* (139) dashproperty ::= DASHED */
	2313	+ -1, /* (140) colorproperty ::= FILL */
	2314	+ -1, /* (141) colorproperty ::= COLOR */
	2315	+ -1, /* (142) position ::= place */
	2316	+ -2, /* (143) between ::= WAY BETWEEN */
	2317	+ -1, /* (144) between ::= BETWEEN */
	2318	+ -4, /* (145) between ::= OF THE WAY BETWEEN */
	2319	+ -1, /* (146) place ::= place2 */
	2320	+ -1, /* (147) edge ::= CENTER */
	2321	+ -1, /* (148) edge ::= EDGEPT */
	2322	+ -1, /* (149) edge ::= TOP */
	2323	+ -1, /* (150) edge ::= BOTTOM */
	2324	+ -1, /* (151) edge ::= START */
	2325	+ -1, /* (152) edge ::= END */
	2326	+ -1, /* (153) edge ::= RIGHT */
	2327	+ -1, /* (154) edge ::= LEFT */
	2328	+ -1, /* (155) object ::= objectname */
2315	2329	};
2316	2330
2317	2331	static void yy_accept(yyParser); / Forward Declaration */
2318	2332
2319	2333	/*
		@@ -2402,656 +2416,661 @@
2402	2416	*/
2403	2417	/******** Begin reduce actions ********************************************/
2404	2418	YYMINORTYPE yylhsminor;
2405	2419	case 0: /* document ::= statement_list */
2406	2420	#line 532 "pikchr.y"
2407		-{pik_render(p,yymsp[0].minor.yy119);}
2408		-#line 2433 "pikchr.c"
	2421	+{pik_render(p,yymsp[0].minor.yy227);}
	2422	+#line 2447 "pikchr.c"
2409	2423	break;
2410	2424	case 1: /* statement_list ::= statement */
2411	2425	#line 535 "pikchr.y"
2412		-{ yylhsminor.yy119 = pik_elist_append(p,0,yymsp[0].minor.yy38); }
2413		-#line 2438 "pikchr.c"
2414		- yymsp[0].minor.yy119 = yylhsminor.yy119;
	2426	+{ yylhsminor.yy227 = pik_elist_append(p,0,yymsp[0].minor.yy36); }
	2427	+#line 2452 "pikchr.c"
	2428	+ yymsp[0].minor.yy227 = yylhsminor.yy227;
2415	2429	break;
2416	2430	case 2: /* statement_list ::= statement_list EOL statement */
2417	2431	#line 537 "pikchr.y"
2418		-{ yylhsminor.yy119 = pik_elist_append(p,yymsp[-2].minor.yy119,yymsp[0].minor.yy38); }
2419		-#line 2444 "pikchr.c"
2420		- yymsp[-2].minor.yy119 = yylhsminor.yy119;
	2432	+{ yylhsminor.yy227 = pik_elist_append(p,yymsp[-2].minor.yy227,yymsp[0].minor.yy36); }
	2433	+#line 2458 "pikchr.c"
	2434	+ yymsp[-2].minor.yy227 = yylhsminor.yy227;
2421	2435	break;
2422	2436	case 3: /* statement ::= */
2423	2437	#line 540 "pikchr.y"
2424		-{ yymsp[1].minor.yy38 = 0; }
2425		-#line 2450 "pikchr.c"
	2438	+{ yymsp[1].minor.yy36 = 0; }
	2439	+#line 2464 "pikchr.c"
2426	2440	break;
2427	2441	case 4: /* statement ::= direction */
2428	2442	#line 541 "pikchr.y"
2429		-{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy38=0; }
2430		-#line 2455 "pikchr.c"
2431		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2443	+{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy36=0; }
	2444	+#line 2469 "pikchr.c"
	2445	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2432	2446	break;
2433	2447	case 5: /* statement ::= lvalue ASSIGN rvalue */
2434	2448	#line 542 "pikchr.y"
2435		-{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy265,&yymsp[-1].minor.yy0); yylhsminor.yy38=0;}
2436		-#line 2461 "pikchr.c"
2437		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2449	+{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy153,&yymsp[-1].minor.yy0); yylhsminor.yy36=0;}
	2450	+#line 2475 "pikchr.c"
	2451	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2438	2452	break;
2439	2453	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2440	2454	#line 544 "pikchr.y"
2441		-{ yylhsminor.yy38 = yymsp[0].minor.yy38; pik_elem_setname(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0); }
2442		-#line 2467 "pikchr.c"
2443		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2455	+{ yylhsminor.yy36 = yymsp[0].minor.yy36; pik_elem_setname(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0); }
	2456	+#line 2481 "pikchr.c"
	2457	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2444	2458	break;
2445	2459	case 7: /* statement ::= PLACENAME COLON position */
2446	2460	#line 546 "pikchr.y"
2447		-{ yylhsminor.yy38 = pik_elem_new(p,0,0,0);
2448		- if(yylhsminor.yy38){ yylhsminor.yy38->ptAt = yymsp[0].minor.yy43; pik_elem_setname(p,yylhsminor.yy38,&yymsp[-2].minor.yy0); }}
2449		-#line 2474 "pikchr.c"
2450		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2461	+{ yylhsminor.yy36 = pik_elem_new(p,0,0,0);
	2462	+ if(yylhsminor.yy36){ yylhsminor.yy36->ptAt = yymsp[0].minor.yy79; pik_elem_setname(p,yylhsminor.yy36,&yymsp[-2].minor.yy0); }}
	2463	+#line 2488 "pikchr.c"
	2464	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2451	2465	break;
2452	2466	case 8: /* statement ::= unnamed_statement */
2453	2467	#line 548 "pikchr.y"
2454		-{yylhsminor.yy38 = yymsp[0].minor.yy38;}
2455		-#line 2480 "pikchr.c"
2456		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2468	+{yylhsminor.yy36 = yymsp[0].minor.yy36;}
	2469	+#line 2494 "pikchr.c"
	2470	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2457	2471	break;
2458	2472	case 9: /* statement ::= print prlist */
2459	2473	#line 549 "pikchr.y"
2460		-{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy38=0;}
2461		-#line 2486 "pikchr.c"
	2474	+{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy36=0;}
	2475	+#line 2500 "pikchr.c"
2462	2476	break;
2463	2477	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2464	2478	#line 554 "pikchr.y"
2465		-{yymsp[-5].minor.yy38=pik_assert(p,yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy265);}
2466		-#line 2491 "pikchr.c"
	2479	+{yymsp[-5].minor.yy36=pik_assert(p,yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy153);}
	2480	+#line 2505 "pikchr.c"
2467	2481	break;
2468	2482	case 11: /* statement ::= ASSERT LP position EQ position RP */
2469	2483	#line 556 "pikchr.y"
2470		-{yymsp[-5].minor.yy38=pik_position_assert(p,&yymsp[-3].minor.yy43,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy43);}
2471		-#line 2496 "pikchr.c"
	2484	+{yymsp[-5].minor.yy36=pik_position_assert(p,&yymsp[-3].minor.yy79,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy79);}
	2485	+#line 2510 "pikchr.c"
2472	2486	break;
2473	2487	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2474	2488	#line 557 "pikchr.y"
2475		-{yymsp[-2].minor.yy38=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2476		-#line 2501 "pikchr.c"
	2489	+{yymsp[-2].minor.yy36=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
	2490	+#line 2515 "pikchr.c"
2477	2491	break;
2478	2492	case 13: /* rvalue ::= PLACENAME */
2479	2493	#line 568 "pikchr.y"
2480		-{yylhsminor.yy265 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2481		-#line 2506 "pikchr.c"
2482		- yymsp[0].minor.yy265 = yylhsminor.yy265;
	2494	+{yylhsminor.yy153 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
	2495	+#line 2520 "pikchr.c"
	2496	+ yymsp[0].minor.yy153 = yylhsminor.yy153;
2483	2497	break;
2484	2498	case 14: /* pritem ::= FILL */
2485	2499	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2486	2500	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2487	2501	#line 573 "pikchr.y"
2488	2502	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2489		-#line 2514 "pikchr.c"
	2503	+#line 2528 "pikchr.c"
2490	2504	break;
2491	2505	case 17: /* pritem ::= rvalue */
2492	2506	#line 576 "pikchr.y"
2493		-{pik_append_num(p,"",yymsp[0].minor.yy265);}
2494		-#line 2519 "pikchr.c"
	2507	+{pik_append_num(p,"",yymsp[0].minor.yy153);}
	2508	+#line 2533 "pikchr.c"
2495	2509	break;
2496	2510	case 18: /* pritem ::= STRING */
2497	2511	#line 577 "pikchr.y"
2498	2512	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2499		-#line 2524 "pikchr.c"
	2513	+#line 2538 "pikchr.c"
2500	2514	break;
2501	2515	case 19: /* prsep ::= COMMA */
2502	2516	#line 578 "pikchr.y"
2503	2517	{pik_append(p, " ", 1);}
2504		-#line 2529 "pikchr.c"
	2518	+#line 2543 "pikchr.c"
2505	2519	break;
2506	2520	case 20: /* unnamed_statement ::= basetype attribute_list */
2507	2521	#line 581 "pikchr.y"
2508		-{yylhsminor.yy38 = yymsp[-1].minor.yy38; pik_after_adding_attributes(p,yylhsminor.yy38);}
2509		-#line 2534 "pikchr.c"
2510		- yymsp[-1].minor.yy38 = yylhsminor.yy38;
	2522	+{yylhsminor.yy36 = yymsp[-1].minor.yy36; pik_after_adding_attributes(p,yylhsminor.yy36);}
	2523	+#line 2548 "pikchr.c"
	2524	+ yymsp[-1].minor.yy36 = yylhsminor.yy36;
2511	2525	break;
2512	2526	case 21: /* basetype ::= CLASSNAME */
2513	2527	#line 583 "pikchr.y"
2514		-{yylhsminor.yy38 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2515		-#line 2540 "pikchr.c"
2516		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2528	+{yylhsminor.yy36 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
	2529	+#line 2554 "pikchr.c"
	2530	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2517	2531	break;
2518	2532	case 22: /* basetype ::= STRING textposition */
2519	2533	#line 585 "pikchr.y"
2520		-{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy44; yylhsminor.yy38 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2521		-#line 2546 "pikchr.c"
2522		- yymsp[-1].minor.yy38 = yylhsminor.yy38;
	2534	+{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy164; yylhsminor.yy36 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
	2535	+#line 2560 "pikchr.c"
	2536	+ yymsp[-1].minor.yy36 = yylhsminor.yy36;
2523	2537	break;
2524	2538	case 23: /* basetype ::= LB savelist statement_list RB */
2525	2539	#line 587 "pikchr.y"
2526		-{ p->list = yymsp[-2].minor.yy119; yymsp[-3].minor.yy38 = pik_elem_new(p,0,0,yymsp[-1].minor.yy119); if(yymsp[-3].minor.yy38) yymsp[-3].minor.yy38->errTok = yymsp[0].minor.yy0; }
2527		-#line 2552 "pikchr.c"
	2540	+{ p->list = yymsp[-2].minor.yy227; yymsp[-3].minor.yy36 = pik_elem_new(p,0,0,yymsp[-1].minor.yy227); if(yymsp[-3].minor.yy36) yymsp[-3].minor.yy36->errTok = yymsp[0].minor.yy0; }
	2541	+#line 2566 "pikchr.c"
2528	2542	break;
2529	2543	case 24: /* savelist ::= */
2530	2544	#line 592 "pikchr.y"
2531		-{yymsp[1].minor.yy119 = p->list; p->list = 0;}
2532		-#line 2557 "pikchr.c"
	2545	+{yymsp[1].minor.yy227 = p->list; p->list = 0;}
	2546	+#line 2571 "pikchr.c"
2533	2547	break;
2534	2548	case 25: /* relexpr ::= expr */
2535	2549	#line 599 "pikchr.y"
2536		-{yylhsminor.yy200.rAbs = yymsp[0].minor.yy265; yylhsminor.yy200.rRel = 0;}
2537		-#line 2562 "pikchr.c"
2538		- yymsp[0].minor.yy200 = yylhsminor.yy200;
	2550	+{yylhsminor.yy10.rAbs = yymsp[0].minor.yy153; yylhsminor.yy10.rRel = 0;}
	2551	+#line 2576 "pikchr.c"
	2552	+ yymsp[0].minor.yy10 = yylhsminor.yy10;
2539	2553	break;
2540	2554	case 26: /* relexpr ::= expr PERCENT */
2541	2555	#line 600 "pikchr.y"
2542		-{yylhsminor.yy200.rAbs = 0; yylhsminor.yy200.rRel = yymsp[-1].minor.yy265/100;}
2543		-#line 2568 "pikchr.c"
2544		- yymsp[-1].minor.yy200 = yylhsminor.yy200;
	2556	+{yylhsminor.yy10.rAbs = 0; yylhsminor.yy10.rRel = yymsp[-1].minor.yy153/100;}
	2557	+#line 2582 "pikchr.c"
	2558	+ yymsp[-1].minor.yy10 = yylhsminor.yy10;
2545	2559	break;
2546	2560	case 27: /* optrelexpr ::= */
2547	2561	#line 602 "pikchr.y"
2548		-{yymsp[1].minor.yy200.rAbs = 0; yymsp[1].minor.yy200.rRel = 1.0;}
2549		-#line 2574 "pikchr.c"
	2562	+{yymsp[1].minor.yy10.rAbs = 0; yymsp[1].minor.yy10.rRel = 1.0;}
	2563	+#line 2588 "pikchr.c"
2550	2564	break;
2551	2565	case 28: /* attribute_list ::= relexpr alist */
2552	2566	#line 604 "pikchr.y"
2553		-{pik_add_direction(p,0,&yymsp[-1].minor.yy200);}
2554		-#line 2579 "pikchr.c"
	2567	+{pik_add_direction(p,0,&yymsp[-1].minor.yy10);}
	2568	+#line 2593 "pikchr.c"
2555	2569	break;
2556	2570	case 29: /* attribute ::= numproperty relexpr */
2557	2571	#line 608 "pikchr.y"
2558		-{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200); }
2559		-#line 2584 "pikchr.c"
	2572	+{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10); }
	2573	+#line 2598 "pikchr.c"
2560	2574	break;
2561	2575	case 30: /* attribute ::= dashproperty expr */
2562	2576	#line 609 "pikchr.y"
2563		-{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy265); }
2564		-#line 2589 "pikchr.c"
	2577	+{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy153); }
	2578	+#line 2603 "pikchr.c"
2565	2579	break;
2566	2580	case 31: /* attribute ::= dashproperty */
2567	2581	#line 610 "pikchr.y"
2568	2582	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2569		-#line 2594 "pikchr.c"
	2583	+#line 2608 "pikchr.c"
2570	2584	break;
2571	2585	case 32: /* attribute ::= colorproperty rvalue */
2572	2586	#line 611 "pikchr.y"
2573		-{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265); }
2574		-#line 2599 "pikchr.c"
	2587	+{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153); }
	2588	+#line 2613 "pikchr.c"
2575	2589	break;
2576	2590	case 33: /* attribute ::= go direction optrelexpr */
2577	2591	#line 612 "pikchr.y"
2578		-{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200);}
2579		-#line 2604 "pikchr.c"
	2592	+{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10);}
	2593	+#line 2618 "pikchr.c"
2580	2594	break;
2581	2595	case 34: /* attribute ::= go direction even position */
2582	2596	#line 613 "pikchr.y"
2583		-{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43);}
2584		-#line 2609 "pikchr.c"
	2597	+{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79);}
	2598	+#line 2623 "pikchr.c"
2585	2599	break;
2586	2600	case 35: /* attribute ::= CLOSE */
2587	2601	#line 614 "pikchr.y"
2588	2602	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2589		-#line 2614 "pikchr.c"
	2603	+#line 2628 "pikchr.c"
2590	2604	break;
2591	2605	case 36: /* attribute ::= CHOP */
2592	2606	#line 615 "pikchr.y"
2593	2607	{ p->cur->bChop = 1; }
2594		-#line 2619 "pikchr.c"
	2608	+#line 2633 "pikchr.c"
2595	2609	break;
2596	2610	case 37: /* attribute ::= FROM position */
2597	2611	#line 616 "pikchr.y"
2598		-{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2599		-#line 2624 "pikchr.c"
	2612	+{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
	2613	+#line 2638 "pikchr.c"
2600	2614	break;
2601	2615	case 38: /* attribute ::= TO position */
2602	2616	#line 617 "pikchr.y"
2603		-{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2604		-#line 2629 "pikchr.c"
	2617	+{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
	2618	+#line 2643 "pikchr.c"
2605	2619	break;
2606	2620	case 39: /* attribute ::= THEN */
2607	2621	#line 618 "pikchr.y"
2608	2622	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2609		-#line 2634 "pikchr.c"
	2623	+#line 2648 "pikchr.c"
2610	2624	break;
2611	2625	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2612	2626	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2613	2627	#line 620 "pikchr.y"
2614		-{pik_move_hdg(p,&yymsp[-2].minor.yy200,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265,0,&yymsp[-3].minor.yy0);}
2615		-#line 2640 "pikchr.c"
	2628	+{pik_move_hdg(p,&yymsp[-2].minor.yy10,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153,0,&yymsp[-3].minor.yy0);}
	2629	+#line 2654 "pikchr.c"
2616	2630	break;
2617	2631	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2618	2632	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2619	2633	#line 621 "pikchr.y"
2620		-{pik_move_hdg(p,&yymsp[-1].minor.yy200,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2621		-#line 2646 "pikchr.c"
	2634	+{pik_move_hdg(p,&yymsp[-1].minor.yy10,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
	2635	+#line 2660 "pikchr.c"
2622	2636	break;
2623	2637	case 44: /* attribute ::= AT position */
2624	2638	#line 626 "pikchr.y"
2625		-{ pik_set_at(p,0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2626		-#line 2651 "pikchr.c"
	2639	+{ pik_set_at(p,0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
	2640	+#line 2665 "pikchr.c"
2627	2641	break;
2628	2642	case 45: /* attribute ::= SAME */
2629	2643	#line 628 "pikchr.y"
2630	2644	{pik_same(p,0,&yymsp[0].minor.yy0);}
2631		-#line 2656 "pikchr.c"
	2645	+#line 2670 "pikchr.c"
2632	2646	break;
2633	2647	case 46: /* attribute ::= SAME AS object */
2634	2648	#line 629 "pikchr.y"
2635		-{pik_same(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2636		-#line 2661 "pikchr.c"
	2649	+{pik_same(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
	2650	+#line 2675 "pikchr.c"
2637	2651	break;
2638	2652	case 47: /* attribute ::= STRING textposition */
2639	2653	#line 630 "pikchr.y"
2640		-{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy44);}
2641		-#line 2666 "pikchr.c"
	2654	+{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy164);}
	2655	+#line 2680 "pikchr.c"
2642	2656	break;
2643	2657	case 48: /* attribute ::= FIT */
2644	2658	#line 631 "pikchr.y"
2645	2659	{pik_size_to_fit(p,&yymsp[0].minor.yy0,3); }
2646		-#line 2671 "pikchr.c"
	2660	+#line 2685 "pikchr.c"
2647	2661	break;
2648	2662	case 49: /* attribute ::= BEHIND object */
2649	2663	#line 632 "pikchr.y"
2650		-{pik_behind(p,yymsp[0].minor.yy38);}
2651		-#line 2676 "pikchr.c"
	2664	+{pik_behind(p,yymsp[0].minor.yy36);}
	2665	+#line 2690 "pikchr.c"
2652	2666	break;
2653	2667	case 50: /* withclause ::= DOT_E edge AT position */
2654	2668	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2655	2669	#line 640 "pikchr.y"
2656		-{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2657		-#line 2682 "pikchr.c"
	2670	+{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
	2671	+#line 2696 "pikchr.c"
2658	2672	break;
2659	2673	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2660	2674	#line 644 "pikchr.y"
2661	2675	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2662		-#line 2687 "pikchr.c"
	2676	+#line 2701 "pikchr.c"
2663	2677	yymsp[0].minor.yy0 = yylhsminor.yy0;
2664	2678	break;
2665	2679	case 53: /* boolproperty ::= CW */
2666	2680	#line 655 "pikchr.y"
2667	2681	{p->cur->cw = 1;}
2668		-#line 2693 "pikchr.c"
	2682	+#line 2707 "pikchr.c"
2669	2683	break;
2670	2684	case 54: /* boolproperty ::= CCW */
2671	2685	#line 656 "pikchr.y"
2672	2686	{p->cur->cw = 0;}
2673		-#line 2698 "pikchr.c"
	2687	+#line 2712 "pikchr.c"
2674	2688	break;
2675	2689	case 55: /* boolproperty ::= LARROW */
2676	2690	#line 657 "pikchr.y"
2677	2691	{p->cur->larrow=1; p->cur->rarrow=0; }
2678		-#line 2703 "pikchr.c"
	2692	+#line 2717 "pikchr.c"
2679	2693	break;
2680	2694	case 56: /* boolproperty ::= RARROW */
2681	2695	#line 658 "pikchr.y"
2682	2696	{p->cur->larrow=0; p->cur->rarrow=1; }
2683		-#line 2708 "pikchr.c"
	2697	+#line 2722 "pikchr.c"
2684	2698	break;
2685	2699	case 57: /* boolproperty ::= LRARROW */
2686	2700	#line 659 "pikchr.y"
2687	2701	{p->cur->larrow=1; p->cur->rarrow=1; }
2688		-#line 2713 "pikchr.c"
	2702	+#line 2727 "pikchr.c"
2689	2703	break;
2690	2704	case 58: /* boolproperty ::= INVIS */
2691	2705	#line 660 "pikchr.y"
2692	2706	{p->cur->sw = 0.0;}
2693		-#line 2718 "pikchr.c"
	2707	+#line 2732 "pikchr.c"
2694	2708	break;
2695	2709	case 59: /* boolproperty ::= THICK */
2696	2710	#line 661 "pikchr.y"
2697	2711	{p->cur->sw *= 1.5;}
2698		-#line 2723 "pikchr.c"
	2712	+#line 2737 "pikchr.c"
2699	2713	break;
2700	2714	case 60: /* boolproperty ::= THIN */
2701	2715	#line 662 "pikchr.y"
2702	2716	{p->cur->sw *= 0.67;}
2703		-#line 2728 "pikchr.c"
	2717	+#line 2742 "pikchr.c"
2704	2718	break;
2705	2719	case 61: /* boolproperty ::= SOLID */
2706	2720	#line 663 "pikchr.y"
2707	2721	{p->cur->sw = pik_value(p,"thickness",9,0);
2708	2722	p->cur->dotted = p->cur->dashed = 0.0;}
2709		-#line 2734 "pikchr.c"
	2723	+#line 2748 "pikchr.c"
2710	2724	break;
2711	2725	case 62: /* textposition ::= */
2712	2726	#line 666 "pikchr.y"
2713		-{yymsp[1].minor.yy44 = 0;}
2714		-#line 2739 "pikchr.c"
	2727	+{yymsp[1].minor.yy164 = 0;}
	2728	+#line 2753 "pikchr.c"
2715	2729	break;
2716	2730	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2717	2731	#line 669 "pikchr.y"
2718		-{yylhsminor.yy44 = (short int)pik_text_position(yymsp[-1].minor.yy44,&yymsp[0].minor.yy0);}
2719		-#line 2744 "pikchr.c"
2720		- yymsp[-1].minor.yy44 = yylhsminor.yy44;
	2732	+{yylhsminor.yy164 = (short int)pik_text_position(yymsp[-1].minor.yy164,&yymsp[0].minor.yy0);}
	2733	+#line 2758 "pikchr.c"
	2734	+ yymsp[-1].minor.yy164 = yylhsminor.yy164;
2721	2735	break;
2722	2736	case 64: /* position ::= expr COMMA expr */
2723	2737	#line 672 "pikchr.y"
2724		-{yylhsminor.yy43.x=yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[0].minor.yy265;}
2725		-#line 2750 "pikchr.c"
2726		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2738	+{yylhsminor.yy79.x=yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[0].minor.yy153;}
	2739	+#line 2764 "pikchr.c"
	2740	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2727	2741	break;
2728	2742	case 65: /* position ::= place PLUS expr COMMA expr */
2729	2743	#line 674 "pikchr.y"
2730		-{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x+yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y+yymsp[0].minor.yy265;}
2731		-#line 2756 "pikchr.c"
2732		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2744	+{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x+yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y+yymsp[0].minor.yy153;}
	2745	+#line 2770 "pikchr.c"
	2746	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2733	2747	break;
2734	2748	case 66: /* position ::= place MINUS expr COMMA expr */
2735	2749	#line 675 "pikchr.y"
2736		-{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x-yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y-yymsp[0].minor.yy265;}
2737		-#line 2762 "pikchr.c"
2738		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2750	+{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x-yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y-yymsp[0].minor.yy153;}
	2751	+#line 2776 "pikchr.c"
	2752	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2739	2753	break;
2740	2754	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2741	2755	#line 677 "pikchr.y"
2742		-{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x+yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y+yymsp[-1].minor.yy265;}
2743		-#line 2768 "pikchr.c"
2744		- yymsp[-6].minor.yy43 = yylhsminor.yy43;
	2756	+{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x+yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y+yymsp[-1].minor.yy153;}
	2757	+#line 2782 "pikchr.c"
	2758	+ yymsp[-6].minor.yy79 = yylhsminor.yy79;
2745	2759	break;
2746	2760	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2747	2761	#line 679 "pikchr.y"
2748		-{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x-yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y-yymsp[-1].minor.yy265;}
2749		-#line 2774 "pikchr.c"
2750		- yymsp[-6].minor.yy43 = yylhsminor.yy43;
	2762	+{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x-yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y-yymsp[-1].minor.yy153;}
	2763	+#line 2788 "pikchr.c"
	2764	+ yymsp[-6].minor.yy79 = yylhsminor.yy79;
2751	2765	break;
2752	2766	case 69: /* position ::= LP position COMMA position RP */
2753	2767	#line 680 "pikchr.y"
2754		-{yymsp[-4].minor.yy43.x=yymsp[-3].minor.yy43.x; yymsp[-4].minor.yy43.y=yymsp[-1].minor.yy43.y;}
2755		-#line 2780 "pikchr.c"
	2768	+{yymsp[-4].minor.yy79.x=yymsp[-3].minor.yy79.x; yymsp[-4].minor.yy79.y=yymsp[-1].minor.yy79.y;}
	2769	+#line 2794 "pikchr.c"
2756	2770	break;
2757	2771	case 70: /* position ::= LP position RP */
2758	2772	#line 681 "pikchr.y"
2759		-{yymsp[-2].minor.yy43=yymsp[-1].minor.yy43;}
2760		-#line 2785 "pikchr.c"
	2773	+{yymsp[-2].minor.yy79=yymsp[-1].minor.yy79;}
	2774	+#line 2799 "pikchr.c"
2761	2775	break;
2762	2776	case 71: /* position ::= expr between position AND position */
2763	2777	#line 683 "pikchr.y"
2764		-{yylhsminor.yy43 = pik_position_between(yymsp[-4].minor.yy265,yymsp[-2].minor.yy43,yymsp[0].minor.yy43);}
2765		-#line 2790 "pikchr.c"
2766		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2778	+{yylhsminor.yy79 = pik_position_between(yymsp[-4].minor.yy153,yymsp[-2].minor.yy79,yymsp[0].minor.yy79);}
	2779	+#line 2804 "pikchr.c"
	2780	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2767	2781	break;
2768	2782	case 72: /* position ::= expr LT position COMMA position GT */
2769	2783	#line 685 "pikchr.y"
2770		-{yylhsminor.yy43 = pik_position_between(yymsp[-5].minor.yy265,yymsp[-3].minor.yy43,yymsp[-1].minor.yy43);}
2771		-#line 2796 "pikchr.c"
2772		- yymsp[-5].minor.yy43 = yylhsminor.yy43;
	2784	+{yylhsminor.yy79 = pik_position_between(yymsp[-5].minor.yy153,yymsp[-3].minor.yy79,yymsp[-1].minor.yy79);}
	2785	+#line 2810 "pikchr.c"
	2786	+ yymsp[-5].minor.yy79 = yylhsminor.yy79;
2773	2787	break;
2774	2788	case 73: /* position ::= expr ABOVE position */
2775	2789	#line 686 "pikchr.y"
2776		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y += yymsp[-2].minor.yy265;}
2777		-#line 2802 "pikchr.c"
2778		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2790	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y += yymsp[-2].minor.yy153;}
	2791	+#line 2816 "pikchr.c"
	2792	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2779	2793	break;
2780	2794	case 74: /* position ::= expr BELOW position */
2781	2795	#line 687 "pikchr.y"
2782		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y -= yymsp[-2].minor.yy265;}
2783		-#line 2808 "pikchr.c"
2784		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2796	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y -= yymsp[-2].minor.yy153;}
	2797	+#line 2822 "pikchr.c"
	2798	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2785	2799	break;
2786	2800	case 75: /* position ::= expr LEFT OF position */
2787	2801	#line 688 "pikchr.y"
2788		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x -= yymsp[-3].minor.yy265;}
2789		-#line 2814 "pikchr.c"
2790		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2802	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x -= yymsp[-3].minor.yy153;}
	2803	+#line 2828 "pikchr.c"
	2804	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2791	2805	break;
2792	2806	case 76: /* position ::= expr RIGHT OF position */
2793	2807	#line 689 "pikchr.y"
2794		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x += yymsp[-3].minor.yy265;}
2795		-#line 2820 "pikchr.c"
2796		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2808	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x += yymsp[-3].minor.yy153;}
	2809	+#line 2834 "pikchr.c"
	2810	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2797	2811	break;
2798	2812	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2799	2813	#line 691 "pikchr.y"
2800		-{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-5].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2801		-#line 2826 "pikchr.c"
2802		- yymsp[-5].minor.yy43 = yylhsminor.yy43;
	2814	+{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-5].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
	2815	+#line 2840 "pikchr.c"
	2816	+ yymsp[-5].minor.yy79 = yylhsminor.yy79;
2803	2817	break;
2804	2818	case 78: /* position ::= expr HEADING EDGEPT OF position */
2805	2819	#line 693 "pikchr.y"
2806		-{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-4].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2807		-#line 2832 "pikchr.c"
2808		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2820	+{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-4].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
	2821	+#line 2846 "pikchr.c"
	2822	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2809	2823	break;
2810	2824	case 79: /* position ::= expr EDGEPT OF position */
2811	2825	#line 695 "pikchr.y"
2812		-{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2813		-#line 2838 "pikchr.c"
2814		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2826	+{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
	2827	+#line 2852 "pikchr.c"
	2828	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2815	2829	break;
2816	2830	case 80: /* position ::= expr ON HEADING expr FROM position */
2817	2831	#line 697 "pikchr.y"
2818		-{yylhsminor.yy43 = pik_position_at_angle(yymsp[-5].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2819		-#line 2844 "pikchr.c"
2820		- yymsp[-5].minor.yy43 = yylhsminor.yy43;
	2832	+{yylhsminor.yy79 = pik_position_at_angle(yymsp[-5].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
	2833	+#line 2858 "pikchr.c"
	2834	+ yymsp[-5].minor.yy79 = yylhsminor.yy79;
2821	2835	break;
2822	2836	case 81: /* position ::= expr HEADING expr FROM position */
2823	2837	#line 699 "pikchr.y"
2824		-{yylhsminor.yy43 = pik_position_at_angle(yymsp[-4].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2825		-#line 2850 "pikchr.c"
2826		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2838	+{yylhsminor.yy79 = pik_position_at_angle(yymsp[-4].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
	2839	+#line 2864 "pikchr.c"
	2840	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2827	2841	break;
2828	2842	case 82: /* place ::= edge OF object */
2829	2843	#line 711 "pikchr.y"
2830		-{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2831		-#line 2856 "pikchr.c"
2832		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2844	+{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
	2845	+#line 2870 "pikchr.c"
	2846	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2833	2847	break;
2834	2848	case 83: /* place2 ::= object */
2835	2849	#line 712 "pikchr.y"
2836		-{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,0);}
2837		-#line 2862 "pikchr.c"
2838		- yymsp[0].minor.yy43 = yylhsminor.yy43;
	2850	+{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,0);}
	2851	+#line 2876 "pikchr.c"
	2852	+ yymsp[0].minor.yy79 = yylhsminor.yy79;
2839	2853	break;
2840	2854	case 84: /* place2 ::= object DOT_E edge */
2841	2855	#line 713 "pikchr.y"
2842		-{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2843		-#line 2868 "pikchr.c"
2844		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2856	+{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
	2857	+#line 2882 "pikchr.c"
	2858	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2845	2859	break;
2846	2860	case 85: /* place2 ::= NTH VERTEX OF object */
2847	2861	#line 714 "pikchr.y"
2848		-{yylhsminor.yy43 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy38);}
2849		-#line 2874 "pikchr.c"
2850		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2862	+{yylhsminor.yy79 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy36);}
	2863	+#line 2888 "pikchr.c"
	2864	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2851	2865	break;
2852	2866	case 86: /* object ::= nth */
2853	2867	#line 726 "pikchr.y"
2854		-{yylhsminor.yy38 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2855		-#line 2880 "pikchr.c"
2856		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2868	+{yylhsminor.yy36 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
	2869	+#line 2894 "pikchr.c"
	2870	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2857	2871	break;
2858	2872	case 87: /* object ::= nth OF\|IN object */
2859	2873	#line 727 "pikchr.y"
2860		-{yylhsminor.yy38 = pik_find_nth(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2861		-#line 2886 "pikchr.c"
2862		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2874	+{yylhsminor.yy36 = pik_find_nth(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
	2875	+#line 2900 "pikchr.c"
	2876	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2863	2877	break;
2864		- case 88: /* objectname ::= PLACENAME */
	2878	+ case 88: /* objectname ::= THIS */
2865	2879	#line 729 "pikchr.y"
2866		-{yylhsminor.yy38 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2867		-#line 2892 "pikchr.c"
2868		- yymsp[0].minor.yy38 = yylhsminor.yy38;
2869		- break;
2870		- case 89: /* objectname ::= objectname DOT_U PLACENAME */
2871		-#line 731 "pikchr.y"
2872		-{yylhsminor.yy38 = pik_find_byname(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2873		-#line 2898 "pikchr.c"
2874		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
2875		- break;
2876		- case 90: /* nth ::= NTH CLASSNAME */
2877		-#line 733 "pikchr.y"
	2880	+{yymsp[0].minor.yy36 = p->cur;}
	2881	+#line 2906 "pikchr.c"
	2882	+ break;
	2883	+ case 89: /* objectname ::= PLACENAME */
	2884	+#line 730 "pikchr.y"
	2885	+{yylhsminor.yy36 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
	2886	+#line 2911 "pikchr.c"
	2887	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
	2888	+ break;
	2889	+ case 90: /* objectname ::= objectname DOT_U PLACENAME */
	2890	+#line 732 "pikchr.y"
	2891	+{yylhsminor.yy36 = pik_find_byname(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
	2892	+#line 2917 "pikchr.c"
	2893	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
	2894	+ break;
	2895	+ case 91: /* nth ::= NTH CLASSNAME */
	2896	+#line 734 "pikchr.y"
2878	2897	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2879		-#line 2904 "pikchr.c"
	2898	+#line 2923 "pikchr.c"
2880	2899	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2881	2900	break;
2882		- case 91: /* nth ::= NTH LAST CLASSNAME */
2883		-#line 734 "pikchr.y"
	2901	+ case 92: /* nth ::= NTH LAST CLASSNAME */
	2902	+#line 735 "pikchr.y"
2884	2903	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2885		-#line 2910 "pikchr.c"
	2904	+#line 2929 "pikchr.c"
2886	2905	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2887	2906	break;
2888		- case 92: /* nth ::= LAST CLASSNAME */
2889		-#line 735 "pikchr.y"
	2907	+ case 93: /* nth ::= LAST CLASSNAME */
	2908	+#line 736 "pikchr.y"
2890	2909	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2891		-#line 2916 "pikchr.c"
	2910	+#line 2935 "pikchr.c"
2892	2911	break;
2893		- case 93: /* nth ::= LAST */
2894		-#line 736 "pikchr.y"
	2912	+ case 94: /* nth ::= LAST */
	2913	+#line 737 "pikchr.y"
2895	2914	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2896		-#line 2921 "pikchr.c"
	2915	+#line 2940 "pikchr.c"
2897	2916	yymsp[0].minor.yy0 = yylhsminor.yy0;
2898	2917	break;
2899		- case 94: /* nth ::= NTH LB RB */
2900		-#line 737 "pikchr.y"
	2918	+ case 95: /* nth ::= NTH LB RB */
	2919	+#line 738 "pikchr.y"
2901	2920	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2902		-#line 2927 "pikchr.c"
	2921	+#line 2946 "pikchr.c"
2903	2922	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2904	2923	break;
2905		- case 95: /* nth ::= NTH LAST LB RB */
2906		-#line 738 "pikchr.y"
	2924	+ case 96: /* nth ::= NTH LAST LB RB */
	2925	+#line 739 "pikchr.y"
2907	2926	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2908		-#line 2933 "pikchr.c"
	2927	+#line 2952 "pikchr.c"
2909	2928	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2910	2929	break;
2911		- case 96: /* nth ::= LAST LB RB */
2912		-#line 739 "pikchr.y"
2913		-{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2914		-#line 2939 "pikchr.c"
2915		- break;
2916		- case 97: /* expr ::= expr PLUS expr */
2917		-#line 741 "pikchr.y"
2918		-{yylhsminor.yy265=yymsp[-2].minor.yy265+yymsp[0].minor.yy265;}
2919		-#line 2944 "pikchr.c"
2920		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2921		- break;
2922		- case 98: /* expr ::= expr MINUS expr */
2923		-#line 742 "pikchr.y"
2924		-{yylhsminor.yy265=yymsp[-2].minor.yy265-yymsp[0].minor.yy265;}
2925		-#line 2950 "pikchr.c"
2926		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2927		- break;
2928		- case 99: /* expr ::= expr STAR expr */
2929		-#line 743 "pikchr.y"
2930		-{yylhsminor.yy265=yymsp[-2].minor.yy265*yymsp[0].minor.yy265;}
2931		-#line 2956 "pikchr.c"
2932		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2933		- break;
2934		- case 100: /* expr ::= expr SLASH expr */
2935		-#line 744 "pikchr.y"
2936		-{
2937		- if( yymsp[0].minor.yy265==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy265 = 0.0; }
2938		- else{ yylhsminor.yy265 = yymsp[-2].minor.yy265/yymsp[0].minor.yy265; }
2939		-}
2940		-#line 2965 "pikchr.c"
2941		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2942		- break;
2943		- case 101: /* expr ::= MINUS expr */
2944		-#line 748 "pikchr.y"
2945		-{yymsp[-1].minor.yy265=-yymsp[0].minor.yy265;}
2946		-#line 2971 "pikchr.c"
2947		- break;
2948		- case 102: /* expr ::= PLUS expr */
2949		-#line 749 "pikchr.y"
2950		-{yymsp[-1].minor.yy265=yymsp[0].minor.yy265;}
2951		-#line 2976 "pikchr.c"
2952		- break;
2953		- case 103: /* expr ::= LP expr RP */
2954		-#line 750 "pikchr.y"
2955		-{yymsp[-2].minor.yy265=yymsp[-1].minor.yy265;}
2956		-#line 2981 "pikchr.c"
2957		- break;
2958		- case 104: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2930	+ case 97: /* nth ::= LAST LB RB */
	2931	+#line 740 "pikchr.y"
	2932	+{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
	2933	+#line 2958 "pikchr.c"
	2934	+ break;
	2935	+ case 98: /* expr ::= expr PLUS expr */
	2936	+#line 742 "pikchr.y"
	2937	+{yylhsminor.yy153=yymsp[-2].minor.yy153+yymsp[0].minor.yy153;}
	2938	+#line 2963 "pikchr.c"
	2939	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2940	+ break;
	2941	+ case 99: /* expr ::= expr MINUS expr */
	2942	+#line 743 "pikchr.y"
	2943	+{yylhsminor.yy153=yymsp[-2].minor.yy153-yymsp[0].minor.yy153;}
	2944	+#line 2969 "pikchr.c"
	2945	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2946	+ break;
	2947	+ case 100: /* expr ::= expr STAR expr */
	2948	+#line 744 "pikchr.y"
	2949	+{yylhsminor.yy153=yymsp[-2].minor.yy153*yymsp[0].minor.yy153;}
	2950	+#line 2975 "pikchr.c"
	2951	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2952	+ break;
	2953	+ case 101: /* expr ::= expr SLASH expr */
	2954	+#line 745 "pikchr.y"
	2955	+{
	2956	+ if( yymsp[0].minor.yy153==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy153 = 0.0; }
	2957	+ else{ yylhsminor.yy153 = yymsp[-2].minor.yy153/yymsp[0].minor.yy153; }
	2958	+}
	2959	+#line 2984 "pikchr.c"
	2960	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2961	+ break;
	2962	+ case 102: /* expr ::= MINUS expr */
	2963	+#line 749 "pikchr.y"
	2964	+{yymsp[-1].minor.yy153=-yymsp[0].minor.yy153;}
	2965	+#line 2990 "pikchr.c"
	2966	+ break;
	2967	+ case 103: /* expr ::= PLUS expr */
	2968	+#line 750 "pikchr.y"
	2969	+{yymsp[-1].minor.yy153=yymsp[0].minor.yy153;}
	2970	+#line 2995 "pikchr.c"
	2971	+ break;
	2972	+ case 104: /* expr ::= LP expr RP */
2959	2973	#line 751 "pikchr.y"
2960		-{yymsp[-2].minor.yy265=pik_get_var(p,&yymsp[-1].minor.yy0);}
2961		-#line 2986 "pikchr.c"
	2974	+{yymsp[-2].minor.yy153=yymsp[-1].minor.yy153;}
	2975	+#line 3000 "pikchr.c"
2962	2976	break;
2963		- case 105: /* expr ::= NUMBER */
	2977	+ case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2964	2978	#line 752 "pikchr.y"
2965		-{yylhsminor.yy265=pik_atof(&yymsp[0].minor.yy0);}
2966		-#line 2991 "pikchr.c"
2967		- yymsp[0].minor.yy265 = yylhsminor.yy265;
	2979	+{yymsp[-2].minor.yy153=pik_get_var(p,&yymsp[-1].minor.yy0);}
	2980	+#line 3005 "pikchr.c"
2968	2981	break;
2969		- case 106: /* expr ::= ID */
	2982	+ case 106: /* expr ::= NUMBER */
2970	2983	#line 753 "pikchr.y"
2971		-{yylhsminor.yy265=pik_get_var(p,&yymsp[0].minor.yy0);}
2972		-#line 2997 "pikchr.c"
2973		- yymsp[0].minor.yy265 = yylhsminor.yy265;
	2984	+{yylhsminor.yy153=pik_atof(&yymsp[0].minor.yy0);}
	2985	+#line 3010 "pikchr.c"
	2986	+ yymsp[0].minor.yy153 = yylhsminor.yy153;
2974	2987	break;
2975		- case 107: /* expr ::= FUNC1 LP expr RP */
	2988	+ case 107: /* expr ::= ID */
2976	2989	#line 754 "pikchr.y"
2977		-{yylhsminor.yy265 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy265,0.0);}
2978		-#line 3003 "pikchr.c"
2979		- yymsp[-3].minor.yy265 = yylhsminor.yy265;
	2990	+{yylhsminor.yy153=pik_get_var(p,&yymsp[0].minor.yy0);}
	2991	+#line 3016 "pikchr.c"
	2992	+ yymsp[0].minor.yy153 = yylhsminor.yy153;
2980	2993	break;
2981		- case 108: /* expr ::= FUNC2 LP expr COMMA expr RP */
	2994	+ case 108: /* expr ::= FUNC1 LP expr RP */
2982	2995	#line 755 "pikchr.y"
2983		-{yylhsminor.yy265 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy265,yymsp[-1].minor.yy265);}
2984		-#line 3009 "pikchr.c"
2985		- yymsp[-5].minor.yy265 = yylhsminor.yy265;
	2996	+{yylhsminor.yy153 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy153,0.0);}
	2997	+#line 3022 "pikchr.c"
	2998	+ yymsp[-3].minor.yy153 = yylhsminor.yy153;
2986	2999	break;
2987		- case 109: /* expr ::= DIST LP position COMMA position RP */
	3000	+ case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
2988	3001	#line 756 "pikchr.y"
2989		-{yymsp[-5].minor.yy265 = pik_dist(&yymsp[-3].minor.yy43,&yymsp[-1].minor.yy43);}
2990		-#line 3015 "pikchr.c"
	3002	+{yylhsminor.yy153 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy153,yymsp[-1].minor.yy153);}
	3003	+#line 3028 "pikchr.c"
	3004	+ yymsp[-5].minor.yy153 = yylhsminor.yy153;
2991	3005	break;
2992		- case 110: /* expr ::= place2 DOT_XY X */
	3006	+ case 110: /* expr ::= DIST LP position COMMA position RP */
2993	3007	#line 757 "pikchr.y"
2994		-{yylhsminor.yy265 = yymsp[-2].minor.yy43.x;}
2995		-#line 3020 "pikchr.c"
2996		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
	3008	+{yymsp[-5].minor.yy153 = pik_dist(&yymsp[-3].minor.yy79,&yymsp[-1].minor.yy79);}
	3009	+#line 3034 "pikchr.c"
2997	3010	break;
2998		- case 111: /* expr ::= place2 DOT_XY Y */
	3011	+ case 111: /* expr ::= place2 DOT_XY X */
2999	3012	#line 758 "pikchr.y"
3000		-{yylhsminor.yy265 = yymsp[-2].minor.yy43.y;}
3001		-#line 3026 "pikchr.c"
3002		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
	3013	+{yylhsminor.yy153 = yymsp[-2].minor.yy79.x;}
	3014	+#line 3039 "pikchr.c"
	3015	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
3003	3016	break;
3004		- case 112: /* expr ::= object DOT_L numproperty */
3005		- case 113: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==113);
3006		- case 114: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==114);
	3017	+ case 112: /* expr ::= place2 DOT_XY Y */
3007	3018	#line 759 "pikchr.y"
3008		-{yylhsminor.yy265=pik_property_of(yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
3009		-#line 3034 "pikchr.c"
3010		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
	3019	+{yylhsminor.yy153 = yymsp[-2].minor.yy79.y;}
	3020	+#line 3045 "pikchr.c"
	3021	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	3022	+ break;
	3023	+ case 113: /* expr ::= object DOT_L numproperty */
	3024	+ case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
	3025	+ case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
	3026	+#line 760 "pikchr.y"
	3027	+{yylhsminor.yy153=pik_property_of(yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
	3028	+#line 3053 "pikchr.c"
	3029	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
3011	3030	break;
3012	3031	default:
3013		- /* (115) lvalue ::= ID */ yytestcase(yyruleno==115);
3014		- /* (116) lvalue ::= FILL */ yytestcase(yyruleno==116);
3015		- /* (117) lvalue ::= COLOR */ yytestcase(yyruleno==117);
3016		- /* (118) lvalue ::= THICKNESS */ yytestcase(yyruleno==118);
3017		- /* (119) rvalue ::= expr */ yytestcase(yyruleno==119);
3018		- /* (120) print ::= PRINT */ yytestcase(yyruleno==120);
3019		- /* (121) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=121);
3020		- /* (122) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==122);
3021		- /* (123) direction ::= UP */ yytestcase(yyruleno==123);
3022		- /* (124) direction ::= DOWN */ yytestcase(yyruleno==124);
3023		- /* (125) direction ::= LEFT */ yytestcase(yyruleno==125);
3024		- /* (126) direction ::= RIGHT */ yytestcase(yyruleno==126);
3025		- /* (127) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=127);
3026		- /* (128) attribute_list ::= alist */ yytestcase(yyruleno==128);
3027		- /* (129) alist ::= */ yytestcase(yyruleno==129);
3028		- /* (130) alist ::= alist attribute */ yytestcase(yyruleno==130);
3029		- /* (131) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=131);
3030		- /* (132) attribute ::= WITH withclause */ yytestcase(yyruleno==132);
3031		- /* (133) go ::= GO */ yytestcase(yyruleno==133);
3032		- /* (134) go ::= */ yytestcase(yyruleno==134);
3033		- /* (135) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==135);
3034		- /* (136) even ::= EVEN WITH */ yytestcase(yyruleno==136);
3035		- /* (137) dashproperty ::= DOTTED */ yytestcase(yyruleno==137);
3036		- /* (138) dashproperty ::= DASHED */ yytestcase(yyruleno==138);
3037		- /* (139) colorproperty ::= FILL */ yytestcase(yyruleno==139);
3038		- /* (140) colorproperty ::= COLOR */ yytestcase(yyruleno==140);
3039		- /* (141) position ::= place */ yytestcase(yyruleno==141);
3040		- /* (142) between ::= WAY BETWEEN */ yytestcase(yyruleno==142);
3041		- /* (143) between ::= BETWEEN */ yytestcase(yyruleno==143);
3042		- /* (144) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==144);
3043		- /* (145) place ::= place2 */ yytestcase(yyruleno==145);
3044		- /* (146) edge ::= CENTER */ yytestcase(yyruleno==146);
3045		- /* (147) edge ::= EDGEPT */ yytestcase(yyruleno==147);
3046		- /* (148) edge ::= TOP */ yytestcase(yyruleno==148);
3047		- /* (149) edge ::= BOTTOM */ yytestcase(yyruleno==149);
3048		- /* (150) edge ::= START */ yytestcase(yyruleno==150);
3049		- /* (151) edge ::= END */ yytestcase(yyruleno==151);
3050		- /* (152) edge ::= RIGHT */ yytestcase(yyruleno==152);
3051		- /* (153) edge ::= LEFT */ yytestcase(yyruleno==153);
3052		- /* (154) object ::= objectname */ yytestcase(yyruleno==154);
	3032	+ /* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
	3033	+ /* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
	3034	+ /* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
	3035	+ /* (119) lvalue ::= THICKNESS */ yytestcase(yyruleno==119);
	3036	+ /* (120) rvalue ::= expr */ yytestcase(yyruleno==120);
	3037	+ /* (121) print ::= PRINT */ yytestcase(yyruleno==121);
	3038	+ /* (122) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=122);
	3039	+ /* (123) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==123);
	3040	+ /* (124) direction ::= UP */ yytestcase(yyruleno==124);
	3041	+ /* (125) direction ::= DOWN */ yytestcase(yyruleno==125);
	3042	+ /* (126) direction ::= LEFT */ yytestcase(yyruleno==126);
	3043	+ /* (127) direction ::= RIGHT */ yytestcase(yyruleno==127);
	3044	+ /* (128) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=128);
	3045	+ /* (129) attribute_list ::= alist */ yytestcase(yyruleno==129);
	3046	+ /* (130) alist ::= */ yytestcase(yyruleno==130);
	3047	+ /* (131) alist ::= alist attribute */ yytestcase(yyruleno==131);
	3048	+ /* (132) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=132);
	3049	+ /* (133) attribute ::= WITH withclause */ yytestcase(yyruleno==133);
	3050	+ /* (134) go ::= GO */ yytestcase(yyruleno==134);
	3051	+ /* (135) go ::= */ yytestcase(yyruleno==135);
	3052	+ /* (136) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==136);
	3053	+ /* (137) even ::= EVEN WITH */ yytestcase(yyruleno==137);
	3054	+ /* (138) dashproperty ::= DOTTED */ yytestcase(yyruleno==138);
	3055	+ /* (139) dashproperty ::= DASHED */ yytestcase(yyruleno==139);
	3056	+ /* (140) colorproperty ::= FILL */ yytestcase(yyruleno==140);
	3057	+ /* (141) colorproperty ::= COLOR */ yytestcase(yyruleno==141);
	3058	+ /* (142) position ::= place */ yytestcase(yyruleno==142);
	3059	+ /* (143) between ::= WAY BETWEEN */ yytestcase(yyruleno==143);
	3060	+ /* (144) between ::= BETWEEN */ yytestcase(yyruleno==144);
	3061	+ /* (145) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==145);
	3062	+ /* (146) place ::= place2 */ yytestcase(yyruleno==146);
	3063	+ /* (147) edge ::= CENTER */ yytestcase(yyruleno==147);
	3064	+ /* (148) edge ::= EDGEPT */ yytestcase(yyruleno==148);
	3065	+ /* (149) edge ::= TOP */ yytestcase(yyruleno==149);
	3066	+ /* (150) edge ::= BOTTOM */ yytestcase(yyruleno==150);
	3067	+ /* (151) edge ::= START */ yytestcase(yyruleno==151);
	3068	+ /* (152) edge ::= END */ yytestcase(yyruleno==152);
	3069	+ /* (153) edge ::= RIGHT */ yytestcase(yyruleno==153);
	3070	+ /* (154) edge ::= LEFT */ yytestcase(yyruleno==154);
	3071	+ /* (155) object ::= objectname */ yytestcase(yyruleno==155);
3053	3072	break;
3054	3073	/******** End reduce actions **********************************************/
3055	3074	};
3056	3075	assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
3057	3076	yygoto = yyRuleInfoLhs[yyruleno];
		@@ -3115,11 +3134,11 @@
3115	3134	pik_error(p, &TOKEN, "syntax error");
3116	3135	}else{
3117	3136	pik_error(p, 0, "syntax error");
3118	3137	}
3119	3138	UNUSED_PARAMETER(yymajor);
3120		-#line 3145 "pikchr.c"
	3139	+#line 3164 "pikchr.c"
3121	3140	/********** End %syntax_error code ****************************************/
3122	3141	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3123	3142	pik_parserCTX_STORE
3124	3143	}
3125	3144
		@@ -3348,11 +3367,11 @@
3348	3367	#else
3349	3368	(void)iToken;
3350	3369	return 0;
3351	3370	#endif
3352	3371	}
3353		-#line 764 "pikchr.y"
	3372	+#line 765 "pikchr.y"
3354	3373
3355	3374
3356	3375
3357	3376	/* Chart of the 148 official CSS color names with their
3358	3377	** corresponding RGB values thru Color Module Level 4:
		@@ -5032,11 +5051,11 @@
5032	5051	int i; /* Loop counter */
5033	5052	int iBump = 0; /* Bump the location of the error cursor */
5034	5053	char zLineno[20]; /* Buffer in which to generate line numbers */
5035	5054
5036	5055	iErrPt = (int)(pErr->z - p->sIn.z);
5037		- if( iErrPt>=p->sIn.n ){
	5056	+ if( iErrPt>=(int)p->sIn.n ){
5038	5057	iErrPt = p->sIn.n-1;
5039	5058	iBump = 1;
5040	5059	}else{
5041	5060	while( iErrPt>0 && (p->sIn.z[iErrPt]=='\n' \|\| p->sIn.z[iErrPt]=='\r') ){
5042	5061	iErrPt--;
		@@ -7095,10 +7114,11 @@
7095	7114	{ "the", 3, T_THE, 0, 0 },
7096	7115	{ "then", 4, T_THEN, 0, 0 },
7097	7116	{ "thick", 5, T_THICK, 0, 0 },
7098	7117	{ "thickness", 9, T_THICKNESS, 0, 0 },
7099	7118	{ "thin", 4, T_THIN, 0, 0 },
	7119	+ { "this", 4, T_THIS, 0, 0 },
7100	7120	{ "to", 2, T_TO, 0, 0 },
7101	7121	{ "top", 3, T_TOP, 0, CP_N },
7102	7122	{ "until", 5, T_UNTIL, 0, 0 },
7103	7123	{ "up", 2, T_UP, DIR_UP, 0 },
7104	7124	{ "vertex", 6, T_VERTEX, 0, 0 },
		@@ -7744,11 +7764,11 @@
7744	7764	static char readFile(const char zFilename){
7745	7765	FILE *in;
7746	7766	size_t n;
7747	7767	size_t nUsed = 0;
7748	7768	size_t nAlloc = 0;
7749		- char z = 0, zNew;
	7769	+ char z = 0, zNew = 0;
7750	7770	in = strcmp(zFilename,"-")==0 ? stdin : fopen(zFilename, "rb");
7751	7771	if( in==0 ){
7752	7772	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
7753	7773	return 0;
7754	7774	}
		@@ -7940,6 +7960,6 @@
7940	7960
7941	7961
7942	7962	#endif /* PIKCHR_TCL */
7943	7963
7944	7964
7945		-#line 7970 "pikchr.c"
	7965	+#line 7990 "pikchr.c"
7946	7966

	--- src/pikchr.c
	+++ src/pikchr.c
	@@ -566,20 +566,21 @@
566	#define T_TOP 83
567	#define T_BOTTOM 84
568	#define T_START 85
569	#define T_END 86
570	#define T_IN 87
571	#define T_DOT_U 88
572	#define T_LAST 89
573	#define T_NUMBER 90
574	#define T_FUNC1 91
575	#define T_FUNC2 92
576	#define T_DIST 93
577	#define T_DOT_XY 94
578	#define T_X 95
579	#define T_Y 96
580	#define T_DOT_L 97

581	#endif
582	/************** End token definitions *************************************/
583
584	/* The next sections is a series of control #defines.
585	** various aspects of the generated parser.
	@@ -635,22 +636,22 @@
635	#ifndef INTERFACE
636	# define INTERFACE 1
637	#endif
638	/*********** Begin control #defines ***************************************/
639	#define YYCODETYPE unsigned char
640	#define YYNOCODE 134
641	#define YYACTIONTYPE unsigned short int
642	#define pik_parserTOKENTYPE PToken
643	typedef union {
644	int yyinit;
645	pik_parserTOKENTYPE yy0;
646	PObj* yy38;
647	PPoint yy43;
648	short int yy44;
649	PList* yy119;
650	PRel yy200;
651	PNum yy265;
652	} YYMINORTYPE;
653	#ifndef YYSTACKDEPTH
654	#define YYSTACKDEPTH 100
655	#endif
656	#define pik_parserARG_SDECL
	@@ -663,21 +664,21 @@
663	#define pik_parserCTX_PARAM ,p
664	#define pik_parserCTX_FETCH Pik *p=yypParser->p;
665	#define pik_parserCTX_STORE yypParser->p=p;
666	#define YYFALLBACK 1
667	#define YYNSTATE 164
668	#define YYNRULE 155
669	#define YYNRULE_WITH_ACTION 115
670	#define YYNTOKEN 98
671	#define YY_MAX_SHIFT 163
672	#define YY_MIN_SHIFTREDUCE 286
673	#define YY_MAX_SHIFTREDUCE 440
674	#define YY_ERROR_ACTION 441
675	#define YY_ACCEPT_ACTION 442
676	#define YY_NO_ACTION 443
677	#define YY_MIN_REDUCE 444
678	#define YY_MAX_REDUCE 598
679	/*********** End control #defines *****************************************/
680	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
681
682	/* Define the yytestcase() macro to be a no-op if is not already defined
683	** otherwise.
	@@ -740,333 +741,341 @@
740	** yy_reduce_ofst[] For each state, the offset into yy_action for
741	** shifting non-terminals after a reduce.
742	** yy_default[] Default action for each state.
743	**
744	********* Begin parsing tables ********************************************/
745	#define YY_ACTTAB_COUNT (1263)
746	static const YYACTIONTYPE yy_action[] = {
747	/* 0 */ 572, 493, 161, 119, 25, 450, 29, 74, 129, 148,
748	/* 10 */ 572, 490, 161, 119, 451, 113, 120, 161, 119, 528,
749	/* 20 */ 425, 426, 338, 556, 81, 30, 557, 558, 572, 64,
750	/* 30 */ 63, 62, 61, 321, 322, 9, 8, 33, 149, 32,
751	/* 40 */ 7, 71, 127, 38, 334, 66, 48, 37, 28, 338,
752	/* 50 */ 338, 338, 338, 423, 424, 339, 340, 341, 342, 343,
753	/* 60 */ 344, 345, 346, 347, 472, 526, 161, 119, 574, 77,
754	/* 70 */ 574, 73, 374, 148, 472, 531, 161, 119, 112, 113,
755	/* 80 */ 120, 161, 119, 128, 425, 426, 338, 305, 81, 376,
756	/* 90 */ 158, 76, 472, 529, 161, 119, 31, 321, 322, 9,
757	/* 100 */ 8, 33, 149, 32, 7, 71, 127, 329, 334, 66,
758	/* 110 */ 576, 83, 36, 338, 338, 338, 338, 423, 424, 339,
759	/* 120 */ 340, 341, 342, 343, 344, 345, 346, 347, 392, 433,
760	/* 130 */ 309, 59, 60, 409, 410, 411, 412, 107, 84, 374,
761	/* 140 */ 65, 108, 2, 46, 401, 162, 120, 161, 119, 117,
762	/* 150 */ 476, 80, 118, 307, 79, 133, 35, 126, 439, 438,
763	/* 160 */ 298, 123, 122, 402, 403, 404, 406, 80, 152, 307,
764	/* 170 */ 79, 327, 409, 410, 411, 412, 392, 54, 51, 59,
765	/* 180 */ 60, 64, 63, 62, 61, 312, 3, 102, 378, 157,
766	/* 190 */ 42, 432, 446, 452, 29, 300, 301, 302, 448, 304,
767	/* 200 */ 62, 61, 64, 63, 62, 61, 297, 47, 106, 163,
768	/* 210 */ 434, 435, 436, 437, 27, 389, 117, 391, 155, 154,
769	/* 220 */ 153, 392, 433, 49, 59, 60, 64, 63, 62, 61,
770	/* 230 */ 532, 69, 374, 396, 397, 2, 376, 158, 356, 296,
771	/* 240 */ 156, 156, 156, 67, 392, 433, 13, 59, 60, 4,
772	/* 250 */ 107, 439, 438, 377, 159, 374, 106, 5, 2, 120,
773	/* 260 */ 161, 119, 131, 449, 117, 391, 155, 154, 153, 392,
774	/* 270 */ 532, 6, 59, 60, 439, 438, 532, 444, 422, 532,
775	/* 280 */ 374, 152, 421, 42, 432, 1, 395, 36, 156, 156,
776	/* 290 */ 156, 11, 12, 355, 64, 63, 62, 61, 430, 118,
777	/* 300 */ 14, 106, 138, 434, 435, 436, 437, 432, 428, 117,
778	/* 310 */ 391, 155, 154, 153, 16, 69, 142, 140, 64, 63,
779	/* 320 */ 62, 61, 139, 18, 106, 15, 434, 435, 436, 437,
780	/* 330 */ 45, 44, 117, 391, 155, 154, 153, 358, 19, 55,
781	/* 340 */ 64, 63, 62, 61, 20, 147, 146, 68, 114, 106,
782	/* 350 */ 23, 382, 43, 26, 425, 426, 338, 117, 391, 155,
783	/* 360 */ 154, 153, 392, 57, 58, 59, 60, 390, 380, 375,
784	/* 370 */ 381, 17, 160, 374, 70, 39, 42, 443, 443, 443,
785	/* 380 */ 443, 22, 21, 338, 338, 338, 338, 423, 424, 24,
786	/* 390 */ 443, 145, 141, 429, 142, 140, 64, 63, 62, 61,
787	/* 400 */ 392, 471, 443, 59, 60, 443, 443, 132, 130, 389,
788	/* 410 */ 443, 374, 443, 443, 42, 443, 443, 55, 443, 64,
789	/* 420 */ 63, 62, 61, 147, 146, 392, 143, 443, 59, 60,
790	/* 430 */ 43, 443, 389, 443, 443, 443, 374, 471, 443, 42,
791	/* 440 */ 52, 443, 106, 443, 392, 144, 443, 59, 60, 443,
792	/* 450 */ 117, 391, 155, 154, 153, 374, 443, 443, 42, 22,
793	/* 460 */ 21, 121, 445, 452, 29, 443, 443, 24, 448, 145,
794	/* 470 */ 141, 429, 142, 140, 64, 63, 62, 61, 443, 163,
795	/* 480 */ 106, 443, 392, 442, 27, 59, 60, 443, 117, 391,
796	/* 490 */ 155, 154, 153, 374, 443, 55, 42, 443, 443, 443,
797	/* 500 */ 443, 147, 146, 443, 443, 106, 443, 392, 43, 443,
798	/* 510 */ 59, 60, 443, 117, 391, 155, 154, 153, 102, 443,
799	/* 520 */ 74, 42, 148, 443, 106, 443, 443, 124, 113, 120,
800	/* 530 */ 161, 119, 117, 391, 155, 154, 153, 22, 21, 392,
801	/* 540 */ 443, 443, 59, 60, 443, 24, 443, 145, 141, 429,
802	/* 550 */ 374, 149, 392, 40, 443, 59, 60, 443, 85, 443,
803	/* 560 */ 443, 443, 106, 374, 443, 443, 41, 120, 161, 119,
804	/* 570 */ 117, 391, 155, 154, 153, 349, 349, 349, 349, 349,
805	/* 580 */ 349, 349, 349, 349, 349, 443, 443, 106, 443, 152,
806	/* 590 */ 443, 443, 88, 443, 443, 117, 391, 155, 154, 153,
807	/* 600 */ 443, 120, 161, 119, 72, 443, 148, 10, 477, 477,
808	/* 610 */ 443, 125, 113, 120, 161, 119, 443, 443, 443, 106,
809	/* 620 */ 443, 443, 433, 152, 443, 443, 443, 117, 391, 155,
810	/* 630 */ 154, 153, 106, 443, 443, 149, 64, 63, 62, 61,
811	/* 640 */ 117, 391, 155, 154, 153, 443, 74, 443, 148, 354,
812	/* 650 */ 107, 439, 438, 495, 113, 120, 161, 119, 443, 120,
813	/* 660 */ 161, 119, 443, 461, 443, 74, 443, 148, 75, 443,
814	/* 670 */ 78, 78, 494, 113, 120, 161, 119, 149, 74, 443,
815	/* 680 */ 148, 152, 443, 443, 432, 488, 113, 120, 161, 119,
816	/* 690 */ 74, 443, 148, 443, 443, 443, 149, 482, 113, 120,
817	/* 700 */ 161, 119, 88, 434, 435, 436, 437, 443, 443, 149,
818	/* 710 */ 443, 120, 161, 119, 443, 74, 443, 148, 110, 110,
819	/* 720 */ 443, 149, 481, 113, 120, 161, 119, 443, 443, 443,
820	/* 730 */ 74, 443, 148, 152, 443, 443, 443, 478, 113, 120,
821	/* 740 */ 161, 119, 443, 74, 443, 148, 149, 443, 443, 443,
822	/* 750 */ 134, 113, 120, 161, 119, 74, 443, 148, 443, 443,
823	/* 760 */ 443, 149, 515, 113, 120, 161, 119, 443, 74, 443,
824	/* 770 */ 148, 443, 443, 443, 149, 137, 113, 120, 161, 119,
825	/* 780 */ 74, 443, 148, 443, 443, 443, 149, 523, 113, 120,
826	/* 790 */ 161, 119, 443, 74, 443, 148, 443, 443, 443, 149,
827	/* 800 */ 525, 113, 120, 161, 119, 443, 74, 443, 148, 443,
828	/* 810 */ 443, 149, 443, 522, 113, 120, 161, 119, 74, 443,
829	/* 820 */ 148, 86, 443, 443, 149, 524, 113, 120, 161, 119,
830	/* 830 */ 120, 161, 119, 74, 443, 148, 443, 149, 443, 443,
831	/* 840 */ 521, 113, 120, 161, 119, 443, 74, 443, 148, 149,
832	/* 850 */ 443, 443, 152, 520, 113, 120, 161, 119, 74, 443,
833	/* 860 */ 148, 443, 443, 443, 149, 519, 113, 120, 161, 119,
834	/* 870 */ 443, 74, 443, 148, 443, 443, 443, 149, 518, 113,
835	/* 880 */ 120, 161, 119, 74, 443, 148, 443, 443, 443, 149,
836	/* 890 */ 517, 113, 120, 161, 119, 433, 74, 443, 148, 443,
837	/* 900 */ 443, 443, 149, 150, 113, 120, 161, 119, 443, 74,
838	/* 910 */ 443, 148, 443, 443, 149, 443, 151, 113, 120, 161,
839	/* 920 */ 119, 74, 443, 148, 439, 438, 443, 149, 136, 113,
840	/* 930 */ 120, 161, 119, 443, 443, 443, 74, 443, 148, 443,
841	/* 940 */ 149, 443, 443, 135, 113, 120, 161, 119, 443, 88,
842	/* 950 */ 443, 443, 149, 443, 443, 443, 443, 432, 120, 161,
843	/* 960 */ 119, 443, 443, 443, 443, 82, 443, 149, 443, 443,
844	/* 970 */ 443, 443, 464, 443, 34, 443, 434, 435, 436, 437,
845	/* 980 */ 152, 107, 109, 445, 452, 29, 443, 443, 443, 448,
846	/* 990 */ 120, 161, 119, 443, 461, 443, 443, 88, 443, 443,
847	/* 1000 */ 163, 443, 566, 443, 443, 27, 120, 161, 119, 88,
848	/* 1010 */ 443, 443, 152, 111, 111, 443, 443, 443, 120, 161,
849	/* 1020 */ 119, 98, 443, 443, 89, 473, 443, 90, 152, 443,
850	/* 1030 */ 120, 161, 119, 120, 161, 119, 120, 161, 119, 87,
851	/* 1040 */ 152, 443, 443, 64, 63, 62, 61, 443, 120, 161,
852	/* 1050 */ 119, 443, 152, 443, 443, 152, 443, 443, 152, 443,
853	/* 1060 */ 443, 443, 99, 443, 50, 443, 443, 443, 100, 443,
854	/* 1070 */ 152, 120, 161, 119, 443, 101, 443, 120, 161, 119,
855	/* 1080 */ 91, 443, 443, 443, 120, 161, 119, 103, 443, 120,
856	/* 1090 */ 161, 119, 92, 152, 443, 443, 120, 161, 119, 152,
857	/* 1100 */ 443, 120, 161, 119, 443, 93, 152, 443, 443, 443,
858	/* 1110 */ 104, 152, 443, 443, 120, 161, 119, 94, 152, 120,
859	/* 1120 */ 161, 119, 105, 152, 443, 443, 120, 161, 119, 443,
860	/* 1130 */ 443, 120, 161, 119, 95, 443, 152, 443, 443, 443,
861	/* 1140 */ 96, 152, 443, 120, 161, 119, 443, 443, 152, 120,
862	/* 1150 */ 161, 119, 97, 152, 443, 443, 443, 443, 546, 443,
863	/* 1160 */ 443, 120, 161, 119, 443, 152, 443, 120, 161, 119,
864	/* 1170 */ 443, 152, 443, 443, 443, 545, 443, 443, 443, 443,
865	/* 1180 */ 443, 544, 443, 152, 120, 161, 119, 543, 443, 152,
866	/* 1190 */ 120, 161, 119, 115, 443, 443, 120, 161, 119, 116,
867	/* 1200 */ 443, 443, 120, 161, 119, 443, 152, 443, 120, 161,
868	/* 1210 */ 119, 443, 152, 64, 63, 62, 61, 443, 152, 64,
869	/* 1220 */ 63, 62, 61, 443, 152, 443, 353, 443, 443, 443,
870	/* 1230 */ 152, 64, 63, 62, 61, 64, 63, 62, 61, 443,
871	/* 1240 */ 53, 443, 443, 443, 394, 64, 63, 62, 61, 64,
872	/* 1250 */ 63, 62, 61, 443, 443, 443, 56, 443, 393, 443,
873	/* 1260 */ 443, 443, 389,




874	};
875	static const YYCODETYPE yy_lookahead[] = {
876	/* 0 */ 0, 111, 112, 113, 132, 100, 101, 102, 104, 104,
877	/* 10 */ 10, 111, 112, 113, 109, 110, 111, 112, 113, 104,
878	/* 20 */ 20, 21, 22, 103, 24, 124, 106, 107, 28, 4,
879	/* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 133, 39,
880	/* 40 */ 40, 41, 42, 103, 44, 45, 106, 107, 105, 49,
881	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
882	/* 60 */ 60, 61, 62, 63, 0, 111, 112, 113, 128, 129,
883	/* 70 */ 130, 102, 12, 104, 10, 111, 112, 113, 109, 110,
884	/* 80 */ 111, 112, 113, 104, 20, 21, 22, 25, 24, 26,
885	/* 90 */ 27, 48, 28, 111, 112, 113, 126, 33, 34, 35,
886	/* 100 */ 36, 37, 133, 39, 40, 41, 42, 2, 44, 45,
887	/* 110 */ 131, 114, 10, 49, 50, 51, 52, 53, 54, 55,
888	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
889	/* 130 */ 28, 4, 5, 29, 30, 31, 32, 102, 114, 12,
890	/* 140 */ 97, 81, 15, 38, 1, 82, 111, 112, 113, 89,
891	/* 150 */ 115, 24, 89, 26, 27, 12, 127, 14, 31, 32,
892	/* 160 */ 19, 18, 1, 20, 21, 22, 23, 24, 133, 26,
893	/* 170 */ 27, 2, 29, 30, 31, 32, 1, 4, 5, 4,
894	/* 180 */ 5, 4, 5, 6, 7, 8, 16, 12, 26, 27,
895	/* 190 */ 15, 64, 99, 100, 101, 20, 21, 22, 105, 24,
896	/* 200 */ 6, 7, 4, 5, 6, 7, 17, 38, 81, 116,
897	/* 210 */ 83, 84, 85, 86, 121, 17, 89, 90, 91, 92,
898	/* 220 */ 93, 1, 2, 25, 4, 5, 4, 5, 6, 7,
899	/* 230 */ 48, 3, 12, 95, 96, 15, 26, 27, 17, 17,
900	/* 240 */ 20, 21, 22, 43, 1, 2, 25, 4, 5, 15,
901	/* 250 */ 102, 31, 32, 26, 27, 12, 81, 40, 15, 111,
902	/* 260 */ 112, 113, 47, 115, 89, 90, 91, 92, 93, 1,
903	/* 270 */ 88, 40, 4, 5, 31, 32, 94, 0, 41, 97,
904	/* 280 */ 12, 133, 41, 15, 64, 13, 17, 10, 20, 21,
905	/* 290 */ 22, 25, 74, 17, 4, 5, 6, 7, 79, 89,
906	/* 300 */ 3, 81, 78, 83, 84, 85, 86, 64, 79, 89,
907	/* 310 */ 90, 91, 92, 93, 3, 87, 2, 3, 4, 5,
908	/* 320 */ 6, 7, 80, 3, 81, 35, 83, 84, 85, 86,
909	/* 330 */ 16, 38, 89, 90, 91, 92, 93, 76, 3, 25,
910	/* 340 */ 4, 5, 6, 7, 3, 31, 32, 3, 94, 81,
911	/* 350 */ 25, 28, 38, 15, 20, 21, 22, 89, 90, 91,
912	/* 360 */ 92, 93, 1, 15, 15, 4, 5, 17, 28, 12,
913	/* 370 */ 28, 35, 88, 12, 3, 11, 15, 134, 134, 134,
914	/* 380 */ 134, 67, 68, 49, 50, 51, 52, 53, 54, 75,
915	/* 390 */ 134, 77, 78, 79, 2, 3, 4, 5, 6, 7,
916	/* 400 */ 1, 2, 134, 4, 5, 134, 134, 46, 47, 17,
917	/* 410 */ 134, 12, 134, 134, 15, 134, 134, 25, 134, 4,
918	/* 420 */ 5, 6, 7, 31, 32, 1, 2, 134, 4, 5,
919	/* 430 */ 38, 134, 17, 134, 134, 134, 12, 38, 134, 15,
920	/* 440 */ 25, 134, 81, 134, 1, 2, 134, 4, 5, 134,
921	/* 450 */ 89, 90, 91, 92, 93, 12, 134, 134, 15, 67,
922	/* 460 */ 68, 98, 99, 100, 101, 134, 134, 75, 105, 77,
923	/* 470 */ 78, 79, 2, 3, 4, 5, 6, 7, 134, 116,
924	/* 480 */ 81, 134, 1, 120, 121, 4, 5, 134, 89, 90,
925	/* 490 */ 91, 92, 93, 12, 134, 25, 15, 134, 134, 134,
926	/* 500 */ 134, 31, 32, 134, 134, 81, 134, 1, 38, 134,
927	/* 510 */ 4, 5, 134, 89, 90, 91, 92, 93, 12, 134,
928	/* 520 */ 102, 15, 104, 134, 81, 134, 134, 109, 110, 111,
929	/* 530 */ 112, 113, 89, 90, 91, 92, 93, 67, 68, 1,
930	/* 540 */ 134, 134, 4, 5, 134, 75, 134, 77, 78, 79,
931	/* 550 */ 12, 133, 1, 15, 134, 4, 5, 134, 102, 134,
932	/* 560 */ 134, 134, 81, 12, 134, 134, 15, 111, 112, 113,
933	/* 570 */ 89, 90, 91, 92, 93, 64, 65, 66, 67, 68,
934	/* 580 */ 69, 70, 71, 72, 73, 134, 134, 81, 134, 133,
935	/* 590 */ 134, 134, 102, 134, 134, 89, 90, 91, 92, 93,
936	/* 600 */ 134, 111, 112, 113, 102, 134, 104, 117, 118, 119,
937	/* 610 */ 134, 109, 110, 111, 112, 113, 134, 134, 134, 81,
938	/* 620 */ 134, 134, 2, 133, 134, 134, 134, 89, 90, 91,
939	/* 630 */ 92, 93, 81, 134, 134, 133, 4, 5, 6, 7,
940	/* 640 */ 89, 90, 91, 92, 93, 134, 102, 134, 104, 17,
941	/* 650 */ 102, 31, 32, 109, 110, 111, 112, 113, 134, 111,
942	/* 660 */ 112, 113, 134, 115, 134, 102, 134, 104, 48, 134,
943	/* 670 */ 122, 123, 109, 110, 111, 112, 113, 133, 102, 134,
944	/* 680 */ 104, 133, 134, 134, 64, 109, 110, 111, 112, 113,
945	/* 690 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
946	/* 700 */ 112, 113, 102, 83, 84, 85, 86, 134, 134, 133,
947	/* 710 */ 134, 111, 112, 113, 134, 102, 134, 104, 118, 119,
948	/* 720 */ 134, 133, 109, 110, 111, 112, 113, 134, 134, 134,
949	/* 730 */ 102, 134, 104, 133, 134, 134, 134, 109, 110, 111,
950	/* 740 */ 112, 113, 134, 102, 134, 104, 133, 134, 134, 134,
951	/* 750 */ 109, 110, 111, 112, 113, 102, 134, 104, 134, 134,
952	/* 760 */ 134, 133, 109, 110, 111, 112, 113, 134, 102, 134,
953	/* 770 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
954	/* 780 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
955	/* 790 */ 112, 113, 134, 102, 134, 104, 134, 134, 134, 133,
956	/* 800 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 134,
957	/* 810 */ 134, 133, 134, 109, 110, 111, 112, 113, 102, 134,
958	/* 820 */ 104, 102, 134, 134, 133, 109, 110, 111, 112, 113,
959	/* 830 */ 111, 112, 113, 102, 134, 104, 134, 133, 134, 134,
960	/* 840 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 133,
961	/* 850 */ 134, 134, 133, 109, 110, 111, 112, 113, 102, 134,
962	/* 860 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
963	/* 870 */ 134, 102, 134, 104, 134, 134, 134, 133, 109, 110,
964	/* 880 */ 111, 112, 113, 102, 134, 104, 134, 134, 134, 133,
965	/* 890 */ 109, 110, 111, 112, 113, 2, 102, 134, 104, 134,
966	/* 900 */ 134, 134, 133, 109, 110, 111, 112, 113, 134, 102,
967	/* 910 */ 134, 104, 134, 134, 133, 134, 109, 110, 111, 112,
968	/* 920 */ 113, 102, 134, 104, 31, 32, 134, 133, 109, 110,
969	/* 930 */ 111, 112, 113, 134, 134, 134, 102, 134, 104, 134,
970	/* 940 */ 133, 134, 134, 109, 110, 111, 112, 113, 134, 102,
971	/* 950 */ 134, 134, 133, 134, 134, 134, 134, 64, 111, 112,
972	/* 960 */ 113, 134, 134, 134, 134, 118, 134, 133, 134, 134,
973	/* 970 */ 134, 134, 125, 134, 127, 134, 83, 84, 85, 86,
974	/* 980 */ 133, 102, 98, 99, 100, 101, 134, 134, 134, 105,
975	/* 990 */ 111, 112, 113, 134, 115, 134, 134, 102, 134, 134,
976	/* 1000 */ 116, 134, 123, 134, 134, 121, 111, 112, 113, 102,
977	/* 1010 */ 134, 134, 133, 118, 119, 134, 134, 134, 111, 112,
978	/* 1020 */ 113, 102, 134, 134, 102, 118, 134, 102, 133, 134,
979	/* 1030 */ 111, 112, 113, 111, 112, 113, 111, 112, 113, 102,
980	/* 1040 */ 133, 134, 134, 4, 5, 6, 7, 134, 111, 112,
981	/* 1050 */ 113, 134, 133, 134, 134, 133, 134, 134, 133, 134,
982	/* 1060 */ 134, 134, 102, 134, 25, 134, 134, 134, 102, 134,
983	/* 1070 */ 133, 111, 112, 113, 134, 102, 134, 111, 112, 113,
984	/* 1080 */ 102, 134, 134, 134, 111, 112, 113, 102, 134, 111,
985	/* 1090 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 133,
986	/* 1100 */ 134, 111, 112, 113, 134, 102, 133, 134, 134, 134,
987	/* 1110 */ 102, 133, 134, 134, 111, 112, 113, 102, 133, 111,
988	/* 1120 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 134,
989	/* 1130 */ 134, 111, 112, 113, 102, 134, 133, 134, 134, 134,
990	/* 1140 */ 102, 133, 134, 111, 112, 113, 134, 134, 133, 111,
991	/* 1150 */ 112, 113, 102, 133, 134, 134, 134, 134, 102, 134,
992	/* 1160 */ 134, 111, 112, 113, 134, 133, 134, 111, 112, 113,
993	/* 1170 */ 134, 133, 134, 134, 134, 102, 134, 134, 134, 134,
994	/* 1180 */ 134, 102, 134, 133, 111, 112, 113, 102, 134, 133,
995	/* 1190 */ 111, 112, 113, 102, 134, 134, 111, 112, 113, 102,
996	/* 1200 */ 134, 134, 111, 112, 113, 134, 133, 134, 111, 112,
997	/* 1210 */ 113, 134, 133, 4, 5, 6, 7, 134, 133, 4,
998	/* 1220 */ 5, 6, 7, 134, 133, 134, 17, 134, 134, 134,
999	/* 1230 */ 133, 4, 5, 6, 7, 4, 5, 6, 7, 134,
1000	/* 1240 */ 25, 134, 134, 134, 17, 4, 5, 6, 7, 4,
1001	/* 1250 */ 5, 6, 7, 134, 134, 134, 25, 134, 17, 134,
1002	/* 1260 */ 134, 134, 17, 134, 134, 134, 134, 134, 134, 134,
1003	/* 1270 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1004	/* 1280 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1005	/* 1290 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1006	/* 1300 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1007	/* 1310 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1008	/* 1320 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1009	/* 1330 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1010	/* 1340 */ 134, 134, 134, 134, 134, 134, 134, 134, 98, 98,
1011	/* 1350 */ 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
1012	/* 1360 */ 98,




1013	};
1014	#define YY_SHIFT_COUNT (163)
1015	#define YY_SHIFT_MIN (0)
1016	#define YY_SHIFT_MAX (1245)
1017	static const unsigned short int yy_shift_ofst[] = {
1018	/* 0 */ 143, 127, 220, 243, 243, 243, 243, 243, 243, 243,
1019	/* 10 */ 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
1020	/* 20 */ 243, 243, 243, 243, 243, 243, 243, 175, 361, 481,
1021	/* 30 */ 175, 143, 399, 399, 0, 64, 143, 506, 481, 506,
1022	/* 40 */ 268, 268, 268, 424, 443, 481, 481, 481, 481, 481,
1023	/* 50 */ 481, 538, 481, 481, 551, 481, 481, 481, 481, 481,
1024	/* 60 */ 481, 481, 481, 481, 481, 334, 60, 60, 60, 60,
1025	/* 70 */ 60, 620, 314, 392, 470, 893, 893, 104, 62, 1263,
1026	/* 80 */ 1263, 1263, 1263, 511, 511, 198, 415, 222, 177, 290,
1027	/* 90 */ 336, 632, 1039, 1209, 1215, 1227, 1231, 1241, 1245, 25,
1028	/* 100 */ 25, 25, 182, 25, 25, 25, 63, 25, 210, 102,
1029	/* 110 */ 105, 169, 221, 173, 138, 194, 194, 162, 227, 228,
1030	/* 120 */ 43, 277, 141, 161, 189, 170, 234, 200, 217, 231,
1031	/* 130 */ 237, 241, 215, 272, 269, 266, 218, 276, 219, 224,
1032	/* 140 */ 242, 229, 297, 311, 320, 293, 335, 341, 344, 254,
1033	/* 150 */ 261, 325, 254, 338, 348, 349, 350, 323, 340, 342,
1034	/* 160 */ 357, 284, 371, 364,
1035	};
1036	#define YY_REDUCE_COUNT (82)
1037	#define YY_REDUCE_MIN (-128)
1038	#define YY_REDUCE_MAX (1097)
1039	static const short yy_reduce_ofst[] = {
1040	/* 0 */ 363, -95, -31, 418, 502, 544, 563, 576, 588, 613,
1041	/* 10 */ 628, 641, 653, 666, 678, 691, 704, 716, 731, 744,
1042	/* 20 */ 756, 769, 781, 794, 807, 819, 834, 548, 490, 847,
1043	/* 30 */ 879, 884, 600, 895, -60, -60, 93, 35, 907, 148,
1044	/* 40 */ 456, 719, 919, 922, 925, 937, 960, 966, 973, 978,
1045	/* 50 */ 985, 990, 1003, 1008, 1015, 1020, 1032, 1038, 1050, 1056,
1046	/* 60 */ 1073, 1079, 1085, 1091, 1097, -80, -110, -100, -46, -36,
1047	/* 70 */ -18, -21, -128, -128, -128, -96, -85, -57, -99, -30,
1048	/* 80 */ -3, 24, 29,
1049	};
1050	static const YYACTIONTYPE yy_default[] = {
1051	/* 0 */ 447, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1052	/* 10 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1053	/* 20 */ 441, 441, 441, 441, 441, 441, 441, 441, 471, 573,
1054	/* 30 */ 441, 447, 577, 483, 578, 578, 447, 441, 441, 441,
1055	/* 40 */ 441, 441, 441, 441, 441, 441, 441, 441, 475, 441,
1056	/* 50 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1057	/* 60 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1058	/* 70 */ 441, 441, 441, 441, 441, 441, 441, 441, 453, 468,
1059	/* 80 */ 506, 506, 573, 466, 491, 441, 441, 441, 469, 441,
1060	/* 90 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 486,
1061	/* 100 */ 484, 474, 457, 510, 509, 508, 441, 563, 441, 441,
1062	/* 110 */ 441, 441, 441, 585, 441, 542, 541, 537, 441, 530,
1063	/* 120 */ 527, 441, 441, 441, 441, 441, 441, 489, 441, 441,
1064	/* 130 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1065	/* 140 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 589,
1066	/* 150 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1067	/* 160 */ 441, 598, 441, 441,
1068	};
1069	/******** End of lemon-generated parsing tables ***************************/
1070
1071	/* The next table maps tokens (terminal symbols) into fallback tokens.
1072	** If a construct like the following:
	@@ -1170,10 +1179,11 @@
1170	0, /* TOP => nothing */
1171	0, /* BOTTOM => nothing */
1172	0, /* START => nothing */
1173	0, /* END => nothing */
1174	0, /* IN => nothing */

1175	0, /* DOT_U => nothing */
1176	0, /* LAST => nothing */
1177	0, /* NUMBER => nothing */
1178	0, /* FUNC1 => nothing */
1179	0, /* FUNC2 => nothing */
	@@ -1356,56 +1366,57 @@
1356	/* 83 */ "TOP",
1357	/* 84 */ "BOTTOM",
1358	/* 85 */ "START",
1359	/* 86 */ "END",
1360	/* 87 */ "IN",
1361	/* 88 */ "DOT_U",
1362	/* 89 */ "LAST",
1363	/* 90 */ "NUMBER",
1364	/* 91 */ "FUNC1",
1365	/* 92 */ "FUNC2",
1366	/* 93 */ "DIST",
1367	/* 94 */ "DOT_XY",
1368	/* 95 */ "X",
1369	/* 96 */ "Y",
1370	/* 97 */ "DOT_L",
1371	/* 98 */ "statement_list",
1372	/* 99 */ "statement",
1373	/* 100 */ "unnamed_statement",
1374	/* 101 */ "basetype",
1375	/* 102 */ "expr",
1376	/* 103 */ "numproperty",
1377	/* 104 */ "edge",
1378	/* 105 */ "direction",
1379	/* 106 */ "dashproperty",
1380	/* 107 */ "colorproperty",
1381	/* 108 */ "locproperty",
1382	/* 109 */ "position",
1383	/* 110 */ "place",
1384	/* 111 */ "object",
1385	/* 112 */ "objectname",
1386	/* 113 */ "nth",
1387	/* 114 */ "textposition",
1388	/* 115 */ "rvalue",
1389	/* 116 */ "lvalue",
1390	/* 117 */ "even",
1391	/* 118 */ "relexpr",
1392	/* 119 */ "optrelexpr",
1393	/* 120 */ "document",
1394	/* 121 */ "print",
1395	/* 122 */ "prlist",
1396	/* 123 */ "pritem",
1397	/* 124 */ "prsep",
1398	/* 125 */ "attribute_list",
1399	/* 126 */ "savelist",
1400	/* 127 */ "alist",
1401	/* 128 */ "attribute",
1402	/* 129 */ "go",
1403	/* 130 */ "boolproperty",
1404	/* 131 */ "withclause",
1405	/* 132 */ "between",
1406	/* 133 */ "place2",

1407	};
1408	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1409
1410	#ifndef NDEBUG
1411	/* For tracing reduce actions, the names of all rules are required.
	@@ -1497,77 +1508,78 @@
1497	/* 83 */ "place2 ::= object",
1498	/* 84 */ "place2 ::= object DOT_E edge",
1499	/* 85 */ "place2 ::= NTH VERTEX OF object",
1500	/* 86 */ "object ::= nth",
1501	/* 87 */ "object ::= nth OF\|IN object",
1502	/* 88 */ "objectname ::= PLACENAME",
1503	/* 89 */ "objectname ::= objectname DOT_U PLACENAME",
1504	/* 90 */ "nth ::= NTH CLASSNAME",
1505	/* 91 */ "nth ::= NTH LAST CLASSNAME",
1506	/* 92 */ "nth ::= LAST CLASSNAME",
1507	/* 93 */ "nth ::= LAST",
1508	/* 94 */ "nth ::= NTH LB RB",
1509	/* 95 */ "nth ::= NTH LAST LB RB",
1510	/* 96 */ "nth ::= LAST LB RB",
1511	/* 97 */ "expr ::= expr PLUS expr",
1512	/* 98 */ "expr ::= expr MINUS expr",
1513	/* 99 */ "expr ::= expr STAR expr",
1514	/* 100 */ "expr ::= expr SLASH expr",
1515	/* 101 */ "expr ::= MINUS expr",
1516	/* 102 */ "expr ::= PLUS expr",
1517	/* 103 */ "expr ::= LP expr RP",
1518	/* 104 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
1519	/* 105 */ "expr ::= NUMBER",
1520	/* 106 */ "expr ::= ID",
1521	/* 107 */ "expr ::= FUNC1 LP expr RP",
1522	/* 108 */ "expr ::= FUNC2 LP expr COMMA expr RP",
1523	/* 109 */ "expr ::= DIST LP position COMMA position RP",
1524	/* 110 */ "expr ::= place2 DOT_XY X",
1525	/* 111 */ "expr ::= place2 DOT_XY Y",
1526	/* 112 */ "expr ::= object DOT_L numproperty",
1527	/* 113 */ "expr ::= object DOT_L dashproperty",
1528	/* 114 */ "expr ::= object DOT_L colorproperty",
1529	/* 115 */ "lvalue ::= ID",
1530	/* 116 */ "lvalue ::= FILL",
1531	/* 117 */ "lvalue ::= COLOR",
1532	/* 118 */ "lvalue ::= THICKNESS",
1533	/* 119 */ "rvalue ::= expr",
1534	/* 120 */ "print ::= PRINT",
1535	/* 121 */ "prlist ::= pritem",
1536	/* 122 */ "prlist ::= prlist prsep pritem",
1537	/* 123 */ "direction ::= UP",
1538	/* 124 */ "direction ::= DOWN",
1539	/* 125 */ "direction ::= LEFT",
1540	/* 126 */ "direction ::= RIGHT",
1541	/* 127 */ "optrelexpr ::= relexpr",
1542	/* 128 */ "attribute_list ::= alist",
1543	/* 129 */ "alist ::=",
1544	/* 130 */ "alist ::= alist attribute",
1545	/* 131 */ "attribute ::= boolproperty",
1546	/* 132 */ "attribute ::= WITH withclause",
1547	/* 133 */ "go ::= GO",
1548	/* 134 */ "go ::=",
1549	/* 135 */ "even ::= UNTIL EVEN WITH",
1550	/* 136 */ "even ::= EVEN WITH",
1551	/* 137 */ "dashproperty ::= DOTTED",
1552	/* 138 */ "dashproperty ::= DASHED",
1553	/* 139 */ "colorproperty ::= FILL",
1554	/* 140 */ "colorproperty ::= COLOR",
1555	/* 141 */ "position ::= place",
1556	/* 142 */ "between ::= WAY BETWEEN",
1557	/* 143 */ "between ::= BETWEEN",
1558	/* 144 */ "between ::= OF THE WAY BETWEEN",
1559	/* 145 */ "place ::= place2",
1560	/* 146 */ "edge ::= CENTER",
1561	/* 147 */ "edge ::= EDGEPT",
1562	/* 148 */ "edge ::= TOP",
1563	/* 149 */ "edge ::= BOTTOM",
1564	/* 150 */ "edge ::= START",
1565	/* 151 */ "edge ::= END",
1566	/* 152 */ "edge ::= RIGHT",
1567	/* 153 */ "edge ::= LEFT",
1568	/* 154 */ "object ::= objectname",

1569	};
1570	#endif /* NDEBUG */
1571
1572
1573	#if YYSTACKDEPTH<=0
	@@ -1689,24 +1701,24 @@
1689	** Note: during a reduce, the only symbols destroyed are those
1690	** which appear on the RHS of the rule, but which are not used
1691	** inside the C code.
1692	*/
1693	/******* Begin destructor definitions *************************************/
1694	case 98: /* statement_list */
1695	{
1696	#line 494 "pikchr.y"
1697	pik_elist_free(p,(yypminor->yy119));
1698	#line 1723 "pikchr.c"
1699	}
1700	break;
1701	case 99: /* statement */
1702	case 100: /* unnamed_statement */
1703	case 101: /* basetype */
1704	{
1705	#line 496 "pikchr.y"
1706	pik_elem_free(p,(yypminor->yy38));
1707	#line 1732 "pikchr.c"
1708	}
1709	break;
1710	/******* End destructor definitions ***************************************/
1711	default: break; /* If no destructor action specified: do nothing */
1712	}
	@@ -1923,11 +1935,11 @@
1923	** stack every overflows */
1924	/****** Begin %stack_overflow code ****************************************/
1925	#line 528 "pikchr.y"
1926
1927	pik_error(p, 0, "parser stack overflow");
1928	#line 1953 "pikchr.c"
1929	/****** End %stack_overflow code ******************************************/
1930	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
1931	pik_parserCTX_STORE
1932	}
1933
	@@ -1995,165 +2007,166 @@
1995	}
1996
1997	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
1998	** of that rule */
1999	static const YYCODETYPE yyRuleInfoLhs[] = {
2000	120, /* (0) document ::= statement_list */
2001	98, /* (1) statement_list ::= statement */
2002	98, /* (2) statement_list ::= statement_list EOL statement */
2003	99, /* (3) statement ::= */
2004	99, /* (4) statement ::= direction */
2005	99, /* (5) statement ::= lvalue ASSIGN rvalue */
2006	99, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2007	99, /* (7) statement ::= PLACENAME COLON position */
2008	99, /* (8) statement ::= unnamed_statement */
2009	99, /* (9) statement ::= print prlist */
2010	99, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2011	99, /* (11) statement ::= ASSERT LP position EQ position RP */
2012	99, /* (12) statement ::= DEFINE ID CODEBLOCK */
2013	115, /* (13) rvalue ::= PLACENAME */
2014	123, /* (14) pritem ::= FILL */
2015	123, /* (15) pritem ::= COLOR */
2016	123, /* (16) pritem ::= THICKNESS */
2017	123, /* (17) pritem ::= rvalue */
2018	123, /* (18) pritem ::= STRING */
2019	124, /* (19) prsep ::= COMMA */
2020	100, /* (20) unnamed_statement ::= basetype attribute_list */
2021	101, /* (21) basetype ::= CLASSNAME */
2022	101, /* (22) basetype ::= STRING textposition */
2023	101, /* (23) basetype ::= LB savelist statement_list RB */
2024	126, /* (24) savelist ::= */
2025	118, /* (25) relexpr ::= expr */
2026	118, /* (26) relexpr ::= expr PERCENT */
2027	119, /* (27) optrelexpr ::= */
2028	125, /* (28) attribute_list ::= relexpr alist */
2029	128, /* (29) attribute ::= numproperty relexpr */
2030	128, /* (30) attribute ::= dashproperty expr */
2031	128, /* (31) attribute ::= dashproperty */
2032	128, /* (32) attribute ::= colorproperty rvalue */
2033	128, /* (33) attribute ::= go direction optrelexpr */
2034	128, /* (34) attribute ::= go direction even position */
2035	128, /* (35) attribute ::= CLOSE */
2036	128, /* (36) attribute ::= CHOP */
2037	128, /* (37) attribute ::= FROM position */
2038	128, /* (38) attribute ::= TO position */
2039	128, /* (39) attribute ::= THEN */
2040	128, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2041	128, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2042	128, /* (42) attribute ::= GO optrelexpr HEADING expr */
2043	128, /* (43) attribute ::= GO optrelexpr EDGEPT */
2044	128, /* (44) attribute ::= AT position */
2045	128, /* (45) attribute ::= SAME */
2046	128, /* (46) attribute ::= SAME AS object */
2047	128, /* (47) attribute ::= STRING textposition */
2048	128, /* (48) attribute ::= FIT */
2049	128, /* (49) attribute ::= BEHIND object */
2050	131, /* (50) withclause ::= DOT_E edge AT position */
2051	131, /* (51) withclause ::= edge AT position */
2052	103, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2053	130, /* (53) boolproperty ::= CW */
2054	130, /* (54) boolproperty ::= CCW */
2055	130, /* (55) boolproperty ::= LARROW */
2056	130, /* (56) boolproperty ::= RARROW */
2057	130, /* (57) boolproperty ::= LRARROW */
2058	130, /* (58) boolproperty ::= INVIS */
2059	130, /* (59) boolproperty ::= THICK */
2060	130, /* (60) boolproperty ::= THIN */
2061	130, /* (61) boolproperty ::= SOLID */
2062	114, /* (62) textposition ::= */
2063	114, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2064	109, /* (64) position ::= expr COMMA expr */
2065	109, /* (65) position ::= place PLUS expr COMMA expr */
2066	109, /* (66) position ::= place MINUS expr COMMA expr */
2067	109, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2068	109, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2069	109, /* (69) position ::= LP position COMMA position RP */
2070	109, /* (70) position ::= LP position RP */
2071	109, /* (71) position ::= expr between position AND position */
2072	109, /* (72) position ::= expr LT position COMMA position GT */
2073	109, /* (73) position ::= expr ABOVE position */
2074	109, /* (74) position ::= expr BELOW position */
2075	109, /* (75) position ::= expr LEFT OF position */
2076	109, /* (76) position ::= expr RIGHT OF position */
2077	109, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2078	109, /* (78) position ::= expr HEADING EDGEPT OF position */
2079	109, /* (79) position ::= expr EDGEPT OF position */
2080	109, /* (80) position ::= expr ON HEADING expr FROM position */
2081	109, /* (81) position ::= expr HEADING expr FROM position */
2082	110, /* (82) place ::= edge OF object */
2083	133, /* (83) place2 ::= object */
2084	133, /* (84) place2 ::= object DOT_E edge */
2085	133, /* (85) place2 ::= NTH VERTEX OF object */
2086	111, /* (86) object ::= nth */
2087	111, /* (87) object ::= nth OF\|IN object */
2088	112, /* (88) objectname ::= PLACENAME */
2089	112, /* (89) objectname ::= objectname DOT_U PLACENAME */
2090	113, /* (90) nth ::= NTH CLASSNAME */
2091	113, /* (91) nth ::= NTH LAST CLASSNAME */
2092	113, /* (92) nth ::= LAST CLASSNAME */
2093	113, /* (93) nth ::= LAST */
2094	113, /* (94) nth ::= NTH LB RB */
2095	113, /* (95) nth ::= NTH LAST LB RB */
2096	113, /* (96) nth ::= LAST LB RB */
2097	102, /* (97) expr ::= expr PLUS expr */
2098	102, /* (98) expr ::= expr MINUS expr */
2099	102, /* (99) expr ::= expr STAR expr */
2100	102, /* (100) expr ::= expr SLASH expr */
2101	102, /* (101) expr ::= MINUS expr */
2102	102, /* (102) expr ::= PLUS expr */
2103	102, /* (103) expr ::= LP expr RP */
2104	102, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2105	102, /* (105) expr ::= NUMBER */
2106	102, /* (106) expr ::= ID */
2107	102, /* (107) expr ::= FUNC1 LP expr RP */
2108	102, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2109	102, /* (109) expr ::= DIST LP position COMMA position RP */
2110	102, /* (110) expr ::= place2 DOT_XY X */
2111	102, /* (111) expr ::= place2 DOT_XY Y */
2112	102, /* (112) expr ::= object DOT_L numproperty */
2113	102, /* (113) expr ::= object DOT_L dashproperty */
2114	102, /* (114) expr ::= object DOT_L colorproperty */
2115	116, /* (115) lvalue ::= ID */
2116	116, /* (116) lvalue ::= FILL */
2117	116, /* (117) lvalue ::= COLOR */
2118	116, /* (118) lvalue ::= THICKNESS */
2119	115, /* (119) rvalue ::= expr */
2120	121, /* (120) print ::= PRINT */
2121	122, /* (121) prlist ::= pritem */
2122	122, /* (122) prlist ::= prlist prsep pritem */
2123	105, /* (123) direction ::= UP */
2124	105, /* (124) direction ::= DOWN */
2125	105, /* (125) direction ::= LEFT */
2126	105, /* (126) direction ::= RIGHT */
2127	119, /* (127) optrelexpr ::= relexpr */
2128	125, /* (128) attribute_list ::= alist */
2129	127, /* (129) alist ::= */
2130	127, /* (130) alist ::= alist attribute */
2131	128, /* (131) attribute ::= boolproperty */
2132	128, /* (132) attribute ::= WITH withclause */
2133	129, /* (133) go ::= GO */
2134	129, /* (134) go ::= */
2135	117, /* (135) even ::= UNTIL EVEN WITH */
2136	117, /* (136) even ::= EVEN WITH */
2137	106, /* (137) dashproperty ::= DOTTED */
2138	106, /* (138) dashproperty ::= DASHED */
2139	107, /* (139) colorproperty ::= FILL */
2140	107, /* (140) colorproperty ::= COLOR */
2141	109, /* (141) position ::= place */
2142	132, /* (142) between ::= WAY BETWEEN */
2143	132, /* (143) between ::= BETWEEN */
2144	132, /* (144) between ::= OF THE WAY BETWEEN */
2145	110, /* (145) place ::= place2 */
2146	104, /* (146) edge ::= CENTER */
2147	104, /* (147) edge ::= EDGEPT */
2148	104, /* (148) edge ::= TOP */
2149	104, /* (149) edge ::= BOTTOM */
2150	104, /* (150) edge ::= START */
2151	104, /* (151) edge ::= END */
2152	104, /* (152) edge ::= RIGHT */
2153	104, /* (153) edge ::= LEFT */
2154	111, /* (154) object ::= objectname */

2155	};
2156
2157	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2158	** of symbols on the right-hand side of that rule. */
2159	static const signed char yyRuleInfoNRhs[] = {
	@@ -2243,77 +2256,78 @@
2243	-1, /* (83) place2 ::= object */
2244	-3, /* (84) place2 ::= object DOT_E edge */
2245	-4, /* (85) place2 ::= NTH VERTEX OF object */
2246	-1, /* (86) object ::= nth */
2247	-3, /* (87) object ::= nth OF\|IN object */
2248	-1, /* (88) objectname ::= PLACENAME */
2249	-3, /* (89) objectname ::= objectname DOT_U PLACENAME */
2250	-2, /* (90) nth ::= NTH CLASSNAME */
2251	-3, /* (91) nth ::= NTH LAST CLASSNAME */
2252	-2, /* (92) nth ::= LAST CLASSNAME */
2253	-1, /* (93) nth ::= LAST */
2254	-3, /* (94) nth ::= NTH LB RB */
2255	-4, /* (95) nth ::= NTH LAST LB RB */
2256	-3, /* (96) nth ::= LAST LB RB */
2257	-3, /* (97) expr ::= expr PLUS expr */
2258	-3, /* (98) expr ::= expr MINUS expr */
2259	-3, /* (99) expr ::= expr STAR expr */
2260	-3, /* (100) expr ::= expr SLASH expr */
2261	-2, /* (101) expr ::= MINUS expr */
2262	-2, /* (102) expr ::= PLUS expr */
2263	-3, /* (103) expr ::= LP expr RP */
2264	-3, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2265	-1, /* (105) expr ::= NUMBER */
2266	-1, /* (106) expr ::= ID */
2267	-4, /* (107) expr ::= FUNC1 LP expr RP */
2268	-6, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2269	-6, /* (109) expr ::= DIST LP position COMMA position RP */
2270	-3, /* (110) expr ::= place2 DOT_XY X */
2271	-3, /* (111) expr ::= place2 DOT_XY Y */
2272	-3, /* (112) expr ::= object DOT_L numproperty */
2273	-3, /* (113) expr ::= object DOT_L dashproperty */
2274	-3, /* (114) expr ::= object DOT_L colorproperty */
2275	-1, /* (115) lvalue ::= ID */
2276	-1, /* (116) lvalue ::= FILL */
2277	-1, /* (117) lvalue ::= COLOR */
2278	-1, /* (118) lvalue ::= THICKNESS */
2279	-1, /* (119) rvalue ::= expr */
2280	-1, /* (120) print ::= PRINT */
2281	-1, /* (121) prlist ::= pritem */
2282	-3, /* (122) prlist ::= prlist prsep pritem */
2283	-1, /* (123) direction ::= UP */
2284	-1, /* (124) direction ::= DOWN */
2285	-1, /* (125) direction ::= LEFT */
2286	-1, /* (126) direction ::= RIGHT */
2287	-1, /* (127) optrelexpr ::= relexpr */
2288	-1, /* (128) attribute_list ::= alist */
2289	0, /* (129) alist ::= */
2290	-2, /* (130) alist ::= alist attribute */
2291	-1, /* (131) attribute ::= boolproperty */
2292	-2, /* (132) attribute ::= WITH withclause */
2293	-1, /* (133) go ::= GO */
2294	0, /* (134) go ::= */
2295	-3, /* (135) even ::= UNTIL EVEN WITH */
2296	-2, /* (136) even ::= EVEN WITH */
2297	-1, /* (137) dashproperty ::= DOTTED */
2298	-1, /* (138) dashproperty ::= DASHED */
2299	-1, /* (139) colorproperty ::= FILL */
2300	-1, /* (140) colorproperty ::= COLOR */
2301	-1, /* (141) position ::= place */
2302	-2, /* (142) between ::= WAY BETWEEN */
2303	-1, /* (143) between ::= BETWEEN */
2304	-4, /* (144) between ::= OF THE WAY BETWEEN */
2305	-1, /* (145) place ::= place2 */
2306	-1, /* (146) edge ::= CENTER */
2307	-1, /* (147) edge ::= EDGEPT */
2308	-1, /* (148) edge ::= TOP */
2309	-1, /* (149) edge ::= BOTTOM */
2310	-1, /* (150) edge ::= START */
2311	-1, /* (151) edge ::= END */
2312	-1, /* (152) edge ::= RIGHT */
2313	-1, /* (153) edge ::= LEFT */
2314	-1, /* (154) object ::= objectname */

2315	};
2316
2317	static void yy_accept(yyParser); / Forward Declaration */
2318
2319	/*
	@@ -2402,656 +2416,661 @@
2402	*/
2403	/******** Begin reduce actions ********************************************/
2404	YYMINORTYPE yylhsminor;
2405	case 0: /* document ::= statement_list */
2406	#line 532 "pikchr.y"
2407	{pik_render(p,yymsp[0].minor.yy119);}
2408	#line 2433 "pikchr.c"
2409	break;
2410	case 1: /* statement_list ::= statement */
2411	#line 535 "pikchr.y"
2412	{ yylhsminor.yy119 = pik_elist_append(p,0,yymsp[0].minor.yy38); }
2413	#line 2438 "pikchr.c"
2414	yymsp[0].minor.yy119 = yylhsminor.yy119;
2415	break;
2416	case 2: /* statement_list ::= statement_list EOL statement */
2417	#line 537 "pikchr.y"
2418	{ yylhsminor.yy119 = pik_elist_append(p,yymsp[-2].minor.yy119,yymsp[0].minor.yy38); }
2419	#line 2444 "pikchr.c"
2420	yymsp[-2].minor.yy119 = yylhsminor.yy119;
2421	break;
2422	case 3: /* statement ::= */
2423	#line 540 "pikchr.y"
2424	{ yymsp[1].minor.yy38 = 0; }
2425	#line 2450 "pikchr.c"
2426	break;
2427	case 4: /* statement ::= direction */
2428	#line 541 "pikchr.y"
2429	{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy38=0; }
2430	#line 2455 "pikchr.c"
2431	yymsp[0].minor.yy38 = yylhsminor.yy38;
2432	break;
2433	case 5: /* statement ::= lvalue ASSIGN rvalue */
2434	#line 542 "pikchr.y"
2435	{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy265,&yymsp[-1].minor.yy0); yylhsminor.yy38=0;}
2436	#line 2461 "pikchr.c"
2437	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2438	break;
2439	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2440	#line 544 "pikchr.y"
2441	{ yylhsminor.yy38 = yymsp[0].minor.yy38; pik_elem_setname(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0); }
2442	#line 2467 "pikchr.c"
2443	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2444	break;
2445	case 7: /* statement ::= PLACENAME COLON position */
2446	#line 546 "pikchr.y"
2447	{ yylhsminor.yy38 = pik_elem_new(p,0,0,0);
2448	if(yylhsminor.yy38){ yylhsminor.yy38->ptAt = yymsp[0].minor.yy43; pik_elem_setname(p,yylhsminor.yy38,&yymsp[-2].minor.yy0); }}
2449	#line 2474 "pikchr.c"
2450	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2451	break;
2452	case 8: /* statement ::= unnamed_statement */
2453	#line 548 "pikchr.y"
2454	{yylhsminor.yy38 = yymsp[0].minor.yy38;}
2455	#line 2480 "pikchr.c"
2456	yymsp[0].minor.yy38 = yylhsminor.yy38;
2457	break;
2458	case 9: /* statement ::= print prlist */
2459	#line 549 "pikchr.y"
2460	{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy38=0;}
2461	#line 2486 "pikchr.c"
2462	break;
2463	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2464	#line 554 "pikchr.y"
2465	{yymsp[-5].minor.yy38=pik_assert(p,yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy265);}
2466	#line 2491 "pikchr.c"
2467	break;
2468	case 11: /* statement ::= ASSERT LP position EQ position RP */
2469	#line 556 "pikchr.y"
2470	{yymsp[-5].minor.yy38=pik_position_assert(p,&yymsp[-3].minor.yy43,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy43);}
2471	#line 2496 "pikchr.c"
2472	break;
2473	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2474	#line 557 "pikchr.y"
2475	{yymsp[-2].minor.yy38=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2476	#line 2501 "pikchr.c"
2477	break;
2478	case 13: /* rvalue ::= PLACENAME */
2479	#line 568 "pikchr.y"
2480	{yylhsminor.yy265 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2481	#line 2506 "pikchr.c"
2482	yymsp[0].minor.yy265 = yylhsminor.yy265;
2483	break;
2484	case 14: /* pritem ::= FILL */
2485	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2486	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2487	#line 573 "pikchr.y"
2488	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2489	#line 2514 "pikchr.c"
2490	break;
2491	case 17: /* pritem ::= rvalue */
2492	#line 576 "pikchr.y"
2493	{pik_append_num(p,"",yymsp[0].minor.yy265);}
2494	#line 2519 "pikchr.c"
2495	break;
2496	case 18: /* pritem ::= STRING */
2497	#line 577 "pikchr.y"
2498	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2499	#line 2524 "pikchr.c"
2500	break;
2501	case 19: /* prsep ::= COMMA */
2502	#line 578 "pikchr.y"
2503	{pik_append(p, " ", 1);}
2504	#line 2529 "pikchr.c"
2505	break;
2506	case 20: /* unnamed_statement ::= basetype attribute_list */
2507	#line 581 "pikchr.y"
2508	{yylhsminor.yy38 = yymsp[-1].minor.yy38; pik_after_adding_attributes(p,yylhsminor.yy38);}
2509	#line 2534 "pikchr.c"
2510	yymsp[-1].minor.yy38 = yylhsminor.yy38;
2511	break;
2512	case 21: /* basetype ::= CLASSNAME */
2513	#line 583 "pikchr.y"
2514	{yylhsminor.yy38 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2515	#line 2540 "pikchr.c"
2516	yymsp[0].minor.yy38 = yylhsminor.yy38;
2517	break;
2518	case 22: /* basetype ::= STRING textposition */
2519	#line 585 "pikchr.y"
2520	{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy44; yylhsminor.yy38 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2521	#line 2546 "pikchr.c"
2522	yymsp[-1].minor.yy38 = yylhsminor.yy38;
2523	break;
2524	case 23: /* basetype ::= LB savelist statement_list RB */
2525	#line 587 "pikchr.y"
2526	{ p->list = yymsp[-2].minor.yy119; yymsp[-3].minor.yy38 = pik_elem_new(p,0,0,yymsp[-1].minor.yy119); if(yymsp[-3].minor.yy38) yymsp[-3].minor.yy38->errTok = yymsp[0].minor.yy0; }
2527	#line 2552 "pikchr.c"
2528	break;
2529	case 24: /* savelist ::= */
2530	#line 592 "pikchr.y"
2531	{yymsp[1].minor.yy119 = p->list; p->list = 0;}
2532	#line 2557 "pikchr.c"
2533	break;
2534	case 25: /* relexpr ::= expr */
2535	#line 599 "pikchr.y"
2536	{yylhsminor.yy200.rAbs = yymsp[0].minor.yy265; yylhsminor.yy200.rRel = 0;}
2537	#line 2562 "pikchr.c"
2538	yymsp[0].minor.yy200 = yylhsminor.yy200;
2539	break;
2540	case 26: /* relexpr ::= expr PERCENT */
2541	#line 600 "pikchr.y"
2542	{yylhsminor.yy200.rAbs = 0; yylhsminor.yy200.rRel = yymsp[-1].minor.yy265/100;}
2543	#line 2568 "pikchr.c"
2544	yymsp[-1].minor.yy200 = yylhsminor.yy200;
2545	break;
2546	case 27: /* optrelexpr ::= */
2547	#line 602 "pikchr.y"
2548	{yymsp[1].minor.yy200.rAbs = 0; yymsp[1].minor.yy200.rRel = 1.0;}
2549	#line 2574 "pikchr.c"
2550	break;
2551	case 28: /* attribute_list ::= relexpr alist */
2552	#line 604 "pikchr.y"
2553	{pik_add_direction(p,0,&yymsp[-1].minor.yy200);}
2554	#line 2579 "pikchr.c"
2555	break;
2556	case 29: /* attribute ::= numproperty relexpr */
2557	#line 608 "pikchr.y"
2558	{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200); }
2559	#line 2584 "pikchr.c"
2560	break;
2561	case 30: /* attribute ::= dashproperty expr */
2562	#line 609 "pikchr.y"
2563	{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy265); }
2564	#line 2589 "pikchr.c"
2565	break;
2566	case 31: /* attribute ::= dashproperty */
2567	#line 610 "pikchr.y"
2568	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2569	#line 2594 "pikchr.c"
2570	break;
2571	case 32: /* attribute ::= colorproperty rvalue */
2572	#line 611 "pikchr.y"
2573	{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265); }
2574	#line 2599 "pikchr.c"
2575	break;
2576	case 33: /* attribute ::= go direction optrelexpr */
2577	#line 612 "pikchr.y"
2578	{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200);}
2579	#line 2604 "pikchr.c"
2580	break;
2581	case 34: /* attribute ::= go direction even position */
2582	#line 613 "pikchr.y"
2583	{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43);}
2584	#line 2609 "pikchr.c"
2585	break;
2586	case 35: /* attribute ::= CLOSE */
2587	#line 614 "pikchr.y"
2588	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2589	#line 2614 "pikchr.c"
2590	break;
2591	case 36: /* attribute ::= CHOP */
2592	#line 615 "pikchr.y"
2593	{ p->cur->bChop = 1; }
2594	#line 2619 "pikchr.c"
2595	break;
2596	case 37: /* attribute ::= FROM position */
2597	#line 616 "pikchr.y"
2598	{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2599	#line 2624 "pikchr.c"
2600	break;
2601	case 38: /* attribute ::= TO position */
2602	#line 617 "pikchr.y"
2603	{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2604	#line 2629 "pikchr.c"
2605	break;
2606	case 39: /* attribute ::= THEN */
2607	#line 618 "pikchr.y"
2608	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2609	#line 2634 "pikchr.c"
2610	break;
2611	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2612	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2613	#line 620 "pikchr.y"
2614	{pik_move_hdg(p,&yymsp[-2].minor.yy200,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265,0,&yymsp[-3].minor.yy0);}
2615	#line 2640 "pikchr.c"
2616	break;
2617	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2618	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2619	#line 621 "pikchr.y"
2620	{pik_move_hdg(p,&yymsp[-1].minor.yy200,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2621	#line 2646 "pikchr.c"
2622	break;
2623	case 44: /* attribute ::= AT position */
2624	#line 626 "pikchr.y"
2625	{ pik_set_at(p,0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2626	#line 2651 "pikchr.c"
2627	break;
2628	case 45: /* attribute ::= SAME */
2629	#line 628 "pikchr.y"
2630	{pik_same(p,0,&yymsp[0].minor.yy0);}
2631	#line 2656 "pikchr.c"
2632	break;
2633	case 46: /* attribute ::= SAME AS object */
2634	#line 629 "pikchr.y"
2635	{pik_same(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2636	#line 2661 "pikchr.c"
2637	break;
2638	case 47: /* attribute ::= STRING textposition */
2639	#line 630 "pikchr.y"
2640	{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy44);}
2641	#line 2666 "pikchr.c"
2642	break;
2643	case 48: /* attribute ::= FIT */
2644	#line 631 "pikchr.y"
2645	{pik_size_to_fit(p,&yymsp[0].minor.yy0,3); }
2646	#line 2671 "pikchr.c"
2647	break;
2648	case 49: /* attribute ::= BEHIND object */
2649	#line 632 "pikchr.y"
2650	{pik_behind(p,yymsp[0].minor.yy38);}
2651	#line 2676 "pikchr.c"
2652	break;
2653	case 50: /* withclause ::= DOT_E edge AT position */
2654	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2655	#line 640 "pikchr.y"
2656	{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2657	#line 2682 "pikchr.c"
2658	break;
2659	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2660	#line 644 "pikchr.y"
2661	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2662	#line 2687 "pikchr.c"
2663	yymsp[0].minor.yy0 = yylhsminor.yy0;
2664	break;
2665	case 53: /* boolproperty ::= CW */
2666	#line 655 "pikchr.y"
2667	{p->cur->cw = 1;}
2668	#line 2693 "pikchr.c"
2669	break;
2670	case 54: /* boolproperty ::= CCW */
2671	#line 656 "pikchr.y"
2672	{p->cur->cw = 0;}
2673	#line 2698 "pikchr.c"
2674	break;
2675	case 55: /* boolproperty ::= LARROW */
2676	#line 657 "pikchr.y"
2677	{p->cur->larrow=1; p->cur->rarrow=0; }
2678	#line 2703 "pikchr.c"
2679	break;
2680	case 56: /* boolproperty ::= RARROW */
2681	#line 658 "pikchr.y"
2682	{p->cur->larrow=0; p->cur->rarrow=1; }
2683	#line 2708 "pikchr.c"
2684	break;
2685	case 57: /* boolproperty ::= LRARROW */
2686	#line 659 "pikchr.y"
2687	{p->cur->larrow=1; p->cur->rarrow=1; }
2688	#line 2713 "pikchr.c"
2689	break;
2690	case 58: /* boolproperty ::= INVIS */
2691	#line 660 "pikchr.y"
2692	{p->cur->sw = 0.0;}
2693	#line 2718 "pikchr.c"
2694	break;
2695	case 59: /* boolproperty ::= THICK */
2696	#line 661 "pikchr.y"
2697	{p->cur->sw *= 1.5;}
2698	#line 2723 "pikchr.c"
2699	break;
2700	case 60: /* boolproperty ::= THIN */
2701	#line 662 "pikchr.y"
2702	{p->cur->sw *= 0.67;}
2703	#line 2728 "pikchr.c"
2704	break;
2705	case 61: /* boolproperty ::= SOLID */
2706	#line 663 "pikchr.y"
2707	{p->cur->sw = pik_value(p,"thickness",9,0);
2708	p->cur->dotted = p->cur->dashed = 0.0;}
2709	#line 2734 "pikchr.c"
2710	break;
2711	case 62: /* textposition ::= */
2712	#line 666 "pikchr.y"
2713	{yymsp[1].minor.yy44 = 0;}
2714	#line 2739 "pikchr.c"
2715	break;
2716	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2717	#line 669 "pikchr.y"
2718	{yylhsminor.yy44 = (short int)pik_text_position(yymsp[-1].minor.yy44,&yymsp[0].minor.yy0);}
2719	#line 2744 "pikchr.c"
2720	yymsp[-1].minor.yy44 = yylhsminor.yy44;
2721	break;
2722	case 64: /* position ::= expr COMMA expr */
2723	#line 672 "pikchr.y"
2724	{yylhsminor.yy43.x=yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[0].minor.yy265;}
2725	#line 2750 "pikchr.c"
2726	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2727	break;
2728	case 65: /* position ::= place PLUS expr COMMA expr */
2729	#line 674 "pikchr.y"
2730	{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x+yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y+yymsp[0].minor.yy265;}
2731	#line 2756 "pikchr.c"
2732	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2733	break;
2734	case 66: /* position ::= place MINUS expr COMMA expr */
2735	#line 675 "pikchr.y"
2736	{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x-yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y-yymsp[0].minor.yy265;}
2737	#line 2762 "pikchr.c"
2738	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2739	break;
2740	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2741	#line 677 "pikchr.y"
2742	{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x+yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y+yymsp[-1].minor.yy265;}
2743	#line 2768 "pikchr.c"
2744	yymsp[-6].minor.yy43 = yylhsminor.yy43;
2745	break;
2746	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2747	#line 679 "pikchr.y"
2748	{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x-yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y-yymsp[-1].minor.yy265;}
2749	#line 2774 "pikchr.c"
2750	yymsp[-6].minor.yy43 = yylhsminor.yy43;
2751	break;
2752	case 69: /* position ::= LP position COMMA position RP */
2753	#line 680 "pikchr.y"
2754	{yymsp[-4].minor.yy43.x=yymsp[-3].minor.yy43.x; yymsp[-4].minor.yy43.y=yymsp[-1].minor.yy43.y;}
2755	#line 2780 "pikchr.c"
2756	break;
2757	case 70: /* position ::= LP position RP */
2758	#line 681 "pikchr.y"
2759	{yymsp[-2].minor.yy43=yymsp[-1].minor.yy43;}
2760	#line 2785 "pikchr.c"
2761	break;
2762	case 71: /* position ::= expr between position AND position */
2763	#line 683 "pikchr.y"
2764	{yylhsminor.yy43 = pik_position_between(yymsp[-4].minor.yy265,yymsp[-2].minor.yy43,yymsp[0].minor.yy43);}
2765	#line 2790 "pikchr.c"
2766	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2767	break;
2768	case 72: /* position ::= expr LT position COMMA position GT */
2769	#line 685 "pikchr.y"
2770	{yylhsminor.yy43 = pik_position_between(yymsp[-5].minor.yy265,yymsp[-3].minor.yy43,yymsp[-1].minor.yy43);}
2771	#line 2796 "pikchr.c"
2772	yymsp[-5].minor.yy43 = yylhsminor.yy43;
2773	break;
2774	case 73: /* position ::= expr ABOVE position */
2775	#line 686 "pikchr.y"
2776	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y += yymsp[-2].minor.yy265;}
2777	#line 2802 "pikchr.c"
2778	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2779	break;
2780	case 74: /* position ::= expr BELOW position */
2781	#line 687 "pikchr.y"
2782	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y -= yymsp[-2].minor.yy265;}
2783	#line 2808 "pikchr.c"
2784	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2785	break;
2786	case 75: /* position ::= expr LEFT OF position */
2787	#line 688 "pikchr.y"
2788	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x -= yymsp[-3].minor.yy265;}
2789	#line 2814 "pikchr.c"
2790	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2791	break;
2792	case 76: /* position ::= expr RIGHT OF position */
2793	#line 689 "pikchr.y"
2794	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x += yymsp[-3].minor.yy265;}
2795	#line 2820 "pikchr.c"
2796	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2797	break;
2798	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2799	#line 691 "pikchr.y"
2800	{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-5].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2801	#line 2826 "pikchr.c"
2802	yymsp[-5].minor.yy43 = yylhsminor.yy43;
2803	break;
2804	case 78: /* position ::= expr HEADING EDGEPT OF position */
2805	#line 693 "pikchr.y"
2806	{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-4].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2807	#line 2832 "pikchr.c"
2808	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2809	break;
2810	case 79: /* position ::= expr EDGEPT OF position */
2811	#line 695 "pikchr.y"
2812	{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2813	#line 2838 "pikchr.c"
2814	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2815	break;
2816	case 80: /* position ::= expr ON HEADING expr FROM position */
2817	#line 697 "pikchr.y"
2818	{yylhsminor.yy43 = pik_position_at_angle(yymsp[-5].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2819	#line 2844 "pikchr.c"
2820	yymsp[-5].minor.yy43 = yylhsminor.yy43;
2821	break;
2822	case 81: /* position ::= expr HEADING expr FROM position */
2823	#line 699 "pikchr.y"
2824	{yylhsminor.yy43 = pik_position_at_angle(yymsp[-4].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2825	#line 2850 "pikchr.c"
2826	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2827	break;
2828	case 82: /* place ::= edge OF object */
2829	#line 711 "pikchr.y"
2830	{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2831	#line 2856 "pikchr.c"
2832	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2833	break;
2834	case 83: /* place2 ::= object */
2835	#line 712 "pikchr.y"
2836	{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,0);}
2837	#line 2862 "pikchr.c"
2838	yymsp[0].minor.yy43 = yylhsminor.yy43;
2839	break;
2840	case 84: /* place2 ::= object DOT_E edge */
2841	#line 713 "pikchr.y"
2842	{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2843	#line 2868 "pikchr.c"
2844	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2845	break;
2846	case 85: /* place2 ::= NTH VERTEX OF object */
2847	#line 714 "pikchr.y"
2848	{yylhsminor.yy43 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy38);}
2849	#line 2874 "pikchr.c"
2850	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2851	break;
2852	case 86: /* object ::= nth */
2853	#line 726 "pikchr.y"
2854	{yylhsminor.yy38 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2855	#line 2880 "pikchr.c"
2856	yymsp[0].minor.yy38 = yylhsminor.yy38;
2857	break;
2858	case 87: /* object ::= nth OF\|IN object */
2859	#line 727 "pikchr.y"
2860	{yylhsminor.yy38 = pik_find_nth(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2861	#line 2886 "pikchr.c"
2862	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2863	break;
2864	case 88: /* objectname ::= PLACENAME */
2865	#line 729 "pikchr.y"
2866	{yylhsminor.yy38 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2867	#line 2892 "pikchr.c"
2868	yymsp[0].minor.yy38 = yylhsminor.yy38;
2869	break;
2870	case 89: /* objectname ::= objectname DOT_U PLACENAME */
2871	#line 731 "pikchr.y"
2872	{yylhsminor.yy38 = pik_find_byname(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2873	#line 2898 "pikchr.c"
2874	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2875	break;
2876	case 90: /* nth ::= NTH CLASSNAME */
2877	#line 733 "pikchr.y"





2878	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2879	#line 2904 "pikchr.c"
2880	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2881	break;
2882	case 91: /* nth ::= NTH LAST CLASSNAME */
2883	#line 734 "pikchr.y"
2884	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2885	#line 2910 "pikchr.c"
2886	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2887	break;
2888	case 92: /* nth ::= LAST CLASSNAME */
2889	#line 735 "pikchr.y"
2890	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2891	#line 2916 "pikchr.c"
2892	break;
2893	case 93: /* nth ::= LAST */
2894	#line 736 "pikchr.y"
2895	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2896	#line 2921 "pikchr.c"
2897	yymsp[0].minor.yy0 = yylhsminor.yy0;
2898	break;
2899	case 94: /* nth ::= NTH LB RB */
2900	#line 737 "pikchr.y"
2901	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2902	#line 2927 "pikchr.c"
2903	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2904	break;
2905	case 95: /* nth ::= NTH LAST LB RB */
2906	#line 738 "pikchr.y"
2907	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2908	#line 2933 "pikchr.c"
2909	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2910	break;
2911	case 96: /* nth ::= LAST LB RB */
2912	#line 739 "pikchr.y"
2913	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2914	#line 2939 "pikchr.c"
2915	break;
2916	case 97: /* expr ::= expr PLUS expr */
2917	#line 741 "pikchr.y"
2918	{yylhsminor.yy265=yymsp[-2].minor.yy265+yymsp[0].minor.yy265;}
2919	#line 2944 "pikchr.c"
2920	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2921	break;
2922	case 98: /* expr ::= expr MINUS expr */
2923	#line 742 "pikchr.y"
2924	{yylhsminor.yy265=yymsp[-2].minor.yy265-yymsp[0].minor.yy265;}
2925	#line 2950 "pikchr.c"
2926	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2927	break;
2928	case 99: /* expr ::= expr STAR expr */
2929	#line 743 "pikchr.y"
2930	{yylhsminor.yy265=yymsp[-2].minor.yy265*yymsp[0].minor.yy265;}
2931	#line 2956 "pikchr.c"
2932	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2933	break;
2934	case 100: /* expr ::= expr SLASH expr */
2935	#line 744 "pikchr.y"
2936	{
2937	if( yymsp[0].minor.yy265==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy265 = 0.0; }
2938	else{ yylhsminor.yy265 = yymsp[-2].minor.yy265/yymsp[0].minor.yy265; }
2939	}
2940	#line 2965 "pikchr.c"
2941	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2942	break;
2943	case 101: /* expr ::= MINUS expr */
2944	#line 748 "pikchr.y"
2945	{yymsp[-1].minor.yy265=-yymsp[0].minor.yy265;}
2946	#line 2971 "pikchr.c"
2947	break;
2948	case 102: /* expr ::= PLUS expr */
2949	#line 749 "pikchr.y"
2950	{yymsp[-1].minor.yy265=yymsp[0].minor.yy265;}
2951	#line 2976 "pikchr.c"
2952	break;
2953	case 103: /* expr ::= LP expr RP */
2954	#line 750 "pikchr.y"
2955	{yymsp[-2].minor.yy265=yymsp[-1].minor.yy265;}
2956	#line 2981 "pikchr.c"
2957	break;
2958	case 104: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2959	#line 751 "pikchr.y"
2960	{yymsp[-2].minor.yy265=pik_get_var(p,&yymsp[-1].minor.yy0);}
2961	#line 2986 "pikchr.c"
2962	break;
2963	case 105: /* expr ::= NUMBER */
2964	#line 752 "pikchr.y"
2965	{yylhsminor.yy265=pik_atof(&yymsp[0].minor.yy0);}
2966	#line 2991 "pikchr.c"
2967	yymsp[0].minor.yy265 = yylhsminor.yy265;
2968	break;
2969	case 106: /* expr ::= ID */
2970	#line 753 "pikchr.y"
2971	{yylhsminor.yy265=pik_get_var(p,&yymsp[0].minor.yy0);}
2972	#line 2997 "pikchr.c"
2973	yymsp[0].minor.yy265 = yylhsminor.yy265;
2974	break;
2975	case 107: /* expr ::= FUNC1 LP expr RP */
2976	#line 754 "pikchr.y"
2977	{yylhsminor.yy265 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy265,0.0);}
2978	#line 3003 "pikchr.c"
2979	yymsp[-3].minor.yy265 = yylhsminor.yy265;
2980	break;
2981	case 108: /* expr ::= FUNC2 LP expr COMMA expr RP */
2982	#line 755 "pikchr.y"
2983	{yylhsminor.yy265 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy265,yymsp[-1].minor.yy265);}
2984	#line 3009 "pikchr.c"
2985	yymsp[-5].minor.yy265 = yylhsminor.yy265;
2986	break;
2987	case 109: /* expr ::= DIST LP position COMMA position RP */
2988	#line 756 "pikchr.y"
2989	{yymsp[-5].minor.yy265 = pik_dist(&yymsp[-3].minor.yy43,&yymsp[-1].minor.yy43);}
2990	#line 3015 "pikchr.c"

2991	break;
2992	case 110: /* expr ::= place2 DOT_XY X */
2993	#line 757 "pikchr.y"
2994	{yylhsminor.yy265 = yymsp[-2].minor.yy43.x;}
2995	#line 3020 "pikchr.c"
2996	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2997	break;
2998	case 111: /* expr ::= place2 DOT_XY Y */
2999	#line 758 "pikchr.y"
3000	{yylhsminor.yy265 = yymsp[-2].minor.yy43.y;}
3001	#line 3026 "pikchr.c"
3002	yymsp[-2].minor.yy265 = yylhsminor.yy265;
3003	break;
3004	case 112: /* expr ::= object DOT_L numproperty */
3005	case 113: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==113);
3006	case 114: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==114);
3007	#line 759 "pikchr.y"
3008	{yylhsminor.yy265=pik_property_of(yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
3009	#line 3034 "pikchr.c"
3010	yymsp[-2].minor.yy265 = yylhsminor.yy265;








3011	break;
3012	default:
3013	/* (115) lvalue ::= ID */ yytestcase(yyruleno==115);
3014	/* (116) lvalue ::= FILL */ yytestcase(yyruleno==116);
3015	/* (117) lvalue ::= COLOR */ yytestcase(yyruleno==117);
3016	/* (118) lvalue ::= THICKNESS */ yytestcase(yyruleno==118);
3017	/* (119) rvalue ::= expr */ yytestcase(yyruleno==119);
3018	/* (120) print ::= PRINT */ yytestcase(yyruleno==120);
3019	/* (121) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=121);
3020	/* (122) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==122);
3021	/* (123) direction ::= UP */ yytestcase(yyruleno==123);
3022	/* (124) direction ::= DOWN */ yytestcase(yyruleno==124);
3023	/* (125) direction ::= LEFT */ yytestcase(yyruleno==125);
3024	/* (126) direction ::= RIGHT */ yytestcase(yyruleno==126);
3025	/* (127) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=127);
3026	/* (128) attribute_list ::= alist */ yytestcase(yyruleno==128);
3027	/* (129) alist ::= */ yytestcase(yyruleno==129);
3028	/* (130) alist ::= alist attribute */ yytestcase(yyruleno==130);
3029	/* (131) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=131);
3030	/* (132) attribute ::= WITH withclause */ yytestcase(yyruleno==132);
3031	/* (133) go ::= GO */ yytestcase(yyruleno==133);
3032	/* (134) go ::= */ yytestcase(yyruleno==134);
3033	/* (135) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==135);
3034	/* (136) even ::= EVEN WITH */ yytestcase(yyruleno==136);
3035	/* (137) dashproperty ::= DOTTED */ yytestcase(yyruleno==137);
3036	/* (138) dashproperty ::= DASHED */ yytestcase(yyruleno==138);
3037	/* (139) colorproperty ::= FILL */ yytestcase(yyruleno==139);
3038	/* (140) colorproperty ::= COLOR */ yytestcase(yyruleno==140);
3039	/* (141) position ::= place */ yytestcase(yyruleno==141);
3040	/* (142) between ::= WAY BETWEEN */ yytestcase(yyruleno==142);
3041	/* (143) between ::= BETWEEN */ yytestcase(yyruleno==143);
3042	/* (144) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==144);
3043	/* (145) place ::= place2 */ yytestcase(yyruleno==145);
3044	/* (146) edge ::= CENTER */ yytestcase(yyruleno==146);
3045	/* (147) edge ::= EDGEPT */ yytestcase(yyruleno==147);
3046	/* (148) edge ::= TOP */ yytestcase(yyruleno==148);
3047	/* (149) edge ::= BOTTOM */ yytestcase(yyruleno==149);
3048	/* (150) edge ::= START */ yytestcase(yyruleno==150);
3049	/* (151) edge ::= END */ yytestcase(yyruleno==151);
3050	/* (152) edge ::= RIGHT */ yytestcase(yyruleno==152);
3051	/* (153) edge ::= LEFT */ yytestcase(yyruleno==153);
3052	/* (154) object ::= objectname */ yytestcase(yyruleno==154);
3053	break;
3054	/******** End reduce actions **********************************************/
3055	};
3056	assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
3057	yygoto = yyRuleInfoLhs[yyruleno];
	@@ -3115,11 +3134,11 @@
3115	pik_error(p, &TOKEN, "syntax error");
3116	}else{
3117	pik_error(p, 0, "syntax error");
3118	}
3119	UNUSED_PARAMETER(yymajor);
3120	#line 3145 "pikchr.c"
3121	/********** End %syntax_error code ****************************************/
3122	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3123	pik_parserCTX_STORE
3124	}
3125
	@@ -3348,11 +3367,11 @@
3348	#else
3349	(void)iToken;
3350	return 0;
3351	#endif
3352	}
3353	#line 764 "pikchr.y"
3354
3355
3356
3357	/* Chart of the 148 official CSS color names with their
3358	** corresponding RGB values thru Color Module Level 4:
	@@ -5032,11 +5051,11 @@
5032	int i; /* Loop counter */
5033	int iBump = 0; /* Bump the location of the error cursor */
5034	char zLineno[20]; /* Buffer in which to generate line numbers */
5035
5036	iErrPt = (int)(pErr->z - p->sIn.z);
5037	if( iErrPt>=p->sIn.n ){
5038	iErrPt = p->sIn.n-1;
5039	iBump = 1;
5040	}else{
5041	while( iErrPt>0 && (p->sIn.z[iErrPt]=='\n' \|\| p->sIn.z[iErrPt]=='\r') ){
5042	iErrPt--;
	@@ -7095,10 +7114,11 @@
7095	{ "the", 3, T_THE, 0, 0 },
7096	{ "then", 4, T_THEN, 0, 0 },
7097	{ "thick", 5, T_THICK, 0, 0 },
7098	{ "thickness", 9, T_THICKNESS, 0, 0 },
7099	{ "thin", 4, T_THIN, 0, 0 },

7100	{ "to", 2, T_TO, 0, 0 },
7101	{ "top", 3, T_TOP, 0, CP_N },
7102	{ "until", 5, T_UNTIL, 0, 0 },
7103	{ "up", 2, T_UP, DIR_UP, 0 },
7104	{ "vertex", 6, T_VERTEX, 0, 0 },
	@@ -7744,11 +7764,11 @@
7744	static char readFile(const char zFilename){
7745	FILE *in;
7746	size_t n;
7747	size_t nUsed = 0;
7748	size_t nAlloc = 0;
7749	char z = 0, zNew;
7750	in = strcmp(zFilename,"-")==0 ? stdin : fopen(zFilename, "rb");
7751	if( in==0 ){
7752	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
7753	return 0;
7754	}
	@@ -7940,6 +7960,6 @@
7940
7941
7942	#endif /* PIKCHR_TCL */
7943
7944
7945	#line 7970 "pikchr.c"
7946

	--- src/pikchr.c
	+++ src/pikchr.c
	@@ -566,20 +566,21 @@
566	#define T_TOP 83
567	#define T_BOTTOM 84
568	#define T_START 85
569	#define T_END 86
570	#define T_IN 87
571	#define T_THIS 88
572	#define T_DOT_U 89
573	#define T_LAST 90
574	#define T_NUMBER 91
575	#define T_FUNC1 92
576	#define T_FUNC2 93
577	#define T_DIST 94
578	#define T_DOT_XY 95
579	#define T_X 96
580	#define T_Y 97
581	#define T_DOT_L 98
582	#endif
583	/************** End token definitions *************************************/
584
585	/* The next sections is a series of control #defines.
586	** various aspects of the generated parser.
	@@ -635,22 +636,22 @@
636	#ifndef INTERFACE
637	# define INTERFACE 1
638	#endif
639	/*********** Begin control #defines ***************************************/
640	#define YYCODETYPE unsigned char
641	#define YYNOCODE 135
642	#define YYACTIONTYPE unsigned short int
643	#define pik_parserTOKENTYPE PToken
644	typedef union {
645	int yyinit;
646	pik_parserTOKENTYPE yy0;
647	PRel yy10;
648	PObj* yy36;
649	PPoint yy79;
650	PNum yy153;
651	short int yy164;
652	PList* yy227;
653	} YYMINORTYPE;
654	#ifndef YYSTACKDEPTH
655	#define YYSTACKDEPTH 100
656	#endif
657	#define pik_parserARG_SDECL
	@@ -663,21 +664,21 @@
664	#define pik_parserCTX_PARAM ,p
665	#define pik_parserCTX_FETCH Pik *p=yypParser->p;
666	#define pik_parserCTX_STORE yypParser->p=p;
667	#define YYFALLBACK 1
668	#define YYNSTATE 164
669	#define YYNRULE 156
670	#define YYNRULE_WITH_ACTION 116
671	#define YYNTOKEN 99
672	#define YY_MAX_SHIFT 163
673	#define YY_MIN_SHIFTREDUCE 287
674	#define YY_MAX_SHIFTREDUCE 442
675	#define YY_ERROR_ACTION 443
676	#define YY_ACCEPT_ACTION 444
677	#define YY_NO_ACTION 445
678	#define YY_MIN_REDUCE 446
679	#define YY_MAX_REDUCE 601
680	/*********** End control #defines *****************************************/
681	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
682
683	/* Define the yytestcase() macro to be a no-op if is not already defined
684	** otherwise.
	@@ -740,333 +741,341 @@
741	** yy_reduce_ofst[] For each state, the offset into yy_action for
742	** shifting non-terminals after a reduce.
743	** yy_default[] Default action for each state.
744	**
745	********* Begin parsing tables ********************************************/
746	#define YY_ACTTAB_COUNT (1303)
747	static const YYACTIONTYPE yy_action[] = {
748	/* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
749	/* 10 */ 575, 492, 161, 119, 453, 113, 120, 161, 119, 530,
750	/* 20 */ 427, 428, 339, 559, 81, 30, 560, 561, 575, 64,
751	/* 30 */ 63, 62, 61, 322, 323, 9, 8, 33, 149, 32,
752	/* 40 */ 7, 71, 127, 38, 335, 66, 48, 37, 28, 339,
753	/* 50 */ 339, 339, 339, 425, 426, 340, 341, 342, 343, 344,
754	/* 60 */ 345, 346, 347, 348, 474, 528, 161, 119, 577, 77,
755	/* 70 */ 577, 73, 376, 148, 474, 533, 161, 119, 112, 113,
756	/* 80 */ 120, 161, 119, 128, 427, 428, 339, 357, 81, 531,
757	/* 90 */ 161, 119, 474, 36, 330, 13, 306, 322, 323, 9,
758	/* 100 */ 8, 33, 149, 32, 7, 71, 127, 328, 335, 66,
759	/* 110 */ 579, 310, 31, 339, 339, 339, 339, 425, 426, 340,
760	/* 120 */ 341, 342, 343, 344, 345, 346, 347, 348, 394, 435,
761	/* 130 */ 46, 59, 60, 64, 63, 62, 61, 54, 51, 376,
762	/* 140 */ 69, 108, 2, 47, 403, 83, 297, 435, 375, 84,
763	/* 150 */ 117, 80, 35, 308, 79, 133, 122, 126, 441, 440,
764	/* 160 */ 299, 123, 3, 404, 405, 406, 408, 80, 298, 308,
765	/* 170 */ 79, 4, 411, 412, 413, 414, 441, 440, 350, 350,
766	/* 180 */ 350, 350, 350, 350, 350, 350, 350, 350, 62, 61,
767	/* 190 */ 67, 434, 1, 75, 378, 158, 74, 76, 148, 411,
768	/* 200 */ 412, 413, 414, 124, 113, 120, 161, 119, 106, 434,
769	/* 210 */ 436, 437, 438, 439, 5, 375, 6, 117, 393, 155,
770	/* 220 */ 154, 153, 394, 435, 69, 59, 60, 149, 436, 437,
771	/* 230 */ 438, 439, 535, 376, 398, 399, 2, 424, 427, 428,
772	/* 240 */ 339, 156, 156, 156, 423, 394, 435, 65, 59, 60,
773	/* 250 */ 162, 131, 441, 440, 397, 72, 376, 148, 118, 2,
774	/* 260 */ 380, 157, 125, 113, 120, 161, 119, 339, 339, 339,
775	/* 270 */ 339, 425, 426, 535, 11, 441, 440, 394, 356, 535,
776	/* 280 */ 59, 60, 535, 379, 159, 434, 149, 12, 102, 446,
777	/* 290 */ 432, 42, 138, 14, 435, 139, 301, 302, 303, 36,
778	/* 300 */ 305, 430, 106, 16, 436, 437, 438, 439, 434, 375,
779	/* 310 */ 18, 117, 393, 155, 154, 153, 44, 142, 140, 64,
780	/* 320 */ 63, 62, 61, 441, 440, 106, 19, 436, 437, 438,
781	/* 330 */ 439, 45, 375, 20, 117, 393, 155, 154, 153, 68,
782	/* 340 */ 55, 114, 64, 63, 62, 61, 147, 146, 394, 473,
783	/* 350 */ 359, 59, 60, 43, 23, 391, 434, 106, 26, 376,
784	/* 360 */ 57, 58, 42, 49, 375, 392, 117, 393, 155, 154,
785	/* 370 */ 153, 64, 63, 62, 61, 436, 437, 438, 439, 384,
786	/* 380 */ 382, 383, 22, 21, 377, 473, 160, 70, 39, 445,
787	/* 390 */ 24, 445, 145, 141, 431, 142, 140, 64, 63, 62,
788	/* 400 */ 61, 394, 15, 445, 59, 60, 64, 63, 62, 61,
789	/* 410 */ 391, 445, 376, 445, 445, 42, 445, 445, 55, 391,
790	/* 420 */ 156, 156, 156, 445, 147, 146, 445, 52, 106, 445,
791	/* 430 */ 445, 43, 445, 445, 445, 375, 445, 117, 393, 155,
792	/* 440 */ 154, 153, 445, 394, 143, 445, 59, 60, 64, 63,
793	/* 450 */ 62, 61, 313, 445, 376, 378, 158, 42, 445, 445,
794	/* 460 */ 22, 21, 121, 447, 454, 29, 445, 445, 24, 450,
795	/* 470 */ 145, 141, 431, 142, 140, 64, 63, 62, 61, 445,
796	/* 480 */ 163, 106, 445, 445, 444, 27, 445, 445, 375, 445,
797	/* 490 */ 117, 393, 155, 154, 153, 445, 55, 74, 445, 148,
798	/* 500 */ 445, 445, 147, 146, 497, 113, 120, 161, 119, 43,
799	/* 510 */ 445, 394, 445, 445, 59, 60, 445, 445, 445, 118,
800	/* 520 */ 445, 445, 376, 106, 445, 42, 445, 445, 149, 445,
801	/* 530 */ 375, 445, 117, 393, 155, 154, 153, 445, 22, 21,
802	/* 540 */ 394, 144, 445, 59, 60, 445, 24, 445, 145, 141,
803	/* 550 */ 431, 376, 445, 445, 42, 445, 132, 130, 394, 445,
804	/* 560 */ 445, 59, 60, 109, 447, 454, 29, 445, 445, 376,
805	/* 570 */ 450, 445, 42, 445, 394, 445, 445, 59, 60, 445,
806	/* 580 */ 445, 163, 445, 445, 445, 102, 27, 445, 42, 445,
807	/* 590 */ 445, 106, 445, 64, 63, 62, 61, 445, 375, 445,
808	/* 600 */ 117, 393, 155, 154, 153, 394, 355, 445, 59, 60,
809	/* 610 */ 445, 445, 445, 445, 445, 74, 376, 148, 445, 40,
810	/* 620 */ 106, 445, 496, 113, 120, 161, 119, 375, 445, 117,
811	/* 630 */ 393, 155, 154, 153, 445, 448, 454, 29, 106, 445,
812	/* 640 */ 445, 450, 445, 445, 445, 375, 149, 117, 393, 155,
813	/* 650 */ 154, 153, 163, 445, 106, 445, 445, 27, 445, 445,
814	/* 660 */ 445, 375, 445, 117, 393, 155, 154, 153, 394, 445,
815	/* 670 */ 445, 59, 60, 64, 63, 62, 61, 445, 445, 376,
816	/* 680 */ 445, 445, 41, 445, 445, 106, 354, 64, 63, 62,
817	/* 690 */ 61, 445, 375, 445, 117, 393, 155, 154, 153, 445,
818	/* 700 */ 445, 445, 74, 445, 148, 445, 88, 445, 445, 490,
819	/* 710 */ 113, 120, 161, 119, 445, 120, 161, 119, 17, 74,
820	/* 720 */ 445, 148, 110, 110, 445, 445, 484, 113, 120, 161,
821	/* 730 */ 119, 445, 445, 149, 74, 445, 148, 152, 445, 445,
822	/* 740 */ 445, 483, 113, 120, 161, 119, 445, 445, 106, 445,
823	/* 750 */ 149, 445, 445, 107, 445, 375, 445, 117, 393, 155,
824	/* 760 */ 154, 153, 120, 161, 119, 149, 478, 74, 445, 148,
825	/* 770 */ 445, 88, 445, 445, 480, 113, 120, 161, 119, 445,
826	/* 780 */ 120, 161, 119, 74, 152, 148, 10, 479, 479, 445,
827	/* 790 */ 134, 113, 120, 161, 119, 445, 445, 445, 149, 74,
828	/* 800 */ 445, 148, 152, 445, 445, 445, 517, 113, 120, 161,
829	/* 810 */ 119, 445, 445, 74, 149, 148, 445, 445, 445, 445,
830	/* 820 */ 137, 113, 120, 161, 119, 74, 445, 148, 445, 445,
831	/* 830 */ 149, 445, 525, 113, 120, 161, 119, 445, 74, 445,
832	/* 840 */ 148, 445, 445, 445, 149, 527, 113, 120, 161, 119,
833	/* 850 */ 445, 445, 74, 445, 148, 445, 149, 445, 445, 524,
834	/* 860 */ 113, 120, 161, 119, 74, 445, 148, 445, 445, 149,
835	/* 870 */ 445, 526, 113, 120, 161, 119, 445, 445, 74, 445,
836	/* 880 */ 148, 445, 88, 149, 445, 523, 113, 120, 161, 119,
837	/* 890 */ 445, 120, 161, 119, 74, 149, 148, 85, 111, 111,
838	/* 900 */ 445, 522, 113, 120, 161, 119, 120, 161, 119, 149,
839	/* 910 */ 74, 445, 148, 152, 445, 445, 445, 521, 113, 120,
840	/* 920 */ 161, 119, 445, 445, 74, 149, 148, 445, 152, 445,
841	/* 930 */ 445, 520, 113, 120, 161, 119, 74, 445, 148, 445,
842	/* 940 */ 445, 149, 445, 519, 113, 120, 161, 119, 445, 74,
843	/* 950 */ 445, 148, 445, 445, 445, 149, 150, 113, 120, 161,
844	/* 960 */ 119, 445, 445, 74, 445, 148, 445, 149, 445, 445,
845	/* 970 */ 151, 113, 120, 161, 119, 74, 445, 148, 445, 445,
846	/* 980 */ 149, 445, 136, 113, 120, 161, 119, 445, 445, 74,
847	/* 990 */ 445, 148, 107, 445, 149, 445, 135, 113, 120, 161,
848	/* 1000 */ 119, 120, 161, 119, 445, 463, 149, 445, 88, 445,
849	/* 1010 */ 445, 445, 78, 78, 445, 445, 107, 120, 161, 119,
850	/* 1020 */ 149, 445, 445, 152, 82, 120, 161, 119, 445, 463,
851	/* 1030 */ 445, 466, 86, 34, 445, 88, 445, 569, 445, 152,
852	/* 1040 */ 445, 120, 161, 119, 120, 161, 119, 152, 107, 445,
853	/* 1050 */ 445, 475, 64, 63, 62, 61, 445, 120, 161, 119,
854	/* 1060 */ 98, 451, 445, 152, 89, 396, 152, 90, 445, 120,
855	/* 1070 */ 161, 119, 445, 120, 161, 119, 120, 161, 119, 152,
856	/* 1080 */ 445, 64, 63, 62, 61, 445, 445, 445, 445, 445,
857	/* 1090 */ 87, 152, 445, 99, 395, 152, 100, 445, 152, 120,
858	/* 1100 */ 161, 119, 120, 161, 119, 120, 161, 119, 445, 101,
859	/* 1110 */ 64, 63, 62, 61, 445, 445, 445, 445, 120, 161,
860	/* 1120 */ 119, 152, 91, 391, 152, 445, 445, 152, 103, 445,
861	/* 1130 */ 445, 120, 161, 119, 445, 92, 445, 120, 161, 119,
862	/* 1140 */ 152, 93, 445, 445, 120, 161, 119, 104, 445, 445,
863	/* 1150 */ 120, 161, 119, 152, 445, 445, 120, 161, 119, 152,
864	/* 1160 */ 445, 445, 445, 445, 94, 445, 152, 445, 445, 445,
865	/* 1170 */ 105, 445, 152, 120, 161, 119, 445, 95, 152, 120,
866	/* 1180 */ 161, 119, 96, 445, 445, 445, 120, 161, 119, 445,
867	/* 1190 */ 445, 120, 161, 119, 97, 152, 445, 445, 445, 445,
868	/* 1200 */ 549, 152, 445, 120, 161, 119, 548, 445, 152, 120,
869	/* 1210 */ 161, 119, 445, 152, 445, 120, 161, 119, 445, 445,
870	/* 1220 */ 445, 445, 445, 547, 445, 152, 445, 445, 445, 445,
871	/* 1230 */ 445, 152, 120, 161, 119, 546, 445, 152, 445, 115,
872	/* 1240 */ 445, 445, 116, 445, 120, 161, 119, 445, 120, 161,
873	/* 1250 */ 119, 120, 161, 119, 152, 64, 63, 62, 61, 64,
874	/* 1260 */ 63, 62, 61, 445, 445, 445, 152, 445, 445, 445,
875	/* 1270 */ 152, 445, 445, 152, 445, 445, 50, 445, 445, 445,
876	/* 1280 */ 53, 64, 63, 62, 61, 445, 445, 445, 445, 445,
877	/* 1290 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
878	/* 1300 */ 445, 445, 56,
879	};
880	static const YYCODETYPE yy_lookahead[] = {
881	/* 0 */ 0, 112, 113, 114, 133, 101, 102, 103, 105, 105,
882	/* 10 */ 10, 112, 113, 114, 110, 111, 112, 113, 114, 105,
883	/* 20 */ 20, 21, 22, 104, 24, 125, 107, 108, 28, 4,
884	/* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 134, 39,
885	/* 40 */ 40, 41, 42, 104, 44, 45, 107, 108, 106, 49,
886	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
887	/* 60 */ 60, 61, 62, 63, 0, 112, 113, 114, 129, 130,
888	/* 70 */ 131, 103, 12, 105, 10, 112, 113, 114, 110, 111,
889	/* 80 */ 112, 113, 114, 105, 20, 21, 22, 17, 24, 112,
890	/* 90 */ 113, 114, 28, 10, 2, 25, 25, 33, 34, 35,
891	/* 100 */ 36, 37, 134, 39, 40, 41, 42, 2, 44, 45,
892	/* 110 */ 132, 28, 127, 49, 50, 51, 52, 53, 54, 55,
893	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
894	/* 130 */ 38, 4, 5, 4, 5, 6, 7, 4, 5, 12,
895	/* 140 */ 3, 81, 15, 38, 1, 115, 17, 2, 88, 115,
896	/* 150 */ 90, 24, 128, 26, 27, 12, 1, 14, 31, 32,
897	/* 160 */ 19, 18, 16, 20, 21, 22, 23, 24, 17, 26,
898	/* 170 */ 27, 15, 29, 30, 31, 32, 31, 32, 64, 65,
899	/* 180 */ 66, 67, 68, 69, 70, 71, 72, 73, 6, 7,
900	/* 190 */ 43, 64, 13, 48, 26, 27, 103, 48, 105, 29,
901	/* 200 */ 30, 31, 32, 110, 111, 112, 113, 114, 81, 64,
902	/* 210 */ 83, 84, 85, 86, 40, 88, 40, 90, 91, 92,
903	/* 220 */ 93, 94, 1, 2, 87, 4, 5, 134, 83, 84,
904	/* 230 */ 85, 86, 48, 12, 96, 97, 15, 41, 20, 21,
905	/* 240 */ 22, 20, 21, 22, 41, 1, 2, 98, 4, 5,
906	/* 250 */ 82, 47, 31, 32, 17, 103, 12, 105, 90, 15,
907	/* 260 */ 26, 27, 110, 111, 112, 113, 114, 49, 50, 51,
908	/* 270 */ 52, 53, 54, 89, 25, 31, 32, 1, 17, 95,
909	/* 280 */ 4, 5, 98, 26, 27, 64, 134, 74, 12, 0,
910	/* 290 */ 79, 15, 78, 3, 2, 80, 20, 21, 22, 10,
911	/* 300 */ 24, 79, 81, 3, 83, 84, 85, 86, 64, 88,
912	/* 310 */ 3, 90, 91, 92, 93, 94, 38, 2, 3, 4,
913	/* 320 */ 5, 6, 7, 31, 32, 81, 3, 83, 84, 85,
914	/* 330 */ 86, 16, 88, 3, 90, 91, 92, 93, 94, 3,
915	/* 340 */ 25, 95, 4, 5, 6, 7, 31, 32, 1, 2,
916	/* 350 */ 76, 4, 5, 38, 25, 17, 64, 81, 15, 12,
917	/* 360 */ 15, 15, 15, 25, 88, 17, 90, 91, 92, 93,
918	/* 370 */ 94, 4, 5, 6, 7, 83, 84, 85, 86, 28,
919	/* 380 */ 28, 28, 67, 68, 12, 38, 89, 3, 11, 135,
920	/* 390 */ 75, 135, 77, 78, 79, 2, 3, 4, 5, 6,
921	/* 400 */ 7, 1, 35, 135, 4, 5, 4, 5, 6, 7,
922	/* 410 */ 17, 135, 12, 135, 135, 15, 135, 135, 25, 17,
923	/* 420 */ 20, 21, 22, 135, 31, 32, 135, 25, 81, 135,
924	/* 430 */ 135, 38, 135, 135, 135, 88, 135, 90, 91, 92,
925	/* 440 */ 93, 94, 135, 1, 2, 135, 4, 5, 4, 5,
926	/* 450 */ 6, 7, 8, 135, 12, 26, 27, 15, 135, 135,
927	/* 460 */ 67, 68, 99, 100, 101, 102, 135, 135, 75, 106,
928	/* 470 */ 77, 78, 79, 2, 3, 4, 5, 6, 7, 135,
929	/* 480 */ 117, 81, 135, 135, 121, 122, 135, 135, 88, 135,
930	/* 490 */ 90, 91, 92, 93, 94, 135, 25, 103, 135, 105,
931	/* 500 */ 135, 135, 31, 32, 110, 111, 112, 113, 114, 38,
932	/* 510 */ 135, 1, 135, 135, 4, 5, 135, 135, 135, 90,
933	/* 520 */ 135, 135, 12, 81, 135, 15, 135, 135, 134, 135,
934	/* 530 */ 88, 135, 90, 91, 92, 93, 94, 135, 67, 68,
935	/* 540 */ 1, 2, 135, 4, 5, 135, 75, 135, 77, 78,
936	/* 550 */ 79, 12, 135, 135, 15, 135, 46, 47, 1, 135,
937	/* 560 */ 135, 4, 5, 99, 100, 101, 102, 135, 135, 12,
938	/* 570 */ 106, 135, 15, 135, 1, 135, 135, 4, 5, 135,
939	/* 580 */ 135, 117, 135, 135, 135, 12, 122, 135, 15, 135,
940	/* 590 */ 135, 81, 135, 4, 5, 6, 7, 135, 88, 135,
941	/* 600 */ 90, 91, 92, 93, 94, 1, 17, 135, 4, 5,
942	/* 610 */ 135, 135, 135, 135, 135, 103, 12, 105, 135, 15,
943	/* 620 */ 81, 135, 110, 111, 112, 113, 114, 88, 135, 90,
944	/* 630 */ 91, 92, 93, 94, 135, 100, 101, 102, 81, 135,
945	/* 640 */ 135, 106, 135, 135, 135, 88, 134, 90, 91, 92,
946	/* 650 */ 93, 94, 117, 135, 81, 135, 135, 122, 135, 135,
947	/* 660 */ 135, 88, 135, 90, 91, 92, 93, 94, 1, 135,
948	/* 670 */ 135, 4, 5, 4, 5, 6, 7, 135, 135, 12,
949	/* 680 */ 135, 135, 15, 135, 135, 81, 17, 4, 5, 6,
950	/* 690 */ 7, 135, 88, 135, 90, 91, 92, 93, 94, 135,
951	/* 700 */ 135, 135, 103, 135, 105, 135, 103, 135, 135, 110,
952	/* 710 */ 111, 112, 113, 114, 135, 112, 113, 114, 35, 103,
953	/* 720 */ 135, 105, 119, 120, 135, 135, 110, 111, 112, 113,
954	/* 730 */ 114, 135, 135, 134, 103, 135, 105, 134, 135, 135,
955	/* 740 */ 135, 110, 111, 112, 113, 114, 135, 135, 81, 135,
956	/* 750 */ 134, 135, 135, 103, 135, 88, 135, 90, 91, 92,
957	/* 760 */ 93, 94, 112, 113, 114, 134, 116, 103, 135, 105,
958	/* 770 */ 135, 103, 135, 135, 110, 111, 112, 113, 114, 135,
959	/* 780 */ 112, 113, 114, 103, 134, 105, 118, 119, 120, 135,
960	/* 790 */ 110, 111, 112, 113, 114, 135, 135, 135, 134, 103,
961	/* 800 */ 135, 105, 134, 135, 135, 135, 110, 111, 112, 113,
962	/* 810 */ 114, 135, 135, 103, 134, 105, 135, 135, 135, 135,
963	/* 820 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
964	/* 830 */ 134, 135, 110, 111, 112, 113, 114, 135, 103, 135,
965	/* 840 */ 105, 135, 135, 135, 134, 110, 111, 112, 113, 114,
966	/* 850 */ 135, 135, 103, 135, 105, 135, 134, 135, 135, 110,
967	/* 860 */ 111, 112, 113, 114, 103, 135, 105, 135, 135, 134,
968	/* 870 */ 135, 110, 111, 112, 113, 114, 135, 135, 103, 135,
969	/* 880 */ 105, 135, 103, 134, 135, 110, 111, 112, 113, 114,
970	/* 890 */ 135, 112, 113, 114, 103, 134, 105, 103, 119, 120,
971	/* 900 */ 135, 110, 111, 112, 113, 114, 112, 113, 114, 134,
972	/* 910 */ 103, 135, 105, 134, 135, 135, 135, 110, 111, 112,
973	/* 920 */ 113, 114, 135, 135, 103, 134, 105, 135, 134, 135,
974	/* 930 */ 135, 110, 111, 112, 113, 114, 103, 135, 105, 135,
975	/* 940 */ 135, 134, 135, 110, 111, 112, 113, 114, 135, 103,
976	/* 950 */ 135, 105, 135, 135, 135, 134, 110, 111, 112, 113,
977	/* 960 */ 114, 135, 135, 103, 135, 105, 135, 134, 135, 135,
978	/* 970 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
979	/* 980 */ 134, 135, 110, 111, 112, 113, 114, 135, 135, 103,
980	/* 990 */ 135, 105, 103, 135, 134, 135, 110, 111, 112, 113,
981	/* 1000 */ 114, 112, 113, 114, 135, 116, 134, 135, 103, 135,
982	/* 1010 */ 135, 135, 123, 124, 135, 135, 103, 112, 113, 114,
983	/* 1020 */ 134, 135, 135, 134, 119, 112, 113, 114, 135, 116,
984	/* 1030 */ 135, 126, 103, 128, 135, 103, 135, 124, 135, 134,
985	/* 1040 */ 135, 112, 113, 114, 112, 113, 114, 134, 103, 135,
986	/* 1050 */ 135, 119, 4, 5, 6, 7, 135, 112, 113, 114,
987	/* 1060 */ 103, 116, 135, 134, 103, 17, 134, 103, 135, 112,
988	/* 1070 */ 113, 114, 135, 112, 113, 114, 112, 113, 114, 134,
989	/* 1080 */ 135, 4, 5, 6, 7, 135, 135, 135, 135, 135,
990	/* 1090 */ 103, 134, 135, 103, 17, 134, 103, 135, 134, 112,
991	/* 1100 */ 113, 114, 112, 113, 114, 112, 113, 114, 135, 103,
992	/* 1110 */ 4, 5, 6, 7, 135, 135, 135, 135, 112, 113,
993	/* 1120 */ 114, 134, 103, 17, 134, 135, 135, 134, 103, 135,
994	/* 1130 */ 135, 112, 113, 114, 135, 103, 135, 112, 113, 114,
995	/* 1140 */ 134, 103, 135, 135, 112, 113, 114, 103, 135, 135,
996	/* 1150 */ 112, 113, 114, 134, 135, 135, 112, 113, 114, 134,
997	/* 1160 */ 135, 135, 135, 135, 103, 135, 134, 135, 135, 135,
998	/* 1170 */ 103, 135, 134, 112, 113, 114, 135, 103, 134, 112,
999	/* 1180 */ 113, 114, 103, 135, 135, 135, 112, 113, 114, 135,
1000	/* 1190 */ 135, 112, 113, 114, 103, 134, 135, 135, 135, 135,
1001	/* 1200 */ 103, 134, 135, 112, 113, 114, 103, 135, 134, 112,
1002	/* 1210 */ 113, 114, 135, 134, 135, 112, 113, 114, 135, 135,
1003	/* 1220 */ 135, 135, 135, 103, 135, 134, 135, 135, 135, 135,
1004	/* 1230 */ 135, 134, 112, 113, 114, 103, 135, 134, 135, 103,
1005	/* 1240 */ 135, 135, 103, 135, 112, 113, 114, 135, 112, 113,
1006	/* 1250 */ 114, 112, 113, 114, 134, 4, 5, 6, 7, 4,
1007	/* 1260 */ 5, 6, 7, 135, 135, 135, 134, 135, 135, 135,
1008	/* 1270 */ 134, 135, 135, 134, 135, 135, 25, 135, 135, 135,
1009	/* 1280 */ 25, 4, 5, 6, 7, 135, 135, 135, 135, 135,
1010	/* 1290 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1011	/* 1300 */ 135, 135, 25, 135, 135, 135, 135, 135, 135, 135,
1012	/* 1310 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1013	/* 1320 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1014	/* 1330 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1015	/* 1340 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1016	/* 1350 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1017	/* 1360 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1018	/* 1370 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1019	/* 1380 */ 135, 99, 99, 99, 99, 99, 99, 99, 99, 99,
1020	/* 1390 */ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
1021	/* 1400 */ 99, 99,
1022	};
1023	#define YY_SHIFT_COUNT (163)
1024	#define YY_SHIFT_MIN (0)
1025	#define YY_SHIFT_MAX (1277)
1026	static const unsigned short int yy_shift_ofst[] = {
1027	/* 0 */ 143, 127, 221, 244, 244, 244, 244, 244, 244, 244,
1028	/* 10 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244,
1029	/* 20 */ 244, 244, 244, 244, 244, 244, 244, 276, 510, 557,
1030	/* 30 */ 276, 143, 347, 347, 0, 64, 143, 573, 557, 573,
1031	/* 40 */ 400, 400, 400, 442, 539, 557, 557, 557, 557, 557,
1032	/* 50 */ 557, 604, 557, 557, 667, 557, 557, 557, 557, 557,
1033	/* 60 */ 557, 557, 557, 557, 557, 218, 60, 60, 60, 60,
1034	/* 70 */ 60, 145, 315, 393, 471, 292, 292, 170, 71, 1303,
1035	/* 80 */ 1303, 1303, 1303, 114, 114, 338, 402, 129, 444, 367,
1036	/* 90 */ 683, 589, 1251, 669, 1255, 1048, 1277, 1077, 1106, 25,
1037	/* 100 */ 25, 25, 184, 25, 25, 25, 168, 25, 429, 83,
1038	/* 110 */ 92, 105, 70, 133, 138, 182, 182, 234, 257, 137,
1039	/* 120 */ 149, 289, 141, 155, 151, 146, 156, 147, 174, 176,
1040	/* 130 */ 196, 203, 204, 179, 237, 249, 213, 261, 211, 214,
1041	/* 140 */ 215, 222, 290, 300, 307, 278, 323, 330, 336, 246,
1042	/* 150 */ 274, 329, 246, 343, 345, 346, 348, 351, 352, 353,
1043	/* 160 */ 372, 297, 384, 377,
1044	};
1045	#define YY_REDUCE_COUNT (82)
1046	#define YY_REDUCE_MIN (-129)
1047	#define YY_REDUCE_MAX (1139)
1048	static const short yy_reduce_ofst[] = {
1049	/* 0 */ 363, -96, -32, 93, 152, 394, 512, 599, 616, 631,
1050	/* 10 */ 664, 680, 696, 710, 722, 735, 749, 761, 775, 791,
1051	/* 20 */ 807, 821, 833, 846, 860, 872, 886, 889, 668, 905,
1052	/* 30 */ 913, 464, 603, 779, -61, -61, 535, 650, 932, 945,
1053	/* 40 */ 794, 929, 957, 961, 964, 987, 990, 993, 1006, 1019,
1054	/* 50 */ 1025, 1032, 1038, 1044, 1061, 1067, 1074, 1079, 1091, 1097,
1055	/* 60 */ 1103, 1120, 1132, 1136, 1139, -81, -111, -101, -47, -37,
1056	/* 70 */ -23, -22, -129, -129, -129, -97, -86, -58, -100, -15,
1057	/* 80 */ 30, 34, 24,
1058	};
1059	static const YYACTIONTYPE yy_default[] = {
1060	/* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1061	/* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1062	/* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
1063	/* 30 */ 443, 449, 580, 485, 581, 581, 449, 443, 443, 443,
1064	/* 40 */ 443, 443, 443, 443, 443, 443, 443, 443, 477, 443,
1065	/* 50 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1066	/* 60 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1067	/* 70 */ 443, 443, 443, 443, 443, 443, 443, 443, 455, 470,
1068	/* 80 */ 508, 508, 576, 468, 493, 443, 443, 443, 471, 443,
1069	/* 90 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 488,
1070	/* 100 */ 486, 476, 459, 512, 511, 510, 443, 566, 443, 443,
1071	/* 110 */ 443, 443, 443, 588, 443, 545, 544, 540, 443, 532,
1072	/* 120 */ 529, 443, 443, 443, 443, 443, 443, 491, 443, 443,
1073	/* 130 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1074	/* 140 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 592,
1075	/* 150 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1076	/* 160 */ 443, 601, 443, 443,
1077	};
1078	/******** End of lemon-generated parsing tables ***************************/
1079
1080	/* The next table maps tokens (terminal symbols) into fallback tokens.
1081	** If a construct like the following:
	@@ -1170,10 +1179,11 @@
1179	0, /* TOP => nothing */
1180	0, /* BOTTOM => nothing */
1181	0, /* START => nothing */
1182	0, /* END => nothing */
1183	0, /* IN => nothing */
1184	0, /* THIS => nothing */
1185	0, /* DOT_U => nothing */
1186	0, /* LAST => nothing */
1187	0, /* NUMBER => nothing */
1188	0, /* FUNC1 => nothing */
1189	0, /* FUNC2 => nothing */
	@@ -1356,56 +1366,57 @@
1366	/* 83 */ "TOP",
1367	/* 84 */ "BOTTOM",
1368	/* 85 */ "START",
1369	/* 86 */ "END",
1370	/* 87 */ "IN",
1371	/* 88 */ "THIS",
1372	/* 89 */ "DOT_U",
1373	/* 90 */ "LAST",
1374	/* 91 */ "NUMBER",
1375	/* 92 */ "FUNC1",
1376	/* 93 */ "FUNC2",
1377	/* 94 */ "DIST",
1378	/* 95 */ "DOT_XY",
1379	/* 96 */ "X",
1380	/* 97 */ "Y",
1381	/* 98 */ "DOT_L",
1382	/* 99 */ "statement_list",
1383	/* 100 */ "statement",
1384	/* 101 */ "unnamed_statement",
1385	/* 102 */ "basetype",
1386	/* 103 */ "expr",
1387	/* 104 */ "numproperty",
1388	/* 105 */ "edge",
1389	/* 106 */ "direction",
1390	/* 107 */ "dashproperty",
1391	/* 108 */ "colorproperty",
1392	/* 109 */ "locproperty",
1393	/* 110 */ "position",
1394	/* 111 */ "place",
1395	/* 112 */ "object",
1396	/* 113 */ "objectname",
1397	/* 114 */ "nth",
1398	/* 115 */ "textposition",
1399	/* 116 */ "rvalue",
1400	/* 117 */ "lvalue",
1401	/* 118 */ "even",
1402	/* 119 */ "relexpr",
1403	/* 120 */ "optrelexpr",
1404	/* 121 */ "document",
1405	/* 122 */ "print",
1406	/* 123 */ "prlist",
1407	/* 124 */ "pritem",
1408	/* 125 */ "prsep",
1409	/* 126 */ "attribute_list",
1410	/* 127 */ "savelist",
1411	/* 128 */ "alist",
1412	/* 129 */ "attribute",
1413	/* 130 */ "go",
1414	/* 131 */ "boolproperty",
1415	/* 132 */ "withclause",
1416	/* 133 */ "between",
1417	/* 134 */ "place2",
1418	};
1419	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1420
1421	#ifndef NDEBUG
1422	/* For tracing reduce actions, the names of all rules are required.
	@@ -1497,77 +1508,78 @@
1508	/* 83 */ "place2 ::= object",
1509	/* 84 */ "place2 ::= object DOT_E edge",
1510	/* 85 */ "place2 ::= NTH VERTEX OF object",
1511	/* 86 */ "object ::= nth",
1512	/* 87 */ "object ::= nth OF\|IN object",
1513	/* 88 */ "objectname ::= THIS",
1514	/* 89 */ "objectname ::= PLACENAME",
1515	/* 90 */ "objectname ::= objectname DOT_U PLACENAME",
1516	/* 91 */ "nth ::= NTH CLASSNAME",
1517	/* 92 */ "nth ::= NTH LAST CLASSNAME",
1518	/* 93 */ "nth ::= LAST CLASSNAME",
1519	/* 94 */ "nth ::= LAST",
1520	/* 95 */ "nth ::= NTH LB RB",
1521	/* 96 */ "nth ::= NTH LAST LB RB",
1522	/* 97 */ "nth ::= LAST LB RB",
1523	/* 98 */ "expr ::= expr PLUS expr",
1524	/* 99 */ "expr ::= expr MINUS expr",
1525	/* 100 */ "expr ::= expr STAR expr",
1526	/* 101 */ "expr ::= expr SLASH expr",
1527	/* 102 */ "expr ::= MINUS expr",
1528	/* 103 */ "expr ::= PLUS expr",
1529	/* 104 */ "expr ::= LP expr RP",
1530	/* 105 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
1531	/* 106 */ "expr ::= NUMBER",
1532	/* 107 */ "expr ::= ID",
1533	/* 108 */ "expr ::= FUNC1 LP expr RP",
1534	/* 109 */ "expr ::= FUNC2 LP expr COMMA expr RP",
1535	/* 110 */ "expr ::= DIST LP position COMMA position RP",
1536	/* 111 */ "expr ::= place2 DOT_XY X",
1537	/* 112 */ "expr ::= place2 DOT_XY Y",
1538	/* 113 */ "expr ::= object DOT_L numproperty",
1539	/* 114 */ "expr ::= object DOT_L dashproperty",
1540	/* 115 */ "expr ::= object DOT_L colorproperty",
1541	/* 116 */ "lvalue ::= ID",
1542	/* 117 */ "lvalue ::= FILL",
1543	/* 118 */ "lvalue ::= COLOR",
1544	/* 119 */ "lvalue ::= THICKNESS",
1545	/* 120 */ "rvalue ::= expr",
1546	/* 121 */ "print ::= PRINT",
1547	/* 122 */ "prlist ::= pritem",
1548	/* 123 */ "prlist ::= prlist prsep pritem",
1549	/* 124 */ "direction ::= UP",
1550	/* 125 */ "direction ::= DOWN",
1551	/* 126 */ "direction ::= LEFT",
1552	/* 127 */ "direction ::= RIGHT",
1553	/* 128 */ "optrelexpr ::= relexpr",
1554	/* 129 */ "attribute_list ::= alist",
1555	/* 130 */ "alist ::=",
1556	/* 131 */ "alist ::= alist attribute",
1557	/* 132 */ "attribute ::= boolproperty",
1558	/* 133 */ "attribute ::= WITH withclause",
1559	/* 134 */ "go ::= GO",
1560	/* 135 */ "go ::=",
1561	/* 136 */ "even ::= UNTIL EVEN WITH",
1562	/* 137 */ "even ::= EVEN WITH",
1563	/* 138 */ "dashproperty ::= DOTTED",
1564	/* 139 */ "dashproperty ::= DASHED",
1565	/* 140 */ "colorproperty ::= FILL",
1566	/* 141 */ "colorproperty ::= COLOR",
1567	/* 142 */ "position ::= place",
1568	/* 143 */ "between ::= WAY BETWEEN",
1569	/* 144 */ "between ::= BETWEEN",
1570	/* 145 */ "between ::= OF THE WAY BETWEEN",
1571	/* 146 */ "place ::= place2",
1572	/* 147 */ "edge ::= CENTER",
1573	/* 148 */ "edge ::= EDGEPT",
1574	/* 149 */ "edge ::= TOP",
1575	/* 150 */ "edge ::= BOTTOM",
1576	/* 151 */ "edge ::= START",
1577	/* 152 */ "edge ::= END",
1578	/* 153 */ "edge ::= RIGHT",
1579	/* 154 */ "edge ::= LEFT",
1580	/* 155 */ "object ::= objectname",
1581	};
1582	#endif /* NDEBUG */
1583
1584
1585	#if YYSTACKDEPTH<=0
	@@ -1689,24 +1701,24 @@
1701	** Note: during a reduce, the only symbols destroyed are those
1702	** which appear on the RHS of the rule, but which are not used
1703	** inside the C code.
1704	*/
1705	/******* Begin destructor definitions *************************************/
1706	case 99: /* statement_list */
1707	{
1708	#line 494 "pikchr.y"
1709	pik_elist_free(p,(yypminor->yy227));
1710	#line 1735 "pikchr.c"
1711	}
1712	break;
1713	case 100: /* statement */
1714	case 101: /* unnamed_statement */
1715	case 102: /* basetype */
1716	{
1717	#line 496 "pikchr.y"
1718	pik_elem_free(p,(yypminor->yy36));
1719	#line 1744 "pikchr.c"
1720	}
1721	break;
1722	/******* End destructor definitions ***************************************/
1723	default: break; /* If no destructor action specified: do nothing */
1724	}
	@@ -1923,11 +1935,11 @@
1935	** stack every overflows */
1936	/****** Begin %stack_overflow code ****************************************/
1937	#line 528 "pikchr.y"
1938
1939	pik_error(p, 0, "parser stack overflow");
1940	#line 1965 "pikchr.c"
1941	/****** End %stack_overflow code ******************************************/
1942	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
1943	pik_parserCTX_STORE
1944	}
1945
	@@ -1995,165 +2007,166 @@
2007	}
2008
2009	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
2010	** of that rule */
2011	static const YYCODETYPE yyRuleInfoLhs[] = {
2012	121, /* (0) document ::= statement_list */
2013	99, /* (1) statement_list ::= statement */
2014	99, /* (2) statement_list ::= statement_list EOL statement */
2015	100, /* (3) statement ::= */
2016	100, /* (4) statement ::= direction */
2017	100, /* (5) statement ::= lvalue ASSIGN rvalue */
2018	100, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2019	100, /* (7) statement ::= PLACENAME COLON position */
2020	100, /* (8) statement ::= unnamed_statement */
2021	100, /* (9) statement ::= print prlist */
2022	100, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2023	100, /* (11) statement ::= ASSERT LP position EQ position RP */
2024	100, /* (12) statement ::= DEFINE ID CODEBLOCK */
2025	116, /* (13) rvalue ::= PLACENAME */
2026	124, /* (14) pritem ::= FILL */
2027	124, /* (15) pritem ::= COLOR */
2028	124, /* (16) pritem ::= THICKNESS */
2029	124, /* (17) pritem ::= rvalue */
2030	124, /* (18) pritem ::= STRING */
2031	125, /* (19) prsep ::= COMMA */
2032	101, /* (20) unnamed_statement ::= basetype attribute_list */
2033	102, /* (21) basetype ::= CLASSNAME */
2034	102, /* (22) basetype ::= STRING textposition */
2035	102, /* (23) basetype ::= LB savelist statement_list RB */
2036	127, /* (24) savelist ::= */
2037	119, /* (25) relexpr ::= expr */
2038	119, /* (26) relexpr ::= expr PERCENT */
2039	120, /* (27) optrelexpr ::= */
2040	126, /* (28) attribute_list ::= relexpr alist */
2041	129, /* (29) attribute ::= numproperty relexpr */
2042	129, /* (30) attribute ::= dashproperty expr */
2043	129, /* (31) attribute ::= dashproperty */
2044	129, /* (32) attribute ::= colorproperty rvalue */
2045	129, /* (33) attribute ::= go direction optrelexpr */
2046	129, /* (34) attribute ::= go direction even position */
2047	129, /* (35) attribute ::= CLOSE */
2048	129, /* (36) attribute ::= CHOP */
2049	129, /* (37) attribute ::= FROM position */
2050	129, /* (38) attribute ::= TO position */
2051	129, /* (39) attribute ::= THEN */
2052	129, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2053	129, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2054	129, /* (42) attribute ::= GO optrelexpr HEADING expr */
2055	129, /* (43) attribute ::= GO optrelexpr EDGEPT */
2056	129, /* (44) attribute ::= AT position */
2057	129, /* (45) attribute ::= SAME */
2058	129, /* (46) attribute ::= SAME AS object */
2059	129, /* (47) attribute ::= STRING textposition */
2060	129, /* (48) attribute ::= FIT */
2061	129, /* (49) attribute ::= BEHIND object */
2062	132, /* (50) withclause ::= DOT_E edge AT position */
2063	132, /* (51) withclause ::= edge AT position */
2064	104, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2065	131, /* (53) boolproperty ::= CW */
2066	131, /* (54) boolproperty ::= CCW */
2067	131, /* (55) boolproperty ::= LARROW */
2068	131, /* (56) boolproperty ::= RARROW */
2069	131, /* (57) boolproperty ::= LRARROW */
2070	131, /* (58) boolproperty ::= INVIS */
2071	131, /* (59) boolproperty ::= THICK */
2072	131, /* (60) boolproperty ::= THIN */
2073	131, /* (61) boolproperty ::= SOLID */
2074	115, /* (62) textposition ::= */
2075	115, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2076	110, /* (64) position ::= expr COMMA expr */
2077	110, /* (65) position ::= place PLUS expr COMMA expr */
2078	110, /* (66) position ::= place MINUS expr COMMA expr */
2079	110, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2080	110, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2081	110, /* (69) position ::= LP position COMMA position RP */
2082	110, /* (70) position ::= LP position RP */
2083	110, /* (71) position ::= expr between position AND position */
2084	110, /* (72) position ::= expr LT position COMMA position GT */
2085	110, /* (73) position ::= expr ABOVE position */
2086	110, /* (74) position ::= expr BELOW position */
2087	110, /* (75) position ::= expr LEFT OF position */
2088	110, /* (76) position ::= expr RIGHT OF position */
2089	110, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2090	110, /* (78) position ::= expr HEADING EDGEPT OF position */
2091	110, /* (79) position ::= expr EDGEPT OF position */
2092	110, /* (80) position ::= expr ON HEADING expr FROM position */
2093	110, /* (81) position ::= expr HEADING expr FROM position */
2094	111, /* (82) place ::= edge OF object */
2095	134, /* (83) place2 ::= object */
2096	134, /* (84) place2 ::= object DOT_E edge */
2097	134, /* (85) place2 ::= NTH VERTEX OF object */
2098	112, /* (86) object ::= nth */
2099	112, /* (87) object ::= nth OF\|IN object */
2100	113, /* (88) objectname ::= THIS */
2101	113, /* (89) objectname ::= PLACENAME */
2102	113, /* (90) objectname ::= objectname DOT_U PLACENAME */
2103	114, /* (91) nth ::= NTH CLASSNAME */
2104	114, /* (92) nth ::= NTH LAST CLASSNAME */
2105	114, /* (93) nth ::= LAST CLASSNAME */
2106	114, /* (94) nth ::= LAST */
2107	114, /* (95) nth ::= NTH LB RB */
2108	114, /* (96) nth ::= NTH LAST LB RB */
2109	114, /* (97) nth ::= LAST LB RB */
2110	103, /* (98) expr ::= expr PLUS expr */
2111	103, /* (99) expr ::= expr MINUS expr */
2112	103, /* (100) expr ::= expr STAR expr */
2113	103, /* (101) expr ::= expr SLASH expr */
2114	103, /* (102) expr ::= MINUS expr */
2115	103, /* (103) expr ::= PLUS expr */
2116	103, /* (104) expr ::= LP expr RP */
2117	103, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2118	103, /* (106) expr ::= NUMBER */
2119	103, /* (107) expr ::= ID */
2120	103, /* (108) expr ::= FUNC1 LP expr RP */
2121	103, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2122	103, /* (110) expr ::= DIST LP position COMMA position RP */
2123	103, /* (111) expr ::= place2 DOT_XY X */
2124	103, /* (112) expr ::= place2 DOT_XY Y */
2125	103, /* (113) expr ::= object DOT_L numproperty */
2126	103, /* (114) expr ::= object DOT_L dashproperty */
2127	103, /* (115) expr ::= object DOT_L colorproperty */
2128	117, /* (116) lvalue ::= ID */
2129	117, /* (117) lvalue ::= FILL */
2130	117, /* (118) lvalue ::= COLOR */
2131	117, /* (119) lvalue ::= THICKNESS */
2132	116, /* (120) rvalue ::= expr */
2133	122, /* (121) print ::= PRINT */
2134	123, /* (122) prlist ::= pritem */
2135	123, /* (123) prlist ::= prlist prsep pritem */
2136	106, /* (124) direction ::= UP */
2137	106, /* (125) direction ::= DOWN */
2138	106, /* (126) direction ::= LEFT */
2139	106, /* (127) direction ::= RIGHT */
2140	120, /* (128) optrelexpr ::= relexpr */
2141	126, /* (129) attribute_list ::= alist */
2142	128, /* (130) alist ::= */
2143	128, /* (131) alist ::= alist attribute */
2144	129, /* (132) attribute ::= boolproperty */
2145	129, /* (133) attribute ::= WITH withclause */
2146	130, /* (134) go ::= GO */
2147	130, /* (135) go ::= */
2148	118, /* (136) even ::= UNTIL EVEN WITH */
2149	118, /* (137) even ::= EVEN WITH */
2150	107, /* (138) dashproperty ::= DOTTED */
2151	107, /* (139) dashproperty ::= DASHED */
2152	108, /* (140) colorproperty ::= FILL */
2153	108, /* (141) colorproperty ::= COLOR */
2154	110, /* (142) position ::= place */
2155	133, /* (143) between ::= WAY BETWEEN */
2156	133, /* (144) between ::= BETWEEN */
2157	133, /* (145) between ::= OF THE WAY BETWEEN */
2158	111, /* (146) place ::= place2 */
2159	105, /* (147) edge ::= CENTER */
2160	105, /* (148) edge ::= EDGEPT */
2161	105, /* (149) edge ::= TOP */
2162	105, /* (150) edge ::= BOTTOM */
2163	105, /* (151) edge ::= START */
2164	105, /* (152) edge ::= END */
2165	105, /* (153) edge ::= RIGHT */
2166	105, /* (154) edge ::= LEFT */
2167	112, /* (155) object ::= objectname */
2168	};
2169
2170	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2171	** of symbols on the right-hand side of that rule. */
2172	static const signed char yyRuleInfoNRhs[] = {
	@@ -2243,77 +2256,78 @@
2256	-1, /* (83) place2 ::= object */
2257	-3, /* (84) place2 ::= object DOT_E edge */
2258	-4, /* (85) place2 ::= NTH VERTEX OF object */
2259	-1, /* (86) object ::= nth */
2260	-3, /* (87) object ::= nth OF\|IN object */
2261	-1, /* (88) objectname ::= THIS */
2262	-1, /* (89) objectname ::= PLACENAME */
2263	-3, /* (90) objectname ::= objectname DOT_U PLACENAME */
2264	-2, /* (91) nth ::= NTH CLASSNAME */
2265	-3, /* (92) nth ::= NTH LAST CLASSNAME */
2266	-2, /* (93) nth ::= LAST CLASSNAME */
2267	-1, /* (94) nth ::= LAST */
2268	-3, /* (95) nth ::= NTH LB RB */
2269	-4, /* (96) nth ::= NTH LAST LB RB */
2270	-3, /* (97) nth ::= LAST LB RB */
2271	-3, /* (98) expr ::= expr PLUS expr */
2272	-3, /* (99) expr ::= expr MINUS expr */
2273	-3, /* (100) expr ::= expr STAR expr */
2274	-3, /* (101) expr ::= expr SLASH expr */
2275	-2, /* (102) expr ::= MINUS expr */
2276	-2, /* (103) expr ::= PLUS expr */
2277	-3, /* (104) expr ::= LP expr RP */
2278	-3, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2279	-1, /* (106) expr ::= NUMBER */
2280	-1, /* (107) expr ::= ID */
2281	-4, /* (108) expr ::= FUNC1 LP expr RP */
2282	-6, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2283	-6, /* (110) expr ::= DIST LP position COMMA position RP */
2284	-3, /* (111) expr ::= place2 DOT_XY X */
2285	-3, /* (112) expr ::= place2 DOT_XY Y */
2286	-3, /* (113) expr ::= object DOT_L numproperty */
2287	-3, /* (114) expr ::= object DOT_L dashproperty */
2288	-3, /* (115) expr ::= object DOT_L colorproperty */
2289	-1, /* (116) lvalue ::= ID */
2290	-1, /* (117) lvalue ::= FILL */
2291	-1, /* (118) lvalue ::= COLOR */
2292	-1, /* (119) lvalue ::= THICKNESS */
2293	-1, /* (120) rvalue ::= expr */
2294	-1, /* (121) print ::= PRINT */
2295	-1, /* (122) prlist ::= pritem */
2296	-3, /* (123) prlist ::= prlist prsep pritem */
2297	-1, /* (124) direction ::= UP */
2298	-1, /* (125) direction ::= DOWN */
2299	-1, /* (126) direction ::= LEFT */
2300	-1, /* (127) direction ::= RIGHT */
2301	-1, /* (128) optrelexpr ::= relexpr */
2302	-1, /* (129) attribute_list ::= alist */
2303	0, /* (130) alist ::= */
2304	-2, /* (131) alist ::= alist attribute */
2305	-1, /* (132) attribute ::= boolproperty */
2306	-2, /* (133) attribute ::= WITH withclause */
2307	-1, /* (134) go ::= GO */
2308	0, /* (135) go ::= */
2309	-3, /* (136) even ::= UNTIL EVEN WITH */
2310	-2, /* (137) even ::= EVEN WITH */
2311	-1, /* (138) dashproperty ::= DOTTED */
2312	-1, /* (139) dashproperty ::= DASHED */
2313	-1, /* (140) colorproperty ::= FILL */
2314	-1, /* (141) colorproperty ::= COLOR */
2315	-1, /* (142) position ::= place */
2316	-2, /* (143) between ::= WAY BETWEEN */
2317	-1, /* (144) between ::= BETWEEN */
2318	-4, /* (145) between ::= OF THE WAY BETWEEN */
2319	-1, /* (146) place ::= place2 */
2320	-1, /* (147) edge ::= CENTER */
2321	-1, /* (148) edge ::= EDGEPT */
2322	-1, /* (149) edge ::= TOP */
2323	-1, /* (150) edge ::= BOTTOM */
2324	-1, /* (151) edge ::= START */
2325	-1, /* (152) edge ::= END */
2326	-1, /* (153) edge ::= RIGHT */
2327	-1, /* (154) edge ::= LEFT */
2328	-1, /* (155) object ::= objectname */
2329	};
2330
2331	static void yy_accept(yyParser); / Forward Declaration */
2332
2333	/*
	@@ -2402,656 +2416,661 @@
2416	*/
2417	/******** Begin reduce actions ********************************************/
2418	YYMINORTYPE yylhsminor;
2419	case 0: /* document ::= statement_list */
2420	#line 532 "pikchr.y"
2421	{pik_render(p,yymsp[0].minor.yy227);}
2422	#line 2447 "pikchr.c"
2423	break;
2424	case 1: /* statement_list ::= statement */
2425	#line 535 "pikchr.y"
2426	{ yylhsminor.yy227 = pik_elist_append(p,0,yymsp[0].minor.yy36); }
2427	#line 2452 "pikchr.c"
2428	yymsp[0].minor.yy227 = yylhsminor.yy227;
2429	break;
2430	case 2: /* statement_list ::= statement_list EOL statement */
2431	#line 537 "pikchr.y"
2432	{ yylhsminor.yy227 = pik_elist_append(p,yymsp[-2].minor.yy227,yymsp[0].minor.yy36); }
2433	#line 2458 "pikchr.c"
2434	yymsp[-2].minor.yy227 = yylhsminor.yy227;
2435	break;
2436	case 3: /* statement ::= */
2437	#line 540 "pikchr.y"
2438	{ yymsp[1].minor.yy36 = 0; }
2439	#line 2464 "pikchr.c"
2440	break;
2441	case 4: /* statement ::= direction */
2442	#line 541 "pikchr.y"
2443	{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy36=0; }
2444	#line 2469 "pikchr.c"
2445	yymsp[0].minor.yy36 = yylhsminor.yy36;
2446	break;
2447	case 5: /* statement ::= lvalue ASSIGN rvalue */
2448	#line 542 "pikchr.y"
2449	{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy153,&yymsp[-1].minor.yy0); yylhsminor.yy36=0;}
2450	#line 2475 "pikchr.c"
2451	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2452	break;
2453	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2454	#line 544 "pikchr.y"
2455	{ yylhsminor.yy36 = yymsp[0].minor.yy36; pik_elem_setname(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0); }
2456	#line 2481 "pikchr.c"
2457	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2458	break;
2459	case 7: /* statement ::= PLACENAME COLON position */
2460	#line 546 "pikchr.y"
2461	{ yylhsminor.yy36 = pik_elem_new(p,0,0,0);
2462	if(yylhsminor.yy36){ yylhsminor.yy36->ptAt = yymsp[0].minor.yy79; pik_elem_setname(p,yylhsminor.yy36,&yymsp[-2].minor.yy0); }}
2463	#line 2488 "pikchr.c"
2464	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2465	break;
2466	case 8: /* statement ::= unnamed_statement */
2467	#line 548 "pikchr.y"
2468	{yylhsminor.yy36 = yymsp[0].minor.yy36;}
2469	#line 2494 "pikchr.c"
2470	yymsp[0].minor.yy36 = yylhsminor.yy36;
2471	break;
2472	case 9: /* statement ::= print prlist */
2473	#line 549 "pikchr.y"
2474	{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy36=0;}
2475	#line 2500 "pikchr.c"
2476	break;
2477	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2478	#line 554 "pikchr.y"
2479	{yymsp[-5].minor.yy36=pik_assert(p,yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy153);}
2480	#line 2505 "pikchr.c"
2481	break;
2482	case 11: /* statement ::= ASSERT LP position EQ position RP */
2483	#line 556 "pikchr.y"
2484	{yymsp[-5].minor.yy36=pik_position_assert(p,&yymsp[-3].minor.yy79,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy79);}
2485	#line 2510 "pikchr.c"
2486	break;
2487	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2488	#line 557 "pikchr.y"
2489	{yymsp[-2].minor.yy36=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2490	#line 2515 "pikchr.c"
2491	break;
2492	case 13: /* rvalue ::= PLACENAME */
2493	#line 568 "pikchr.y"
2494	{yylhsminor.yy153 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2495	#line 2520 "pikchr.c"
2496	yymsp[0].minor.yy153 = yylhsminor.yy153;
2497	break;
2498	case 14: /* pritem ::= FILL */
2499	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2500	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2501	#line 573 "pikchr.y"
2502	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2503	#line 2528 "pikchr.c"
2504	break;
2505	case 17: /* pritem ::= rvalue */
2506	#line 576 "pikchr.y"
2507	{pik_append_num(p,"",yymsp[0].minor.yy153);}
2508	#line 2533 "pikchr.c"
2509	break;
2510	case 18: /* pritem ::= STRING */
2511	#line 577 "pikchr.y"
2512	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2513	#line 2538 "pikchr.c"
2514	break;
2515	case 19: /* prsep ::= COMMA */
2516	#line 578 "pikchr.y"
2517	{pik_append(p, " ", 1);}
2518	#line 2543 "pikchr.c"
2519	break;
2520	case 20: /* unnamed_statement ::= basetype attribute_list */
2521	#line 581 "pikchr.y"
2522	{yylhsminor.yy36 = yymsp[-1].minor.yy36; pik_after_adding_attributes(p,yylhsminor.yy36);}
2523	#line 2548 "pikchr.c"
2524	yymsp[-1].minor.yy36 = yylhsminor.yy36;
2525	break;
2526	case 21: /* basetype ::= CLASSNAME */
2527	#line 583 "pikchr.y"
2528	{yylhsminor.yy36 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2529	#line 2554 "pikchr.c"
2530	yymsp[0].minor.yy36 = yylhsminor.yy36;
2531	break;
2532	case 22: /* basetype ::= STRING textposition */
2533	#line 585 "pikchr.y"
2534	{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy164; yylhsminor.yy36 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2535	#line 2560 "pikchr.c"
2536	yymsp[-1].minor.yy36 = yylhsminor.yy36;
2537	break;
2538	case 23: /* basetype ::= LB savelist statement_list RB */
2539	#line 587 "pikchr.y"
2540	{ p->list = yymsp[-2].minor.yy227; yymsp[-3].minor.yy36 = pik_elem_new(p,0,0,yymsp[-1].minor.yy227); if(yymsp[-3].minor.yy36) yymsp[-3].minor.yy36->errTok = yymsp[0].minor.yy0; }
2541	#line 2566 "pikchr.c"
2542	break;
2543	case 24: /* savelist ::= */
2544	#line 592 "pikchr.y"
2545	{yymsp[1].minor.yy227 = p->list; p->list = 0;}
2546	#line 2571 "pikchr.c"
2547	break;
2548	case 25: /* relexpr ::= expr */
2549	#line 599 "pikchr.y"
2550	{yylhsminor.yy10.rAbs = yymsp[0].minor.yy153; yylhsminor.yy10.rRel = 0;}
2551	#line 2576 "pikchr.c"
2552	yymsp[0].minor.yy10 = yylhsminor.yy10;
2553	break;
2554	case 26: /* relexpr ::= expr PERCENT */
2555	#line 600 "pikchr.y"
2556	{yylhsminor.yy10.rAbs = 0; yylhsminor.yy10.rRel = yymsp[-1].minor.yy153/100;}
2557	#line 2582 "pikchr.c"
2558	yymsp[-1].minor.yy10 = yylhsminor.yy10;
2559	break;
2560	case 27: /* optrelexpr ::= */
2561	#line 602 "pikchr.y"
2562	{yymsp[1].minor.yy10.rAbs = 0; yymsp[1].minor.yy10.rRel = 1.0;}
2563	#line 2588 "pikchr.c"
2564	break;
2565	case 28: /* attribute_list ::= relexpr alist */
2566	#line 604 "pikchr.y"
2567	{pik_add_direction(p,0,&yymsp[-1].minor.yy10);}
2568	#line 2593 "pikchr.c"
2569	break;
2570	case 29: /* attribute ::= numproperty relexpr */
2571	#line 608 "pikchr.y"
2572	{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10); }
2573	#line 2598 "pikchr.c"
2574	break;
2575	case 30: /* attribute ::= dashproperty expr */
2576	#line 609 "pikchr.y"
2577	{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy153); }
2578	#line 2603 "pikchr.c"
2579	break;
2580	case 31: /* attribute ::= dashproperty */
2581	#line 610 "pikchr.y"
2582	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2583	#line 2608 "pikchr.c"
2584	break;
2585	case 32: /* attribute ::= colorproperty rvalue */
2586	#line 611 "pikchr.y"
2587	{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153); }
2588	#line 2613 "pikchr.c"
2589	break;
2590	case 33: /* attribute ::= go direction optrelexpr */
2591	#line 612 "pikchr.y"
2592	{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10);}
2593	#line 2618 "pikchr.c"
2594	break;
2595	case 34: /* attribute ::= go direction even position */
2596	#line 613 "pikchr.y"
2597	{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79);}
2598	#line 2623 "pikchr.c"
2599	break;
2600	case 35: /* attribute ::= CLOSE */
2601	#line 614 "pikchr.y"
2602	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2603	#line 2628 "pikchr.c"
2604	break;
2605	case 36: /* attribute ::= CHOP */
2606	#line 615 "pikchr.y"
2607	{ p->cur->bChop = 1; }
2608	#line 2633 "pikchr.c"
2609	break;
2610	case 37: /* attribute ::= FROM position */
2611	#line 616 "pikchr.y"
2612	{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
2613	#line 2638 "pikchr.c"
2614	break;
2615	case 38: /* attribute ::= TO position */
2616	#line 617 "pikchr.y"
2617	{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
2618	#line 2643 "pikchr.c"
2619	break;
2620	case 39: /* attribute ::= THEN */
2621	#line 618 "pikchr.y"
2622	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2623	#line 2648 "pikchr.c"
2624	break;
2625	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2626	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2627	#line 620 "pikchr.y"
2628	{pik_move_hdg(p,&yymsp[-2].minor.yy10,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153,0,&yymsp[-3].minor.yy0);}
2629	#line 2654 "pikchr.c"
2630	break;
2631	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2632	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2633	#line 621 "pikchr.y"
2634	{pik_move_hdg(p,&yymsp[-1].minor.yy10,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2635	#line 2660 "pikchr.c"
2636	break;
2637	case 44: /* attribute ::= AT position */
2638	#line 626 "pikchr.y"
2639	{ pik_set_at(p,0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
2640	#line 2665 "pikchr.c"
2641	break;
2642	case 45: /* attribute ::= SAME */
2643	#line 628 "pikchr.y"
2644	{pik_same(p,0,&yymsp[0].minor.yy0);}
2645	#line 2670 "pikchr.c"
2646	break;
2647	case 46: /* attribute ::= SAME AS object */
2648	#line 629 "pikchr.y"
2649	{pik_same(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
2650	#line 2675 "pikchr.c"
2651	break;
2652	case 47: /* attribute ::= STRING textposition */
2653	#line 630 "pikchr.y"
2654	{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy164);}
2655	#line 2680 "pikchr.c"
2656	break;
2657	case 48: /* attribute ::= FIT */
2658	#line 631 "pikchr.y"
2659	{pik_size_to_fit(p,&yymsp[0].minor.yy0,3); }
2660	#line 2685 "pikchr.c"
2661	break;
2662	case 49: /* attribute ::= BEHIND object */
2663	#line 632 "pikchr.y"
2664	{pik_behind(p,yymsp[0].minor.yy36);}
2665	#line 2690 "pikchr.c"
2666	break;
2667	case 50: /* withclause ::= DOT_E edge AT position */
2668	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2669	#line 640 "pikchr.y"
2670	{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
2671	#line 2696 "pikchr.c"
2672	break;
2673	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2674	#line 644 "pikchr.y"
2675	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2676	#line 2701 "pikchr.c"
2677	yymsp[0].minor.yy0 = yylhsminor.yy0;
2678	break;
2679	case 53: /* boolproperty ::= CW */
2680	#line 655 "pikchr.y"
2681	{p->cur->cw = 1;}
2682	#line 2707 "pikchr.c"
2683	break;
2684	case 54: /* boolproperty ::= CCW */
2685	#line 656 "pikchr.y"
2686	{p->cur->cw = 0;}
2687	#line 2712 "pikchr.c"
2688	break;
2689	case 55: /* boolproperty ::= LARROW */
2690	#line 657 "pikchr.y"
2691	{p->cur->larrow=1; p->cur->rarrow=0; }
2692	#line 2717 "pikchr.c"
2693	break;
2694	case 56: /* boolproperty ::= RARROW */
2695	#line 658 "pikchr.y"
2696	{p->cur->larrow=0; p->cur->rarrow=1; }
2697	#line 2722 "pikchr.c"
2698	break;
2699	case 57: /* boolproperty ::= LRARROW */
2700	#line 659 "pikchr.y"
2701	{p->cur->larrow=1; p->cur->rarrow=1; }
2702	#line 2727 "pikchr.c"
2703	break;
2704	case 58: /* boolproperty ::= INVIS */
2705	#line 660 "pikchr.y"
2706	{p->cur->sw = 0.0;}
2707	#line 2732 "pikchr.c"
2708	break;
2709	case 59: /* boolproperty ::= THICK */
2710	#line 661 "pikchr.y"
2711	{p->cur->sw *= 1.5;}
2712	#line 2737 "pikchr.c"
2713	break;
2714	case 60: /* boolproperty ::= THIN */
2715	#line 662 "pikchr.y"
2716	{p->cur->sw *= 0.67;}
2717	#line 2742 "pikchr.c"
2718	break;
2719	case 61: /* boolproperty ::= SOLID */
2720	#line 663 "pikchr.y"
2721	{p->cur->sw = pik_value(p,"thickness",9,0);
2722	p->cur->dotted = p->cur->dashed = 0.0;}
2723	#line 2748 "pikchr.c"
2724	break;
2725	case 62: /* textposition ::= */
2726	#line 666 "pikchr.y"
2727	{yymsp[1].minor.yy164 = 0;}
2728	#line 2753 "pikchr.c"
2729	break;
2730	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2731	#line 669 "pikchr.y"
2732	{yylhsminor.yy164 = (short int)pik_text_position(yymsp[-1].minor.yy164,&yymsp[0].minor.yy0);}
2733	#line 2758 "pikchr.c"
2734	yymsp[-1].minor.yy164 = yylhsminor.yy164;
2735	break;
2736	case 64: /* position ::= expr COMMA expr */
2737	#line 672 "pikchr.y"
2738	{yylhsminor.yy79.x=yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[0].minor.yy153;}
2739	#line 2764 "pikchr.c"
2740	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2741	break;
2742	case 65: /* position ::= place PLUS expr COMMA expr */
2743	#line 674 "pikchr.y"
2744	{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x+yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y+yymsp[0].minor.yy153;}
2745	#line 2770 "pikchr.c"
2746	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2747	break;
2748	case 66: /* position ::= place MINUS expr COMMA expr */
2749	#line 675 "pikchr.y"
2750	{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x-yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y-yymsp[0].minor.yy153;}
2751	#line 2776 "pikchr.c"
2752	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2753	break;
2754	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2755	#line 677 "pikchr.y"
2756	{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x+yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y+yymsp[-1].minor.yy153;}
2757	#line 2782 "pikchr.c"
2758	yymsp[-6].minor.yy79 = yylhsminor.yy79;
2759	break;
2760	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2761	#line 679 "pikchr.y"
2762	{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x-yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y-yymsp[-1].minor.yy153;}
2763	#line 2788 "pikchr.c"
2764	yymsp[-6].minor.yy79 = yylhsminor.yy79;
2765	break;
2766	case 69: /* position ::= LP position COMMA position RP */
2767	#line 680 "pikchr.y"
2768	{yymsp[-4].minor.yy79.x=yymsp[-3].minor.yy79.x; yymsp[-4].minor.yy79.y=yymsp[-1].minor.yy79.y;}
2769	#line 2794 "pikchr.c"
2770	break;
2771	case 70: /* position ::= LP position RP */
2772	#line 681 "pikchr.y"
2773	{yymsp[-2].minor.yy79=yymsp[-1].minor.yy79;}
2774	#line 2799 "pikchr.c"
2775	break;
2776	case 71: /* position ::= expr between position AND position */
2777	#line 683 "pikchr.y"
2778	{yylhsminor.yy79 = pik_position_between(yymsp[-4].minor.yy153,yymsp[-2].minor.yy79,yymsp[0].minor.yy79);}
2779	#line 2804 "pikchr.c"
2780	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2781	break;
2782	case 72: /* position ::= expr LT position COMMA position GT */
2783	#line 685 "pikchr.y"
2784	{yylhsminor.yy79 = pik_position_between(yymsp[-5].minor.yy153,yymsp[-3].minor.yy79,yymsp[-1].minor.yy79);}
2785	#line 2810 "pikchr.c"
2786	yymsp[-5].minor.yy79 = yylhsminor.yy79;
2787	break;
2788	case 73: /* position ::= expr ABOVE position */
2789	#line 686 "pikchr.y"
2790	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y += yymsp[-2].minor.yy153;}
2791	#line 2816 "pikchr.c"
2792	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2793	break;
2794	case 74: /* position ::= expr BELOW position */
2795	#line 687 "pikchr.y"
2796	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y -= yymsp[-2].minor.yy153;}
2797	#line 2822 "pikchr.c"
2798	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2799	break;
2800	case 75: /* position ::= expr LEFT OF position */
2801	#line 688 "pikchr.y"
2802	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x -= yymsp[-3].minor.yy153;}
2803	#line 2828 "pikchr.c"
2804	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2805	break;
2806	case 76: /* position ::= expr RIGHT OF position */
2807	#line 689 "pikchr.y"
2808	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x += yymsp[-3].minor.yy153;}
2809	#line 2834 "pikchr.c"
2810	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2811	break;
2812	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2813	#line 691 "pikchr.y"
2814	{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-5].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
2815	#line 2840 "pikchr.c"
2816	yymsp[-5].minor.yy79 = yylhsminor.yy79;
2817	break;
2818	case 78: /* position ::= expr HEADING EDGEPT OF position */
2819	#line 693 "pikchr.y"
2820	{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-4].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
2821	#line 2846 "pikchr.c"
2822	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2823	break;
2824	case 79: /* position ::= expr EDGEPT OF position */
2825	#line 695 "pikchr.y"
2826	{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
2827	#line 2852 "pikchr.c"
2828	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2829	break;
2830	case 80: /* position ::= expr ON HEADING expr FROM position */
2831	#line 697 "pikchr.y"
2832	{yylhsminor.yy79 = pik_position_at_angle(yymsp[-5].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
2833	#line 2858 "pikchr.c"
2834	yymsp[-5].minor.yy79 = yylhsminor.yy79;
2835	break;
2836	case 81: /* position ::= expr HEADING expr FROM position */
2837	#line 699 "pikchr.y"
2838	{yylhsminor.yy79 = pik_position_at_angle(yymsp[-4].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
2839	#line 2864 "pikchr.c"
2840	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2841	break;
2842	case 82: /* place ::= edge OF object */
2843	#line 711 "pikchr.y"
2844	{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
2845	#line 2870 "pikchr.c"
2846	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2847	break;
2848	case 83: /* place2 ::= object */
2849	#line 712 "pikchr.y"
2850	{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,0);}
2851	#line 2876 "pikchr.c"
2852	yymsp[0].minor.yy79 = yylhsminor.yy79;
2853	break;
2854	case 84: /* place2 ::= object DOT_E edge */
2855	#line 713 "pikchr.y"
2856	{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
2857	#line 2882 "pikchr.c"
2858	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2859	break;
2860	case 85: /* place2 ::= NTH VERTEX OF object */
2861	#line 714 "pikchr.y"
2862	{yylhsminor.yy79 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy36);}
2863	#line 2888 "pikchr.c"
2864	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2865	break;
2866	case 86: /* object ::= nth */
2867	#line 726 "pikchr.y"
2868	{yylhsminor.yy36 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2869	#line 2894 "pikchr.c"
2870	yymsp[0].minor.yy36 = yylhsminor.yy36;
2871	break;
2872	case 87: /* object ::= nth OF\|IN object */
2873	#line 727 "pikchr.y"
2874	{yylhsminor.yy36 = pik_find_nth(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
2875	#line 2900 "pikchr.c"
2876	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2877	break;
2878	case 88: /* objectname ::= THIS */
2879	#line 729 "pikchr.y"
2880	{yymsp[0].minor.yy36 = p->cur;}
2881	#line 2906 "pikchr.c"
2882	break;
2883	case 89: /* objectname ::= PLACENAME */
2884	#line 730 "pikchr.y"
2885	{yylhsminor.yy36 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2886	#line 2911 "pikchr.c"
2887	yymsp[0].minor.yy36 = yylhsminor.yy36;
2888	break;
2889	case 90: /* objectname ::= objectname DOT_U PLACENAME */
2890	#line 732 "pikchr.y"
2891	{yylhsminor.yy36 = pik_find_byname(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
2892	#line 2917 "pikchr.c"
2893	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2894	break;
2895	case 91: /* nth ::= NTH CLASSNAME */
2896	#line 734 "pikchr.y"
2897	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2898	#line 2923 "pikchr.c"
2899	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2900	break;
2901	case 92: /* nth ::= NTH LAST CLASSNAME */
2902	#line 735 "pikchr.y"
2903	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2904	#line 2929 "pikchr.c"
2905	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2906	break;
2907	case 93: /* nth ::= LAST CLASSNAME */
2908	#line 736 "pikchr.y"
2909	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2910	#line 2935 "pikchr.c"
2911	break;
2912	case 94: /* nth ::= LAST */
2913	#line 737 "pikchr.y"
2914	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2915	#line 2940 "pikchr.c"
2916	yymsp[0].minor.yy0 = yylhsminor.yy0;
2917	break;
2918	case 95: /* nth ::= NTH LB RB */
2919	#line 738 "pikchr.y"
2920	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2921	#line 2946 "pikchr.c"
2922	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2923	break;
2924	case 96: /* nth ::= NTH LAST LB RB */
2925	#line 739 "pikchr.y"
2926	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2927	#line 2952 "pikchr.c"
2928	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2929	break;
2930	case 97: /* nth ::= LAST LB RB */
2931	#line 740 "pikchr.y"
2932	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2933	#line 2958 "pikchr.c"
2934	break;
2935	case 98: /* expr ::= expr PLUS expr */
2936	#line 742 "pikchr.y"
2937	{yylhsminor.yy153=yymsp[-2].minor.yy153+yymsp[0].minor.yy153;}
2938	#line 2963 "pikchr.c"
2939	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2940	break;
2941	case 99: /* expr ::= expr MINUS expr */
2942	#line 743 "pikchr.y"
2943	{yylhsminor.yy153=yymsp[-2].minor.yy153-yymsp[0].minor.yy153;}
2944	#line 2969 "pikchr.c"
2945	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2946	break;
2947	case 100: /* expr ::= expr STAR expr */
2948	#line 744 "pikchr.y"
2949	{yylhsminor.yy153=yymsp[-2].minor.yy153*yymsp[0].minor.yy153;}
2950	#line 2975 "pikchr.c"
2951	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2952	break;
2953	case 101: /* expr ::= expr SLASH expr */
2954	#line 745 "pikchr.y"
2955	{
2956	if( yymsp[0].minor.yy153==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy153 = 0.0; }
2957	else{ yylhsminor.yy153 = yymsp[-2].minor.yy153/yymsp[0].minor.yy153; }
2958	}
2959	#line 2984 "pikchr.c"
2960	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2961	break;
2962	case 102: /* expr ::= MINUS expr */
2963	#line 749 "pikchr.y"
2964	{yymsp[-1].minor.yy153=-yymsp[0].minor.yy153;}
2965	#line 2990 "pikchr.c"
2966	break;
2967	case 103: /* expr ::= PLUS expr */
2968	#line 750 "pikchr.y"
2969	{yymsp[-1].minor.yy153=yymsp[0].minor.yy153;}
2970	#line 2995 "pikchr.c"
2971	break;
2972	case 104: /* expr ::= LP expr RP */





2973	#line 751 "pikchr.y"
2974	{yymsp[-2].minor.yy153=yymsp[-1].minor.yy153;}
2975	#line 3000 "pikchr.c"
2976	break;
2977	case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2978	#line 752 "pikchr.y"
2979	{yymsp[-2].minor.yy153=pik_get_var(p,&yymsp[-1].minor.yy0);}
2980	#line 3005 "pikchr.c"

2981	break;
2982	case 106: /* expr ::= NUMBER */
2983	#line 753 "pikchr.y"
2984	{yylhsminor.yy153=pik_atof(&yymsp[0].minor.yy0);}
2985	#line 3010 "pikchr.c"
2986	yymsp[0].minor.yy153 = yylhsminor.yy153;
2987	break;
2988	case 107: /* expr ::= ID */
2989	#line 754 "pikchr.y"
2990	{yylhsminor.yy153=pik_get_var(p,&yymsp[0].minor.yy0);}
2991	#line 3016 "pikchr.c"
2992	yymsp[0].minor.yy153 = yylhsminor.yy153;
2993	break;
2994	case 108: /* expr ::= FUNC1 LP expr RP */
2995	#line 755 "pikchr.y"
2996	{yylhsminor.yy153 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy153,0.0);}
2997	#line 3022 "pikchr.c"
2998	yymsp[-3].minor.yy153 = yylhsminor.yy153;
2999	break;
3000	case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
3001	#line 756 "pikchr.y"
3002	{yylhsminor.yy153 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy153,yymsp[-1].minor.yy153);}
3003	#line 3028 "pikchr.c"
3004	yymsp[-5].minor.yy153 = yylhsminor.yy153;
3005	break;
3006	case 110: /* expr ::= DIST LP position COMMA position RP */
3007	#line 757 "pikchr.y"
3008	{yymsp[-5].minor.yy153 = pik_dist(&yymsp[-3].minor.yy79,&yymsp[-1].minor.yy79);}
3009	#line 3034 "pikchr.c"

3010	break;
3011	case 111: /* expr ::= place2 DOT_XY X */
3012	#line 758 "pikchr.y"
3013	{yylhsminor.yy153 = yymsp[-2].minor.yy79.x;}
3014	#line 3039 "pikchr.c"
3015	yymsp[-2].minor.yy153 = yylhsminor.yy153;
3016	break;
3017	case 112: /* expr ::= place2 DOT_XY Y */


3018	#line 759 "pikchr.y"
3019	{yylhsminor.yy153 = yymsp[-2].minor.yy79.y;}
3020	#line 3045 "pikchr.c"
3021	yymsp[-2].minor.yy153 = yylhsminor.yy153;
3022	break;
3023	case 113: /* expr ::= object DOT_L numproperty */
3024	case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
3025	case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
3026	#line 760 "pikchr.y"
3027	{yylhsminor.yy153=pik_property_of(yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
3028	#line 3053 "pikchr.c"
3029	yymsp[-2].minor.yy153 = yylhsminor.yy153;
3030	break;
3031	default:
3032	/* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
3033	/* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
3034	/* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
3035	/* (119) lvalue ::= THICKNESS */ yytestcase(yyruleno==119);
3036	/* (120) rvalue ::= expr */ yytestcase(yyruleno==120);
3037	/* (121) print ::= PRINT */ yytestcase(yyruleno==121);
3038	/* (122) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=122);
3039	/* (123) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==123);
3040	/* (124) direction ::= UP */ yytestcase(yyruleno==124);
3041	/* (125) direction ::= DOWN */ yytestcase(yyruleno==125);
3042	/* (126) direction ::= LEFT */ yytestcase(yyruleno==126);
3043	/* (127) direction ::= RIGHT */ yytestcase(yyruleno==127);
3044	/* (128) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=128);
3045	/* (129) attribute_list ::= alist */ yytestcase(yyruleno==129);
3046	/* (130) alist ::= */ yytestcase(yyruleno==130);
3047	/* (131) alist ::= alist attribute */ yytestcase(yyruleno==131);
3048	/* (132) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=132);
3049	/* (133) attribute ::= WITH withclause */ yytestcase(yyruleno==133);
3050	/* (134) go ::= GO */ yytestcase(yyruleno==134);
3051	/* (135) go ::= */ yytestcase(yyruleno==135);
3052	/* (136) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==136);
3053	/* (137) even ::= EVEN WITH */ yytestcase(yyruleno==137);
3054	/* (138) dashproperty ::= DOTTED */ yytestcase(yyruleno==138);
3055	/* (139) dashproperty ::= DASHED */ yytestcase(yyruleno==139);
3056	/* (140) colorproperty ::= FILL */ yytestcase(yyruleno==140);
3057	/* (141) colorproperty ::= COLOR */ yytestcase(yyruleno==141);
3058	/* (142) position ::= place */ yytestcase(yyruleno==142);
3059	/* (143) between ::= WAY BETWEEN */ yytestcase(yyruleno==143);
3060	/* (144) between ::= BETWEEN */ yytestcase(yyruleno==144);
3061	/* (145) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==145);
3062	/* (146) place ::= place2 */ yytestcase(yyruleno==146);
3063	/* (147) edge ::= CENTER */ yytestcase(yyruleno==147);
3064	/* (148) edge ::= EDGEPT */ yytestcase(yyruleno==148);
3065	/* (149) edge ::= TOP */ yytestcase(yyruleno==149);
3066	/* (150) edge ::= BOTTOM */ yytestcase(yyruleno==150);
3067	/* (151) edge ::= START */ yytestcase(yyruleno==151);
3068	/* (152) edge ::= END */ yytestcase(yyruleno==152);
3069	/* (153) edge ::= RIGHT */ yytestcase(yyruleno==153);
3070	/* (154) edge ::= LEFT */ yytestcase(yyruleno==154);
3071	/* (155) object ::= objectname */ yytestcase(yyruleno==155);
3072	break;
3073	/******** End reduce actions **********************************************/
3074	};
3075	assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
3076	yygoto = yyRuleInfoLhs[yyruleno];
	@@ -3115,11 +3134,11 @@
3134	pik_error(p, &TOKEN, "syntax error");
3135	}else{
3136	pik_error(p, 0, "syntax error");
3137	}
3138	UNUSED_PARAMETER(yymajor);
3139	#line 3164 "pikchr.c"
3140	/********** End %syntax_error code ****************************************/
3141	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3142	pik_parserCTX_STORE
3143	}
3144
	@@ -3348,11 +3367,11 @@
3367	#else
3368	(void)iToken;
3369	return 0;
3370	#endif
3371	}
3372	#line 765 "pikchr.y"
3373
3374
3375
3376	/* Chart of the 148 official CSS color names with their
3377	** corresponding RGB values thru Color Module Level 4:
	@@ -5032,11 +5051,11 @@
5051	int i; /* Loop counter */
5052	int iBump = 0; /* Bump the location of the error cursor */
5053	char zLineno[20]; /* Buffer in which to generate line numbers */
5054
5055	iErrPt = (int)(pErr->z - p->sIn.z);
5056	if( iErrPt>=(int)p->sIn.n ){
5057	iErrPt = p->sIn.n-1;
5058	iBump = 1;
5059	}else{
5060	while( iErrPt>0 && (p->sIn.z[iErrPt]=='\n' \|\| p->sIn.z[iErrPt]=='\r') ){
5061	iErrPt--;
	@@ -7095,10 +7114,11 @@
7114	{ "the", 3, T_THE, 0, 0 },
7115	{ "then", 4, T_THEN, 0, 0 },
7116	{ "thick", 5, T_THICK, 0, 0 },
7117	{ "thickness", 9, T_THICKNESS, 0, 0 },
7118	{ "thin", 4, T_THIN, 0, 0 },
7119	{ "this", 4, T_THIS, 0, 0 },
7120	{ "to", 2, T_TO, 0, 0 },
7121	{ "top", 3, T_TOP, 0, CP_N },
7122	{ "until", 5, T_UNTIL, 0, 0 },
7123	{ "up", 2, T_UP, DIR_UP, 0 },
7124	{ "vertex", 6, T_VERTEX, 0, 0 },
	@@ -7744,11 +7764,11 @@
7764	static char readFile(const char zFilename){
7765	FILE *in;
7766	size_t n;
7767	size_t nUsed = 0;
7768	size_t nAlloc = 0;
7769	char z = 0, zNew = 0;
7770	in = strcmp(zFilename,"-")==0 ? stdin : fopen(zFilename, "rb");
7771	if( in==0 ){
7772	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
7773	return 0;
7774	}
	@@ -7940,6 +7960,6 @@
7960
7961
7962	#endif /* PIKCHR_TCL */
7963
7964
7965	#line 7990 "pikchr.c"
7966

M src/pikchr.c

+1041 -1021

		--- src/pikchr.c
		+++ src/pikchr.c
		@@ -566,20 +566,21 @@
566	566	#define T_TOP 83
567	567	#define T_BOTTOM 84
568	568	#define T_START 85
569	569	#define T_END 86
570	570	#define T_IN 87
571		-#define T_DOT_U 88
572		-#define T_LAST 89
573		-#define T_NUMBER 90
574		-#define T_FUNC1 91
575		-#define T_FUNC2 92
576		-#define T_DIST 93
577		-#define T_DOT_XY 94
578		-#define T_X 95
579		-#define T_Y 96
580		-#define T_DOT_L 97
	571	+#define T_THIS 88
	572	+#define T_DOT_U 89
	573	+#define T_LAST 90
	574	+#define T_NUMBER 91
	575	+#define T_FUNC1 92
	576	+#define T_FUNC2 93
	577	+#define T_DIST 94
	578	+#define T_DOT_XY 95
	579	+#define T_X 96
	580	+#define T_Y 97
	581	+#define T_DOT_L 98
581	582	#endif
582	583	/************** End token definitions *************************************/
583	584
584	585	/* The next sections is a series of control #defines.
585	586	** various aspects of the generated parser.
		@@ -635,22 +636,22 @@
635	636	#ifndef INTERFACE
636	637	# define INTERFACE 1
637	638	#endif
638	639	/*********** Begin control #defines ***************************************/
639	640	#define YYCODETYPE unsigned char
640		-#define YYNOCODE 134
	641	+#define YYNOCODE 135
641	642	#define YYACTIONTYPE unsigned short int
642	643	#define pik_parserTOKENTYPE PToken
643	644	typedef union {
644	645	int yyinit;
645	646	pik_parserTOKENTYPE yy0;
646		- PObj* yy38;
647		- PPoint yy43;
648		- short int yy44;
649		- PList* yy119;
650		- PRel yy200;
651		- PNum yy265;
	647	+ PRel yy10;
	648	+ PObj* yy36;
	649	+ PPoint yy79;
	650	+ PNum yy153;
	651	+ short int yy164;
	652	+ PList* yy227;
652	653	} YYMINORTYPE;
653	654	#ifndef YYSTACKDEPTH
654	655	#define YYSTACKDEPTH 100
655	656	#endif
656	657	#define pik_parserARG_SDECL
		@@ -663,21 +664,21 @@
663	664	#define pik_parserCTX_PARAM ,p
664	665	#define pik_parserCTX_FETCH Pik *p=yypParser->p;
665	666	#define pik_parserCTX_STORE yypParser->p=p;
666	667	#define YYFALLBACK 1
667	668	#define YYNSTATE 164
668		-#define YYNRULE 155
669		-#define YYNRULE_WITH_ACTION 115
670		-#define YYNTOKEN 98
	669	+#define YYNRULE 156
	670	+#define YYNRULE_WITH_ACTION 116
	671	+#define YYNTOKEN 99
671	672	#define YY_MAX_SHIFT 163
672		-#define YY_MIN_SHIFTREDUCE 286
673		-#define YY_MAX_SHIFTREDUCE 440
674		-#define YY_ERROR_ACTION 441
675		-#define YY_ACCEPT_ACTION 442
676		-#define YY_NO_ACTION 443
677		-#define YY_MIN_REDUCE 444
678		-#define YY_MAX_REDUCE 598
	673	+#define YY_MIN_SHIFTREDUCE 287
	674	+#define YY_MAX_SHIFTREDUCE 442
	675	+#define YY_ERROR_ACTION 443
	676	+#define YY_ACCEPT_ACTION 444
	677	+#define YY_NO_ACTION 445
	678	+#define YY_MIN_REDUCE 446
	679	+#define YY_MAX_REDUCE 601
679	680	/*********** End control #defines *****************************************/
680	681	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
681	682
682	683	/* Define the yytestcase() macro to be a no-op if is not already defined
683	684	** otherwise.
		@@ -740,333 +741,341 @@
740	741	** yy_reduce_ofst[] For each state, the offset into yy_action for
741	742	** shifting non-terminals after a reduce.
742	743	** yy_default[] Default action for each state.
743	744	**
744	745	********* Begin parsing tables ********************************************/
745		-#define YY_ACTTAB_COUNT (1263)
	746	+#define YY_ACTTAB_COUNT (1303)
746	747	static const YYACTIONTYPE yy_action[] = {
747		- /* 0 */ 572, 493, 161, 119, 25, 450, 29, 74, 129, 148,
748		- /* 10 */ 572, 490, 161, 119, 451, 113, 120, 161, 119, 528,
749		- /* 20 */ 425, 426, 338, 556, 81, 30, 557, 558, 572, 64,
750		- /* 30 */ 63, 62, 61, 321, 322, 9, 8, 33, 149, 32,
751		- /* 40 */ 7, 71, 127, 38, 334, 66, 48, 37, 28, 338,
752		- /* 50 */ 338, 338, 338, 423, 424, 339, 340, 341, 342, 343,
753		- /* 60 */ 344, 345, 346, 347, 472, 526, 161, 119, 574, 77,
754		- /* 70 */ 574, 73, 374, 148, 472, 531, 161, 119, 112, 113,
755		- /* 80 */ 120, 161, 119, 128, 425, 426, 338, 305, 81, 376,
756		- /* 90 */ 158, 76, 472, 529, 161, 119, 31, 321, 322, 9,
757		- /* 100 */ 8, 33, 149, 32, 7, 71, 127, 329, 334, 66,
758		- /* 110 */ 576, 83, 36, 338, 338, 338, 338, 423, 424, 339,
759		- /* 120 */ 340, 341, 342, 343, 344, 345, 346, 347, 392, 433,
760		- /* 130 */ 309, 59, 60, 409, 410, 411, 412, 107, 84, 374,
761		- /* 140 */ 65, 108, 2, 46, 401, 162, 120, 161, 119, 117,
762		- /* 150 */ 476, 80, 118, 307, 79, 133, 35, 126, 439, 438,
763		- /* 160 */ 298, 123, 122, 402, 403, 404, 406, 80, 152, 307,
764		- /* 170 */ 79, 327, 409, 410, 411, 412, 392, 54, 51, 59,
765		- /* 180 */ 60, 64, 63, 62, 61, 312, 3, 102, 378, 157,
766		- /* 190 */ 42, 432, 446, 452, 29, 300, 301, 302, 448, 304,
767		- /* 200 */ 62, 61, 64, 63, 62, 61, 297, 47, 106, 163,
768		- /* 210 */ 434, 435, 436, 437, 27, 389, 117, 391, 155, 154,
769		- /* 220 */ 153, 392, 433, 49, 59, 60, 64, 63, 62, 61,
770		- /* 230 */ 532, 69, 374, 396, 397, 2, 376, 158, 356, 296,
771		- /* 240 */ 156, 156, 156, 67, 392, 433, 13, 59, 60, 4,
772		- /* 250 */ 107, 439, 438, 377, 159, 374, 106, 5, 2, 120,
773		- /* 260 */ 161, 119, 131, 449, 117, 391, 155, 154, 153, 392,
774		- /* 270 */ 532, 6, 59, 60, 439, 438, 532, 444, 422, 532,
775		- /* 280 */ 374, 152, 421, 42, 432, 1, 395, 36, 156, 156,
776		- /* 290 */ 156, 11, 12, 355, 64, 63, 62, 61, 430, 118,
777		- /* 300 */ 14, 106, 138, 434, 435, 436, 437, 432, 428, 117,
778		- /* 310 */ 391, 155, 154, 153, 16, 69, 142, 140, 64, 63,
779		- /* 320 */ 62, 61, 139, 18, 106, 15, 434, 435, 436, 437,
780		- /* 330 */ 45, 44, 117, 391, 155, 154, 153, 358, 19, 55,
781		- /* 340 */ 64, 63, 62, 61, 20, 147, 146, 68, 114, 106,
782		- /* 350 */ 23, 382, 43, 26, 425, 426, 338, 117, 391, 155,
783		- /* 360 */ 154, 153, 392, 57, 58, 59, 60, 390, 380, 375,
784		- /* 370 */ 381, 17, 160, 374, 70, 39, 42, 443, 443, 443,
785		- /* 380 */ 443, 22, 21, 338, 338, 338, 338, 423, 424, 24,
786		- /* 390 */ 443, 145, 141, 429, 142, 140, 64, 63, 62, 61,
787		- /* 400 */ 392, 471, 443, 59, 60, 443, 443, 132, 130, 389,
788		- /* 410 */ 443, 374, 443, 443, 42, 443, 443, 55, 443, 64,
789		- /* 420 */ 63, 62, 61, 147, 146, 392, 143, 443, 59, 60,
790		- /* 430 */ 43, 443, 389, 443, 443, 443, 374, 471, 443, 42,
791		- /* 440 */ 52, 443, 106, 443, 392, 144, 443, 59, 60, 443,
792		- /* 450 */ 117, 391, 155, 154, 153, 374, 443, 443, 42, 22,
793		- /* 460 */ 21, 121, 445, 452, 29, 443, 443, 24, 448, 145,
794		- /* 470 */ 141, 429, 142, 140, 64, 63, 62, 61, 443, 163,
795		- /* 480 */ 106, 443, 392, 442, 27, 59, 60, 443, 117, 391,
796		- /* 490 */ 155, 154, 153, 374, 443, 55, 42, 443, 443, 443,
797		- /* 500 */ 443, 147, 146, 443, 443, 106, 443, 392, 43, 443,
798		- /* 510 */ 59, 60, 443, 117, 391, 155, 154, 153, 102, 443,
799		- /* 520 */ 74, 42, 148, 443, 106, 443, 443, 124, 113, 120,
800		- /* 530 */ 161, 119, 117, 391, 155, 154, 153, 22, 21, 392,
801		- /* 540 */ 443, 443, 59, 60, 443, 24, 443, 145, 141, 429,
802		- /* 550 */ 374, 149, 392, 40, 443, 59, 60, 443, 85, 443,
803		- /* 560 */ 443, 443, 106, 374, 443, 443, 41, 120, 161, 119,
804		- /* 570 */ 117, 391, 155, 154, 153, 349, 349, 349, 349, 349,
805		- /* 580 */ 349, 349, 349, 349, 349, 443, 443, 106, 443, 152,
806		- /* 590 */ 443, 443, 88, 443, 443, 117, 391, 155, 154, 153,
807		- /* 600 */ 443, 120, 161, 119, 72, 443, 148, 10, 477, 477,
808		- /* 610 */ 443, 125, 113, 120, 161, 119, 443, 443, 443, 106,
809		- /* 620 */ 443, 443, 433, 152, 443, 443, 443, 117, 391, 155,
810		- /* 630 */ 154, 153, 106, 443, 443, 149, 64, 63, 62, 61,
811		- /* 640 */ 117, 391, 155, 154, 153, 443, 74, 443, 148, 354,
812		- /* 650 */ 107, 439, 438, 495, 113, 120, 161, 119, 443, 120,
813		- /* 660 */ 161, 119, 443, 461, 443, 74, 443, 148, 75, 443,
814		- /* 670 */ 78, 78, 494, 113, 120, 161, 119, 149, 74, 443,
815		- /* 680 */ 148, 152, 443, 443, 432, 488, 113, 120, 161, 119,
816		- /* 690 */ 74, 443, 148, 443, 443, 443, 149, 482, 113, 120,
817		- /* 700 */ 161, 119, 88, 434, 435, 436, 437, 443, 443, 149,
818		- /* 710 */ 443, 120, 161, 119, 443, 74, 443, 148, 110, 110,
819		- /* 720 */ 443, 149, 481, 113, 120, 161, 119, 443, 443, 443,
820		- /* 730 */ 74, 443, 148, 152, 443, 443, 443, 478, 113, 120,
821		- /* 740 */ 161, 119, 443, 74, 443, 148, 149, 443, 443, 443,
822		- /* 750 */ 134, 113, 120, 161, 119, 74, 443, 148, 443, 443,
823		- /* 760 */ 443, 149, 515, 113, 120, 161, 119, 443, 74, 443,
824		- /* 770 */ 148, 443, 443, 443, 149, 137, 113, 120, 161, 119,
825		- /* 780 */ 74, 443, 148, 443, 443, 443, 149, 523, 113, 120,
826		- /* 790 */ 161, 119, 443, 74, 443, 148, 443, 443, 443, 149,
827		- /* 800 */ 525, 113, 120, 161, 119, 443, 74, 443, 148, 443,
828		- /* 810 */ 443, 149, 443, 522, 113, 120, 161, 119, 74, 443,
829		- /* 820 */ 148, 86, 443, 443, 149, 524, 113, 120, 161, 119,
830		- /* 830 */ 120, 161, 119, 74, 443, 148, 443, 149, 443, 443,
831		- /* 840 */ 521, 113, 120, 161, 119, 443, 74, 443, 148, 149,
832		- /* 850 */ 443, 443, 152, 520, 113, 120, 161, 119, 74, 443,
833		- /* 860 */ 148, 443, 443, 443, 149, 519, 113, 120, 161, 119,
834		- /* 870 */ 443, 74, 443, 148, 443, 443, 443, 149, 518, 113,
835		- /* 880 */ 120, 161, 119, 74, 443, 148, 443, 443, 443, 149,
836		- /* 890 */ 517, 113, 120, 161, 119, 433, 74, 443, 148, 443,
837		- /* 900 */ 443, 443, 149, 150, 113, 120, 161, 119, 443, 74,
838		- /* 910 */ 443, 148, 443, 443, 149, 443, 151, 113, 120, 161,
839		- /* 920 */ 119, 74, 443, 148, 439, 438, 443, 149, 136, 113,
840		- /* 930 */ 120, 161, 119, 443, 443, 443, 74, 443, 148, 443,
841		- /* 940 */ 149, 443, 443, 135, 113, 120, 161, 119, 443, 88,
842		- /* 950 */ 443, 443, 149, 443, 443, 443, 443, 432, 120, 161,
843		- /* 960 */ 119, 443, 443, 443, 443, 82, 443, 149, 443, 443,
844		- /* 970 */ 443, 443, 464, 443, 34, 443, 434, 435, 436, 437,
845		- /* 980 */ 152, 107, 109, 445, 452, 29, 443, 443, 443, 448,
846		- /* 990 */ 120, 161, 119, 443, 461, 443, 443, 88, 443, 443,
847		- /* 1000 */ 163, 443, 566, 443, 443, 27, 120, 161, 119, 88,
848		- /* 1010 */ 443, 443, 152, 111, 111, 443, 443, 443, 120, 161,
849		- /* 1020 */ 119, 98, 443, 443, 89, 473, 443, 90, 152, 443,
850		- /* 1030 */ 120, 161, 119, 120, 161, 119, 120, 161, 119, 87,
851		- /* 1040 */ 152, 443, 443, 64, 63, 62, 61, 443, 120, 161,
852		- /* 1050 */ 119, 443, 152, 443, 443, 152, 443, 443, 152, 443,
853		- /* 1060 */ 443, 443, 99, 443, 50, 443, 443, 443, 100, 443,
854		- /* 1070 */ 152, 120, 161, 119, 443, 101, 443, 120, 161, 119,
855		- /* 1080 */ 91, 443, 443, 443, 120, 161, 119, 103, 443, 120,
856		- /* 1090 */ 161, 119, 92, 152, 443, 443, 120, 161, 119, 152,
857		- /* 1100 */ 443, 120, 161, 119, 443, 93, 152, 443, 443, 443,
858		- /* 1110 */ 104, 152, 443, 443, 120, 161, 119, 94, 152, 120,
859		- /* 1120 */ 161, 119, 105, 152, 443, 443, 120, 161, 119, 443,
860		- /* 1130 */ 443, 120, 161, 119, 95, 443, 152, 443, 443, 443,
861		- /* 1140 */ 96, 152, 443, 120, 161, 119, 443, 443, 152, 120,
862		- /* 1150 */ 161, 119, 97, 152, 443, 443, 443, 443, 546, 443,
863		- /* 1160 */ 443, 120, 161, 119, 443, 152, 443, 120, 161, 119,
864		- /* 1170 */ 443, 152, 443, 443, 443, 545, 443, 443, 443, 443,
865		- /* 1180 */ 443, 544, 443, 152, 120, 161, 119, 543, 443, 152,
866		- /* 1190 */ 120, 161, 119, 115, 443, 443, 120, 161, 119, 116,
867		- /* 1200 */ 443, 443, 120, 161, 119, 443, 152, 443, 120, 161,
868		- /* 1210 */ 119, 443, 152, 64, 63, 62, 61, 443, 152, 64,
869		- /* 1220 */ 63, 62, 61, 443, 152, 443, 353, 443, 443, 443,
870		- /* 1230 */ 152, 64, 63, 62, 61, 64, 63, 62, 61, 443,
871		- /* 1240 */ 53, 443, 443, 443, 394, 64, 63, 62, 61, 64,
872		- /* 1250 */ 63, 62, 61, 443, 443, 443, 56, 443, 393, 443,
873		- /* 1260 */ 443, 443, 389,
	748	+ /* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
	749	+ /* 10 */ 575, 492, 161, 119, 453, 113, 120, 161, 119, 530,
	750	+ /* 20 */ 427, 428, 339, 559, 81, 30, 560, 561, 575, 64,
	751	+ /* 30 */ 63, 62, 61, 322, 323, 9, 8, 33, 149, 32,
	752	+ /* 40 */ 7, 71, 127, 38, 335, 66, 48, 37, 28, 339,
	753	+ /* 50 */ 339, 339, 339, 425, 426, 340, 341, 342, 343, 344,
	754	+ /* 60 */ 345, 346, 347, 348, 474, 528, 161, 119, 577, 77,
	755	+ /* 70 */ 577, 73, 376, 148, 474, 533, 161, 119, 112, 113,
	756	+ /* 80 */ 120, 161, 119, 128, 427, 428, 339, 357, 81, 531,
	757	+ /* 90 */ 161, 119, 474, 36, 330, 13, 306, 322, 323, 9,
	758	+ /* 100 */ 8, 33, 149, 32, 7, 71, 127, 328, 335, 66,
	759	+ /* 110 */ 579, 310, 31, 339, 339, 339, 339, 425, 426, 340,
	760	+ /* 120 */ 341, 342, 343, 344, 345, 346, 347, 348, 394, 435,
	761	+ /* 130 */ 46, 59, 60, 64, 63, 62, 61, 54, 51, 376,
	762	+ /* 140 */ 69, 108, 2, 47, 403, 83, 297, 435, 375, 84,
	763	+ /* 150 */ 117, 80, 35, 308, 79, 133, 122, 126, 441, 440,
	764	+ /* 160 */ 299, 123, 3, 404, 405, 406, 408, 80, 298, 308,
	765	+ /* 170 */ 79, 4, 411, 412, 413, 414, 441, 440, 350, 350,
	766	+ /* 180 */ 350, 350, 350, 350, 350, 350, 350, 350, 62, 61,
	767	+ /* 190 */ 67, 434, 1, 75, 378, 158, 74, 76, 148, 411,
	768	+ /* 200 */ 412, 413, 414, 124, 113, 120, 161, 119, 106, 434,
	769	+ /* 210 */ 436, 437, 438, 439, 5, 375, 6, 117, 393, 155,
	770	+ /* 220 */ 154, 153, 394, 435, 69, 59, 60, 149, 436, 437,
	771	+ /* 230 */ 438, 439, 535, 376, 398, 399, 2, 424, 427, 428,
	772	+ /* 240 */ 339, 156, 156, 156, 423, 394, 435, 65, 59, 60,
	773	+ /* 250 */ 162, 131, 441, 440, 397, 72, 376, 148, 118, 2,
	774	+ /* 260 */ 380, 157, 125, 113, 120, 161, 119, 339, 339, 339,
	775	+ /* 270 */ 339, 425, 426, 535, 11, 441, 440, 394, 356, 535,
	776	+ /* 280 */ 59, 60, 535, 379, 159, 434, 149, 12, 102, 446,
	777	+ /* 290 */ 432, 42, 138, 14, 435, 139, 301, 302, 303, 36,
	778	+ /* 300 */ 305, 430, 106, 16, 436, 437, 438, 439, 434, 375,
	779	+ /* 310 */ 18, 117, 393, 155, 154, 153, 44, 142, 140, 64,
	780	+ /* 320 */ 63, 62, 61, 441, 440, 106, 19, 436, 437, 438,
	781	+ /* 330 */ 439, 45, 375, 20, 117, 393, 155, 154, 153, 68,
	782	+ /* 340 */ 55, 114, 64, 63, 62, 61, 147, 146, 394, 473,
	783	+ /* 350 */ 359, 59, 60, 43, 23, 391, 434, 106, 26, 376,
	784	+ /* 360 */ 57, 58, 42, 49, 375, 392, 117, 393, 155, 154,
	785	+ /* 370 */ 153, 64, 63, 62, 61, 436, 437, 438, 439, 384,
	786	+ /* 380 */ 382, 383, 22, 21, 377, 473, 160, 70, 39, 445,
	787	+ /* 390 */ 24, 445, 145, 141, 431, 142, 140, 64, 63, 62,
	788	+ /* 400 */ 61, 394, 15, 445, 59, 60, 64, 63, 62, 61,
	789	+ /* 410 */ 391, 445, 376, 445, 445, 42, 445, 445, 55, 391,
	790	+ /* 420 */ 156, 156, 156, 445, 147, 146, 445, 52, 106, 445,
	791	+ /* 430 */ 445, 43, 445, 445, 445, 375, 445, 117, 393, 155,
	792	+ /* 440 */ 154, 153, 445, 394, 143, 445, 59, 60, 64, 63,
	793	+ /* 450 */ 62, 61, 313, 445, 376, 378, 158, 42, 445, 445,
	794	+ /* 460 */ 22, 21, 121, 447, 454, 29, 445, 445, 24, 450,
	795	+ /* 470 */ 145, 141, 431, 142, 140, 64, 63, 62, 61, 445,
	796	+ /* 480 */ 163, 106, 445, 445, 444, 27, 445, 445, 375, 445,
	797	+ /* 490 */ 117, 393, 155, 154, 153, 445, 55, 74, 445, 148,
	798	+ /* 500 */ 445, 445, 147, 146, 497, 113, 120, 161, 119, 43,
	799	+ /* 510 */ 445, 394, 445, 445, 59, 60, 445, 445, 445, 118,
	800	+ /* 520 */ 445, 445, 376, 106, 445, 42, 445, 445, 149, 445,
	801	+ /* 530 */ 375, 445, 117, 393, 155, 154, 153, 445, 22, 21,
	802	+ /* 540 */ 394, 144, 445, 59, 60, 445, 24, 445, 145, 141,
	803	+ /* 550 */ 431, 376, 445, 445, 42, 445, 132, 130, 394, 445,
	804	+ /* 560 */ 445, 59, 60, 109, 447, 454, 29, 445, 445, 376,
	805	+ /* 570 */ 450, 445, 42, 445, 394, 445, 445, 59, 60, 445,
	806	+ /* 580 */ 445, 163, 445, 445, 445, 102, 27, 445, 42, 445,
	807	+ /* 590 */ 445, 106, 445, 64, 63, 62, 61, 445, 375, 445,
	808	+ /* 600 */ 117, 393, 155, 154, 153, 394, 355, 445, 59, 60,
	809	+ /* 610 */ 445, 445, 445, 445, 445, 74, 376, 148, 445, 40,
	810	+ /* 620 */ 106, 445, 496, 113, 120, 161, 119, 375, 445, 117,
	811	+ /* 630 */ 393, 155, 154, 153, 445, 448, 454, 29, 106, 445,
	812	+ /* 640 */ 445, 450, 445, 445, 445, 375, 149, 117, 393, 155,
	813	+ /* 650 */ 154, 153, 163, 445, 106, 445, 445, 27, 445, 445,
	814	+ /* 660 */ 445, 375, 445, 117, 393, 155, 154, 153, 394, 445,
	815	+ /* 670 */ 445, 59, 60, 64, 63, 62, 61, 445, 445, 376,
	816	+ /* 680 */ 445, 445, 41, 445, 445, 106, 354, 64, 63, 62,
	817	+ /* 690 */ 61, 445, 375, 445, 117, 393, 155, 154, 153, 445,
	818	+ /* 700 */ 445, 445, 74, 445, 148, 445, 88, 445, 445, 490,
	819	+ /* 710 */ 113, 120, 161, 119, 445, 120, 161, 119, 17, 74,
	820	+ /* 720 */ 445, 148, 110, 110, 445, 445, 484, 113, 120, 161,
	821	+ /* 730 */ 119, 445, 445, 149, 74, 445, 148, 152, 445, 445,
	822	+ /* 740 */ 445, 483, 113, 120, 161, 119, 445, 445, 106, 445,
	823	+ /* 750 */ 149, 445, 445, 107, 445, 375, 445, 117, 393, 155,
	824	+ /* 760 */ 154, 153, 120, 161, 119, 149, 478, 74, 445, 148,
	825	+ /* 770 */ 445, 88, 445, 445, 480, 113, 120, 161, 119, 445,
	826	+ /* 780 */ 120, 161, 119, 74, 152, 148, 10, 479, 479, 445,
	827	+ /* 790 */ 134, 113, 120, 161, 119, 445, 445, 445, 149, 74,
	828	+ /* 800 */ 445, 148, 152, 445, 445, 445, 517, 113, 120, 161,
	829	+ /* 810 */ 119, 445, 445, 74, 149, 148, 445, 445, 445, 445,
	830	+ /* 820 */ 137, 113, 120, 161, 119, 74, 445, 148, 445, 445,
	831	+ /* 830 */ 149, 445, 525, 113, 120, 161, 119, 445, 74, 445,
	832	+ /* 840 */ 148, 445, 445, 445, 149, 527, 113, 120, 161, 119,
	833	+ /* 850 */ 445, 445, 74, 445, 148, 445, 149, 445, 445, 524,
	834	+ /* 860 */ 113, 120, 161, 119, 74, 445, 148, 445, 445, 149,
	835	+ /* 870 */ 445, 526, 113, 120, 161, 119, 445, 445, 74, 445,
	836	+ /* 880 */ 148, 445, 88, 149, 445, 523, 113, 120, 161, 119,
	837	+ /* 890 */ 445, 120, 161, 119, 74, 149, 148, 85, 111, 111,
	838	+ /* 900 */ 445, 522, 113, 120, 161, 119, 120, 161, 119, 149,
	839	+ /* 910 */ 74, 445, 148, 152, 445, 445, 445, 521, 113, 120,
	840	+ /* 920 */ 161, 119, 445, 445, 74, 149, 148, 445, 152, 445,
	841	+ /* 930 */ 445, 520, 113, 120, 161, 119, 74, 445, 148, 445,
	842	+ /* 940 */ 445, 149, 445, 519, 113, 120, 161, 119, 445, 74,
	843	+ /* 950 */ 445, 148, 445, 445, 445, 149, 150, 113, 120, 161,
	844	+ /* 960 */ 119, 445, 445, 74, 445, 148, 445, 149, 445, 445,
	845	+ /* 970 */ 151, 113, 120, 161, 119, 74, 445, 148, 445, 445,
	846	+ /* 980 */ 149, 445, 136, 113, 120, 161, 119, 445, 445, 74,
	847	+ /* 990 */ 445, 148, 107, 445, 149, 445, 135, 113, 120, 161,
	848	+ /* 1000 */ 119, 120, 161, 119, 445, 463, 149, 445, 88, 445,
	849	+ /* 1010 */ 445, 445, 78, 78, 445, 445, 107, 120, 161, 119,
	850	+ /* 1020 */ 149, 445, 445, 152, 82, 120, 161, 119, 445, 463,
	851	+ /* 1030 */ 445, 466, 86, 34, 445, 88, 445, 569, 445, 152,
	852	+ /* 1040 */ 445, 120, 161, 119, 120, 161, 119, 152, 107, 445,
	853	+ /* 1050 */ 445, 475, 64, 63, 62, 61, 445, 120, 161, 119,
	854	+ /* 1060 */ 98, 451, 445, 152, 89, 396, 152, 90, 445, 120,
	855	+ /* 1070 */ 161, 119, 445, 120, 161, 119, 120, 161, 119, 152,
	856	+ /* 1080 */ 445, 64, 63, 62, 61, 445, 445, 445, 445, 445,
	857	+ /* 1090 */ 87, 152, 445, 99, 395, 152, 100, 445, 152, 120,
	858	+ /* 1100 */ 161, 119, 120, 161, 119, 120, 161, 119, 445, 101,
	859	+ /* 1110 */ 64, 63, 62, 61, 445, 445, 445, 445, 120, 161,
	860	+ /* 1120 */ 119, 152, 91, 391, 152, 445, 445, 152, 103, 445,
	861	+ /* 1130 */ 445, 120, 161, 119, 445, 92, 445, 120, 161, 119,
	862	+ /* 1140 */ 152, 93, 445, 445, 120, 161, 119, 104, 445, 445,
	863	+ /* 1150 */ 120, 161, 119, 152, 445, 445, 120, 161, 119, 152,
	864	+ /* 1160 */ 445, 445, 445, 445, 94, 445, 152, 445, 445, 445,
	865	+ /* 1170 */ 105, 445, 152, 120, 161, 119, 445, 95, 152, 120,
	866	+ /* 1180 */ 161, 119, 96, 445, 445, 445, 120, 161, 119, 445,
	867	+ /* 1190 */ 445, 120, 161, 119, 97, 152, 445, 445, 445, 445,
	868	+ /* 1200 */ 549, 152, 445, 120, 161, 119, 548, 445, 152, 120,
	869	+ /* 1210 */ 161, 119, 445, 152, 445, 120, 161, 119, 445, 445,
	870	+ /* 1220 */ 445, 445, 445, 547, 445, 152, 445, 445, 445, 445,
	871	+ /* 1230 */ 445, 152, 120, 161, 119, 546, 445, 152, 445, 115,
	872	+ /* 1240 */ 445, 445, 116, 445, 120, 161, 119, 445, 120, 161,
	873	+ /* 1250 */ 119, 120, 161, 119, 152, 64, 63, 62, 61, 64,
	874	+ /* 1260 */ 63, 62, 61, 445, 445, 445, 152, 445, 445, 445,
	875	+ /* 1270 */ 152, 445, 445, 152, 445, 445, 50, 445, 445, 445,
	876	+ /* 1280 */ 53, 64, 63, 62, 61, 445, 445, 445, 445, 445,
	877	+ /* 1290 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
	878	+ /* 1300 */ 445, 445, 56,
874	879	};
875	880	static const YYCODETYPE yy_lookahead[] = {
876		- /* 0 */ 0, 111, 112, 113, 132, 100, 101, 102, 104, 104,
877		- /* 10 */ 10, 111, 112, 113, 109, 110, 111, 112, 113, 104,
878		- /* 20 */ 20, 21, 22, 103, 24, 124, 106, 107, 28, 4,
879		- /* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 133, 39,
880		- /* 40 */ 40, 41, 42, 103, 44, 45, 106, 107, 105, 49,
	881	+ /* 0 */ 0, 112, 113, 114, 133, 101, 102, 103, 105, 105,
	882	+ /* 10 */ 10, 112, 113, 114, 110, 111, 112, 113, 114, 105,
	883	+ /* 20 */ 20, 21, 22, 104, 24, 125, 107, 108, 28, 4,
	884	+ /* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 134, 39,
	885	+ /* 40 */ 40, 41, 42, 104, 44, 45, 107, 108, 106, 49,
881	886	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
882		- /* 60 */ 60, 61, 62, 63, 0, 111, 112, 113, 128, 129,
883		- /* 70 */ 130, 102, 12, 104, 10, 111, 112, 113, 109, 110,
884		- /* 80 */ 111, 112, 113, 104, 20, 21, 22, 25, 24, 26,
885		- /* 90 */ 27, 48, 28, 111, 112, 113, 126, 33, 34, 35,
886		- /* 100 */ 36, 37, 133, 39, 40, 41, 42, 2, 44, 45,
887		- /* 110 */ 131, 114, 10, 49, 50, 51, 52, 53, 54, 55,
	887	+ /* 60 */ 60, 61, 62, 63, 0, 112, 113, 114, 129, 130,
	888	+ /* 70 */ 131, 103, 12, 105, 10, 112, 113, 114, 110, 111,
	889	+ /* 80 */ 112, 113, 114, 105, 20, 21, 22, 17, 24, 112,
	890	+ /* 90 */ 113, 114, 28, 10, 2, 25, 25, 33, 34, 35,
	891	+ /* 100 */ 36, 37, 134, 39, 40, 41, 42, 2, 44, 45,
	892	+ /* 110 */ 132, 28, 127, 49, 50, 51, 52, 53, 54, 55,
888	893	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
889		- /* 130 */ 28, 4, 5, 29, 30, 31, 32, 102, 114, 12,
890		- /* 140 */ 97, 81, 15, 38, 1, 82, 111, 112, 113, 89,
891		- /* 150 */ 115, 24, 89, 26, 27, 12, 127, 14, 31, 32,
892		- /* 160 */ 19, 18, 1, 20, 21, 22, 23, 24, 133, 26,
893		- /* 170 */ 27, 2, 29, 30, 31, 32, 1, 4, 5, 4,
894		- /* 180 */ 5, 4, 5, 6, 7, 8, 16, 12, 26, 27,
895		- /* 190 */ 15, 64, 99, 100, 101, 20, 21, 22, 105, 24,
896		- /* 200 */ 6, 7, 4, 5, 6, 7, 17, 38, 81, 116,
897		- /* 210 */ 83, 84, 85, 86, 121, 17, 89, 90, 91, 92,
898		- /* 220 */ 93, 1, 2, 25, 4, 5, 4, 5, 6, 7,
899		- /* 230 */ 48, 3, 12, 95, 96, 15, 26, 27, 17, 17,
900		- /* 240 */ 20, 21, 22, 43, 1, 2, 25, 4, 5, 15,
901		- /* 250 */ 102, 31, 32, 26, 27, 12, 81, 40, 15, 111,
902		- /* 260 */ 112, 113, 47, 115, 89, 90, 91, 92, 93, 1,
903		- /* 270 */ 88, 40, 4, 5, 31, 32, 94, 0, 41, 97,
904		- /* 280 */ 12, 133, 41, 15, 64, 13, 17, 10, 20, 21,
905		- /* 290 */ 22, 25, 74, 17, 4, 5, 6, 7, 79, 89,
906		- /* 300 */ 3, 81, 78, 83, 84, 85, 86, 64, 79, 89,
907		- /* 310 */ 90, 91, 92, 93, 3, 87, 2, 3, 4, 5,
908		- /* 320 */ 6, 7, 80, 3, 81, 35, 83, 84, 85, 86,
909		- /* 330 */ 16, 38, 89, 90, 91, 92, 93, 76, 3, 25,
910		- /* 340 */ 4, 5, 6, 7, 3, 31, 32, 3, 94, 81,
911		- /* 350 */ 25, 28, 38, 15, 20, 21, 22, 89, 90, 91,
912		- /* 360 */ 92, 93, 1, 15, 15, 4, 5, 17, 28, 12,
913		- /* 370 */ 28, 35, 88, 12, 3, 11, 15, 134, 134, 134,
914		- /* 380 */ 134, 67, 68, 49, 50, 51, 52, 53, 54, 75,
915		- /* 390 */ 134, 77, 78, 79, 2, 3, 4, 5, 6, 7,
916		- /* 400 */ 1, 2, 134, 4, 5, 134, 134, 46, 47, 17,
917		- /* 410 */ 134, 12, 134, 134, 15, 134, 134, 25, 134, 4,
918		- /* 420 */ 5, 6, 7, 31, 32, 1, 2, 134, 4, 5,
919		- /* 430 */ 38, 134, 17, 134, 134, 134, 12, 38, 134, 15,
920		- /* 440 */ 25, 134, 81, 134, 1, 2, 134, 4, 5, 134,
921		- /* 450 */ 89, 90, 91, 92, 93, 12, 134, 134, 15, 67,
922		- /* 460 */ 68, 98, 99, 100, 101, 134, 134, 75, 105, 77,
923		- /* 470 */ 78, 79, 2, 3, 4, 5, 6, 7, 134, 116,
924		- /* 480 */ 81, 134, 1, 120, 121, 4, 5, 134, 89, 90,
925		- /* 490 */ 91, 92, 93, 12, 134, 25, 15, 134, 134, 134,
926		- /* 500 */ 134, 31, 32, 134, 134, 81, 134, 1, 38, 134,
927		- /* 510 */ 4, 5, 134, 89, 90, 91, 92, 93, 12, 134,
928		- /* 520 */ 102, 15, 104, 134, 81, 134, 134, 109, 110, 111,
929		- /* 530 */ 112, 113, 89, 90, 91, 92, 93, 67, 68, 1,
930		- /* 540 */ 134, 134, 4, 5, 134, 75, 134, 77, 78, 79,
931		- /* 550 */ 12, 133, 1, 15, 134, 4, 5, 134, 102, 134,
932		- /* 560 */ 134, 134, 81, 12, 134, 134, 15, 111, 112, 113,
933		- /* 570 */ 89, 90, 91, 92, 93, 64, 65, 66, 67, 68,
934		- /* 580 */ 69, 70, 71, 72, 73, 134, 134, 81, 134, 133,
935		- /* 590 */ 134, 134, 102, 134, 134, 89, 90, 91, 92, 93,
936		- /* 600 */ 134, 111, 112, 113, 102, 134, 104, 117, 118, 119,
937		- /* 610 */ 134, 109, 110, 111, 112, 113, 134, 134, 134, 81,
938		- /* 620 */ 134, 134, 2, 133, 134, 134, 134, 89, 90, 91,
939		- /* 630 */ 92, 93, 81, 134, 134, 133, 4, 5, 6, 7,
940		- /* 640 */ 89, 90, 91, 92, 93, 134, 102, 134, 104, 17,
941		- /* 650 */ 102, 31, 32, 109, 110, 111, 112, 113, 134, 111,
942		- /* 660 */ 112, 113, 134, 115, 134, 102, 134, 104, 48, 134,
943		- /* 670 */ 122, 123, 109, 110, 111, 112, 113, 133, 102, 134,
944		- /* 680 */ 104, 133, 134, 134, 64, 109, 110, 111, 112, 113,
945		- /* 690 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
946		- /* 700 */ 112, 113, 102, 83, 84, 85, 86, 134, 134, 133,
947		- /* 710 */ 134, 111, 112, 113, 134, 102, 134, 104, 118, 119,
948		- /* 720 */ 134, 133, 109, 110, 111, 112, 113, 134, 134, 134,
949		- /* 730 */ 102, 134, 104, 133, 134, 134, 134, 109, 110, 111,
950		- /* 740 */ 112, 113, 134, 102, 134, 104, 133, 134, 134, 134,
951		- /* 750 */ 109, 110, 111, 112, 113, 102, 134, 104, 134, 134,
952		- /* 760 */ 134, 133, 109, 110, 111, 112, 113, 134, 102, 134,
953		- /* 770 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
954		- /* 780 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
955		- /* 790 */ 112, 113, 134, 102, 134, 104, 134, 134, 134, 133,
956		- /* 800 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 134,
957		- /* 810 */ 134, 133, 134, 109, 110, 111, 112, 113, 102, 134,
958		- /* 820 */ 104, 102, 134, 134, 133, 109, 110, 111, 112, 113,
959		- /* 830 */ 111, 112, 113, 102, 134, 104, 134, 133, 134, 134,
960		- /* 840 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 133,
961		- /* 850 */ 134, 134, 133, 109, 110, 111, 112, 113, 102, 134,
962		- /* 860 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
963		- /* 870 */ 134, 102, 134, 104, 134, 134, 134, 133, 109, 110,
964		- /* 880 */ 111, 112, 113, 102, 134, 104, 134, 134, 134, 133,
965		- /* 890 */ 109, 110, 111, 112, 113, 2, 102, 134, 104, 134,
966		- /* 900 */ 134, 134, 133, 109, 110, 111, 112, 113, 134, 102,
967		- /* 910 */ 134, 104, 134, 134, 133, 134, 109, 110, 111, 112,
968		- /* 920 */ 113, 102, 134, 104, 31, 32, 134, 133, 109, 110,
969		- /* 930 */ 111, 112, 113, 134, 134, 134, 102, 134, 104, 134,
970		- /* 940 */ 133, 134, 134, 109, 110, 111, 112, 113, 134, 102,
971		- /* 950 */ 134, 134, 133, 134, 134, 134, 134, 64, 111, 112,
972		- /* 960 */ 113, 134, 134, 134, 134, 118, 134, 133, 134, 134,
973		- /* 970 */ 134, 134, 125, 134, 127, 134, 83, 84, 85, 86,
974		- /* 980 */ 133, 102, 98, 99, 100, 101, 134, 134, 134, 105,
975		- /* 990 */ 111, 112, 113, 134, 115, 134, 134, 102, 134, 134,
976		- /* 1000 */ 116, 134, 123, 134, 134, 121, 111, 112, 113, 102,
977		- /* 1010 */ 134, 134, 133, 118, 119, 134, 134, 134, 111, 112,
978		- /* 1020 */ 113, 102, 134, 134, 102, 118, 134, 102, 133, 134,
979		- /* 1030 */ 111, 112, 113, 111, 112, 113, 111, 112, 113, 102,
980		- /* 1040 */ 133, 134, 134, 4, 5, 6, 7, 134, 111, 112,
981		- /* 1050 */ 113, 134, 133, 134, 134, 133, 134, 134, 133, 134,
982		- /* 1060 */ 134, 134, 102, 134, 25, 134, 134, 134, 102, 134,
983		- /* 1070 */ 133, 111, 112, 113, 134, 102, 134, 111, 112, 113,
984		- /* 1080 */ 102, 134, 134, 134, 111, 112, 113, 102, 134, 111,
985		- /* 1090 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 133,
986		- /* 1100 */ 134, 111, 112, 113, 134, 102, 133, 134, 134, 134,
987		- /* 1110 */ 102, 133, 134, 134, 111, 112, 113, 102, 133, 111,
988		- /* 1120 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 134,
989		- /* 1130 */ 134, 111, 112, 113, 102, 134, 133, 134, 134, 134,
990		- /* 1140 */ 102, 133, 134, 111, 112, 113, 134, 134, 133, 111,
991		- /* 1150 */ 112, 113, 102, 133, 134, 134, 134, 134, 102, 134,
992		- /* 1160 */ 134, 111, 112, 113, 134, 133, 134, 111, 112, 113,
993		- /* 1170 */ 134, 133, 134, 134, 134, 102, 134, 134, 134, 134,
994		- /* 1180 */ 134, 102, 134, 133, 111, 112, 113, 102, 134, 133,
995		- /* 1190 */ 111, 112, 113, 102, 134, 134, 111, 112, 113, 102,
996		- /* 1200 */ 134, 134, 111, 112, 113, 134, 133, 134, 111, 112,
997		- /* 1210 */ 113, 134, 133, 4, 5, 6, 7, 134, 133, 4,
998		- /* 1220 */ 5, 6, 7, 134, 133, 134, 17, 134, 134, 134,
999		- /* 1230 */ 133, 4, 5, 6, 7, 4, 5, 6, 7, 134,
1000		- /* 1240 */ 25, 134, 134, 134, 17, 4, 5, 6, 7, 4,
1001		- /* 1250 */ 5, 6, 7, 134, 134, 134, 25, 134, 17, 134,
1002		- /* 1260 */ 134, 134, 17, 134, 134, 134, 134, 134, 134, 134,
1003		- /* 1270 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1004		- /* 1280 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1005		- /* 1290 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1006		- /* 1300 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1007		- /* 1310 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1008		- /* 1320 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1009		- /* 1330 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1010		- /* 1340 */ 134, 134, 134, 134, 134, 134, 134, 134, 98, 98,
1011		- /* 1350 */ 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
1012		- /* 1360 */ 98,
	894	+ /* 130 */ 38, 4, 5, 4, 5, 6, 7, 4, 5, 12,
	895	+ /* 140 */ 3, 81, 15, 38, 1, 115, 17, 2, 88, 115,
	896	+ /* 150 */ 90, 24, 128, 26, 27, 12, 1, 14, 31, 32,
	897	+ /* 160 */ 19, 18, 16, 20, 21, 22, 23, 24, 17, 26,
	898	+ /* 170 */ 27, 15, 29, 30, 31, 32, 31, 32, 64, 65,
	899	+ /* 180 */ 66, 67, 68, 69, 70, 71, 72, 73, 6, 7,
	900	+ /* 190 */ 43, 64, 13, 48, 26, 27, 103, 48, 105, 29,
	901	+ /* 200 */ 30, 31, 32, 110, 111, 112, 113, 114, 81, 64,
	902	+ /* 210 */ 83, 84, 85, 86, 40, 88, 40, 90, 91, 92,
	903	+ /* 220 */ 93, 94, 1, 2, 87, 4, 5, 134, 83, 84,
	904	+ /* 230 */ 85, 86, 48, 12, 96, 97, 15, 41, 20, 21,
	905	+ /* 240 */ 22, 20, 21, 22, 41, 1, 2, 98, 4, 5,
	906	+ /* 250 */ 82, 47, 31, 32, 17, 103, 12, 105, 90, 15,
	907	+ /* 260 */ 26, 27, 110, 111, 112, 113, 114, 49, 50, 51,
	908	+ /* 270 */ 52, 53, 54, 89, 25, 31, 32, 1, 17, 95,
	909	+ /* 280 */ 4, 5, 98, 26, 27, 64, 134, 74, 12, 0,
	910	+ /* 290 */ 79, 15, 78, 3, 2, 80, 20, 21, 22, 10,
	911	+ /* 300 */ 24, 79, 81, 3, 83, 84, 85, 86, 64, 88,
	912	+ /* 310 */ 3, 90, 91, 92, 93, 94, 38, 2, 3, 4,
	913	+ /* 320 */ 5, 6, 7, 31, 32, 81, 3, 83, 84, 85,
	914	+ /* 330 */ 86, 16, 88, 3, 90, 91, 92, 93, 94, 3,
	915	+ /* 340 */ 25, 95, 4, 5, 6, 7, 31, 32, 1, 2,
	916	+ /* 350 */ 76, 4, 5, 38, 25, 17, 64, 81, 15, 12,
	917	+ /* 360 */ 15, 15, 15, 25, 88, 17, 90, 91, 92, 93,
	918	+ /* 370 */ 94, 4, 5, 6, 7, 83, 84, 85, 86, 28,
	919	+ /* 380 */ 28, 28, 67, 68, 12, 38, 89, 3, 11, 135,
	920	+ /* 390 */ 75, 135, 77, 78, 79, 2, 3, 4, 5, 6,
	921	+ /* 400 */ 7, 1, 35, 135, 4, 5, 4, 5, 6, 7,
	922	+ /* 410 */ 17, 135, 12, 135, 135, 15, 135, 135, 25, 17,
	923	+ /* 420 */ 20, 21, 22, 135, 31, 32, 135, 25, 81, 135,
	924	+ /* 430 */ 135, 38, 135, 135, 135, 88, 135, 90, 91, 92,
	925	+ /* 440 */ 93, 94, 135, 1, 2, 135, 4, 5, 4, 5,
	926	+ /* 450 */ 6, 7, 8, 135, 12, 26, 27, 15, 135, 135,
	927	+ /* 460 */ 67, 68, 99, 100, 101, 102, 135, 135, 75, 106,
	928	+ /* 470 */ 77, 78, 79, 2, 3, 4, 5, 6, 7, 135,
	929	+ /* 480 */ 117, 81, 135, 135, 121, 122, 135, 135, 88, 135,
	930	+ /* 490 */ 90, 91, 92, 93, 94, 135, 25, 103, 135, 105,
	931	+ /* 500 */ 135, 135, 31, 32, 110, 111, 112, 113, 114, 38,
	932	+ /* 510 */ 135, 1, 135, 135, 4, 5, 135, 135, 135, 90,
	933	+ /* 520 */ 135, 135, 12, 81, 135, 15, 135, 135, 134, 135,
	934	+ /* 530 */ 88, 135, 90, 91, 92, 93, 94, 135, 67, 68,
	935	+ /* 540 */ 1, 2, 135, 4, 5, 135, 75, 135, 77, 78,
	936	+ /* 550 */ 79, 12, 135, 135, 15, 135, 46, 47, 1, 135,
	937	+ /* 560 */ 135, 4, 5, 99, 100, 101, 102, 135, 135, 12,
	938	+ /* 570 */ 106, 135, 15, 135, 1, 135, 135, 4, 5, 135,
	939	+ /* 580 */ 135, 117, 135, 135, 135, 12, 122, 135, 15, 135,
	940	+ /* 590 */ 135, 81, 135, 4, 5, 6, 7, 135, 88, 135,
	941	+ /* 600 */ 90, 91, 92, 93, 94, 1, 17, 135, 4, 5,
	942	+ /* 610 */ 135, 135, 135, 135, 135, 103, 12, 105, 135, 15,
	943	+ /* 620 */ 81, 135, 110, 111, 112, 113, 114, 88, 135, 90,
	944	+ /* 630 */ 91, 92, 93, 94, 135, 100, 101, 102, 81, 135,
	945	+ /* 640 */ 135, 106, 135, 135, 135, 88, 134, 90, 91, 92,
	946	+ /* 650 */ 93, 94, 117, 135, 81, 135, 135, 122, 135, 135,
	947	+ /* 660 */ 135, 88, 135, 90, 91, 92, 93, 94, 1, 135,
	948	+ /* 670 */ 135, 4, 5, 4, 5, 6, 7, 135, 135, 12,
	949	+ /* 680 */ 135, 135, 15, 135, 135, 81, 17, 4, 5, 6,
	950	+ /* 690 */ 7, 135, 88, 135, 90, 91, 92, 93, 94, 135,
	951	+ /* 700 */ 135, 135, 103, 135, 105, 135, 103, 135, 135, 110,
	952	+ /* 710 */ 111, 112, 113, 114, 135, 112, 113, 114, 35, 103,
	953	+ /* 720 */ 135, 105, 119, 120, 135, 135, 110, 111, 112, 113,
	954	+ /* 730 */ 114, 135, 135, 134, 103, 135, 105, 134, 135, 135,
	955	+ /* 740 */ 135, 110, 111, 112, 113, 114, 135, 135, 81, 135,
	956	+ /* 750 */ 134, 135, 135, 103, 135, 88, 135, 90, 91, 92,
	957	+ /* 760 */ 93, 94, 112, 113, 114, 134, 116, 103, 135, 105,
	958	+ /* 770 */ 135, 103, 135, 135, 110, 111, 112, 113, 114, 135,
	959	+ /* 780 */ 112, 113, 114, 103, 134, 105, 118, 119, 120, 135,
	960	+ /* 790 */ 110, 111, 112, 113, 114, 135, 135, 135, 134, 103,
	961	+ /* 800 */ 135, 105, 134, 135, 135, 135, 110, 111, 112, 113,
	962	+ /* 810 */ 114, 135, 135, 103, 134, 105, 135, 135, 135, 135,
	963	+ /* 820 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
	964	+ /* 830 */ 134, 135, 110, 111, 112, 113, 114, 135, 103, 135,
	965	+ /* 840 */ 105, 135, 135, 135, 134, 110, 111, 112, 113, 114,
	966	+ /* 850 */ 135, 135, 103, 135, 105, 135, 134, 135, 135, 110,
	967	+ /* 860 */ 111, 112, 113, 114, 103, 135, 105, 135, 135, 134,
	968	+ /* 870 */ 135, 110, 111, 112, 113, 114, 135, 135, 103, 135,
	969	+ /* 880 */ 105, 135, 103, 134, 135, 110, 111, 112, 113, 114,
	970	+ /* 890 */ 135, 112, 113, 114, 103, 134, 105, 103, 119, 120,
	971	+ /* 900 */ 135, 110, 111, 112, 113, 114, 112, 113, 114, 134,
	972	+ /* 910 */ 103, 135, 105, 134, 135, 135, 135, 110, 111, 112,
	973	+ /* 920 */ 113, 114, 135, 135, 103, 134, 105, 135, 134, 135,
	974	+ /* 930 */ 135, 110, 111, 112, 113, 114, 103, 135, 105, 135,
	975	+ /* 940 */ 135, 134, 135, 110, 111, 112, 113, 114, 135, 103,
	976	+ /* 950 */ 135, 105, 135, 135, 135, 134, 110, 111, 112, 113,
	977	+ /* 960 */ 114, 135, 135, 103, 135, 105, 135, 134, 135, 135,
	978	+ /* 970 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
	979	+ /* 980 */ 134, 135, 110, 111, 112, 113, 114, 135, 135, 103,
	980	+ /* 990 */ 135, 105, 103, 135, 134, 135, 110, 111, 112, 113,
	981	+ /* 1000 */ 114, 112, 113, 114, 135, 116, 134, 135, 103, 135,
	982	+ /* 1010 */ 135, 135, 123, 124, 135, 135, 103, 112, 113, 114,
	983	+ /* 1020 */ 134, 135, 135, 134, 119, 112, 113, 114, 135, 116,
	984	+ /* 1030 */ 135, 126, 103, 128, 135, 103, 135, 124, 135, 134,
	985	+ /* 1040 */ 135, 112, 113, 114, 112, 113, 114, 134, 103, 135,
	986	+ /* 1050 */ 135, 119, 4, 5, 6, 7, 135, 112, 113, 114,
	987	+ /* 1060 */ 103, 116, 135, 134, 103, 17, 134, 103, 135, 112,
	988	+ /* 1070 */ 113, 114, 135, 112, 113, 114, 112, 113, 114, 134,
	989	+ /* 1080 */ 135, 4, 5, 6, 7, 135, 135, 135, 135, 135,
	990	+ /* 1090 */ 103, 134, 135, 103, 17, 134, 103, 135, 134, 112,
	991	+ /* 1100 */ 113, 114, 112, 113, 114, 112, 113, 114, 135, 103,
	992	+ /* 1110 */ 4, 5, 6, 7, 135, 135, 135, 135, 112, 113,
	993	+ /* 1120 */ 114, 134, 103, 17, 134, 135, 135, 134, 103, 135,
	994	+ /* 1130 */ 135, 112, 113, 114, 135, 103, 135, 112, 113, 114,
	995	+ /* 1140 */ 134, 103, 135, 135, 112, 113, 114, 103, 135, 135,
	996	+ /* 1150 */ 112, 113, 114, 134, 135, 135, 112, 113, 114, 134,
	997	+ /* 1160 */ 135, 135, 135, 135, 103, 135, 134, 135, 135, 135,
	998	+ /* 1170 */ 103, 135, 134, 112, 113, 114, 135, 103, 134, 112,
	999	+ /* 1180 */ 113, 114, 103, 135, 135, 135, 112, 113, 114, 135,
	1000	+ /* 1190 */ 135, 112, 113, 114, 103, 134, 135, 135, 135, 135,
	1001	+ /* 1200 */ 103, 134, 135, 112, 113, 114, 103, 135, 134, 112,
	1002	+ /* 1210 */ 113, 114, 135, 134, 135, 112, 113, 114, 135, 135,
	1003	+ /* 1220 */ 135, 135, 135, 103, 135, 134, 135, 135, 135, 135,
	1004	+ /* 1230 */ 135, 134, 112, 113, 114, 103, 135, 134, 135, 103,
	1005	+ /* 1240 */ 135, 135, 103, 135, 112, 113, 114, 135, 112, 113,
	1006	+ /* 1250 */ 114, 112, 113, 114, 134, 4, 5, 6, 7, 4,
	1007	+ /* 1260 */ 5, 6, 7, 135, 135, 135, 134, 135, 135, 135,
	1008	+ /* 1270 */ 134, 135, 135, 134, 135, 135, 25, 135, 135, 135,
	1009	+ /* 1280 */ 25, 4, 5, 6, 7, 135, 135, 135, 135, 135,
	1010	+ /* 1290 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1011	+ /* 1300 */ 135, 135, 25, 135, 135, 135, 135, 135, 135, 135,
	1012	+ /* 1310 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1013	+ /* 1320 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1014	+ /* 1330 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1015	+ /* 1340 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1016	+ /* 1350 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1017	+ /* 1360 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1018	+ /* 1370 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
	1019	+ /* 1380 */ 135, 99, 99, 99, 99, 99, 99, 99, 99, 99,
	1020	+ /* 1390 */ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
	1021	+ /* 1400 */ 99, 99,
1013	1022	};
1014	1023	#define YY_SHIFT_COUNT (163)
1015	1024	#define YY_SHIFT_MIN (0)
1016		-#define YY_SHIFT_MAX (1245)
	1025	+#define YY_SHIFT_MAX (1277)
1017	1026	static const unsigned short int yy_shift_ofst[] = {
1018		- /* 0 */ 143, 127, 220, 243, 243, 243, 243, 243, 243, 243,
1019		- /* 10 */ 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
1020		- /* 20 */ 243, 243, 243, 243, 243, 243, 243, 175, 361, 481,
1021		- /* 30 */ 175, 143, 399, 399, 0, 64, 143, 506, 481, 506,
1022		- /* 40 */ 268, 268, 268, 424, 443, 481, 481, 481, 481, 481,
1023		- /* 50 */ 481, 538, 481, 481, 551, 481, 481, 481, 481, 481,
1024		- /* 60 */ 481, 481, 481, 481, 481, 334, 60, 60, 60, 60,
1025		- /* 70 */ 60, 620, 314, 392, 470, 893, 893, 104, 62, 1263,
1026		- /* 80 */ 1263, 1263, 1263, 511, 511, 198, 415, 222, 177, 290,
1027		- /* 90 */ 336, 632, 1039, 1209, 1215, 1227, 1231, 1241, 1245, 25,
1028		- /* 100 */ 25, 25, 182, 25, 25, 25, 63, 25, 210, 102,
1029		- /* 110 */ 105, 169, 221, 173, 138, 194, 194, 162, 227, 228,
1030		- /* 120 */ 43, 277, 141, 161, 189, 170, 234, 200, 217, 231,
1031		- /* 130 */ 237, 241, 215, 272, 269, 266, 218, 276, 219, 224,
1032		- /* 140 */ 242, 229, 297, 311, 320, 293, 335, 341, 344, 254,
1033		- /* 150 */ 261, 325, 254, 338, 348, 349, 350, 323, 340, 342,
1034		- /* 160 */ 357, 284, 371, 364,
	1027	+ /* 0 */ 143, 127, 221, 244, 244, 244, 244, 244, 244, 244,
	1028	+ /* 10 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244,
	1029	+ /* 20 */ 244, 244, 244, 244, 244, 244, 244, 276, 510, 557,
	1030	+ /* 30 */ 276, 143, 347, 347, 0, 64, 143, 573, 557, 573,
	1031	+ /* 40 */ 400, 400, 400, 442, 539, 557, 557, 557, 557, 557,
	1032	+ /* 50 */ 557, 604, 557, 557, 667, 557, 557, 557, 557, 557,
	1033	+ /* 60 */ 557, 557, 557, 557, 557, 218, 60, 60, 60, 60,
	1034	+ /* 70 */ 60, 145, 315, 393, 471, 292, 292, 170, 71, 1303,
	1035	+ /* 80 */ 1303, 1303, 1303, 114, 114, 338, 402, 129, 444, 367,
	1036	+ /* 90 */ 683, 589, 1251, 669, 1255, 1048, 1277, 1077, 1106, 25,
	1037	+ /* 100 */ 25, 25, 184, 25, 25, 25, 168, 25, 429, 83,
	1038	+ /* 110 */ 92, 105, 70, 133, 138, 182, 182, 234, 257, 137,
	1039	+ /* 120 */ 149, 289, 141, 155, 151, 146, 156, 147, 174, 176,
	1040	+ /* 130 */ 196, 203, 204, 179, 237, 249, 213, 261, 211, 214,
	1041	+ /* 140 */ 215, 222, 290, 300, 307, 278, 323, 330, 336, 246,
	1042	+ /* 150 */ 274, 329, 246, 343, 345, 346, 348, 351, 352, 353,
	1043	+ /* 160 */ 372, 297, 384, 377,
1035	1044	};
1036	1045	#define YY_REDUCE_COUNT (82)
1037		-#define YY_REDUCE_MIN (-128)
1038		-#define YY_REDUCE_MAX (1097)
	1046	+#define YY_REDUCE_MIN (-129)
	1047	+#define YY_REDUCE_MAX (1139)
1039	1048	static const short yy_reduce_ofst[] = {
1040		- /* 0 */ 363, -95, -31, 418, 502, 544, 563, 576, 588, 613,
1041		- /* 10 */ 628, 641, 653, 666, 678, 691, 704, 716, 731, 744,
1042		- /* 20 */ 756, 769, 781, 794, 807, 819, 834, 548, 490, 847,
1043		- /* 30 */ 879, 884, 600, 895, -60, -60, 93, 35, 907, 148,
1044		- /* 40 */ 456, 719, 919, 922, 925, 937, 960, 966, 973, 978,
1045		- /* 50 */ 985, 990, 1003, 1008, 1015, 1020, 1032, 1038, 1050, 1056,
1046		- /* 60 */ 1073, 1079, 1085, 1091, 1097, -80, -110, -100, -46, -36,
1047		- /* 70 */ -18, -21, -128, -128, -128, -96, -85, -57, -99, -30,
1048		- /* 80 */ -3, 24, 29,
	1049	+ /* 0 */ 363, -96, -32, 93, 152, 394, 512, 599, 616, 631,
	1050	+ /* 10 */ 664, 680, 696, 710, 722, 735, 749, 761, 775, 791,
	1051	+ /* 20 */ 807, 821, 833, 846, 860, 872, 886, 889, 668, 905,
	1052	+ /* 30 */ 913, 464, 603, 779, -61, -61, 535, 650, 932, 945,
	1053	+ /* 40 */ 794, 929, 957, 961, 964, 987, 990, 993, 1006, 1019,
	1054	+ /* 50 */ 1025, 1032, 1038, 1044, 1061, 1067, 1074, 1079, 1091, 1097,
	1055	+ /* 60 */ 1103, 1120, 1132, 1136, 1139, -81, -111, -101, -47, -37,
	1056	+ /* 70 */ -23, -22, -129, -129, -129, -97, -86, -58, -100, -15,
	1057	+ /* 80 */ 30, 34, 24,
1049	1058	};
1050	1059	static const YYACTIONTYPE yy_default[] = {
1051		- /* 0 */ 447, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1052		- /* 10 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1053		- /* 20 */ 441, 441, 441, 441, 441, 441, 441, 441, 471, 573,
1054		- /* 30 */ 441, 447, 577, 483, 578, 578, 447, 441, 441, 441,
1055		- /* 40 */ 441, 441, 441, 441, 441, 441, 441, 441, 475, 441,
1056		- /* 50 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1057		- /* 60 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1058		- /* 70 */ 441, 441, 441, 441, 441, 441, 441, 441, 453, 468,
1059		- /* 80 */ 506, 506, 573, 466, 491, 441, 441, 441, 469, 441,
1060		- /* 90 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 486,
1061		- /* 100 */ 484, 474, 457, 510, 509, 508, 441, 563, 441, 441,
1062		- /* 110 */ 441, 441, 441, 585, 441, 542, 541, 537, 441, 530,
1063		- /* 120 */ 527, 441, 441, 441, 441, 441, 441, 489, 441, 441,
1064		- /* 130 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1065		- /* 140 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 589,
1066		- /* 150 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1067		- /* 160 */ 441, 598, 441, 441,
	1060	+ /* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1061	+ /* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1062	+ /* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
	1063	+ /* 30 */ 443, 449, 580, 485, 581, 581, 449, 443, 443, 443,
	1064	+ /* 40 */ 443, 443, 443, 443, 443, 443, 443, 443, 477, 443,
	1065	+ /* 50 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1066	+ /* 60 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1067	+ /* 70 */ 443, 443, 443, 443, 443, 443, 443, 443, 455, 470,
	1068	+ /* 80 */ 508, 508, 576, 468, 493, 443, 443, 443, 471, 443,
	1069	+ /* 90 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 488,
	1070	+ /* 100 */ 486, 476, 459, 512, 511, 510, 443, 566, 443, 443,
	1071	+ /* 110 */ 443, 443, 443, 588, 443, 545, 544, 540, 443, 532,
	1072	+ /* 120 */ 529, 443, 443, 443, 443, 443, 443, 491, 443, 443,
	1073	+ /* 130 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1074	+ /* 140 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 592,
	1075	+ /* 150 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
	1076	+ /* 160 */ 443, 601, 443, 443,
1068	1077	};
1069	1078	/******** End of lemon-generated parsing tables ***************************/
1070	1079
1071	1080	/* The next table maps tokens (terminal symbols) into fallback tokens.
1072	1081	** If a construct like the following:
		@@ -1170,10 +1179,11 @@
1170	1179	0, /* TOP => nothing */
1171	1180	0, /* BOTTOM => nothing */
1172	1181	0, /* START => nothing */
1173	1182	0, /* END => nothing */
1174	1183	0, /* IN => nothing */
	1184	+ 0, /* THIS => nothing */
1175	1185	0, /* DOT_U => nothing */
1176	1186	0, /* LAST => nothing */
1177	1187	0, /* NUMBER => nothing */
1178	1188	0, /* FUNC1 => nothing */
1179	1189	0, /* FUNC2 => nothing */
		@@ -1356,56 +1366,57 @@
1356	1366	/* 83 */ "TOP",
1357	1367	/* 84 */ "BOTTOM",
1358	1368	/* 85 */ "START",
1359	1369	/* 86 */ "END",
1360	1370	/* 87 */ "IN",
1361		- /* 88 */ "DOT_U",
1362		- /* 89 */ "LAST",
1363		- /* 90 */ "NUMBER",
1364		- /* 91 */ "FUNC1",
1365		- /* 92 */ "FUNC2",
1366		- /* 93 */ "DIST",
1367		- /* 94 */ "DOT_XY",
1368		- /* 95 */ "X",
1369		- /* 96 */ "Y",
1370		- /* 97 */ "DOT_L",
1371		- /* 98 */ "statement_list",
1372		- /* 99 */ "statement",
1373		- /* 100 */ "unnamed_statement",
1374		- /* 101 */ "basetype",
1375		- /* 102 */ "expr",
1376		- /* 103 */ "numproperty",
1377		- /* 104 */ "edge",
1378		- /* 105 */ "direction",
1379		- /* 106 */ "dashproperty",
1380		- /* 107 */ "colorproperty",
1381		- /* 108 */ "locproperty",
1382		- /* 109 */ "position",
1383		- /* 110 */ "place",
1384		- /* 111 */ "object",
1385		- /* 112 */ "objectname",
1386		- /* 113 */ "nth",
1387		- /* 114 */ "textposition",
1388		- /* 115 */ "rvalue",
1389		- /* 116 */ "lvalue",
1390		- /* 117 */ "even",
1391		- /* 118 */ "relexpr",
1392		- /* 119 */ "optrelexpr",
1393		- /* 120 */ "document",
1394		- /* 121 */ "print",
1395		- /* 122 */ "prlist",
1396		- /* 123 */ "pritem",
1397		- /* 124 */ "prsep",
1398		- /* 125 */ "attribute_list",
1399		- /* 126 */ "savelist",
1400		- /* 127 */ "alist",
1401		- /* 128 */ "attribute",
1402		- /* 129 */ "go",
1403		- /* 130 */ "boolproperty",
1404		- /* 131 */ "withclause",
1405		- /* 132 */ "between",
1406		- /* 133 */ "place2",
	1371	+ /* 88 */ "THIS",
	1372	+ /* 89 */ "DOT_U",
	1373	+ /* 90 */ "LAST",
	1374	+ /* 91 */ "NUMBER",
	1375	+ /* 92 */ "FUNC1",
	1376	+ /* 93 */ "FUNC2",
	1377	+ /* 94 */ "DIST",
	1378	+ /* 95 */ "DOT_XY",
	1379	+ /* 96 */ "X",
	1380	+ /* 97 */ "Y",
	1381	+ /* 98 */ "DOT_L",
	1382	+ /* 99 */ "statement_list",
	1383	+ /* 100 */ "statement",
	1384	+ /* 101 */ "unnamed_statement",
	1385	+ /* 102 */ "basetype",
	1386	+ /* 103 */ "expr",
	1387	+ /* 104 */ "numproperty",
	1388	+ /* 105 */ "edge",
	1389	+ /* 106 */ "direction",
	1390	+ /* 107 */ "dashproperty",
	1391	+ /* 108 */ "colorproperty",
	1392	+ /* 109 */ "locproperty",
	1393	+ /* 110 */ "position",
	1394	+ /* 111 */ "place",
	1395	+ /* 112 */ "object",
	1396	+ /* 113 */ "objectname",
	1397	+ /* 114 */ "nth",
	1398	+ /* 115 */ "textposition",
	1399	+ /* 116 */ "rvalue",
	1400	+ /* 117 */ "lvalue",
	1401	+ /* 118 */ "even",
	1402	+ /* 119 */ "relexpr",
	1403	+ /* 120 */ "optrelexpr",
	1404	+ /* 121 */ "document",
	1405	+ /* 122 */ "print",
	1406	+ /* 123 */ "prlist",
	1407	+ /* 124 */ "pritem",
	1408	+ /* 125 */ "prsep",
	1409	+ /* 126 */ "attribute_list",
	1410	+ /* 127 */ "savelist",
	1411	+ /* 128 */ "alist",
	1412	+ /* 129 */ "attribute",
	1413	+ /* 130 */ "go",
	1414	+ /* 131 */ "boolproperty",
	1415	+ /* 132 */ "withclause",
	1416	+ /* 133 */ "between",
	1417	+ /* 134 */ "place2",
1407	1418	};
1408	1419	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1409	1420
1410	1421	#ifndef NDEBUG
1411	1422	/* For tracing reduce actions, the names of all rules are required.
		@@ -1497,77 +1508,78 @@
1497	1508	/* 83 */ "place2 ::= object",
1498	1509	/* 84 */ "place2 ::= object DOT_E edge",
1499	1510	/* 85 */ "place2 ::= NTH VERTEX OF object",
1500	1511	/* 86 */ "object ::= nth",
1501	1512	/* 87 */ "object ::= nth OF\|IN object",
1502		- /* 88 */ "objectname ::= PLACENAME",
1503		- /* 89 */ "objectname ::= objectname DOT_U PLACENAME",
1504		- /* 90 */ "nth ::= NTH CLASSNAME",
1505		- /* 91 */ "nth ::= NTH LAST CLASSNAME",
1506		- /* 92 */ "nth ::= LAST CLASSNAME",
1507		- /* 93 */ "nth ::= LAST",
1508		- /* 94 */ "nth ::= NTH LB RB",
1509		- /* 95 */ "nth ::= NTH LAST LB RB",
1510		- /* 96 */ "nth ::= LAST LB RB",
1511		- /* 97 */ "expr ::= expr PLUS expr",
1512		- /* 98 */ "expr ::= expr MINUS expr",
1513		- /* 99 */ "expr ::= expr STAR expr",
1514		- /* 100 */ "expr ::= expr SLASH expr",
1515		- /* 101 */ "expr ::= MINUS expr",
1516		- /* 102 */ "expr ::= PLUS expr",
1517		- /* 103 */ "expr ::= LP expr RP",
1518		- /* 104 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
1519		- /* 105 */ "expr ::= NUMBER",
1520		- /* 106 */ "expr ::= ID",
1521		- /* 107 */ "expr ::= FUNC1 LP expr RP",
1522		- /* 108 */ "expr ::= FUNC2 LP expr COMMA expr RP",
1523		- /* 109 */ "expr ::= DIST LP position COMMA position RP",
1524		- /* 110 */ "expr ::= place2 DOT_XY X",
1525		- /* 111 */ "expr ::= place2 DOT_XY Y",
1526		- /* 112 */ "expr ::= object DOT_L numproperty",
1527		- /* 113 */ "expr ::= object DOT_L dashproperty",
1528		- /* 114 */ "expr ::= object DOT_L colorproperty",
1529		- /* 115 */ "lvalue ::= ID",
1530		- /* 116 */ "lvalue ::= FILL",
1531		- /* 117 */ "lvalue ::= COLOR",
1532		- /* 118 */ "lvalue ::= THICKNESS",
1533		- /* 119 */ "rvalue ::= expr",
1534		- /* 120 */ "print ::= PRINT",
1535		- /* 121 */ "prlist ::= pritem",
1536		- /* 122 */ "prlist ::= prlist prsep pritem",
1537		- /* 123 */ "direction ::= UP",
1538		- /* 124 */ "direction ::= DOWN",
1539		- /* 125 */ "direction ::= LEFT",
1540		- /* 126 */ "direction ::= RIGHT",
1541		- /* 127 */ "optrelexpr ::= relexpr",
1542		- /* 128 */ "attribute_list ::= alist",
1543		- /* 129 */ "alist ::=",
1544		- /* 130 */ "alist ::= alist attribute",
1545		- /* 131 */ "attribute ::= boolproperty",
1546		- /* 132 */ "attribute ::= WITH withclause",
1547		- /* 133 */ "go ::= GO",
1548		- /* 134 */ "go ::=",
1549		- /* 135 */ "even ::= UNTIL EVEN WITH",
1550		- /* 136 */ "even ::= EVEN WITH",
1551		- /* 137 */ "dashproperty ::= DOTTED",
1552		- /* 138 */ "dashproperty ::= DASHED",
1553		- /* 139 */ "colorproperty ::= FILL",
1554		- /* 140 */ "colorproperty ::= COLOR",
1555		- /* 141 */ "position ::= place",
1556		- /* 142 */ "between ::= WAY BETWEEN",
1557		- /* 143 */ "between ::= BETWEEN",
1558		- /* 144 */ "between ::= OF THE WAY BETWEEN",
1559		- /* 145 */ "place ::= place2",
1560		- /* 146 */ "edge ::= CENTER",
1561		- /* 147 */ "edge ::= EDGEPT",
1562		- /* 148 */ "edge ::= TOP",
1563		- /* 149 */ "edge ::= BOTTOM",
1564		- /* 150 */ "edge ::= START",
1565		- /* 151 */ "edge ::= END",
1566		- /* 152 */ "edge ::= RIGHT",
1567		- /* 153 */ "edge ::= LEFT",
1568		- /* 154 */ "object ::= objectname",
	1513	+ /* 88 */ "objectname ::= THIS",
	1514	+ /* 89 */ "objectname ::= PLACENAME",
	1515	+ /* 90 */ "objectname ::= objectname DOT_U PLACENAME",
	1516	+ /* 91 */ "nth ::= NTH CLASSNAME",
	1517	+ /* 92 */ "nth ::= NTH LAST CLASSNAME",
	1518	+ /* 93 */ "nth ::= LAST CLASSNAME",
	1519	+ /* 94 */ "nth ::= LAST",
	1520	+ /* 95 */ "nth ::= NTH LB RB",
	1521	+ /* 96 */ "nth ::= NTH LAST LB RB",
	1522	+ /* 97 */ "nth ::= LAST LB RB",
	1523	+ /* 98 */ "expr ::= expr PLUS expr",
	1524	+ /* 99 */ "expr ::= expr MINUS expr",
	1525	+ /* 100 */ "expr ::= expr STAR expr",
	1526	+ /* 101 */ "expr ::= expr SLASH expr",
	1527	+ /* 102 */ "expr ::= MINUS expr",
	1528	+ /* 103 */ "expr ::= PLUS expr",
	1529	+ /* 104 */ "expr ::= LP expr RP",
	1530	+ /* 105 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
	1531	+ /* 106 */ "expr ::= NUMBER",
	1532	+ /* 107 */ "expr ::= ID",
	1533	+ /* 108 */ "expr ::= FUNC1 LP expr RP",
	1534	+ /* 109 */ "expr ::= FUNC2 LP expr COMMA expr RP",
	1535	+ /* 110 */ "expr ::= DIST LP position COMMA position RP",
	1536	+ /* 111 */ "expr ::= place2 DOT_XY X",
	1537	+ /* 112 */ "expr ::= place2 DOT_XY Y",
	1538	+ /* 113 */ "expr ::= object DOT_L numproperty",
	1539	+ /* 114 */ "expr ::= object DOT_L dashproperty",
	1540	+ /* 115 */ "expr ::= object DOT_L colorproperty",
	1541	+ /* 116 */ "lvalue ::= ID",
	1542	+ /* 117 */ "lvalue ::= FILL",
	1543	+ /* 118 */ "lvalue ::= COLOR",
	1544	+ /* 119 */ "lvalue ::= THICKNESS",
	1545	+ /* 120 */ "rvalue ::= expr",
	1546	+ /* 121 */ "print ::= PRINT",
	1547	+ /* 122 */ "prlist ::= pritem",
	1548	+ /* 123 */ "prlist ::= prlist prsep pritem",
	1549	+ /* 124 */ "direction ::= UP",
	1550	+ /* 125 */ "direction ::= DOWN",
	1551	+ /* 126 */ "direction ::= LEFT",
	1552	+ /* 127 */ "direction ::= RIGHT",
	1553	+ /* 128 */ "optrelexpr ::= relexpr",
	1554	+ /* 129 */ "attribute_list ::= alist",
	1555	+ /* 130 */ "alist ::=",
	1556	+ /* 131 */ "alist ::= alist attribute",
	1557	+ /* 132 */ "attribute ::= boolproperty",
	1558	+ /* 133 */ "attribute ::= WITH withclause",
	1559	+ /* 134 */ "go ::= GO",
	1560	+ /* 135 */ "go ::=",
	1561	+ /* 136 */ "even ::= UNTIL EVEN WITH",
	1562	+ /* 137 */ "even ::= EVEN WITH",
	1563	+ /* 138 */ "dashproperty ::= DOTTED",
	1564	+ /* 139 */ "dashproperty ::= DASHED",
	1565	+ /* 140 */ "colorproperty ::= FILL",
	1566	+ /* 141 */ "colorproperty ::= COLOR",
	1567	+ /* 142 */ "position ::= place",
	1568	+ /* 143 */ "between ::= WAY BETWEEN",
	1569	+ /* 144 */ "between ::= BETWEEN",
	1570	+ /* 145 */ "between ::= OF THE WAY BETWEEN",
	1571	+ /* 146 */ "place ::= place2",
	1572	+ /* 147 */ "edge ::= CENTER",
	1573	+ /* 148 */ "edge ::= EDGEPT",
	1574	+ /* 149 */ "edge ::= TOP",
	1575	+ /* 150 */ "edge ::= BOTTOM",
	1576	+ /* 151 */ "edge ::= START",
	1577	+ /* 152 */ "edge ::= END",
	1578	+ /* 153 */ "edge ::= RIGHT",
	1579	+ /* 154 */ "edge ::= LEFT",
	1580	+ /* 155 */ "object ::= objectname",
1569	1581	};
1570	1582	#endif /* NDEBUG */
1571	1583
1572	1584
1573	1585	#if YYSTACKDEPTH<=0
		@@ -1689,24 +1701,24 @@
1689	1701	** Note: during a reduce, the only symbols destroyed are those
1690	1702	** which appear on the RHS of the rule, but which are not used
1691	1703	** inside the C code.
1692	1704	*/
1693	1705	/******* Begin destructor definitions *************************************/
1694		- case 98: /* statement_list */
	1706	+ case 99: /* statement_list */
1695	1707	{
1696	1708	#line 494 "pikchr.y"
1697		-pik_elist_free(p,(yypminor->yy119));
1698		-#line 1723 "pikchr.c"
	1709	+pik_elist_free(p,(yypminor->yy227));
	1710	+#line 1735 "pikchr.c"
1699	1711	}
1700	1712	break;
1701		- case 99: /* statement */
1702		- case 100: /* unnamed_statement */
1703		- case 101: /* basetype */
	1713	+ case 100: /* statement */
	1714	+ case 101: /* unnamed_statement */
	1715	+ case 102: /* basetype */
1704	1716	{
1705	1717	#line 496 "pikchr.y"
1706		-pik_elem_free(p,(yypminor->yy38));
1707		-#line 1732 "pikchr.c"
	1718	+pik_elem_free(p,(yypminor->yy36));
	1719	+#line 1744 "pikchr.c"
1708	1720	}
1709	1721	break;
1710	1722	/******* End destructor definitions ***************************************/
1711	1723	default: break; /* If no destructor action specified: do nothing */
1712	1724	}
		@@ -1923,11 +1935,11 @@
1923	1935	** stack every overflows */
1924	1936	/****** Begin %stack_overflow code ****************************************/
1925	1937	#line 528 "pikchr.y"
1926	1938
1927	1939	pik_error(p, 0, "parser stack overflow");
1928		-#line 1953 "pikchr.c"
	1940	+#line 1965 "pikchr.c"
1929	1941	/****** End %stack_overflow code ******************************************/
1930	1942	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
1931	1943	pik_parserCTX_STORE
1932	1944	}
1933	1945
		@@ -1995,165 +2007,166 @@
1995	2007	}
1996	2008
1997	2009	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
1998	2010	** of that rule */
1999	2011	static const YYCODETYPE yyRuleInfoLhs[] = {
2000		- 120, /* (0) document ::= statement_list */
2001		- 98, /* (1) statement_list ::= statement */
2002		- 98, /* (2) statement_list ::= statement_list EOL statement */
2003		- 99, /* (3) statement ::= */
2004		- 99, /* (4) statement ::= direction */
2005		- 99, /* (5) statement ::= lvalue ASSIGN rvalue */
2006		- 99, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2007		- 99, /* (7) statement ::= PLACENAME COLON position */
2008		- 99, /* (8) statement ::= unnamed_statement */
2009		- 99, /* (9) statement ::= print prlist */
2010		- 99, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2011		- 99, /* (11) statement ::= ASSERT LP position EQ position RP */
2012		- 99, /* (12) statement ::= DEFINE ID CODEBLOCK */
2013		- 115, /* (13) rvalue ::= PLACENAME */
2014		- 123, /* (14) pritem ::= FILL */
2015		- 123, /* (15) pritem ::= COLOR */
2016		- 123, /* (16) pritem ::= THICKNESS */
2017		- 123, /* (17) pritem ::= rvalue */
2018		- 123, /* (18) pritem ::= STRING */
2019		- 124, /* (19) prsep ::= COMMA */
2020		- 100, /* (20) unnamed_statement ::= basetype attribute_list */
2021		- 101, /* (21) basetype ::= CLASSNAME */
2022		- 101, /* (22) basetype ::= STRING textposition */
2023		- 101, /* (23) basetype ::= LB savelist statement_list RB */
2024		- 126, /* (24) savelist ::= */
2025		- 118, /* (25) relexpr ::= expr */
2026		- 118, /* (26) relexpr ::= expr PERCENT */
2027		- 119, /* (27) optrelexpr ::= */
2028		- 125, /* (28) attribute_list ::= relexpr alist */
2029		- 128, /* (29) attribute ::= numproperty relexpr */
2030		- 128, /* (30) attribute ::= dashproperty expr */
2031		- 128, /* (31) attribute ::= dashproperty */
2032		- 128, /* (32) attribute ::= colorproperty rvalue */
2033		- 128, /* (33) attribute ::= go direction optrelexpr */
2034		- 128, /* (34) attribute ::= go direction even position */
2035		- 128, /* (35) attribute ::= CLOSE */
2036		- 128, /* (36) attribute ::= CHOP */
2037		- 128, /* (37) attribute ::= FROM position */
2038		- 128, /* (38) attribute ::= TO position */
2039		- 128, /* (39) attribute ::= THEN */
2040		- 128, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2041		- 128, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2042		- 128, /* (42) attribute ::= GO optrelexpr HEADING expr */
2043		- 128, /* (43) attribute ::= GO optrelexpr EDGEPT */
2044		- 128, /* (44) attribute ::= AT position */
2045		- 128, /* (45) attribute ::= SAME */
2046		- 128, /* (46) attribute ::= SAME AS object */
2047		- 128, /* (47) attribute ::= STRING textposition */
2048		- 128, /* (48) attribute ::= FIT */
2049		- 128, /* (49) attribute ::= BEHIND object */
2050		- 131, /* (50) withclause ::= DOT_E edge AT position */
2051		- 131, /* (51) withclause ::= edge AT position */
2052		- 103, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2053		- 130, /* (53) boolproperty ::= CW */
2054		- 130, /* (54) boolproperty ::= CCW */
2055		- 130, /* (55) boolproperty ::= LARROW */
2056		- 130, /* (56) boolproperty ::= RARROW */
2057		- 130, /* (57) boolproperty ::= LRARROW */
2058		- 130, /* (58) boolproperty ::= INVIS */
2059		- 130, /* (59) boolproperty ::= THICK */
2060		- 130, /* (60) boolproperty ::= THIN */
2061		- 130, /* (61) boolproperty ::= SOLID */
2062		- 114, /* (62) textposition ::= */
2063		- 114, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2064		- 109, /* (64) position ::= expr COMMA expr */
2065		- 109, /* (65) position ::= place PLUS expr COMMA expr */
2066		- 109, /* (66) position ::= place MINUS expr COMMA expr */
2067		- 109, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2068		- 109, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2069		- 109, /* (69) position ::= LP position COMMA position RP */
2070		- 109, /* (70) position ::= LP position RP */
2071		- 109, /* (71) position ::= expr between position AND position */
2072		- 109, /* (72) position ::= expr LT position COMMA position GT */
2073		- 109, /* (73) position ::= expr ABOVE position */
2074		- 109, /* (74) position ::= expr BELOW position */
2075		- 109, /* (75) position ::= expr LEFT OF position */
2076		- 109, /* (76) position ::= expr RIGHT OF position */
2077		- 109, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2078		- 109, /* (78) position ::= expr HEADING EDGEPT OF position */
2079		- 109, /* (79) position ::= expr EDGEPT OF position */
2080		- 109, /* (80) position ::= expr ON HEADING expr FROM position */
2081		- 109, /* (81) position ::= expr HEADING expr FROM position */
2082		- 110, /* (82) place ::= edge OF object */
2083		- 133, /* (83) place2 ::= object */
2084		- 133, /* (84) place2 ::= object DOT_E edge */
2085		- 133, /* (85) place2 ::= NTH VERTEX OF object */
2086		- 111, /* (86) object ::= nth */
2087		- 111, /* (87) object ::= nth OF\|IN object */
2088		- 112, /* (88) objectname ::= PLACENAME */
2089		- 112, /* (89) objectname ::= objectname DOT_U PLACENAME */
2090		- 113, /* (90) nth ::= NTH CLASSNAME */
2091		- 113, /* (91) nth ::= NTH LAST CLASSNAME */
2092		- 113, /* (92) nth ::= LAST CLASSNAME */
2093		- 113, /* (93) nth ::= LAST */
2094		- 113, /* (94) nth ::= NTH LB RB */
2095		- 113, /* (95) nth ::= NTH LAST LB RB */
2096		- 113, /* (96) nth ::= LAST LB RB */
2097		- 102, /* (97) expr ::= expr PLUS expr */
2098		- 102, /* (98) expr ::= expr MINUS expr */
2099		- 102, /* (99) expr ::= expr STAR expr */
2100		- 102, /* (100) expr ::= expr SLASH expr */
2101		- 102, /* (101) expr ::= MINUS expr */
2102		- 102, /* (102) expr ::= PLUS expr */
2103		- 102, /* (103) expr ::= LP expr RP */
2104		- 102, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2105		- 102, /* (105) expr ::= NUMBER */
2106		- 102, /* (106) expr ::= ID */
2107		- 102, /* (107) expr ::= FUNC1 LP expr RP */
2108		- 102, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2109		- 102, /* (109) expr ::= DIST LP position COMMA position RP */
2110		- 102, /* (110) expr ::= place2 DOT_XY X */
2111		- 102, /* (111) expr ::= place2 DOT_XY Y */
2112		- 102, /* (112) expr ::= object DOT_L numproperty */
2113		- 102, /* (113) expr ::= object DOT_L dashproperty */
2114		- 102, /* (114) expr ::= object DOT_L colorproperty */
2115		- 116, /* (115) lvalue ::= ID */
2116		- 116, /* (116) lvalue ::= FILL */
2117		- 116, /* (117) lvalue ::= COLOR */
2118		- 116, /* (118) lvalue ::= THICKNESS */
2119		- 115, /* (119) rvalue ::= expr */
2120		- 121, /* (120) print ::= PRINT */
2121		- 122, /* (121) prlist ::= pritem */
2122		- 122, /* (122) prlist ::= prlist prsep pritem */
2123		- 105, /* (123) direction ::= UP */
2124		- 105, /* (124) direction ::= DOWN */
2125		- 105, /* (125) direction ::= LEFT */
2126		- 105, /* (126) direction ::= RIGHT */
2127		- 119, /* (127) optrelexpr ::= relexpr */
2128		- 125, /* (128) attribute_list ::= alist */
2129		- 127, /* (129) alist ::= */
2130		- 127, /* (130) alist ::= alist attribute */
2131		- 128, /* (131) attribute ::= boolproperty */
2132		- 128, /* (132) attribute ::= WITH withclause */
2133		- 129, /* (133) go ::= GO */
2134		- 129, /* (134) go ::= */
2135		- 117, /* (135) even ::= UNTIL EVEN WITH */
2136		- 117, /* (136) even ::= EVEN WITH */
2137		- 106, /* (137) dashproperty ::= DOTTED */
2138		- 106, /* (138) dashproperty ::= DASHED */
2139		- 107, /* (139) colorproperty ::= FILL */
2140		- 107, /* (140) colorproperty ::= COLOR */
2141		- 109, /* (141) position ::= place */
2142		- 132, /* (142) between ::= WAY BETWEEN */
2143		- 132, /* (143) between ::= BETWEEN */
2144		- 132, /* (144) between ::= OF THE WAY BETWEEN */
2145		- 110, /* (145) place ::= place2 */
2146		- 104, /* (146) edge ::= CENTER */
2147		- 104, /* (147) edge ::= EDGEPT */
2148		- 104, /* (148) edge ::= TOP */
2149		- 104, /* (149) edge ::= BOTTOM */
2150		- 104, /* (150) edge ::= START */
2151		- 104, /* (151) edge ::= END */
2152		- 104, /* (152) edge ::= RIGHT */
2153		- 104, /* (153) edge ::= LEFT */
2154		- 111, /* (154) object ::= objectname */
	2012	+ 121, /* (0) document ::= statement_list */
	2013	+ 99, /* (1) statement_list ::= statement */
	2014	+ 99, /* (2) statement_list ::= statement_list EOL statement */
	2015	+ 100, /* (3) statement ::= */
	2016	+ 100, /* (4) statement ::= direction */
	2017	+ 100, /* (5) statement ::= lvalue ASSIGN rvalue */
	2018	+ 100, /* (6) statement ::= PLACENAME COLON unnamed_statement */
	2019	+ 100, /* (7) statement ::= PLACENAME COLON position */
	2020	+ 100, /* (8) statement ::= unnamed_statement */
	2021	+ 100, /* (9) statement ::= print prlist */
	2022	+ 100, /* (10) statement ::= ASSERT LP expr EQ expr RP */
	2023	+ 100, /* (11) statement ::= ASSERT LP position EQ position RP */
	2024	+ 100, /* (12) statement ::= DEFINE ID CODEBLOCK */
	2025	+ 116, /* (13) rvalue ::= PLACENAME */
	2026	+ 124, /* (14) pritem ::= FILL */
	2027	+ 124, /* (15) pritem ::= COLOR */
	2028	+ 124, /* (16) pritem ::= THICKNESS */
	2029	+ 124, /* (17) pritem ::= rvalue */
	2030	+ 124, /* (18) pritem ::= STRING */
	2031	+ 125, /* (19) prsep ::= COMMA */
	2032	+ 101, /* (20) unnamed_statement ::= basetype attribute_list */
	2033	+ 102, /* (21) basetype ::= CLASSNAME */
	2034	+ 102, /* (22) basetype ::= STRING textposition */
	2035	+ 102, /* (23) basetype ::= LB savelist statement_list RB */
	2036	+ 127, /* (24) savelist ::= */
	2037	+ 119, /* (25) relexpr ::= expr */
	2038	+ 119, /* (26) relexpr ::= expr PERCENT */
	2039	+ 120, /* (27) optrelexpr ::= */
	2040	+ 126, /* (28) attribute_list ::= relexpr alist */
	2041	+ 129, /* (29) attribute ::= numproperty relexpr */
	2042	+ 129, /* (30) attribute ::= dashproperty expr */
	2043	+ 129, /* (31) attribute ::= dashproperty */
	2044	+ 129, /* (32) attribute ::= colorproperty rvalue */
	2045	+ 129, /* (33) attribute ::= go direction optrelexpr */
	2046	+ 129, /* (34) attribute ::= go direction even position */
	2047	+ 129, /* (35) attribute ::= CLOSE */
	2048	+ 129, /* (36) attribute ::= CHOP */
	2049	+ 129, /* (37) attribute ::= FROM position */
	2050	+ 129, /* (38) attribute ::= TO position */
	2051	+ 129, /* (39) attribute ::= THEN */
	2052	+ 129, /* (40) attribute ::= THEN optrelexpr HEADING expr */
	2053	+ 129, /* (41) attribute ::= THEN optrelexpr EDGEPT */
	2054	+ 129, /* (42) attribute ::= GO optrelexpr HEADING expr */
	2055	+ 129, /* (43) attribute ::= GO optrelexpr EDGEPT */
	2056	+ 129, /* (44) attribute ::= AT position */
	2057	+ 129, /* (45) attribute ::= SAME */
	2058	+ 129, /* (46) attribute ::= SAME AS object */
	2059	+ 129, /* (47) attribute ::= STRING textposition */
	2060	+ 129, /* (48) attribute ::= FIT */
	2061	+ 129, /* (49) attribute ::= BEHIND object */
	2062	+ 132, /* (50) withclause ::= DOT_E edge AT position */
	2063	+ 132, /* (51) withclause ::= edge AT position */
	2064	+ 104, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
	2065	+ 131, /* (53) boolproperty ::= CW */
	2066	+ 131, /* (54) boolproperty ::= CCW */
	2067	+ 131, /* (55) boolproperty ::= LARROW */
	2068	+ 131, /* (56) boolproperty ::= RARROW */
	2069	+ 131, /* (57) boolproperty ::= LRARROW */
	2070	+ 131, /* (58) boolproperty ::= INVIS */
	2071	+ 131, /* (59) boolproperty ::= THICK */
	2072	+ 131, /* (60) boolproperty ::= THIN */
	2073	+ 131, /* (61) boolproperty ::= SOLID */
	2074	+ 115, /* (62) textposition ::= */
	2075	+ 115, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
	2076	+ 110, /* (64) position ::= expr COMMA expr */
	2077	+ 110, /* (65) position ::= place PLUS expr COMMA expr */
	2078	+ 110, /* (66) position ::= place MINUS expr COMMA expr */
	2079	+ 110, /* (67) position ::= place PLUS LP expr COMMA expr RP */
	2080	+ 110, /* (68) position ::= place MINUS LP expr COMMA expr RP */
	2081	+ 110, /* (69) position ::= LP position COMMA position RP */
	2082	+ 110, /* (70) position ::= LP position RP */
	2083	+ 110, /* (71) position ::= expr between position AND position */
	2084	+ 110, /* (72) position ::= expr LT position COMMA position GT */
	2085	+ 110, /* (73) position ::= expr ABOVE position */
	2086	+ 110, /* (74) position ::= expr BELOW position */
	2087	+ 110, /* (75) position ::= expr LEFT OF position */
	2088	+ 110, /* (76) position ::= expr RIGHT OF position */
	2089	+ 110, /* (77) position ::= expr ON HEADING EDGEPT OF position */
	2090	+ 110, /* (78) position ::= expr HEADING EDGEPT OF position */
	2091	+ 110, /* (79) position ::= expr EDGEPT OF position */
	2092	+ 110, /* (80) position ::= expr ON HEADING expr FROM position */
	2093	+ 110, /* (81) position ::= expr HEADING expr FROM position */
	2094	+ 111, /* (82) place ::= edge OF object */
	2095	+ 134, /* (83) place2 ::= object */
	2096	+ 134, /* (84) place2 ::= object DOT_E edge */
	2097	+ 134, /* (85) place2 ::= NTH VERTEX OF object */
	2098	+ 112, /* (86) object ::= nth */
	2099	+ 112, /* (87) object ::= nth OF\|IN object */
	2100	+ 113, /* (88) objectname ::= THIS */
	2101	+ 113, /* (89) objectname ::= PLACENAME */
	2102	+ 113, /* (90) objectname ::= objectname DOT_U PLACENAME */
	2103	+ 114, /* (91) nth ::= NTH CLASSNAME */
	2104	+ 114, /* (92) nth ::= NTH LAST CLASSNAME */
	2105	+ 114, /* (93) nth ::= LAST CLASSNAME */
	2106	+ 114, /* (94) nth ::= LAST */
	2107	+ 114, /* (95) nth ::= NTH LB RB */
	2108	+ 114, /* (96) nth ::= NTH LAST LB RB */
	2109	+ 114, /* (97) nth ::= LAST LB RB */
	2110	+ 103, /* (98) expr ::= expr PLUS expr */
	2111	+ 103, /* (99) expr ::= expr MINUS expr */
	2112	+ 103, /* (100) expr ::= expr STAR expr */
	2113	+ 103, /* (101) expr ::= expr SLASH expr */
	2114	+ 103, /* (102) expr ::= MINUS expr */
	2115	+ 103, /* (103) expr ::= PLUS expr */
	2116	+ 103, /* (104) expr ::= LP expr RP */
	2117	+ 103, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2118	+ 103, /* (106) expr ::= NUMBER */
	2119	+ 103, /* (107) expr ::= ID */
	2120	+ 103, /* (108) expr ::= FUNC1 LP expr RP */
	2121	+ 103, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
	2122	+ 103, /* (110) expr ::= DIST LP position COMMA position RP */
	2123	+ 103, /* (111) expr ::= place2 DOT_XY X */
	2124	+ 103, /* (112) expr ::= place2 DOT_XY Y */
	2125	+ 103, /* (113) expr ::= object DOT_L numproperty */
	2126	+ 103, /* (114) expr ::= object DOT_L dashproperty */
	2127	+ 103, /* (115) expr ::= object DOT_L colorproperty */
	2128	+ 117, /* (116) lvalue ::= ID */
	2129	+ 117, /* (117) lvalue ::= FILL */
	2130	+ 117, /* (118) lvalue ::= COLOR */
	2131	+ 117, /* (119) lvalue ::= THICKNESS */
	2132	+ 116, /* (120) rvalue ::= expr */
	2133	+ 122, /* (121) print ::= PRINT */
	2134	+ 123, /* (122) prlist ::= pritem */
	2135	+ 123, /* (123) prlist ::= prlist prsep pritem */
	2136	+ 106, /* (124) direction ::= UP */
	2137	+ 106, /* (125) direction ::= DOWN */
	2138	+ 106, /* (126) direction ::= LEFT */
	2139	+ 106, /* (127) direction ::= RIGHT */
	2140	+ 120, /* (128) optrelexpr ::= relexpr */
	2141	+ 126, /* (129) attribute_list ::= alist */
	2142	+ 128, /* (130) alist ::= */
	2143	+ 128, /* (131) alist ::= alist attribute */
	2144	+ 129, /* (132) attribute ::= boolproperty */
	2145	+ 129, /* (133) attribute ::= WITH withclause */
	2146	+ 130, /* (134) go ::= GO */
	2147	+ 130, /* (135) go ::= */
	2148	+ 118, /* (136) even ::= UNTIL EVEN WITH */
	2149	+ 118, /* (137) even ::= EVEN WITH */
	2150	+ 107, /* (138) dashproperty ::= DOTTED */
	2151	+ 107, /* (139) dashproperty ::= DASHED */
	2152	+ 108, /* (140) colorproperty ::= FILL */
	2153	+ 108, /* (141) colorproperty ::= COLOR */
	2154	+ 110, /* (142) position ::= place */
	2155	+ 133, /* (143) between ::= WAY BETWEEN */
	2156	+ 133, /* (144) between ::= BETWEEN */
	2157	+ 133, /* (145) between ::= OF THE WAY BETWEEN */
	2158	+ 111, /* (146) place ::= place2 */
	2159	+ 105, /* (147) edge ::= CENTER */
	2160	+ 105, /* (148) edge ::= EDGEPT */
	2161	+ 105, /* (149) edge ::= TOP */
	2162	+ 105, /* (150) edge ::= BOTTOM */
	2163	+ 105, /* (151) edge ::= START */
	2164	+ 105, /* (152) edge ::= END */
	2165	+ 105, /* (153) edge ::= RIGHT */
	2166	+ 105, /* (154) edge ::= LEFT */
	2167	+ 112, /* (155) object ::= objectname */
2155	2168	};
2156	2169
2157	2170	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2158	2171	** of symbols on the right-hand side of that rule. */
2159	2172	static const signed char yyRuleInfoNRhs[] = {
		@@ -2243,77 +2256,78 @@
2243	2256	-1, /* (83) place2 ::= object */
2244	2257	-3, /* (84) place2 ::= object DOT_E edge */
2245	2258	-4, /* (85) place2 ::= NTH VERTEX OF object */
2246	2259	-1, /* (86) object ::= nth */
2247	2260	-3, /* (87) object ::= nth OF\|IN object */
2248		- -1, /* (88) objectname ::= PLACENAME */
2249		- -3, /* (89) objectname ::= objectname DOT_U PLACENAME */
2250		- -2, /* (90) nth ::= NTH CLASSNAME */
2251		- -3, /* (91) nth ::= NTH LAST CLASSNAME */
2252		- -2, /* (92) nth ::= LAST CLASSNAME */
2253		- -1, /* (93) nth ::= LAST */
2254		- -3, /* (94) nth ::= NTH LB RB */
2255		- -4, /* (95) nth ::= NTH LAST LB RB */
2256		- -3, /* (96) nth ::= LAST LB RB */
2257		- -3, /* (97) expr ::= expr PLUS expr */
2258		- -3, /* (98) expr ::= expr MINUS expr */
2259		- -3, /* (99) expr ::= expr STAR expr */
2260		- -3, /* (100) expr ::= expr SLASH expr */
2261		- -2, /* (101) expr ::= MINUS expr */
2262		- -2, /* (102) expr ::= PLUS expr */
2263		- -3, /* (103) expr ::= LP expr RP */
2264		- -3, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2265		- -1, /* (105) expr ::= NUMBER */
2266		- -1, /* (106) expr ::= ID */
2267		- -4, /* (107) expr ::= FUNC1 LP expr RP */
2268		- -6, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2269		- -6, /* (109) expr ::= DIST LP position COMMA position RP */
2270		- -3, /* (110) expr ::= place2 DOT_XY X */
2271		- -3, /* (111) expr ::= place2 DOT_XY Y */
2272		- -3, /* (112) expr ::= object DOT_L numproperty */
2273		- -3, /* (113) expr ::= object DOT_L dashproperty */
2274		- -3, /* (114) expr ::= object DOT_L colorproperty */
2275		- -1, /* (115) lvalue ::= ID */
2276		- -1, /* (116) lvalue ::= FILL */
2277		- -1, /* (117) lvalue ::= COLOR */
2278		- -1, /* (118) lvalue ::= THICKNESS */
2279		- -1, /* (119) rvalue ::= expr */
2280		- -1, /* (120) print ::= PRINT */
2281		- -1, /* (121) prlist ::= pritem */
2282		- -3, /* (122) prlist ::= prlist prsep pritem */
2283		- -1, /* (123) direction ::= UP */
2284		- -1, /* (124) direction ::= DOWN */
2285		- -1, /* (125) direction ::= LEFT */
2286		- -1, /* (126) direction ::= RIGHT */
2287		- -1, /* (127) optrelexpr ::= relexpr */
2288		- -1, /* (128) attribute_list ::= alist */
2289		- 0, /* (129) alist ::= */
2290		- -2, /* (130) alist ::= alist attribute */
2291		- -1, /* (131) attribute ::= boolproperty */
2292		- -2, /* (132) attribute ::= WITH withclause */
2293		- -1, /* (133) go ::= GO */
2294		- 0, /* (134) go ::= */
2295		- -3, /* (135) even ::= UNTIL EVEN WITH */
2296		- -2, /* (136) even ::= EVEN WITH */
2297		- -1, /* (137) dashproperty ::= DOTTED */
2298		- -1, /* (138) dashproperty ::= DASHED */
2299		- -1, /* (139) colorproperty ::= FILL */
2300		- -1, /* (140) colorproperty ::= COLOR */
2301		- -1, /* (141) position ::= place */
2302		- -2, /* (142) between ::= WAY BETWEEN */
2303		- -1, /* (143) between ::= BETWEEN */
2304		- -4, /* (144) between ::= OF THE WAY BETWEEN */
2305		- -1, /* (145) place ::= place2 */
2306		- -1, /* (146) edge ::= CENTER */
2307		- -1, /* (147) edge ::= EDGEPT */
2308		- -1, /* (148) edge ::= TOP */
2309		- -1, /* (149) edge ::= BOTTOM */
2310		- -1, /* (150) edge ::= START */
2311		- -1, /* (151) edge ::= END */
2312		- -1, /* (152) edge ::= RIGHT */
2313		- -1, /* (153) edge ::= LEFT */
2314		- -1, /* (154) object ::= objectname */
	2261	+ -1, /* (88) objectname ::= THIS */
	2262	+ -1, /* (89) objectname ::= PLACENAME */
	2263	+ -3, /* (90) objectname ::= objectname DOT_U PLACENAME */
	2264	+ -2, /* (91) nth ::= NTH CLASSNAME */
	2265	+ -3, /* (92) nth ::= NTH LAST CLASSNAME */
	2266	+ -2, /* (93) nth ::= LAST CLASSNAME */
	2267	+ -1, /* (94) nth ::= LAST */
	2268	+ -3, /* (95) nth ::= NTH LB RB */
	2269	+ -4, /* (96) nth ::= NTH LAST LB RB */
	2270	+ -3, /* (97) nth ::= LAST LB RB */
	2271	+ -3, /* (98) expr ::= expr PLUS expr */
	2272	+ -3, /* (99) expr ::= expr MINUS expr */
	2273	+ -3, /* (100) expr ::= expr STAR expr */
	2274	+ -3, /* (101) expr ::= expr SLASH expr */
	2275	+ -2, /* (102) expr ::= MINUS expr */
	2276	+ -2, /* (103) expr ::= PLUS expr */
	2277	+ -3, /* (104) expr ::= LP expr RP */
	2278	+ -3, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2279	+ -1, /* (106) expr ::= NUMBER */
	2280	+ -1, /* (107) expr ::= ID */
	2281	+ -4, /* (108) expr ::= FUNC1 LP expr RP */
	2282	+ -6, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
	2283	+ -6, /* (110) expr ::= DIST LP position COMMA position RP */
	2284	+ -3, /* (111) expr ::= place2 DOT_XY X */
	2285	+ -3, /* (112) expr ::= place2 DOT_XY Y */
	2286	+ -3, /* (113) expr ::= object DOT_L numproperty */
	2287	+ -3, /* (114) expr ::= object DOT_L dashproperty */
	2288	+ -3, /* (115) expr ::= object DOT_L colorproperty */
	2289	+ -1, /* (116) lvalue ::= ID */
	2290	+ -1, /* (117) lvalue ::= FILL */
	2291	+ -1, /* (118) lvalue ::= COLOR */
	2292	+ -1, /* (119) lvalue ::= THICKNESS */
	2293	+ -1, /* (120) rvalue ::= expr */
	2294	+ -1, /* (121) print ::= PRINT */
	2295	+ -1, /* (122) prlist ::= pritem */
	2296	+ -3, /* (123) prlist ::= prlist prsep pritem */
	2297	+ -1, /* (124) direction ::= UP */
	2298	+ -1, /* (125) direction ::= DOWN */
	2299	+ -1, /* (126) direction ::= LEFT */
	2300	+ -1, /* (127) direction ::= RIGHT */
	2301	+ -1, /* (128) optrelexpr ::= relexpr */
	2302	+ -1, /* (129) attribute_list ::= alist */
	2303	+ 0, /* (130) alist ::= */
	2304	+ -2, /* (131) alist ::= alist attribute */
	2305	+ -1, /* (132) attribute ::= boolproperty */
	2306	+ -2, /* (133) attribute ::= WITH withclause */
	2307	+ -1, /* (134) go ::= GO */
	2308	+ 0, /* (135) go ::= */
	2309	+ -3, /* (136) even ::= UNTIL EVEN WITH */
	2310	+ -2, /* (137) even ::= EVEN WITH */
	2311	+ -1, /* (138) dashproperty ::= DOTTED */
	2312	+ -1, /* (139) dashproperty ::= DASHED */
	2313	+ -1, /* (140) colorproperty ::= FILL */
	2314	+ -1, /* (141) colorproperty ::= COLOR */
	2315	+ -1, /* (142) position ::= place */
	2316	+ -2, /* (143) between ::= WAY BETWEEN */
	2317	+ -1, /* (144) between ::= BETWEEN */
	2318	+ -4, /* (145) between ::= OF THE WAY BETWEEN */
	2319	+ -1, /* (146) place ::= place2 */
	2320	+ -1, /* (147) edge ::= CENTER */
	2321	+ -1, /* (148) edge ::= EDGEPT */
	2322	+ -1, /* (149) edge ::= TOP */
	2323	+ -1, /* (150) edge ::= BOTTOM */
	2324	+ -1, /* (151) edge ::= START */
	2325	+ -1, /* (152) edge ::= END */
	2326	+ -1, /* (153) edge ::= RIGHT */
	2327	+ -1, /* (154) edge ::= LEFT */
	2328	+ -1, /* (155) object ::= objectname */
2315	2329	};
2316	2330
2317	2331	static void yy_accept(yyParser); / Forward Declaration */
2318	2332
2319	2333	/*
		@@ -2402,656 +2416,661 @@
2402	2416	*/
2403	2417	/******** Begin reduce actions ********************************************/
2404	2418	YYMINORTYPE yylhsminor;
2405	2419	case 0: /* document ::= statement_list */
2406	2420	#line 532 "pikchr.y"
2407		-{pik_render(p,yymsp[0].minor.yy119);}
2408		-#line 2433 "pikchr.c"
	2421	+{pik_render(p,yymsp[0].minor.yy227);}
	2422	+#line 2447 "pikchr.c"
2409	2423	break;
2410	2424	case 1: /* statement_list ::= statement */
2411	2425	#line 535 "pikchr.y"
2412		-{ yylhsminor.yy119 = pik_elist_append(p,0,yymsp[0].minor.yy38); }
2413		-#line 2438 "pikchr.c"
2414		- yymsp[0].minor.yy119 = yylhsminor.yy119;
	2426	+{ yylhsminor.yy227 = pik_elist_append(p,0,yymsp[0].minor.yy36); }
	2427	+#line 2452 "pikchr.c"
	2428	+ yymsp[0].minor.yy227 = yylhsminor.yy227;
2415	2429	break;
2416	2430	case 2: /* statement_list ::= statement_list EOL statement */
2417	2431	#line 537 "pikchr.y"
2418		-{ yylhsminor.yy119 = pik_elist_append(p,yymsp[-2].minor.yy119,yymsp[0].minor.yy38); }
2419		-#line 2444 "pikchr.c"
2420		- yymsp[-2].minor.yy119 = yylhsminor.yy119;
	2432	+{ yylhsminor.yy227 = pik_elist_append(p,yymsp[-2].minor.yy227,yymsp[0].minor.yy36); }
	2433	+#line 2458 "pikchr.c"
	2434	+ yymsp[-2].minor.yy227 = yylhsminor.yy227;
2421	2435	break;
2422	2436	case 3: /* statement ::= */
2423	2437	#line 540 "pikchr.y"
2424		-{ yymsp[1].minor.yy38 = 0; }
2425		-#line 2450 "pikchr.c"
	2438	+{ yymsp[1].minor.yy36 = 0; }
	2439	+#line 2464 "pikchr.c"
2426	2440	break;
2427	2441	case 4: /* statement ::= direction */
2428	2442	#line 541 "pikchr.y"
2429		-{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy38=0; }
2430		-#line 2455 "pikchr.c"
2431		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2443	+{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy36=0; }
	2444	+#line 2469 "pikchr.c"
	2445	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2432	2446	break;
2433	2447	case 5: /* statement ::= lvalue ASSIGN rvalue */
2434	2448	#line 542 "pikchr.y"
2435		-{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy265,&yymsp[-1].minor.yy0); yylhsminor.yy38=0;}
2436		-#line 2461 "pikchr.c"
2437		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2449	+{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy153,&yymsp[-1].minor.yy0); yylhsminor.yy36=0;}
	2450	+#line 2475 "pikchr.c"
	2451	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2438	2452	break;
2439	2453	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2440	2454	#line 544 "pikchr.y"
2441		-{ yylhsminor.yy38 = yymsp[0].minor.yy38; pik_elem_setname(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0); }
2442		-#line 2467 "pikchr.c"
2443		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2455	+{ yylhsminor.yy36 = yymsp[0].minor.yy36; pik_elem_setname(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0); }
	2456	+#line 2481 "pikchr.c"
	2457	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2444	2458	break;
2445	2459	case 7: /* statement ::= PLACENAME COLON position */
2446	2460	#line 546 "pikchr.y"
2447		-{ yylhsminor.yy38 = pik_elem_new(p,0,0,0);
2448		- if(yylhsminor.yy38){ yylhsminor.yy38->ptAt = yymsp[0].minor.yy43; pik_elem_setname(p,yylhsminor.yy38,&yymsp[-2].minor.yy0); }}
2449		-#line 2474 "pikchr.c"
2450		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2461	+{ yylhsminor.yy36 = pik_elem_new(p,0,0,0);
	2462	+ if(yylhsminor.yy36){ yylhsminor.yy36->ptAt = yymsp[0].minor.yy79; pik_elem_setname(p,yylhsminor.yy36,&yymsp[-2].minor.yy0); }}
	2463	+#line 2488 "pikchr.c"
	2464	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2451	2465	break;
2452	2466	case 8: /* statement ::= unnamed_statement */
2453	2467	#line 548 "pikchr.y"
2454		-{yylhsminor.yy38 = yymsp[0].minor.yy38;}
2455		-#line 2480 "pikchr.c"
2456		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2468	+{yylhsminor.yy36 = yymsp[0].minor.yy36;}
	2469	+#line 2494 "pikchr.c"
	2470	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2457	2471	break;
2458	2472	case 9: /* statement ::= print prlist */
2459	2473	#line 549 "pikchr.y"
2460		-{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy38=0;}
2461		-#line 2486 "pikchr.c"
	2474	+{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy36=0;}
	2475	+#line 2500 "pikchr.c"
2462	2476	break;
2463	2477	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2464	2478	#line 554 "pikchr.y"
2465		-{yymsp[-5].minor.yy38=pik_assert(p,yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy265);}
2466		-#line 2491 "pikchr.c"
	2479	+{yymsp[-5].minor.yy36=pik_assert(p,yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy153);}
	2480	+#line 2505 "pikchr.c"
2467	2481	break;
2468	2482	case 11: /* statement ::= ASSERT LP position EQ position RP */
2469	2483	#line 556 "pikchr.y"
2470		-{yymsp[-5].minor.yy38=pik_position_assert(p,&yymsp[-3].minor.yy43,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy43);}
2471		-#line 2496 "pikchr.c"
	2484	+{yymsp[-5].minor.yy36=pik_position_assert(p,&yymsp[-3].minor.yy79,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy79);}
	2485	+#line 2510 "pikchr.c"
2472	2486	break;
2473	2487	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2474	2488	#line 557 "pikchr.y"
2475		-{yymsp[-2].minor.yy38=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2476		-#line 2501 "pikchr.c"
	2489	+{yymsp[-2].minor.yy36=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
	2490	+#line 2515 "pikchr.c"
2477	2491	break;
2478	2492	case 13: /* rvalue ::= PLACENAME */
2479	2493	#line 568 "pikchr.y"
2480		-{yylhsminor.yy265 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2481		-#line 2506 "pikchr.c"
2482		- yymsp[0].minor.yy265 = yylhsminor.yy265;
	2494	+{yylhsminor.yy153 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
	2495	+#line 2520 "pikchr.c"
	2496	+ yymsp[0].minor.yy153 = yylhsminor.yy153;
2483	2497	break;
2484	2498	case 14: /* pritem ::= FILL */
2485	2499	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2486	2500	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2487	2501	#line 573 "pikchr.y"
2488	2502	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2489		-#line 2514 "pikchr.c"
	2503	+#line 2528 "pikchr.c"
2490	2504	break;
2491	2505	case 17: /* pritem ::= rvalue */
2492	2506	#line 576 "pikchr.y"
2493		-{pik_append_num(p,"",yymsp[0].minor.yy265);}
2494		-#line 2519 "pikchr.c"
	2507	+{pik_append_num(p,"",yymsp[0].minor.yy153);}
	2508	+#line 2533 "pikchr.c"
2495	2509	break;
2496	2510	case 18: /* pritem ::= STRING */
2497	2511	#line 577 "pikchr.y"
2498	2512	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2499		-#line 2524 "pikchr.c"
	2513	+#line 2538 "pikchr.c"
2500	2514	break;
2501	2515	case 19: /* prsep ::= COMMA */
2502	2516	#line 578 "pikchr.y"
2503	2517	{pik_append(p, " ", 1);}
2504		-#line 2529 "pikchr.c"
	2518	+#line 2543 "pikchr.c"
2505	2519	break;
2506	2520	case 20: /* unnamed_statement ::= basetype attribute_list */
2507	2521	#line 581 "pikchr.y"
2508		-{yylhsminor.yy38 = yymsp[-1].minor.yy38; pik_after_adding_attributes(p,yylhsminor.yy38);}
2509		-#line 2534 "pikchr.c"
2510		- yymsp[-1].minor.yy38 = yylhsminor.yy38;
	2522	+{yylhsminor.yy36 = yymsp[-1].minor.yy36; pik_after_adding_attributes(p,yylhsminor.yy36);}
	2523	+#line 2548 "pikchr.c"
	2524	+ yymsp[-1].minor.yy36 = yylhsminor.yy36;
2511	2525	break;
2512	2526	case 21: /* basetype ::= CLASSNAME */
2513	2527	#line 583 "pikchr.y"
2514		-{yylhsminor.yy38 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2515		-#line 2540 "pikchr.c"
2516		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2528	+{yylhsminor.yy36 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
	2529	+#line 2554 "pikchr.c"
	2530	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2517	2531	break;
2518	2532	case 22: /* basetype ::= STRING textposition */
2519	2533	#line 585 "pikchr.y"
2520		-{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy44; yylhsminor.yy38 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2521		-#line 2546 "pikchr.c"
2522		- yymsp[-1].minor.yy38 = yylhsminor.yy38;
	2534	+{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy164; yylhsminor.yy36 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
	2535	+#line 2560 "pikchr.c"
	2536	+ yymsp[-1].minor.yy36 = yylhsminor.yy36;
2523	2537	break;
2524	2538	case 23: /* basetype ::= LB savelist statement_list RB */
2525	2539	#line 587 "pikchr.y"
2526		-{ p->list = yymsp[-2].minor.yy119; yymsp[-3].minor.yy38 = pik_elem_new(p,0,0,yymsp[-1].minor.yy119); if(yymsp[-3].minor.yy38) yymsp[-3].minor.yy38->errTok = yymsp[0].minor.yy0; }
2527		-#line 2552 "pikchr.c"
	2540	+{ p->list = yymsp[-2].minor.yy227; yymsp[-3].minor.yy36 = pik_elem_new(p,0,0,yymsp[-1].minor.yy227); if(yymsp[-3].minor.yy36) yymsp[-3].minor.yy36->errTok = yymsp[0].minor.yy0; }
	2541	+#line 2566 "pikchr.c"
2528	2542	break;
2529	2543	case 24: /* savelist ::= */
2530	2544	#line 592 "pikchr.y"
2531		-{yymsp[1].minor.yy119 = p->list; p->list = 0;}
2532		-#line 2557 "pikchr.c"
	2545	+{yymsp[1].minor.yy227 = p->list; p->list = 0;}
	2546	+#line 2571 "pikchr.c"
2533	2547	break;
2534	2548	case 25: /* relexpr ::= expr */
2535	2549	#line 599 "pikchr.y"
2536		-{yylhsminor.yy200.rAbs = yymsp[0].minor.yy265; yylhsminor.yy200.rRel = 0;}
2537		-#line 2562 "pikchr.c"
2538		- yymsp[0].minor.yy200 = yylhsminor.yy200;
	2550	+{yylhsminor.yy10.rAbs = yymsp[0].minor.yy153; yylhsminor.yy10.rRel = 0;}
	2551	+#line 2576 "pikchr.c"
	2552	+ yymsp[0].minor.yy10 = yylhsminor.yy10;
2539	2553	break;
2540	2554	case 26: /* relexpr ::= expr PERCENT */
2541	2555	#line 600 "pikchr.y"
2542		-{yylhsminor.yy200.rAbs = 0; yylhsminor.yy200.rRel = yymsp[-1].minor.yy265/100;}
2543		-#line 2568 "pikchr.c"
2544		- yymsp[-1].minor.yy200 = yylhsminor.yy200;
	2556	+{yylhsminor.yy10.rAbs = 0; yylhsminor.yy10.rRel = yymsp[-1].minor.yy153/100;}
	2557	+#line 2582 "pikchr.c"
	2558	+ yymsp[-1].minor.yy10 = yylhsminor.yy10;
2545	2559	break;
2546	2560	case 27: /* optrelexpr ::= */
2547	2561	#line 602 "pikchr.y"
2548		-{yymsp[1].minor.yy200.rAbs = 0; yymsp[1].minor.yy200.rRel = 1.0;}
2549		-#line 2574 "pikchr.c"
	2562	+{yymsp[1].minor.yy10.rAbs = 0; yymsp[1].minor.yy10.rRel = 1.0;}
	2563	+#line 2588 "pikchr.c"
2550	2564	break;
2551	2565	case 28: /* attribute_list ::= relexpr alist */
2552	2566	#line 604 "pikchr.y"
2553		-{pik_add_direction(p,0,&yymsp[-1].minor.yy200);}
2554		-#line 2579 "pikchr.c"
	2567	+{pik_add_direction(p,0,&yymsp[-1].minor.yy10);}
	2568	+#line 2593 "pikchr.c"
2555	2569	break;
2556	2570	case 29: /* attribute ::= numproperty relexpr */
2557	2571	#line 608 "pikchr.y"
2558		-{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200); }
2559		-#line 2584 "pikchr.c"
	2572	+{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10); }
	2573	+#line 2598 "pikchr.c"
2560	2574	break;
2561	2575	case 30: /* attribute ::= dashproperty expr */
2562	2576	#line 609 "pikchr.y"
2563		-{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy265); }
2564		-#line 2589 "pikchr.c"
	2577	+{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy153); }
	2578	+#line 2603 "pikchr.c"
2565	2579	break;
2566	2580	case 31: /* attribute ::= dashproperty */
2567	2581	#line 610 "pikchr.y"
2568	2582	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2569		-#line 2594 "pikchr.c"
	2583	+#line 2608 "pikchr.c"
2570	2584	break;
2571	2585	case 32: /* attribute ::= colorproperty rvalue */
2572	2586	#line 611 "pikchr.y"
2573		-{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265); }
2574		-#line 2599 "pikchr.c"
	2587	+{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153); }
	2588	+#line 2613 "pikchr.c"
2575	2589	break;
2576	2590	case 33: /* attribute ::= go direction optrelexpr */
2577	2591	#line 612 "pikchr.y"
2578		-{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200);}
2579		-#line 2604 "pikchr.c"
	2592	+{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10);}
	2593	+#line 2618 "pikchr.c"
2580	2594	break;
2581	2595	case 34: /* attribute ::= go direction even position */
2582	2596	#line 613 "pikchr.y"
2583		-{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43);}
2584		-#line 2609 "pikchr.c"
	2597	+{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79);}
	2598	+#line 2623 "pikchr.c"
2585	2599	break;
2586	2600	case 35: /* attribute ::= CLOSE */
2587	2601	#line 614 "pikchr.y"
2588	2602	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2589		-#line 2614 "pikchr.c"
	2603	+#line 2628 "pikchr.c"
2590	2604	break;
2591	2605	case 36: /* attribute ::= CHOP */
2592	2606	#line 615 "pikchr.y"
2593	2607	{ p->cur->bChop = 1; }
2594		-#line 2619 "pikchr.c"
	2608	+#line 2633 "pikchr.c"
2595	2609	break;
2596	2610	case 37: /* attribute ::= FROM position */
2597	2611	#line 616 "pikchr.y"
2598		-{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2599		-#line 2624 "pikchr.c"
	2612	+{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
	2613	+#line 2638 "pikchr.c"
2600	2614	break;
2601	2615	case 38: /* attribute ::= TO position */
2602	2616	#line 617 "pikchr.y"
2603		-{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2604		-#line 2629 "pikchr.c"
	2617	+{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
	2618	+#line 2643 "pikchr.c"
2605	2619	break;
2606	2620	case 39: /* attribute ::= THEN */
2607	2621	#line 618 "pikchr.y"
2608	2622	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2609		-#line 2634 "pikchr.c"
	2623	+#line 2648 "pikchr.c"
2610	2624	break;
2611	2625	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2612	2626	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2613	2627	#line 620 "pikchr.y"
2614		-{pik_move_hdg(p,&yymsp[-2].minor.yy200,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265,0,&yymsp[-3].minor.yy0);}
2615		-#line 2640 "pikchr.c"
	2628	+{pik_move_hdg(p,&yymsp[-2].minor.yy10,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153,0,&yymsp[-3].minor.yy0);}
	2629	+#line 2654 "pikchr.c"
2616	2630	break;
2617	2631	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2618	2632	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2619	2633	#line 621 "pikchr.y"
2620		-{pik_move_hdg(p,&yymsp[-1].minor.yy200,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2621		-#line 2646 "pikchr.c"
	2634	+{pik_move_hdg(p,&yymsp[-1].minor.yy10,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
	2635	+#line 2660 "pikchr.c"
2622	2636	break;
2623	2637	case 44: /* attribute ::= AT position */
2624	2638	#line 626 "pikchr.y"
2625		-{ pik_set_at(p,0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2626		-#line 2651 "pikchr.c"
	2639	+{ pik_set_at(p,0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
	2640	+#line 2665 "pikchr.c"
2627	2641	break;
2628	2642	case 45: /* attribute ::= SAME */
2629	2643	#line 628 "pikchr.y"
2630	2644	{pik_same(p,0,&yymsp[0].minor.yy0);}
2631		-#line 2656 "pikchr.c"
	2645	+#line 2670 "pikchr.c"
2632	2646	break;
2633	2647	case 46: /* attribute ::= SAME AS object */
2634	2648	#line 629 "pikchr.y"
2635		-{pik_same(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2636		-#line 2661 "pikchr.c"
	2649	+{pik_same(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
	2650	+#line 2675 "pikchr.c"
2637	2651	break;
2638	2652	case 47: /* attribute ::= STRING textposition */
2639	2653	#line 630 "pikchr.y"
2640		-{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy44);}
2641		-#line 2666 "pikchr.c"
	2654	+{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy164);}
	2655	+#line 2680 "pikchr.c"
2642	2656	break;
2643	2657	case 48: /* attribute ::= FIT */
2644	2658	#line 631 "pikchr.y"
2645	2659	{pik_size_to_fit(p,&yymsp[0].minor.yy0,3); }
2646		-#line 2671 "pikchr.c"
	2660	+#line 2685 "pikchr.c"
2647	2661	break;
2648	2662	case 49: /* attribute ::= BEHIND object */
2649	2663	#line 632 "pikchr.y"
2650		-{pik_behind(p,yymsp[0].minor.yy38);}
2651		-#line 2676 "pikchr.c"
	2664	+{pik_behind(p,yymsp[0].minor.yy36);}
	2665	+#line 2690 "pikchr.c"
2652	2666	break;
2653	2667	case 50: /* withclause ::= DOT_E edge AT position */
2654	2668	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2655	2669	#line 640 "pikchr.y"
2656		-{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2657		-#line 2682 "pikchr.c"
	2670	+{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
	2671	+#line 2696 "pikchr.c"
2658	2672	break;
2659	2673	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2660	2674	#line 644 "pikchr.y"
2661	2675	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2662		-#line 2687 "pikchr.c"
	2676	+#line 2701 "pikchr.c"
2663	2677	yymsp[0].minor.yy0 = yylhsminor.yy0;
2664	2678	break;
2665	2679	case 53: /* boolproperty ::= CW */
2666	2680	#line 655 "pikchr.y"
2667	2681	{p->cur->cw = 1;}
2668		-#line 2693 "pikchr.c"
	2682	+#line 2707 "pikchr.c"
2669	2683	break;
2670	2684	case 54: /* boolproperty ::= CCW */
2671	2685	#line 656 "pikchr.y"
2672	2686	{p->cur->cw = 0;}
2673		-#line 2698 "pikchr.c"
	2687	+#line 2712 "pikchr.c"
2674	2688	break;
2675	2689	case 55: /* boolproperty ::= LARROW */
2676	2690	#line 657 "pikchr.y"
2677	2691	{p->cur->larrow=1; p->cur->rarrow=0; }
2678		-#line 2703 "pikchr.c"
	2692	+#line 2717 "pikchr.c"
2679	2693	break;
2680	2694	case 56: /* boolproperty ::= RARROW */
2681	2695	#line 658 "pikchr.y"
2682	2696	{p->cur->larrow=0; p->cur->rarrow=1; }
2683		-#line 2708 "pikchr.c"
	2697	+#line 2722 "pikchr.c"
2684	2698	break;
2685	2699	case 57: /* boolproperty ::= LRARROW */
2686	2700	#line 659 "pikchr.y"
2687	2701	{p->cur->larrow=1; p->cur->rarrow=1; }
2688		-#line 2713 "pikchr.c"
	2702	+#line 2727 "pikchr.c"
2689	2703	break;
2690	2704	case 58: /* boolproperty ::= INVIS */
2691	2705	#line 660 "pikchr.y"
2692	2706	{p->cur->sw = 0.0;}
2693		-#line 2718 "pikchr.c"
	2707	+#line 2732 "pikchr.c"
2694	2708	break;
2695	2709	case 59: /* boolproperty ::= THICK */
2696	2710	#line 661 "pikchr.y"
2697	2711	{p->cur->sw *= 1.5;}
2698		-#line 2723 "pikchr.c"
	2712	+#line 2737 "pikchr.c"
2699	2713	break;
2700	2714	case 60: /* boolproperty ::= THIN */
2701	2715	#line 662 "pikchr.y"
2702	2716	{p->cur->sw *= 0.67;}
2703		-#line 2728 "pikchr.c"
	2717	+#line 2742 "pikchr.c"
2704	2718	break;
2705	2719	case 61: /* boolproperty ::= SOLID */
2706	2720	#line 663 "pikchr.y"
2707	2721	{p->cur->sw = pik_value(p,"thickness",9,0);
2708	2722	p->cur->dotted = p->cur->dashed = 0.0;}
2709		-#line 2734 "pikchr.c"
	2723	+#line 2748 "pikchr.c"
2710	2724	break;
2711	2725	case 62: /* textposition ::= */
2712	2726	#line 666 "pikchr.y"
2713		-{yymsp[1].minor.yy44 = 0;}
2714		-#line 2739 "pikchr.c"
	2727	+{yymsp[1].minor.yy164 = 0;}
	2728	+#line 2753 "pikchr.c"
2715	2729	break;
2716	2730	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2717	2731	#line 669 "pikchr.y"
2718		-{yylhsminor.yy44 = (short int)pik_text_position(yymsp[-1].minor.yy44,&yymsp[0].minor.yy0);}
2719		-#line 2744 "pikchr.c"
2720		- yymsp[-1].minor.yy44 = yylhsminor.yy44;
	2732	+{yylhsminor.yy164 = (short int)pik_text_position(yymsp[-1].minor.yy164,&yymsp[0].minor.yy0);}
	2733	+#line 2758 "pikchr.c"
	2734	+ yymsp[-1].minor.yy164 = yylhsminor.yy164;
2721	2735	break;
2722	2736	case 64: /* position ::= expr COMMA expr */
2723	2737	#line 672 "pikchr.y"
2724		-{yylhsminor.yy43.x=yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[0].minor.yy265;}
2725		-#line 2750 "pikchr.c"
2726		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2738	+{yylhsminor.yy79.x=yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[0].minor.yy153;}
	2739	+#line 2764 "pikchr.c"
	2740	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2727	2741	break;
2728	2742	case 65: /* position ::= place PLUS expr COMMA expr */
2729	2743	#line 674 "pikchr.y"
2730		-{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x+yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y+yymsp[0].minor.yy265;}
2731		-#line 2756 "pikchr.c"
2732		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2744	+{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x+yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y+yymsp[0].minor.yy153;}
	2745	+#line 2770 "pikchr.c"
	2746	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2733	2747	break;
2734	2748	case 66: /* position ::= place MINUS expr COMMA expr */
2735	2749	#line 675 "pikchr.y"
2736		-{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x-yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y-yymsp[0].minor.yy265;}
2737		-#line 2762 "pikchr.c"
2738		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2750	+{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x-yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y-yymsp[0].minor.yy153;}
	2751	+#line 2776 "pikchr.c"
	2752	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2739	2753	break;
2740	2754	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2741	2755	#line 677 "pikchr.y"
2742		-{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x+yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y+yymsp[-1].minor.yy265;}
2743		-#line 2768 "pikchr.c"
2744		- yymsp[-6].minor.yy43 = yylhsminor.yy43;
	2756	+{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x+yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y+yymsp[-1].minor.yy153;}
	2757	+#line 2782 "pikchr.c"
	2758	+ yymsp[-6].minor.yy79 = yylhsminor.yy79;
2745	2759	break;
2746	2760	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2747	2761	#line 679 "pikchr.y"
2748		-{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x-yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y-yymsp[-1].minor.yy265;}
2749		-#line 2774 "pikchr.c"
2750		- yymsp[-6].minor.yy43 = yylhsminor.yy43;
	2762	+{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x-yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y-yymsp[-1].minor.yy153;}
	2763	+#line 2788 "pikchr.c"
	2764	+ yymsp[-6].minor.yy79 = yylhsminor.yy79;
2751	2765	break;
2752	2766	case 69: /* position ::= LP position COMMA position RP */
2753	2767	#line 680 "pikchr.y"
2754		-{yymsp[-4].minor.yy43.x=yymsp[-3].minor.yy43.x; yymsp[-4].minor.yy43.y=yymsp[-1].minor.yy43.y;}
2755		-#line 2780 "pikchr.c"
	2768	+{yymsp[-4].minor.yy79.x=yymsp[-3].minor.yy79.x; yymsp[-4].minor.yy79.y=yymsp[-1].minor.yy79.y;}
	2769	+#line 2794 "pikchr.c"
2756	2770	break;
2757	2771	case 70: /* position ::= LP position RP */
2758	2772	#line 681 "pikchr.y"
2759		-{yymsp[-2].minor.yy43=yymsp[-1].minor.yy43;}
2760		-#line 2785 "pikchr.c"
	2773	+{yymsp[-2].minor.yy79=yymsp[-1].minor.yy79;}
	2774	+#line 2799 "pikchr.c"
2761	2775	break;
2762	2776	case 71: /* position ::= expr between position AND position */
2763	2777	#line 683 "pikchr.y"
2764		-{yylhsminor.yy43 = pik_position_between(yymsp[-4].minor.yy265,yymsp[-2].minor.yy43,yymsp[0].minor.yy43);}
2765		-#line 2790 "pikchr.c"
2766		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2778	+{yylhsminor.yy79 = pik_position_between(yymsp[-4].minor.yy153,yymsp[-2].minor.yy79,yymsp[0].minor.yy79);}
	2779	+#line 2804 "pikchr.c"
	2780	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2767	2781	break;
2768	2782	case 72: /* position ::= expr LT position COMMA position GT */
2769	2783	#line 685 "pikchr.y"
2770		-{yylhsminor.yy43 = pik_position_between(yymsp[-5].minor.yy265,yymsp[-3].minor.yy43,yymsp[-1].minor.yy43);}
2771		-#line 2796 "pikchr.c"
2772		- yymsp[-5].minor.yy43 = yylhsminor.yy43;
	2784	+{yylhsminor.yy79 = pik_position_between(yymsp[-5].minor.yy153,yymsp[-3].minor.yy79,yymsp[-1].minor.yy79);}
	2785	+#line 2810 "pikchr.c"
	2786	+ yymsp[-5].minor.yy79 = yylhsminor.yy79;
2773	2787	break;
2774	2788	case 73: /* position ::= expr ABOVE position */
2775	2789	#line 686 "pikchr.y"
2776		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y += yymsp[-2].minor.yy265;}
2777		-#line 2802 "pikchr.c"
2778		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2790	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y += yymsp[-2].minor.yy153;}
	2791	+#line 2816 "pikchr.c"
	2792	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2779	2793	break;
2780	2794	case 74: /* position ::= expr BELOW position */
2781	2795	#line 687 "pikchr.y"
2782		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y -= yymsp[-2].minor.yy265;}
2783		-#line 2808 "pikchr.c"
2784		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2796	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y -= yymsp[-2].minor.yy153;}
	2797	+#line 2822 "pikchr.c"
	2798	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2785	2799	break;
2786	2800	case 75: /* position ::= expr LEFT OF position */
2787	2801	#line 688 "pikchr.y"
2788		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x -= yymsp[-3].minor.yy265;}
2789		-#line 2814 "pikchr.c"
2790		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2802	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x -= yymsp[-3].minor.yy153;}
	2803	+#line 2828 "pikchr.c"
	2804	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2791	2805	break;
2792	2806	case 76: /* position ::= expr RIGHT OF position */
2793	2807	#line 689 "pikchr.y"
2794		-{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x += yymsp[-3].minor.yy265;}
2795		-#line 2820 "pikchr.c"
2796		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2808	+{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x += yymsp[-3].minor.yy153;}
	2809	+#line 2834 "pikchr.c"
	2810	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2797	2811	break;
2798	2812	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2799	2813	#line 691 "pikchr.y"
2800		-{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-5].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2801		-#line 2826 "pikchr.c"
2802		- yymsp[-5].minor.yy43 = yylhsminor.yy43;
	2814	+{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-5].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
	2815	+#line 2840 "pikchr.c"
	2816	+ yymsp[-5].minor.yy79 = yylhsminor.yy79;
2803	2817	break;
2804	2818	case 78: /* position ::= expr HEADING EDGEPT OF position */
2805	2819	#line 693 "pikchr.y"
2806		-{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-4].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2807		-#line 2832 "pikchr.c"
2808		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2820	+{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-4].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
	2821	+#line 2846 "pikchr.c"
	2822	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2809	2823	break;
2810	2824	case 79: /* position ::= expr EDGEPT OF position */
2811	2825	#line 695 "pikchr.y"
2812		-{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2813		-#line 2838 "pikchr.c"
2814		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2826	+{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
	2827	+#line 2852 "pikchr.c"
	2828	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2815	2829	break;
2816	2830	case 80: /* position ::= expr ON HEADING expr FROM position */
2817	2831	#line 697 "pikchr.y"
2818		-{yylhsminor.yy43 = pik_position_at_angle(yymsp[-5].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2819		-#line 2844 "pikchr.c"
2820		- yymsp[-5].minor.yy43 = yylhsminor.yy43;
	2832	+{yylhsminor.yy79 = pik_position_at_angle(yymsp[-5].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
	2833	+#line 2858 "pikchr.c"
	2834	+ yymsp[-5].minor.yy79 = yylhsminor.yy79;
2821	2835	break;
2822	2836	case 81: /* position ::= expr HEADING expr FROM position */
2823	2837	#line 699 "pikchr.y"
2824		-{yylhsminor.yy43 = pik_position_at_angle(yymsp[-4].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2825		-#line 2850 "pikchr.c"
2826		- yymsp[-4].minor.yy43 = yylhsminor.yy43;
	2838	+{yylhsminor.yy79 = pik_position_at_angle(yymsp[-4].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
	2839	+#line 2864 "pikchr.c"
	2840	+ yymsp[-4].minor.yy79 = yylhsminor.yy79;
2827	2841	break;
2828	2842	case 82: /* place ::= edge OF object */
2829	2843	#line 711 "pikchr.y"
2830		-{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2831		-#line 2856 "pikchr.c"
2832		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2844	+{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
	2845	+#line 2870 "pikchr.c"
	2846	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2833	2847	break;
2834	2848	case 83: /* place2 ::= object */
2835	2849	#line 712 "pikchr.y"
2836		-{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,0);}
2837		-#line 2862 "pikchr.c"
2838		- yymsp[0].minor.yy43 = yylhsminor.yy43;
	2850	+{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,0);}
	2851	+#line 2876 "pikchr.c"
	2852	+ yymsp[0].minor.yy79 = yylhsminor.yy79;
2839	2853	break;
2840	2854	case 84: /* place2 ::= object DOT_E edge */
2841	2855	#line 713 "pikchr.y"
2842		-{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2843		-#line 2868 "pikchr.c"
2844		- yymsp[-2].minor.yy43 = yylhsminor.yy43;
	2856	+{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
	2857	+#line 2882 "pikchr.c"
	2858	+ yymsp[-2].minor.yy79 = yylhsminor.yy79;
2845	2859	break;
2846	2860	case 85: /* place2 ::= NTH VERTEX OF object */
2847	2861	#line 714 "pikchr.y"
2848		-{yylhsminor.yy43 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy38);}
2849		-#line 2874 "pikchr.c"
2850		- yymsp[-3].minor.yy43 = yylhsminor.yy43;
	2862	+{yylhsminor.yy79 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy36);}
	2863	+#line 2888 "pikchr.c"
	2864	+ yymsp[-3].minor.yy79 = yylhsminor.yy79;
2851	2865	break;
2852	2866	case 86: /* object ::= nth */
2853	2867	#line 726 "pikchr.y"
2854		-{yylhsminor.yy38 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2855		-#line 2880 "pikchr.c"
2856		- yymsp[0].minor.yy38 = yylhsminor.yy38;
	2868	+{yylhsminor.yy36 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
	2869	+#line 2894 "pikchr.c"
	2870	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
2857	2871	break;
2858	2872	case 87: /* object ::= nth OF\|IN object */
2859	2873	#line 727 "pikchr.y"
2860		-{yylhsminor.yy38 = pik_find_nth(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2861		-#line 2886 "pikchr.c"
2862		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
	2874	+{yylhsminor.yy36 = pik_find_nth(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
	2875	+#line 2900 "pikchr.c"
	2876	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
2863	2877	break;
2864		- case 88: /* objectname ::= PLACENAME */
	2878	+ case 88: /* objectname ::= THIS */
2865	2879	#line 729 "pikchr.y"
2866		-{yylhsminor.yy38 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2867		-#line 2892 "pikchr.c"
2868		- yymsp[0].minor.yy38 = yylhsminor.yy38;
2869		- break;
2870		- case 89: /* objectname ::= objectname DOT_U PLACENAME */
2871		-#line 731 "pikchr.y"
2872		-{yylhsminor.yy38 = pik_find_byname(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2873		-#line 2898 "pikchr.c"
2874		- yymsp[-2].minor.yy38 = yylhsminor.yy38;
2875		- break;
2876		- case 90: /* nth ::= NTH CLASSNAME */
2877		-#line 733 "pikchr.y"
	2880	+{yymsp[0].minor.yy36 = p->cur;}
	2881	+#line 2906 "pikchr.c"
	2882	+ break;
	2883	+ case 89: /* objectname ::= PLACENAME */
	2884	+#line 730 "pikchr.y"
	2885	+{yylhsminor.yy36 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
	2886	+#line 2911 "pikchr.c"
	2887	+ yymsp[0].minor.yy36 = yylhsminor.yy36;
	2888	+ break;
	2889	+ case 90: /* objectname ::= objectname DOT_U PLACENAME */
	2890	+#line 732 "pikchr.y"
	2891	+{yylhsminor.yy36 = pik_find_byname(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
	2892	+#line 2917 "pikchr.c"
	2893	+ yymsp[-2].minor.yy36 = yylhsminor.yy36;
	2894	+ break;
	2895	+ case 91: /* nth ::= NTH CLASSNAME */
	2896	+#line 734 "pikchr.y"
2878	2897	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2879		-#line 2904 "pikchr.c"
	2898	+#line 2923 "pikchr.c"
2880	2899	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2881	2900	break;
2882		- case 91: /* nth ::= NTH LAST CLASSNAME */
2883		-#line 734 "pikchr.y"
	2901	+ case 92: /* nth ::= NTH LAST CLASSNAME */
	2902	+#line 735 "pikchr.y"
2884	2903	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2885		-#line 2910 "pikchr.c"
	2904	+#line 2929 "pikchr.c"
2886	2905	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2887	2906	break;
2888		- case 92: /* nth ::= LAST CLASSNAME */
2889		-#line 735 "pikchr.y"
	2907	+ case 93: /* nth ::= LAST CLASSNAME */
	2908	+#line 736 "pikchr.y"
2890	2909	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2891		-#line 2916 "pikchr.c"
	2910	+#line 2935 "pikchr.c"
2892	2911	break;
2893		- case 93: /* nth ::= LAST */
2894		-#line 736 "pikchr.y"
	2912	+ case 94: /* nth ::= LAST */
	2913	+#line 737 "pikchr.y"
2895	2914	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2896		-#line 2921 "pikchr.c"
	2915	+#line 2940 "pikchr.c"
2897	2916	yymsp[0].minor.yy0 = yylhsminor.yy0;
2898	2917	break;
2899		- case 94: /* nth ::= NTH LB RB */
2900		-#line 737 "pikchr.y"
	2918	+ case 95: /* nth ::= NTH LB RB */
	2919	+#line 738 "pikchr.y"
2901	2920	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2902		-#line 2927 "pikchr.c"
	2921	+#line 2946 "pikchr.c"
2903	2922	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2904	2923	break;
2905		- case 95: /* nth ::= NTH LAST LB RB */
2906		-#line 738 "pikchr.y"
	2924	+ case 96: /* nth ::= NTH LAST LB RB */
	2925	+#line 739 "pikchr.y"
2907	2926	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2908		-#line 2933 "pikchr.c"
	2927	+#line 2952 "pikchr.c"
2909	2928	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2910	2929	break;
2911		- case 96: /* nth ::= LAST LB RB */
2912		-#line 739 "pikchr.y"
2913		-{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2914		-#line 2939 "pikchr.c"
2915		- break;
2916		- case 97: /* expr ::= expr PLUS expr */
2917		-#line 741 "pikchr.y"
2918		-{yylhsminor.yy265=yymsp[-2].minor.yy265+yymsp[0].minor.yy265;}
2919		-#line 2944 "pikchr.c"
2920		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2921		- break;
2922		- case 98: /* expr ::= expr MINUS expr */
2923		-#line 742 "pikchr.y"
2924		-{yylhsminor.yy265=yymsp[-2].minor.yy265-yymsp[0].minor.yy265;}
2925		-#line 2950 "pikchr.c"
2926		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2927		- break;
2928		- case 99: /* expr ::= expr STAR expr */
2929		-#line 743 "pikchr.y"
2930		-{yylhsminor.yy265=yymsp[-2].minor.yy265*yymsp[0].minor.yy265;}
2931		-#line 2956 "pikchr.c"
2932		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2933		- break;
2934		- case 100: /* expr ::= expr SLASH expr */
2935		-#line 744 "pikchr.y"
2936		-{
2937		- if( yymsp[0].minor.yy265==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy265 = 0.0; }
2938		- else{ yylhsminor.yy265 = yymsp[-2].minor.yy265/yymsp[0].minor.yy265; }
2939		-}
2940		-#line 2965 "pikchr.c"
2941		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
2942		- break;
2943		- case 101: /* expr ::= MINUS expr */
2944		-#line 748 "pikchr.y"
2945		-{yymsp[-1].minor.yy265=-yymsp[0].minor.yy265;}
2946		-#line 2971 "pikchr.c"
2947		- break;
2948		- case 102: /* expr ::= PLUS expr */
2949		-#line 749 "pikchr.y"
2950		-{yymsp[-1].minor.yy265=yymsp[0].minor.yy265;}
2951		-#line 2976 "pikchr.c"
2952		- break;
2953		- case 103: /* expr ::= LP expr RP */
2954		-#line 750 "pikchr.y"
2955		-{yymsp[-2].minor.yy265=yymsp[-1].minor.yy265;}
2956		-#line 2981 "pikchr.c"
2957		- break;
2958		- case 104: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
	2930	+ case 97: /* nth ::= LAST LB RB */
	2931	+#line 740 "pikchr.y"
	2932	+{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
	2933	+#line 2958 "pikchr.c"
	2934	+ break;
	2935	+ case 98: /* expr ::= expr PLUS expr */
	2936	+#line 742 "pikchr.y"
	2937	+{yylhsminor.yy153=yymsp[-2].minor.yy153+yymsp[0].minor.yy153;}
	2938	+#line 2963 "pikchr.c"
	2939	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2940	+ break;
	2941	+ case 99: /* expr ::= expr MINUS expr */
	2942	+#line 743 "pikchr.y"
	2943	+{yylhsminor.yy153=yymsp[-2].minor.yy153-yymsp[0].minor.yy153;}
	2944	+#line 2969 "pikchr.c"
	2945	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2946	+ break;
	2947	+ case 100: /* expr ::= expr STAR expr */
	2948	+#line 744 "pikchr.y"
	2949	+{yylhsminor.yy153=yymsp[-2].minor.yy153*yymsp[0].minor.yy153;}
	2950	+#line 2975 "pikchr.c"
	2951	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2952	+ break;
	2953	+ case 101: /* expr ::= expr SLASH expr */
	2954	+#line 745 "pikchr.y"
	2955	+{
	2956	+ if( yymsp[0].minor.yy153==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy153 = 0.0; }
	2957	+ else{ yylhsminor.yy153 = yymsp[-2].minor.yy153/yymsp[0].minor.yy153; }
	2958	+}
	2959	+#line 2984 "pikchr.c"
	2960	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	2961	+ break;
	2962	+ case 102: /* expr ::= MINUS expr */
	2963	+#line 749 "pikchr.y"
	2964	+{yymsp[-1].minor.yy153=-yymsp[0].minor.yy153;}
	2965	+#line 2990 "pikchr.c"
	2966	+ break;
	2967	+ case 103: /* expr ::= PLUS expr */
	2968	+#line 750 "pikchr.y"
	2969	+{yymsp[-1].minor.yy153=yymsp[0].minor.yy153;}
	2970	+#line 2995 "pikchr.c"
	2971	+ break;
	2972	+ case 104: /* expr ::= LP expr RP */
2959	2973	#line 751 "pikchr.y"
2960		-{yymsp[-2].minor.yy265=pik_get_var(p,&yymsp[-1].minor.yy0);}
2961		-#line 2986 "pikchr.c"
	2974	+{yymsp[-2].minor.yy153=yymsp[-1].minor.yy153;}
	2975	+#line 3000 "pikchr.c"
2962	2976	break;
2963		- case 105: /* expr ::= NUMBER */
	2977	+ case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2964	2978	#line 752 "pikchr.y"
2965		-{yylhsminor.yy265=pik_atof(&yymsp[0].minor.yy0);}
2966		-#line 2991 "pikchr.c"
2967		- yymsp[0].minor.yy265 = yylhsminor.yy265;
	2979	+{yymsp[-2].minor.yy153=pik_get_var(p,&yymsp[-1].minor.yy0);}
	2980	+#line 3005 "pikchr.c"
2968	2981	break;
2969		- case 106: /* expr ::= ID */
	2982	+ case 106: /* expr ::= NUMBER */
2970	2983	#line 753 "pikchr.y"
2971		-{yylhsminor.yy265=pik_get_var(p,&yymsp[0].minor.yy0);}
2972		-#line 2997 "pikchr.c"
2973		- yymsp[0].minor.yy265 = yylhsminor.yy265;
	2984	+{yylhsminor.yy153=pik_atof(&yymsp[0].minor.yy0);}
	2985	+#line 3010 "pikchr.c"
	2986	+ yymsp[0].minor.yy153 = yylhsminor.yy153;
2974	2987	break;
2975		- case 107: /* expr ::= FUNC1 LP expr RP */
	2988	+ case 107: /* expr ::= ID */
2976	2989	#line 754 "pikchr.y"
2977		-{yylhsminor.yy265 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy265,0.0);}
2978		-#line 3003 "pikchr.c"
2979		- yymsp[-3].minor.yy265 = yylhsminor.yy265;
	2990	+{yylhsminor.yy153=pik_get_var(p,&yymsp[0].minor.yy0);}
	2991	+#line 3016 "pikchr.c"
	2992	+ yymsp[0].minor.yy153 = yylhsminor.yy153;
2980	2993	break;
2981		- case 108: /* expr ::= FUNC2 LP expr COMMA expr RP */
	2994	+ case 108: /* expr ::= FUNC1 LP expr RP */
2982	2995	#line 755 "pikchr.y"
2983		-{yylhsminor.yy265 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy265,yymsp[-1].minor.yy265);}
2984		-#line 3009 "pikchr.c"
2985		- yymsp[-5].minor.yy265 = yylhsminor.yy265;
	2996	+{yylhsminor.yy153 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy153,0.0);}
	2997	+#line 3022 "pikchr.c"
	2998	+ yymsp[-3].minor.yy153 = yylhsminor.yy153;
2986	2999	break;
2987		- case 109: /* expr ::= DIST LP position COMMA position RP */
	3000	+ case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
2988	3001	#line 756 "pikchr.y"
2989		-{yymsp[-5].minor.yy265 = pik_dist(&yymsp[-3].minor.yy43,&yymsp[-1].minor.yy43);}
2990		-#line 3015 "pikchr.c"
	3002	+{yylhsminor.yy153 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy153,yymsp[-1].minor.yy153);}
	3003	+#line 3028 "pikchr.c"
	3004	+ yymsp[-5].minor.yy153 = yylhsminor.yy153;
2991	3005	break;
2992		- case 110: /* expr ::= place2 DOT_XY X */
	3006	+ case 110: /* expr ::= DIST LP position COMMA position RP */
2993	3007	#line 757 "pikchr.y"
2994		-{yylhsminor.yy265 = yymsp[-2].minor.yy43.x;}
2995		-#line 3020 "pikchr.c"
2996		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
	3008	+{yymsp[-5].minor.yy153 = pik_dist(&yymsp[-3].minor.yy79,&yymsp[-1].minor.yy79);}
	3009	+#line 3034 "pikchr.c"
2997	3010	break;
2998		- case 111: /* expr ::= place2 DOT_XY Y */
	3011	+ case 111: /* expr ::= place2 DOT_XY X */
2999	3012	#line 758 "pikchr.y"
3000		-{yylhsminor.yy265 = yymsp[-2].minor.yy43.y;}
3001		-#line 3026 "pikchr.c"
3002		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
	3013	+{yylhsminor.yy153 = yymsp[-2].minor.yy79.x;}
	3014	+#line 3039 "pikchr.c"
	3015	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
3003	3016	break;
3004		- case 112: /* expr ::= object DOT_L numproperty */
3005		- case 113: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==113);
3006		- case 114: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==114);
	3017	+ case 112: /* expr ::= place2 DOT_XY Y */
3007	3018	#line 759 "pikchr.y"
3008		-{yylhsminor.yy265=pik_property_of(yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
3009		-#line 3034 "pikchr.c"
3010		- yymsp[-2].minor.yy265 = yylhsminor.yy265;
	3019	+{yylhsminor.yy153 = yymsp[-2].minor.yy79.y;}
	3020	+#line 3045 "pikchr.c"
	3021	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
	3022	+ break;
	3023	+ case 113: /* expr ::= object DOT_L numproperty */
	3024	+ case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
	3025	+ case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
	3026	+#line 760 "pikchr.y"
	3027	+{yylhsminor.yy153=pik_property_of(yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
	3028	+#line 3053 "pikchr.c"
	3029	+ yymsp[-2].minor.yy153 = yylhsminor.yy153;
3011	3030	break;
3012	3031	default:
3013		- /* (115) lvalue ::= ID */ yytestcase(yyruleno==115);
3014		- /* (116) lvalue ::= FILL */ yytestcase(yyruleno==116);
3015		- /* (117) lvalue ::= COLOR */ yytestcase(yyruleno==117);
3016		- /* (118) lvalue ::= THICKNESS */ yytestcase(yyruleno==118);
3017		- /* (119) rvalue ::= expr */ yytestcase(yyruleno==119);
3018		- /* (120) print ::= PRINT */ yytestcase(yyruleno==120);
3019		- /* (121) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=121);
3020		- /* (122) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==122);
3021		- /* (123) direction ::= UP */ yytestcase(yyruleno==123);
3022		- /* (124) direction ::= DOWN */ yytestcase(yyruleno==124);
3023		- /* (125) direction ::= LEFT */ yytestcase(yyruleno==125);
3024		- /* (126) direction ::= RIGHT */ yytestcase(yyruleno==126);
3025		- /* (127) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=127);
3026		- /* (128) attribute_list ::= alist */ yytestcase(yyruleno==128);
3027		- /* (129) alist ::= */ yytestcase(yyruleno==129);
3028		- /* (130) alist ::= alist attribute */ yytestcase(yyruleno==130);
3029		- /* (131) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=131);
3030		- /* (132) attribute ::= WITH withclause */ yytestcase(yyruleno==132);
3031		- /* (133) go ::= GO */ yytestcase(yyruleno==133);
3032		- /* (134) go ::= */ yytestcase(yyruleno==134);
3033		- /* (135) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==135);
3034		- /* (136) even ::= EVEN WITH */ yytestcase(yyruleno==136);
3035		- /* (137) dashproperty ::= DOTTED */ yytestcase(yyruleno==137);
3036		- /* (138) dashproperty ::= DASHED */ yytestcase(yyruleno==138);
3037		- /* (139) colorproperty ::= FILL */ yytestcase(yyruleno==139);
3038		- /* (140) colorproperty ::= COLOR */ yytestcase(yyruleno==140);
3039		- /* (141) position ::= place */ yytestcase(yyruleno==141);
3040		- /* (142) between ::= WAY BETWEEN */ yytestcase(yyruleno==142);
3041		- /* (143) between ::= BETWEEN */ yytestcase(yyruleno==143);
3042		- /* (144) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==144);
3043		- /* (145) place ::= place2 */ yytestcase(yyruleno==145);
3044		- /* (146) edge ::= CENTER */ yytestcase(yyruleno==146);
3045		- /* (147) edge ::= EDGEPT */ yytestcase(yyruleno==147);
3046		- /* (148) edge ::= TOP */ yytestcase(yyruleno==148);
3047		- /* (149) edge ::= BOTTOM */ yytestcase(yyruleno==149);
3048		- /* (150) edge ::= START */ yytestcase(yyruleno==150);
3049		- /* (151) edge ::= END */ yytestcase(yyruleno==151);
3050		- /* (152) edge ::= RIGHT */ yytestcase(yyruleno==152);
3051		- /* (153) edge ::= LEFT */ yytestcase(yyruleno==153);
3052		- /* (154) object ::= objectname */ yytestcase(yyruleno==154);
	3032	+ /* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
	3033	+ /* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
	3034	+ /* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
	3035	+ /* (119) lvalue ::= THICKNESS */ yytestcase(yyruleno==119);
	3036	+ /* (120) rvalue ::= expr */ yytestcase(yyruleno==120);
	3037	+ /* (121) print ::= PRINT */ yytestcase(yyruleno==121);
	3038	+ /* (122) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=122);
	3039	+ /* (123) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==123);
	3040	+ /* (124) direction ::= UP */ yytestcase(yyruleno==124);
	3041	+ /* (125) direction ::= DOWN */ yytestcase(yyruleno==125);
	3042	+ /* (126) direction ::= LEFT */ yytestcase(yyruleno==126);
	3043	+ /* (127) direction ::= RIGHT */ yytestcase(yyruleno==127);
	3044	+ /* (128) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=128);
	3045	+ /* (129) attribute_list ::= alist */ yytestcase(yyruleno==129);
	3046	+ /* (130) alist ::= */ yytestcase(yyruleno==130);
	3047	+ /* (131) alist ::= alist attribute */ yytestcase(yyruleno==131);
	3048	+ /* (132) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=132);
	3049	+ /* (133) attribute ::= WITH withclause */ yytestcase(yyruleno==133);
	3050	+ /* (134) go ::= GO */ yytestcase(yyruleno==134);
	3051	+ /* (135) go ::= */ yytestcase(yyruleno==135);
	3052	+ /* (136) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==136);
	3053	+ /* (137) even ::= EVEN WITH */ yytestcase(yyruleno==137);
	3054	+ /* (138) dashproperty ::= DOTTED */ yytestcase(yyruleno==138);
	3055	+ /* (139) dashproperty ::= DASHED */ yytestcase(yyruleno==139);
	3056	+ /* (140) colorproperty ::= FILL */ yytestcase(yyruleno==140);
	3057	+ /* (141) colorproperty ::= COLOR */ yytestcase(yyruleno==141);
	3058	+ /* (142) position ::= place */ yytestcase(yyruleno==142);
	3059	+ /* (143) between ::= WAY BETWEEN */ yytestcase(yyruleno==143);
	3060	+ /* (144) between ::= BETWEEN */ yytestcase(yyruleno==144);
	3061	+ /* (145) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==145);
	3062	+ /* (146) place ::= place2 */ yytestcase(yyruleno==146);
	3063	+ /* (147) edge ::= CENTER */ yytestcase(yyruleno==147);
	3064	+ /* (148) edge ::= EDGEPT */ yytestcase(yyruleno==148);
	3065	+ /* (149) edge ::= TOP */ yytestcase(yyruleno==149);
	3066	+ /* (150) edge ::= BOTTOM */ yytestcase(yyruleno==150);
	3067	+ /* (151) edge ::= START */ yytestcase(yyruleno==151);
	3068	+ /* (152) edge ::= END */ yytestcase(yyruleno==152);
	3069	+ /* (153) edge ::= RIGHT */ yytestcase(yyruleno==153);
	3070	+ /* (154) edge ::= LEFT */ yytestcase(yyruleno==154);
	3071	+ /* (155) object ::= objectname */ yytestcase(yyruleno==155);
3053	3072	break;
3054	3073	/******** End reduce actions **********************************************/
3055	3074	};
3056	3075	assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
3057	3076	yygoto = yyRuleInfoLhs[yyruleno];
		@@ -3115,11 +3134,11 @@
3115	3134	pik_error(p, &TOKEN, "syntax error");
3116	3135	}else{
3117	3136	pik_error(p, 0, "syntax error");
3118	3137	}
3119	3138	UNUSED_PARAMETER(yymajor);
3120		-#line 3145 "pikchr.c"
	3139	+#line 3164 "pikchr.c"
3121	3140	/********** End %syntax_error code ****************************************/
3122	3141	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3123	3142	pik_parserCTX_STORE
3124	3143	}
3125	3144
		@@ -3348,11 +3367,11 @@
3348	3367	#else
3349	3368	(void)iToken;
3350	3369	return 0;
3351	3370	#endif
3352	3371	}
3353		-#line 764 "pikchr.y"
	3372	+#line 765 "pikchr.y"
3354	3373
3355	3374
3356	3375
3357	3376	/* Chart of the 148 official CSS color names with their
3358	3377	** corresponding RGB values thru Color Module Level 4:
		@@ -5032,11 +5051,11 @@
5032	5051	int i; /* Loop counter */
5033	5052	int iBump = 0; /* Bump the location of the error cursor */
5034	5053	char zLineno[20]; /* Buffer in which to generate line numbers */
5035	5054
5036	5055	iErrPt = (int)(pErr->z - p->sIn.z);
5037		- if( iErrPt>=p->sIn.n ){
	5056	+ if( iErrPt>=(int)p->sIn.n ){
5038	5057	iErrPt = p->sIn.n-1;
5039	5058	iBump = 1;
5040	5059	}else{
5041	5060	while( iErrPt>0 && (p->sIn.z[iErrPt]=='\n' \|\| p->sIn.z[iErrPt]=='\r') ){
5042	5061	iErrPt--;
		@@ -7095,10 +7114,11 @@
7095	7114	{ "the", 3, T_THE, 0, 0 },
7096	7115	{ "then", 4, T_THEN, 0, 0 },
7097	7116	{ "thick", 5, T_THICK, 0, 0 },
7098	7117	{ "thickness", 9, T_THICKNESS, 0, 0 },
7099	7118	{ "thin", 4, T_THIN, 0, 0 },
	7119	+ { "this", 4, T_THIS, 0, 0 },
7100	7120	{ "to", 2, T_TO, 0, 0 },
7101	7121	{ "top", 3, T_TOP, 0, CP_N },
7102	7122	{ "until", 5, T_UNTIL, 0, 0 },
7103	7123	{ "up", 2, T_UP, DIR_UP, 0 },
7104	7124	{ "vertex", 6, T_VERTEX, 0, 0 },
		@@ -7744,11 +7764,11 @@
7744	7764	static char readFile(const char zFilename){
7745	7765	FILE *in;
7746	7766	size_t n;
7747	7767	size_t nUsed = 0;
7748	7768	size_t nAlloc = 0;
7749		- char z = 0, zNew;
	7769	+ char z = 0, zNew = 0;
7750	7770	in = strcmp(zFilename,"-")==0 ? stdin : fopen(zFilename, "rb");
7751	7771	if( in==0 ){
7752	7772	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
7753	7773	return 0;
7754	7774	}
		@@ -7940,6 +7960,6 @@
7940	7960
7941	7961
7942	7962	#endif /* PIKCHR_TCL */
7943	7963
7944	7964
7945		-#line 7970 "pikchr.c"
	7965	+#line 7990 "pikchr.c"
7946	7966

	--- src/pikchr.c
	+++ src/pikchr.c
	@@ -566,20 +566,21 @@
566	#define T_TOP 83
567	#define T_BOTTOM 84
568	#define T_START 85
569	#define T_END 86
570	#define T_IN 87
571	#define T_DOT_U 88
572	#define T_LAST 89
573	#define T_NUMBER 90
574	#define T_FUNC1 91
575	#define T_FUNC2 92
576	#define T_DIST 93
577	#define T_DOT_XY 94
578	#define T_X 95
579	#define T_Y 96
580	#define T_DOT_L 97

581	#endif
582	/************** End token definitions *************************************/
583
584	/* The next sections is a series of control #defines.
585	** various aspects of the generated parser.
	@@ -635,22 +636,22 @@
635	#ifndef INTERFACE
636	# define INTERFACE 1
637	#endif
638	/*********** Begin control #defines ***************************************/
639	#define YYCODETYPE unsigned char
640	#define YYNOCODE 134
641	#define YYACTIONTYPE unsigned short int
642	#define pik_parserTOKENTYPE PToken
643	typedef union {
644	int yyinit;
645	pik_parserTOKENTYPE yy0;
646	PObj* yy38;
647	PPoint yy43;
648	short int yy44;
649	PList* yy119;
650	PRel yy200;
651	PNum yy265;
652	} YYMINORTYPE;
653	#ifndef YYSTACKDEPTH
654	#define YYSTACKDEPTH 100
655	#endif
656	#define pik_parserARG_SDECL
	@@ -663,21 +664,21 @@
663	#define pik_parserCTX_PARAM ,p
664	#define pik_parserCTX_FETCH Pik *p=yypParser->p;
665	#define pik_parserCTX_STORE yypParser->p=p;
666	#define YYFALLBACK 1
667	#define YYNSTATE 164
668	#define YYNRULE 155
669	#define YYNRULE_WITH_ACTION 115
670	#define YYNTOKEN 98
671	#define YY_MAX_SHIFT 163
672	#define YY_MIN_SHIFTREDUCE 286
673	#define YY_MAX_SHIFTREDUCE 440
674	#define YY_ERROR_ACTION 441
675	#define YY_ACCEPT_ACTION 442
676	#define YY_NO_ACTION 443
677	#define YY_MIN_REDUCE 444
678	#define YY_MAX_REDUCE 598
679	/*********** End control #defines *****************************************/
680	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
681
682	/* Define the yytestcase() macro to be a no-op if is not already defined
683	** otherwise.
	@@ -740,333 +741,341 @@
740	** yy_reduce_ofst[] For each state, the offset into yy_action for
741	** shifting non-terminals after a reduce.
742	** yy_default[] Default action for each state.
743	**
744	********* Begin parsing tables ********************************************/
745	#define YY_ACTTAB_COUNT (1263)
746	static const YYACTIONTYPE yy_action[] = {
747	/* 0 */ 572, 493, 161, 119, 25, 450, 29, 74, 129, 148,
748	/* 10 */ 572, 490, 161, 119, 451, 113, 120, 161, 119, 528,
749	/* 20 */ 425, 426, 338, 556, 81, 30, 557, 558, 572, 64,
750	/* 30 */ 63, 62, 61, 321, 322, 9, 8, 33, 149, 32,
751	/* 40 */ 7, 71, 127, 38, 334, 66, 48, 37, 28, 338,
752	/* 50 */ 338, 338, 338, 423, 424, 339, 340, 341, 342, 343,
753	/* 60 */ 344, 345, 346, 347, 472, 526, 161, 119, 574, 77,
754	/* 70 */ 574, 73, 374, 148, 472, 531, 161, 119, 112, 113,
755	/* 80 */ 120, 161, 119, 128, 425, 426, 338, 305, 81, 376,
756	/* 90 */ 158, 76, 472, 529, 161, 119, 31, 321, 322, 9,
757	/* 100 */ 8, 33, 149, 32, 7, 71, 127, 329, 334, 66,
758	/* 110 */ 576, 83, 36, 338, 338, 338, 338, 423, 424, 339,
759	/* 120 */ 340, 341, 342, 343, 344, 345, 346, 347, 392, 433,
760	/* 130 */ 309, 59, 60, 409, 410, 411, 412, 107, 84, 374,
761	/* 140 */ 65, 108, 2, 46, 401, 162, 120, 161, 119, 117,
762	/* 150 */ 476, 80, 118, 307, 79, 133, 35, 126, 439, 438,
763	/* 160 */ 298, 123, 122, 402, 403, 404, 406, 80, 152, 307,
764	/* 170 */ 79, 327, 409, 410, 411, 412, 392, 54, 51, 59,
765	/* 180 */ 60, 64, 63, 62, 61, 312, 3, 102, 378, 157,
766	/* 190 */ 42, 432, 446, 452, 29, 300, 301, 302, 448, 304,
767	/* 200 */ 62, 61, 64, 63, 62, 61, 297, 47, 106, 163,
768	/* 210 */ 434, 435, 436, 437, 27, 389, 117, 391, 155, 154,
769	/* 220 */ 153, 392, 433, 49, 59, 60, 64, 63, 62, 61,
770	/* 230 */ 532, 69, 374, 396, 397, 2, 376, 158, 356, 296,
771	/* 240 */ 156, 156, 156, 67, 392, 433, 13, 59, 60, 4,
772	/* 250 */ 107, 439, 438, 377, 159, 374, 106, 5, 2, 120,
773	/* 260 */ 161, 119, 131, 449, 117, 391, 155, 154, 153, 392,
774	/* 270 */ 532, 6, 59, 60, 439, 438, 532, 444, 422, 532,
775	/* 280 */ 374, 152, 421, 42, 432, 1, 395, 36, 156, 156,
776	/* 290 */ 156, 11, 12, 355, 64, 63, 62, 61, 430, 118,
777	/* 300 */ 14, 106, 138, 434, 435, 436, 437, 432, 428, 117,
778	/* 310 */ 391, 155, 154, 153, 16, 69, 142, 140, 64, 63,
779	/* 320 */ 62, 61, 139, 18, 106, 15, 434, 435, 436, 437,
780	/* 330 */ 45, 44, 117, 391, 155, 154, 153, 358, 19, 55,
781	/* 340 */ 64, 63, 62, 61, 20, 147, 146, 68, 114, 106,
782	/* 350 */ 23, 382, 43, 26, 425, 426, 338, 117, 391, 155,
783	/* 360 */ 154, 153, 392, 57, 58, 59, 60, 390, 380, 375,
784	/* 370 */ 381, 17, 160, 374, 70, 39, 42, 443, 443, 443,
785	/* 380 */ 443, 22, 21, 338, 338, 338, 338, 423, 424, 24,
786	/* 390 */ 443, 145, 141, 429, 142, 140, 64, 63, 62, 61,
787	/* 400 */ 392, 471, 443, 59, 60, 443, 443, 132, 130, 389,
788	/* 410 */ 443, 374, 443, 443, 42, 443, 443, 55, 443, 64,
789	/* 420 */ 63, 62, 61, 147, 146, 392, 143, 443, 59, 60,
790	/* 430 */ 43, 443, 389, 443, 443, 443, 374, 471, 443, 42,
791	/* 440 */ 52, 443, 106, 443, 392, 144, 443, 59, 60, 443,
792	/* 450 */ 117, 391, 155, 154, 153, 374, 443, 443, 42, 22,
793	/* 460 */ 21, 121, 445, 452, 29, 443, 443, 24, 448, 145,
794	/* 470 */ 141, 429, 142, 140, 64, 63, 62, 61, 443, 163,
795	/* 480 */ 106, 443, 392, 442, 27, 59, 60, 443, 117, 391,
796	/* 490 */ 155, 154, 153, 374, 443, 55, 42, 443, 443, 443,
797	/* 500 */ 443, 147, 146, 443, 443, 106, 443, 392, 43, 443,
798	/* 510 */ 59, 60, 443, 117, 391, 155, 154, 153, 102, 443,
799	/* 520 */ 74, 42, 148, 443, 106, 443, 443, 124, 113, 120,
800	/* 530 */ 161, 119, 117, 391, 155, 154, 153, 22, 21, 392,
801	/* 540 */ 443, 443, 59, 60, 443, 24, 443, 145, 141, 429,
802	/* 550 */ 374, 149, 392, 40, 443, 59, 60, 443, 85, 443,
803	/* 560 */ 443, 443, 106, 374, 443, 443, 41, 120, 161, 119,
804	/* 570 */ 117, 391, 155, 154, 153, 349, 349, 349, 349, 349,
805	/* 580 */ 349, 349, 349, 349, 349, 443, 443, 106, 443, 152,
806	/* 590 */ 443, 443, 88, 443, 443, 117, 391, 155, 154, 153,
807	/* 600 */ 443, 120, 161, 119, 72, 443, 148, 10, 477, 477,
808	/* 610 */ 443, 125, 113, 120, 161, 119, 443, 443, 443, 106,
809	/* 620 */ 443, 443, 433, 152, 443, 443, 443, 117, 391, 155,
810	/* 630 */ 154, 153, 106, 443, 443, 149, 64, 63, 62, 61,
811	/* 640 */ 117, 391, 155, 154, 153, 443, 74, 443, 148, 354,
812	/* 650 */ 107, 439, 438, 495, 113, 120, 161, 119, 443, 120,
813	/* 660 */ 161, 119, 443, 461, 443, 74, 443, 148, 75, 443,
814	/* 670 */ 78, 78, 494, 113, 120, 161, 119, 149, 74, 443,
815	/* 680 */ 148, 152, 443, 443, 432, 488, 113, 120, 161, 119,
816	/* 690 */ 74, 443, 148, 443, 443, 443, 149, 482, 113, 120,
817	/* 700 */ 161, 119, 88, 434, 435, 436, 437, 443, 443, 149,
818	/* 710 */ 443, 120, 161, 119, 443, 74, 443, 148, 110, 110,
819	/* 720 */ 443, 149, 481, 113, 120, 161, 119, 443, 443, 443,
820	/* 730 */ 74, 443, 148, 152, 443, 443, 443, 478, 113, 120,
821	/* 740 */ 161, 119, 443, 74, 443, 148, 149, 443, 443, 443,
822	/* 750 */ 134, 113, 120, 161, 119, 74, 443, 148, 443, 443,
823	/* 760 */ 443, 149, 515, 113, 120, 161, 119, 443, 74, 443,
824	/* 770 */ 148, 443, 443, 443, 149, 137, 113, 120, 161, 119,
825	/* 780 */ 74, 443, 148, 443, 443, 443, 149, 523, 113, 120,
826	/* 790 */ 161, 119, 443, 74, 443, 148, 443, 443, 443, 149,
827	/* 800 */ 525, 113, 120, 161, 119, 443, 74, 443, 148, 443,
828	/* 810 */ 443, 149, 443, 522, 113, 120, 161, 119, 74, 443,
829	/* 820 */ 148, 86, 443, 443, 149, 524, 113, 120, 161, 119,
830	/* 830 */ 120, 161, 119, 74, 443, 148, 443, 149, 443, 443,
831	/* 840 */ 521, 113, 120, 161, 119, 443, 74, 443, 148, 149,
832	/* 850 */ 443, 443, 152, 520, 113, 120, 161, 119, 74, 443,
833	/* 860 */ 148, 443, 443, 443, 149, 519, 113, 120, 161, 119,
834	/* 870 */ 443, 74, 443, 148, 443, 443, 443, 149, 518, 113,
835	/* 880 */ 120, 161, 119, 74, 443, 148, 443, 443, 443, 149,
836	/* 890 */ 517, 113, 120, 161, 119, 433, 74, 443, 148, 443,
837	/* 900 */ 443, 443, 149, 150, 113, 120, 161, 119, 443, 74,
838	/* 910 */ 443, 148, 443, 443, 149, 443, 151, 113, 120, 161,
839	/* 920 */ 119, 74, 443, 148, 439, 438, 443, 149, 136, 113,
840	/* 930 */ 120, 161, 119, 443, 443, 443, 74, 443, 148, 443,
841	/* 940 */ 149, 443, 443, 135, 113, 120, 161, 119, 443, 88,
842	/* 950 */ 443, 443, 149, 443, 443, 443, 443, 432, 120, 161,
843	/* 960 */ 119, 443, 443, 443, 443, 82, 443, 149, 443, 443,
844	/* 970 */ 443, 443, 464, 443, 34, 443, 434, 435, 436, 437,
845	/* 980 */ 152, 107, 109, 445, 452, 29, 443, 443, 443, 448,
846	/* 990 */ 120, 161, 119, 443, 461, 443, 443, 88, 443, 443,
847	/* 1000 */ 163, 443, 566, 443, 443, 27, 120, 161, 119, 88,
848	/* 1010 */ 443, 443, 152, 111, 111, 443, 443, 443, 120, 161,
849	/* 1020 */ 119, 98, 443, 443, 89, 473, 443, 90, 152, 443,
850	/* 1030 */ 120, 161, 119, 120, 161, 119, 120, 161, 119, 87,
851	/* 1040 */ 152, 443, 443, 64, 63, 62, 61, 443, 120, 161,
852	/* 1050 */ 119, 443, 152, 443, 443, 152, 443, 443, 152, 443,
853	/* 1060 */ 443, 443, 99, 443, 50, 443, 443, 443, 100, 443,
854	/* 1070 */ 152, 120, 161, 119, 443, 101, 443, 120, 161, 119,
855	/* 1080 */ 91, 443, 443, 443, 120, 161, 119, 103, 443, 120,
856	/* 1090 */ 161, 119, 92, 152, 443, 443, 120, 161, 119, 152,
857	/* 1100 */ 443, 120, 161, 119, 443, 93, 152, 443, 443, 443,
858	/* 1110 */ 104, 152, 443, 443, 120, 161, 119, 94, 152, 120,
859	/* 1120 */ 161, 119, 105, 152, 443, 443, 120, 161, 119, 443,
860	/* 1130 */ 443, 120, 161, 119, 95, 443, 152, 443, 443, 443,
861	/* 1140 */ 96, 152, 443, 120, 161, 119, 443, 443, 152, 120,
862	/* 1150 */ 161, 119, 97, 152, 443, 443, 443, 443, 546, 443,
863	/* 1160 */ 443, 120, 161, 119, 443, 152, 443, 120, 161, 119,
864	/* 1170 */ 443, 152, 443, 443, 443, 545, 443, 443, 443, 443,
865	/* 1180 */ 443, 544, 443, 152, 120, 161, 119, 543, 443, 152,
866	/* 1190 */ 120, 161, 119, 115, 443, 443, 120, 161, 119, 116,
867	/* 1200 */ 443, 443, 120, 161, 119, 443, 152, 443, 120, 161,
868	/* 1210 */ 119, 443, 152, 64, 63, 62, 61, 443, 152, 64,
869	/* 1220 */ 63, 62, 61, 443, 152, 443, 353, 443, 443, 443,
870	/* 1230 */ 152, 64, 63, 62, 61, 64, 63, 62, 61, 443,
871	/* 1240 */ 53, 443, 443, 443, 394, 64, 63, 62, 61, 64,
872	/* 1250 */ 63, 62, 61, 443, 443, 443, 56, 443, 393, 443,
873	/* 1260 */ 443, 443, 389,




874	};
875	static const YYCODETYPE yy_lookahead[] = {
876	/* 0 */ 0, 111, 112, 113, 132, 100, 101, 102, 104, 104,
877	/* 10 */ 10, 111, 112, 113, 109, 110, 111, 112, 113, 104,
878	/* 20 */ 20, 21, 22, 103, 24, 124, 106, 107, 28, 4,
879	/* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 133, 39,
880	/* 40 */ 40, 41, 42, 103, 44, 45, 106, 107, 105, 49,
881	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
882	/* 60 */ 60, 61, 62, 63, 0, 111, 112, 113, 128, 129,
883	/* 70 */ 130, 102, 12, 104, 10, 111, 112, 113, 109, 110,
884	/* 80 */ 111, 112, 113, 104, 20, 21, 22, 25, 24, 26,
885	/* 90 */ 27, 48, 28, 111, 112, 113, 126, 33, 34, 35,
886	/* 100 */ 36, 37, 133, 39, 40, 41, 42, 2, 44, 45,
887	/* 110 */ 131, 114, 10, 49, 50, 51, 52, 53, 54, 55,
888	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
889	/* 130 */ 28, 4, 5, 29, 30, 31, 32, 102, 114, 12,
890	/* 140 */ 97, 81, 15, 38, 1, 82, 111, 112, 113, 89,
891	/* 150 */ 115, 24, 89, 26, 27, 12, 127, 14, 31, 32,
892	/* 160 */ 19, 18, 1, 20, 21, 22, 23, 24, 133, 26,
893	/* 170 */ 27, 2, 29, 30, 31, 32, 1, 4, 5, 4,
894	/* 180 */ 5, 4, 5, 6, 7, 8, 16, 12, 26, 27,
895	/* 190 */ 15, 64, 99, 100, 101, 20, 21, 22, 105, 24,
896	/* 200 */ 6, 7, 4, 5, 6, 7, 17, 38, 81, 116,
897	/* 210 */ 83, 84, 85, 86, 121, 17, 89, 90, 91, 92,
898	/* 220 */ 93, 1, 2, 25, 4, 5, 4, 5, 6, 7,
899	/* 230 */ 48, 3, 12, 95, 96, 15, 26, 27, 17, 17,
900	/* 240 */ 20, 21, 22, 43, 1, 2, 25, 4, 5, 15,
901	/* 250 */ 102, 31, 32, 26, 27, 12, 81, 40, 15, 111,
902	/* 260 */ 112, 113, 47, 115, 89, 90, 91, 92, 93, 1,
903	/* 270 */ 88, 40, 4, 5, 31, 32, 94, 0, 41, 97,
904	/* 280 */ 12, 133, 41, 15, 64, 13, 17, 10, 20, 21,
905	/* 290 */ 22, 25, 74, 17, 4, 5, 6, 7, 79, 89,
906	/* 300 */ 3, 81, 78, 83, 84, 85, 86, 64, 79, 89,
907	/* 310 */ 90, 91, 92, 93, 3, 87, 2, 3, 4, 5,
908	/* 320 */ 6, 7, 80, 3, 81, 35, 83, 84, 85, 86,
909	/* 330 */ 16, 38, 89, 90, 91, 92, 93, 76, 3, 25,
910	/* 340 */ 4, 5, 6, 7, 3, 31, 32, 3, 94, 81,
911	/* 350 */ 25, 28, 38, 15, 20, 21, 22, 89, 90, 91,
912	/* 360 */ 92, 93, 1, 15, 15, 4, 5, 17, 28, 12,
913	/* 370 */ 28, 35, 88, 12, 3, 11, 15, 134, 134, 134,
914	/* 380 */ 134, 67, 68, 49, 50, 51, 52, 53, 54, 75,
915	/* 390 */ 134, 77, 78, 79, 2, 3, 4, 5, 6, 7,
916	/* 400 */ 1, 2, 134, 4, 5, 134, 134, 46, 47, 17,
917	/* 410 */ 134, 12, 134, 134, 15, 134, 134, 25, 134, 4,
918	/* 420 */ 5, 6, 7, 31, 32, 1, 2, 134, 4, 5,
919	/* 430 */ 38, 134, 17, 134, 134, 134, 12, 38, 134, 15,
920	/* 440 */ 25, 134, 81, 134, 1, 2, 134, 4, 5, 134,
921	/* 450 */ 89, 90, 91, 92, 93, 12, 134, 134, 15, 67,
922	/* 460 */ 68, 98, 99, 100, 101, 134, 134, 75, 105, 77,
923	/* 470 */ 78, 79, 2, 3, 4, 5, 6, 7, 134, 116,
924	/* 480 */ 81, 134, 1, 120, 121, 4, 5, 134, 89, 90,
925	/* 490 */ 91, 92, 93, 12, 134, 25, 15, 134, 134, 134,
926	/* 500 */ 134, 31, 32, 134, 134, 81, 134, 1, 38, 134,
927	/* 510 */ 4, 5, 134, 89, 90, 91, 92, 93, 12, 134,
928	/* 520 */ 102, 15, 104, 134, 81, 134, 134, 109, 110, 111,
929	/* 530 */ 112, 113, 89, 90, 91, 92, 93, 67, 68, 1,
930	/* 540 */ 134, 134, 4, 5, 134, 75, 134, 77, 78, 79,
931	/* 550 */ 12, 133, 1, 15, 134, 4, 5, 134, 102, 134,
932	/* 560 */ 134, 134, 81, 12, 134, 134, 15, 111, 112, 113,
933	/* 570 */ 89, 90, 91, 92, 93, 64, 65, 66, 67, 68,
934	/* 580 */ 69, 70, 71, 72, 73, 134, 134, 81, 134, 133,
935	/* 590 */ 134, 134, 102, 134, 134, 89, 90, 91, 92, 93,
936	/* 600 */ 134, 111, 112, 113, 102, 134, 104, 117, 118, 119,
937	/* 610 */ 134, 109, 110, 111, 112, 113, 134, 134, 134, 81,
938	/* 620 */ 134, 134, 2, 133, 134, 134, 134, 89, 90, 91,
939	/* 630 */ 92, 93, 81, 134, 134, 133, 4, 5, 6, 7,
940	/* 640 */ 89, 90, 91, 92, 93, 134, 102, 134, 104, 17,
941	/* 650 */ 102, 31, 32, 109, 110, 111, 112, 113, 134, 111,
942	/* 660 */ 112, 113, 134, 115, 134, 102, 134, 104, 48, 134,
943	/* 670 */ 122, 123, 109, 110, 111, 112, 113, 133, 102, 134,
944	/* 680 */ 104, 133, 134, 134, 64, 109, 110, 111, 112, 113,
945	/* 690 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
946	/* 700 */ 112, 113, 102, 83, 84, 85, 86, 134, 134, 133,
947	/* 710 */ 134, 111, 112, 113, 134, 102, 134, 104, 118, 119,
948	/* 720 */ 134, 133, 109, 110, 111, 112, 113, 134, 134, 134,
949	/* 730 */ 102, 134, 104, 133, 134, 134, 134, 109, 110, 111,
950	/* 740 */ 112, 113, 134, 102, 134, 104, 133, 134, 134, 134,
951	/* 750 */ 109, 110, 111, 112, 113, 102, 134, 104, 134, 134,
952	/* 760 */ 134, 133, 109, 110, 111, 112, 113, 134, 102, 134,
953	/* 770 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
954	/* 780 */ 102, 134, 104, 134, 134, 134, 133, 109, 110, 111,
955	/* 790 */ 112, 113, 134, 102, 134, 104, 134, 134, 134, 133,
956	/* 800 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 134,
957	/* 810 */ 134, 133, 134, 109, 110, 111, 112, 113, 102, 134,
958	/* 820 */ 104, 102, 134, 134, 133, 109, 110, 111, 112, 113,
959	/* 830 */ 111, 112, 113, 102, 134, 104, 134, 133, 134, 134,
960	/* 840 */ 109, 110, 111, 112, 113, 134, 102, 134, 104, 133,
961	/* 850 */ 134, 134, 133, 109, 110, 111, 112, 113, 102, 134,
962	/* 860 */ 104, 134, 134, 134, 133, 109, 110, 111, 112, 113,
963	/* 870 */ 134, 102, 134, 104, 134, 134, 134, 133, 109, 110,
964	/* 880 */ 111, 112, 113, 102, 134, 104, 134, 134, 134, 133,
965	/* 890 */ 109, 110, 111, 112, 113, 2, 102, 134, 104, 134,
966	/* 900 */ 134, 134, 133, 109, 110, 111, 112, 113, 134, 102,
967	/* 910 */ 134, 104, 134, 134, 133, 134, 109, 110, 111, 112,
968	/* 920 */ 113, 102, 134, 104, 31, 32, 134, 133, 109, 110,
969	/* 930 */ 111, 112, 113, 134, 134, 134, 102, 134, 104, 134,
970	/* 940 */ 133, 134, 134, 109, 110, 111, 112, 113, 134, 102,
971	/* 950 */ 134, 134, 133, 134, 134, 134, 134, 64, 111, 112,
972	/* 960 */ 113, 134, 134, 134, 134, 118, 134, 133, 134, 134,
973	/* 970 */ 134, 134, 125, 134, 127, 134, 83, 84, 85, 86,
974	/* 980 */ 133, 102, 98, 99, 100, 101, 134, 134, 134, 105,
975	/* 990 */ 111, 112, 113, 134, 115, 134, 134, 102, 134, 134,
976	/* 1000 */ 116, 134, 123, 134, 134, 121, 111, 112, 113, 102,
977	/* 1010 */ 134, 134, 133, 118, 119, 134, 134, 134, 111, 112,
978	/* 1020 */ 113, 102, 134, 134, 102, 118, 134, 102, 133, 134,
979	/* 1030 */ 111, 112, 113, 111, 112, 113, 111, 112, 113, 102,
980	/* 1040 */ 133, 134, 134, 4, 5, 6, 7, 134, 111, 112,
981	/* 1050 */ 113, 134, 133, 134, 134, 133, 134, 134, 133, 134,
982	/* 1060 */ 134, 134, 102, 134, 25, 134, 134, 134, 102, 134,
983	/* 1070 */ 133, 111, 112, 113, 134, 102, 134, 111, 112, 113,
984	/* 1080 */ 102, 134, 134, 134, 111, 112, 113, 102, 134, 111,
985	/* 1090 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 133,
986	/* 1100 */ 134, 111, 112, 113, 134, 102, 133, 134, 134, 134,
987	/* 1110 */ 102, 133, 134, 134, 111, 112, 113, 102, 133, 111,
988	/* 1120 */ 112, 113, 102, 133, 134, 134, 111, 112, 113, 134,
989	/* 1130 */ 134, 111, 112, 113, 102, 134, 133, 134, 134, 134,
990	/* 1140 */ 102, 133, 134, 111, 112, 113, 134, 134, 133, 111,
991	/* 1150 */ 112, 113, 102, 133, 134, 134, 134, 134, 102, 134,
992	/* 1160 */ 134, 111, 112, 113, 134, 133, 134, 111, 112, 113,
993	/* 1170 */ 134, 133, 134, 134, 134, 102, 134, 134, 134, 134,
994	/* 1180 */ 134, 102, 134, 133, 111, 112, 113, 102, 134, 133,
995	/* 1190 */ 111, 112, 113, 102, 134, 134, 111, 112, 113, 102,
996	/* 1200 */ 134, 134, 111, 112, 113, 134, 133, 134, 111, 112,
997	/* 1210 */ 113, 134, 133, 4, 5, 6, 7, 134, 133, 4,
998	/* 1220 */ 5, 6, 7, 134, 133, 134, 17, 134, 134, 134,
999	/* 1230 */ 133, 4, 5, 6, 7, 4, 5, 6, 7, 134,
1000	/* 1240 */ 25, 134, 134, 134, 17, 4, 5, 6, 7, 4,
1001	/* 1250 */ 5, 6, 7, 134, 134, 134, 25, 134, 17, 134,
1002	/* 1260 */ 134, 134, 17, 134, 134, 134, 134, 134, 134, 134,
1003	/* 1270 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1004	/* 1280 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1005	/* 1290 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1006	/* 1300 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1007	/* 1310 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1008	/* 1320 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1009	/* 1330 */ 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
1010	/* 1340 */ 134, 134, 134, 134, 134, 134, 134, 134, 98, 98,
1011	/* 1350 */ 98, 98, 98, 98, 98, 98, 98, 98, 98, 98,
1012	/* 1360 */ 98,




1013	};
1014	#define YY_SHIFT_COUNT (163)
1015	#define YY_SHIFT_MIN (0)
1016	#define YY_SHIFT_MAX (1245)
1017	static const unsigned short int yy_shift_ofst[] = {
1018	/* 0 */ 143, 127, 220, 243, 243, 243, 243, 243, 243, 243,
1019	/* 10 */ 243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
1020	/* 20 */ 243, 243, 243, 243, 243, 243, 243, 175, 361, 481,
1021	/* 30 */ 175, 143, 399, 399, 0, 64, 143, 506, 481, 506,
1022	/* 40 */ 268, 268, 268, 424, 443, 481, 481, 481, 481, 481,
1023	/* 50 */ 481, 538, 481, 481, 551, 481, 481, 481, 481, 481,
1024	/* 60 */ 481, 481, 481, 481, 481, 334, 60, 60, 60, 60,
1025	/* 70 */ 60, 620, 314, 392, 470, 893, 893, 104, 62, 1263,
1026	/* 80 */ 1263, 1263, 1263, 511, 511, 198, 415, 222, 177, 290,
1027	/* 90 */ 336, 632, 1039, 1209, 1215, 1227, 1231, 1241, 1245, 25,
1028	/* 100 */ 25, 25, 182, 25, 25, 25, 63, 25, 210, 102,
1029	/* 110 */ 105, 169, 221, 173, 138, 194, 194, 162, 227, 228,
1030	/* 120 */ 43, 277, 141, 161, 189, 170, 234, 200, 217, 231,
1031	/* 130 */ 237, 241, 215, 272, 269, 266, 218, 276, 219, 224,
1032	/* 140 */ 242, 229, 297, 311, 320, 293, 335, 341, 344, 254,
1033	/* 150 */ 261, 325, 254, 338, 348, 349, 350, 323, 340, 342,
1034	/* 160 */ 357, 284, 371, 364,
1035	};
1036	#define YY_REDUCE_COUNT (82)
1037	#define YY_REDUCE_MIN (-128)
1038	#define YY_REDUCE_MAX (1097)
1039	static const short yy_reduce_ofst[] = {
1040	/* 0 */ 363, -95, -31, 418, 502, 544, 563, 576, 588, 613,
1041	/* 10 */ 628, 641, 653, 666, 678, 691, 704, 716, 731, 744,
1042	/* 20 */ 756, 769, 781, 794, 807, 819, 834, 548, 490, 847,
1043	/* 30 */ 879, 884, 600, 895, -60, -60, 93, 35, 907, 148,
1044	/* 40 */ 456, 719, 919, 922, 925, 937, 960, 966, 973, 978,
1045	/* 50 */ 985, 990, 1003, 1008, 1015, 1020, 1032, 1038, 1050, 1056,
1046	/* 60 */ 1073, 1079, 1085, 1091, 1097, -80, -110, -100, -46, -36,
1047	/* 70 */ -18, -21, -128, -128, -128, -96, -85, -57, -99, -30,
1048	/* 80 */ -3, 24, 29,
1049	};
1050	static const YYACTIONTYPE yy_default[] = {
1051	/* 0 */ 447, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1052	/* 10 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1053	/* 20 */ 441, 441, 441, 441, 441, 441, 441, 441, 471, 573,
1054	/* 30 */ 441, 447, 577, 483, 578, 578, 447, 441, 441, 441,
1055	/* 40 */ 441, 441, 441, 441, 441, 441, 441, 441, 475, 441,
1056	/* 50 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1057	/* 60 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1058	/* 70 */ 441, 441, 441, 441, 441, 441, 441, 441, 453, 468,
1059	/* 80 */ 506, 506, 573, 466, 491, 441, 441, 441, 469, 441,
1060	/* 90 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 486,
1061	/* 100 */ 484, 474, 457, 510, 509, 508, 441, 563, 441, 441,
1062	/* 110 */ 441, 441, 441, 585, 441, 542, 541, 537, 441, 530,
1063	/* 120 */ 527, 441, 441, 441, 441, 441, 441, 489, 441, 441,
1064	/* 130 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1065	/* 140 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 589,
1066	/* 150 */ 441, 441, 441, 441, 441, 441, 441, 441, 441, 441,
1067	/* 160 */ 441, 598, 441, 441,
1068	};
1069	/******** End of lemon-generated parsing tables ***************************/
1070
1071	/* The next table maps tokens (terminal symbols) into fallback tokens.
1072	** If a construct like the following:
	@@ -1170,10 +1179,11 @@
1170	0, /* TOP => nothing */
1171	0, /* BOTTOM => nothing */
1172	0, /* START => nothing */
1173	0, /* END => nothing */
1174	0, /* IN => nothing */

1175	0, /* DOT_U => nothing */
1176	0, /* LAST => nothing */
1177	0, /* NUMBER => nothing */
1178	0, /* FUNC1 => nothing */
1179	0, /* FUNC2 => nothing */
	@@ -1356,56 +1366,57 @@
1356	/* 83 */ "TOP",
1357	/* 84 */ "BOTTOM",
1358	/* 85 */ "START",
1359	/* 86 */ "END",
1360	/* 87 */ "IN",
1361	/* 88 */ "DOT_U",
1362	/* 89 */ "LAST",
1363	/* 90 */ "NUMBER",
1364	/* 91 */ "FUNC1",
1365	/* 92 */ "FUNC2",
1366	/* 93 */ "DIST",
1367	/* 94 */ "DOT_XY",
1368	/* 95 */ "X",
1369	/* 96 */ "Y",
1370	/* 97 */ "DOT_L",
1371	/* 98 */ "statement_list",
1372	/* 99 */ "statement",
1373	/* 100 */ "unnamed_statement",
1374	/* 101 */ "basetype",
1375	/* 102 */ "expr",
1376	/* 103 */ "numproperty",
1377	/* 104 */ "edge",
1378	/* 105 */ "direction",
1379	/* 106 */ "dashproperty",
1380	/* 107 */ "colorproperty",
1381	/* 108 */ "locproperty",
1382	/* 109 */ "position",
1383	/* 110 */ "place",
1384	/* 111 */ "object",
1385	/* 112 */ "objectname",
1386	/* 113 */ "nth",
1387	/* 114 */ "textposition",
1388	/* 115 */ "rvalue",
1389	/* 116 */ "lvalue",
1390	/* 117 */ "even",
1391	/* 118 */ "relexpr",
1392	/* 119 */ "optrelexpr",
1393	/* 120 */ "document",
1394	/* 121 */ "print",
1395	/* 122 */ "prlist",
1396	/* 123 */ "pritem",
1397	/* 124 */ "prsep",
1398	/* 125 */ "attribute_list",
1399	/* 126 */ "savelist",
1400	/* 127 */ "alist",
1401	/* 128 */ "attribute",
1402	/* 129 */ "go",
1403	/* 130 */ "boolproperty",
1404	/* 131 */ "withclause",
1405	/* 132 */ "between",
1406	/* 133 */ "place2",

1407	};
1408	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1409
1410	#ifndef NDEBUG
1411	/* For tracing reduce actions, the names of all rules are required.
	@@ -1497,77 +1508,78 @@
1497	/* 83 */ "place2 ::= object",
1498	/* 84 */ "place2 ::= object DOT_E edge",
1499	/* 85 */ "place2 ::= NTH VERTEX OF object",
1500	/* 86 */ "object ::= nth",
1501	/* 87 */ "object ::= nth OF\|IN object",
1502	/* 88 */ "objectname ::= PLACENAME",
1503	/* 89 */ "objectname ::= objectname DOT_U PLACENAME",
1504	/* 90 */ "nth ::= NTH CLASSNAME",
1505	/* 91 */ "nth ::= NTH LAST CLASSNAME",
1506	/* 92 */ "nth ::= LAST CLASSNAME",
1507	/* 93 */ "nth ::= LAST",
1508	/* 94 */ "nth ::= NTH LB RB",
1509	/* 95 */ "nth ::= NTH LAST LB RB",
1510	/* 96 */ "nth ::= LAST LB RB",
1511	/* 97 */ "expr ::= expr PLUS expr",
1512	/* 98 */ "expr ::= expr MINUS expr",
1513	/* 99 */ "expr ::= expr STAR expr",
1514	/* 100 */ "expr ::= expr SLASH expr",
1515	/* 101 */ "expr ::= MINUS expr",
1516	/* 102 */ "expr ::= PLUS expr",
1517	/* 103 */ "expr ::= LP expr RP",
1518	/* 104 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
1519	/* 105 */ "expr ::= NUMBER",
1520	/* 106 */ "expr ::= ID",
1521	/* 107 */ "expr ::= FUNC1 LP expr RP",
1522	/* 108 */ "expr ::= FUNC2 LP expr COMMA expr RP",
1523	/* 109 */ "expr ::= DIST LP position COMMA position RP",
1524	/* 110 */ "expr ::= place2 DOT_XY X",
1525	/* 111 */ "expr ::= place2 DOT_XY Y",
1526	/* 112 */ "expr ::= object DOT_L numproperty",
1527	/* 113 */ "expr ::= object DOT_L dashproperty",
1528	/* 114 */ "expr ::= object DOT_L colorproperty",
1529	/* 115 */ "lvalue ::= ID",
1530	/* 116 */ "lvalue ::= FILL",
1531	/* 117 */ "lvalue ::= COLOR",
1532	/* 118 */ "lvalue ::= THICKNESS",
1533	/* 119 */ "rvalue ::= expr",
1534	/* 120 */ "print ::= PRINT",
1535	/* 121 */ "prlist ::= pritem",
1536	/* 122 */ "prlist ::= prlist prsep pritem",
1537	/* 123 */ "direction ::= UP",
1538	/* 124 */ "direction ::= DOWN",
1539	/* 125 */ "direction ::= LEFT",
1540	/* 126 */ "direction ::= RIGHT",
1541	/* 127 */ "optrelexpr ::= relexpr",
1542	/* 128 */ "attribute_list ::= alist",
1543	/* 129 */ "alist ::=",
1544	/* 130 */ "alist ::= alist attribute",
1545	/* 131 */ "attribute ::= boolproperty",
1546	/* 132 */ "attribute ::= WITH withclause",
1547	/* 133 */ "go ::= GO",
1548	/* 134 */ "go ::=",
1549	/* 135 */ "even ::= UNTIL EVEN WITH",
1550	/* 136 */ "even ::= EVEN WITH",
1551	/* 137 */ "dashproperty ::= DOTTED",
1552	/* 138 */ "dashproperty ::= DASHED",
1553	/* 139 */ "colorproperty ::= FILL",
1554	/* 140 */ "colorproperty ::= COLOR",
1555	/* 141 */ "position ::= place",
1556	/* 142 */ "between ::= WAY BETWEEN",
1557	/* 143 */ "between ::= BETWEEN",
1558	/* 144 */ "between ::= OF THE WAY BETWEEN",
1559	/* 145 */ "place ::= place2",
1560	/* 146 */ "edge ::= CENTER",
1561	/* 147 */ "edge ::= EDGEPT",
1562	/* 148 */ "edge ::= TOP",
1563	/* 149 */ "edge ::= BOTTOM",
1564	/* 150 */ "edge ::= START",
1565	/* 151 */ "edge ::= END",
1566	/* 152 */ "edge ::= RIGHT",
1567	/* 153 */ "edge ::= LEFT",
1568	/* 154 */ "object ::= objectname",

1569	};
1570	#endif /* NDEBUG */
1571
1572
1573	#if YYSTACKDEPTH<=0
	@@ -1689,24 +1701,24 @@
1689	** Note: during a reduce, the only symbols destroyed are those
1690	** which appear on the RHS of the rule, but which are not used
1691	** inside the C code.
1692	*/
1693	/******* Begin destructor definitions *************************************/
1694	case 98: /* statement_list */
1695	{
1696	#line 494 "pikchr.y"
1697	pik_elist_free(p,(yypminor->yy119));
1698	#line 1723 "pikchr.c"
1699	}
1700	break;
1701	case 99: /* statement */
1702	case 100: /* unnamed_statement */
1703	case 101: /* basetype */
1704	{
1705	#line 496 "pikchr.y"
1706	pik_elem_free(p,(yypminor->yy38));
1707	#line 1732 "pikchr.c"
1708	}
1709	break;
1710	/******* End destructor definitions ***************************************/
1711	default: break; /* If no destructor action specified: do nothing */
1712	}
	@@ -1923,11 +1935,11 @@
1923	** stack every overflows */
1924	/****** Begin %stack_overflow code ****************************************/
1925	#line 528 "pikchr.y"
1926
1927	pik_error(p, 0, "parser stack overflow");
1928	#line 1953 "pikchr.c"
1929	/****** End %stack_overflow code ******************************************/
1930	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
1931	pik_parserCTX_STORE
1932	}
1933
	@@ -1995,165 +2007,166 @@
1995	}
1996
1997	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
1998	** of that rule */
1999	static const YYCODETYPE yyRuleInfoLhs[] = {
2000	120, /* (0) document ::= statement_list */
2001	98, /* (1) statement_list ::= statement */
2002	98, /* (2) statement_list ::= statement_list EOL statement */
2003	99, /* (3) statement ::= */
2004	99, /* (4) statement ::= direction */
2005	99, /* (5) statement ::= lvalue ASSIGN rvalue */
2006	99, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2007	99, /* (7) statement ::= PLACENAME COLON position */
2008	99, /* (8) statement ::= unnamed_statement */
2009	99, /* (9) statement ::= print prlist */
2010	99, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2011	99, /* (11) statement ::= ASSERT LP position EQ position RP */
2012	99, /* (12) statement ::= DEFINE ID CODEBLOCK */
2013	115, /* (13) rvalue ::= PLACENAME */
2014	123, /* (14) pritem ::= FILL */
2015	123, /* (15) pritem ::= COLOR */
2016	123, /* (16) pritem ::= THICKNESS */
2017	123, /* (17) pritem ::= rvalue */
2018	123, /* (18) pritem ::= STRING */
2019	124, /* (19) prsep ::= COMMA */
2020	100, /* (20) unnamed_statement ::= basetype attribute_list */
2021	101, /* (21) basetype ::= CLASSNAME */
2022	101, /* (22) basetype ::= STRING textposition */
2023	101, /* (23) basetype ::= LB savelist statement_list RB */
2024	126, /* (24) savelist ::= */
2025	118, /* (25) relexpr ::= expr */
2026	118, /* (26) relexpr ::= expr PERCENT */
2027	119, /* (27) optrelexpr ::= */
2028	125, /* (28) attribute_list ::= relexpr alist */
2029	128, /* (29) attribute ::= numproperty relexpr */
2030	128, /* (30) attribute ::= dashproperty expr */
2031	128, /* (31) attribute ::= dashproperty */
2032	128, /* (32) attribute ::= colorproperty rvalue */
2033	128, /* (33) attribute ::= go direction optrelexpr */
2034	128, /* (34) attribute ::= go direction even position */
2035	128, /* (35) attribute ::= CLOSE */
2036	128, /* (36) attribute ::= CHOP */
2037	128, /* (37) attribute ::= FROM position */
2038	128, /* (38) attribute ::= TO position */
2039	128, /* (39) attribute ::= THEN */
2040	128, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2041	128, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2042	128, /* (42) attribute ::= GO optrelexpr HEADING expr */
2043	128, /* (43) attribute ::= GO optrelexpr EDGEPT */
2044	128, /* (44) attribute ::= AT position */
2045	128, /* (45) attribute ::= SAME */
2046	128, /* (46) attribute ::= SAME AS object */
2047	128, /* (47) attribute ::= STRING textposition */
2048	128, /* (48) attribute ::= FIT */
2049	128, /* (49) attribute ::= BEHIND object */
2050	131, /* (50) withclause ::= DOT_E edge AT position */
2051	131, /* (51) withclause ::= edge AT position */
2052	103, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2053	130, /* (53) boolproperty ::= CW */
2054	130, /* (54) boolproperty ::= CCW */
2055	130, /* (55) boolproperty ::= LARROW */
2056	130, /* (56) boolproperty ::= RARROW */
2057	130, /* (57) boolproperty ::= LRARROW */
2058	130, /* (58) boolproperty ::= INVIS */
2059	130, /* (59) boolproperty ::= THICK */
2060	130, /* (60) boolproperty ::= THIN */
2061	130, /* (61) boolproperty ::= SOLID */
2062	114, /* (62) textposition ::= */
2063	114, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2064	109, /* (64) position ::= expr COMMA expr */
2065	109, /* (65) position ::= place PLUS expr COMMA expr */
2066	109, /* (66) position ::= place MINUS expr COMMA expr */
2067	109, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2068	109, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2069	109, /* (69) position ::= LP position COMMA position RP */
2070	109, /* (70) position ::= LP position RP */
2071	109, /* (71) position ::= expr between position AND position */
2072	109, /* (72) position ::= expr LT position COMMA position GT */
2073	109, /* (73) position ::= expr ABOVE position */
2074	109, /* (74) position ::= expr BELOW position */
2075	109, /* (75) position ::= expr LEFT OF position */
2076	109, /* (76) position ::= expr RIGHT OF position */
2077	109, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2078	109, /* (78) position ::= expr HEADING EDGEPT OF position */
2079	109, /* (79) position ::= expr EDGEPT OF position */
2080	109, /* (80) position ::= expr ON HEADING expr FROM position */
2081	109, /* (81) position ::= expr HEADING expr FROM position */
2082	110, /* (82) place ::= edge OF object */
2083	133, /* (83) place2 ::= object */
2084	133, /* (84) place2 ::= object DOT_E edge */
2085	133, /* (85) place2 ::= NTH VERTEX OF object */
2086	111, /* (86) object ::= nth */
2087	111, /* (87) object ::= nth OF\|IN object */
2088	112, /* (88) objectname ::= PLACENAME */
2089	112, /* (89) objectname ::= objectname DOT_U PLACENAME */
2090	113, /* (90) nth ::= NTH CLASSNAME */
2091	113, /* (91) nth ::= NTH LAST CLASSNAME */
2092	113, /* (92) nth ::= LAST CLASSNAME */
2093	113, /* (93) nth ::= LAST */
2094	113, /* (94) nth ::= NTH LB RB */
2095	113, /* (95) nth ::= NTH LAST LB RB */
2096	113, /* (96) nth ::= LAST LB RB */
2097	102, /* (97) expr ::= expr PLUS expr */
2098	102, /* (98) expr ::= expr MINUS expr */
2099	102, /* (99) expr ::= expr STAR expr */
2100	102, /* (100) expr ::= expr SLASH expr */
2101	102, /* (101) expr ::= MINUS expr */
2102	102, /* (102) expr ::= PLUS expr */
2103	102, /* (103) expr ::= LP expr RP */
2104	102, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2105	102, /* (105) expr ::= NUMBER */
2106	102, /* (106) expr ::= ID */
2107	102, /* (107) expr ::= FUNC1 LP expr RP */
2108	102, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2109	102, /* (109) expr ::= DIST LP position COMMA position RP */
2110	102, /* (110) expr ::= place2 DOT_XY X */
2111	102, /* (111) expr ::= place2 DOT_XY Y */
2112	102, /* (112) expr ::= object DOT_L numproperty */
2113	102, /* (113) expr ::= object DOT_L dashproperty */
2114	102, /* (114) expr ::= object DOT_L colorproperty */
2115	116, /* (115) lvalue ::= ID */
2116	116, /* (116) lvalue ::= FILL */
2117	116, /* (117) lvalue ::= COLOR */
2118	116, /* (118) lvalue ::= THICKNESS */
2119	115, /* (119) rvalue ::= expr */
2120	121, /* (120) print ::= PRINT */
2121	122, /* (121) prlist ::= pritem */
2122	122, /* (122) prlist ::= prlist prsep pritem */
2123	105, /* (123) direction ::= UP */
2124	105, /* (124) direction ::= DOWN */
2125	105, /* (125) direction ::= LEFT */
2126	105, /* (126) direction ::= RIGHT */
2127	119, /* (127) optrelexpr ::= relexpr */
2128	125, /* (128) attribute_list ::= alist */
2129	127, /* (129) alist ::= */
2130	127, /* (130) alist ::= alist attribute */
2131	128, /* (131) attribute ::= boolproperty */
2132	128, /* (132) attribute ::= WITH withclause */
2133	129, /* (133) go ::= GO */
2134	129, /* (134) go ::= */
2135	117, /* (135) even ::= UNTIL EVEN WITH */
2136	117, /* (136) even ::= EVEN WITH */
2137	106, /* (137) dashproperty ::= DOTTED */
2138	106, /* (138) dashproperty ::= DASHED */
2139	107, /* (139) colorproperty ::= FILL */
2140	107, /* (140) colorproperty ::= COLOR */
2141	109, /* (141) position ::= place */
2142	132, /* (142) between ::= WAY BETWEEN */
2143	132, /* (143) between ::= BETWEEN */
2144	132, /* (144) between ::= OF THE WAY BETWEEN */
2145	110, /* (145) place ::= place2 */
2146	104, /* (146) edge ::= CENTER */
2147	104, /* (147) edge ::= EDGEPT */
2148	104, /* (148) edge ::= TOP */
2149	104, /* (149) edge ::= BOTTOM */
2150	104, /* (150) edge ::= START */
2151	104, /* (151) edge ::= END */
2152	104, /* (152) edge ::= RIGHT */
2153	104, /* (153) edge ::= LEFT */
2154	111, /* (154) object ::= objectname */

2155	};
2156
2157	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2158	** of symbols on the right-hand side of that rule. */
2159	static const signed char yyRuleInfoNRhs[] = {
	@@ -2243,77 +2256,78 @@
2243	-1, /* (83) place2 ::= object */
2244	-3, /* (84) place2 ::= object DOT_E edge */
2245	-4, /* (85) place2 ::= NTH VERTEX OF object */
2246	-1, /* (86) object ::= nth */
2247	-3, /* (87) object ::= nth OF\|IN object */
2248	-1, /* (88) objectname ::= PLACENAME */
2249	-3, /* (89) objectname ::= objectname DOT_U PLACENAME */
2250	-2, /* (90) nth ::= NTH CLASSNAME */
2251	-3, /* (91) nth ::= NTH LAST CLASSNAME */
2252	-2, /* (92) nth ::= LAST CLASSNAME */
2253	-1, /* (93) nth ::= LAST */
2254	-3, /* (94) nth ::= NTH LB RB */
2255	-4, /* (95) nth ::= NTH LAST LB RB */
2256	-3, /* (96) nth ::= LAST LB RB */
2257	-3, /* (97) expr ::= expr PLUS expr */
2258	-3, /* (98) expr ::= expr MINUS expr */
2259	-3, /* (99) expr ::= expr STAR expr */
2260	-3, /* (100) expr ::= expr SLASH expr */
2261	-2, /* (101) expr ::= MINUS expr */
2262	-2, /* (102) expr ::= PLUS expr */
2263	-3, /* (103) expr ::= LP expr RP */
2264	-3, /* (104) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2265	-1, /* (105) expr ::= NUMBER */
2266	-1, /* (106) expr ::= ID */
2267	-4, /* (107) expr ::= FUNC1 LP expr RP */
2268	-6, /* (108) expr ::= FUNC2 LP expr COMMA expr RP */
2269	-6, /* (109) expr ::= DIST LP position COMMA position RP */
2270	-3, /* (110) expr ::= place2 DOT_XY X */
2271	-3, /* (111) expr ::= place2 DOT_XY Y */
2272	-3, /* (112) expr ::= object DOT_L numproperty */
2273	-3, /* (113) expr ::= object DOT_L dashproperty */
2274	-3, /* (114) expr ::= object DOT_L colorproperty */
2275	-1, /* (115) lvalue ::= ID */
2276	-1, /* (116) lvalue ::= FILL */
2277	-1, /* (117) lvalue ::= COLOR */
2278	-1, /* (118) lvalue ::= THICKNESS */
2279	-1, /* (119) rvalue ::= expr */
2280	-1, /* (120) print ::= PRINT */
2281	-1, /* (121) prlist ::= pritem */
2282	-3, /* (122) prlist ::= prlist prsep pritem */
2283	-1, /* (123) direction ::= UP */
2284	-1, /* (124) direction ::= DOWN */
2285	-1, /* (125) direction ::= LEFT */
2286	-1, /* (126) direction ::= RIGHT */
2287	-1, /* (127) optrelexpr ::= relexpr */
2288	-1, /* (128) attribute_list ::= alist */
2289	0, /* (129) alist ::= */
2290	-2, /* (130) alist ::= alist attribute */
2291	-1, /* (131) attribute ::= boolproperty */
2292	-2, /* (132) attribute ::= WITH withclause */
2293	-1, /* (133) go ::= GO */
2294	0, /* (134) go ::= */
2295	-3, /* (135) even ::= UNTIL EVEN WITH */
2296	-2, /* (136) even ::= EVEN WITH */
2297	-1, /* (137) dashproperty ::= DOTTED */
2298	-1, /* (138) dashproperty ::= DASHED */
2299	-1, /* (139) colorproperty ::= FILL */
2300	-1, /* (140) colorproperty ::= COLOR */
2301	-1, /* (141) position ::= place */
2302	-2, /* (142) between ::= WAY BETWEEN */
2303	-1, /* (143) between ::= BETWEEN */
2304	-4, /* (144) between ::= OF THE WAY BETWEEN */
2305	-1, /* (145) place ::= place2 */
2306	-1, /* (146) edge ::= CENTER */
2307	-1, /* (147) edge ::= EDGEPT */
2308	-1, /* (148) edge ::= TOP */
2309	-1, /* (149) edge ::= BOTTOM */
2310	-1, /* (150) edge ::= START */
2311	-1, /* (151) edge ::= END */
2312	-1, /* (152) edge ::= RIGHT */
2313	-1, /* (153) edge ::= LEFT */
2314	-1, /* (154) object ::= objectname */

2315	};
2316
2317	static void yy_accept(yyParser); / Forward Declaration */
2318
2319	/*
	@@ -2402,656 +2416,661 @@
2402	*/
2403	/******** Begin reduce actions ********************************************/
2404	YYMINORTYPE yylhsminor;
2405	case 0: /* document ::= statement_list */
2406	#line 532 "pikchr.y"
2407	{pik_render(p,yymsp[0].minor.yy119);}
2408	#line 2433 "pikchr.c"
2409	break;
2410	case 1: /* statement_list ::= statement */
2411	#line 535 "pikchr.y"
2412	{ yylhsminor.yy119 = pik_elist_append(p,0,yymsp[0].minor.yy38); }
2413	#line 2438 "pikchr.c"
2414	yymsp[0].minor.yy119 = yylhsminor.yy119;
2415	break;
2416	case 2: /* statement_list ::= statement_list EOL statement */
2417	#line 537 "pikchr.y"
2418	{ yylhsminor.yy119 = pik_elist_append(p,yymsp[-2].minor.yy119,yymsp[0].minor.yy38); }
2419	#line 2444 "pikchr.c"
2420	yymsp[-2].minor.yy119 = yylhsminor.yy119;
2421	break;
2422	case 3: /* statement ::= */
2423	#line 540 "pikchr.y"
2424	{ yymsp[1].minor.yy38 = 0; }
2425	#line 2450 "pikchr.c"
2426	break;
2427	case 4: /* statement ::= direction */
2428	#line 541 "pikchr.y"
2429	{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy38=0; }
2430	#line 2455 "pikchr.c"
2431	yymsp[0].minor.yy38 = yylhsminor.yy38;
2432	break;
2433	case 5: /* statement ::= lvalue ASSIGN rvalue */
2434	#line 542 "pikchr.y"
2435	{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy265,&yymsp[-1].minor.yy0); yylhsminor.yy38=0;}
2436	#line 2461 "pikchr.c"
2437	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2438	break;
2439	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2440	#line 544 "pikchr.y"
2441	{ yylhsminor.yy38 = yymsp[0].minor.yy38; pik_elem_setname(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0); }
2442	#line 2467 "pikchr.c"
2443	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2444	break;
2445	case 7: /* statement ::= PLACENAME COLON position */
2446	#line 546 "pikchr.y"
2447	{ yylhsminor.yy38 = pik_elem_new(p,0,0,0);
2448	if(yylhsminor.yy38){ yylhsminor.yy38->ptAt = yymsp[0].minor.yy43; pik_elem_setname(p,yylhsminor.yy38,&yymsp[-2].minor.yy0); }}
2449	#line 2474 "pikchr.c"
2450	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2451	break;
2452	case 8: /* statement ::= unnamed_statement */
2453	#line 548 "pikchr.y"
2454	{yylhsminor.yy38 = yymsp[0].minor.yy38;}
2455	#line 2480 "pikchr.c"
2456	yymsp[0].minor.yy38 = yylhsminor.yy38;
2457	break;
2458	case 9: /* statement ::= print prlist */
2459	#line 549 "pikchr.y"
2460	{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy38=0;}
2461	#line 2486 "pikchr.c"
2462	break;
2463	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2464	#line 554 "pikchr.y"
2465	{yymsp[-5].minor.yy38=pik_assert(p,yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy265);}
2466	#line 2491 "pikchr.c"
2467	break;
2468	case 11: /* statement ::= ASSERT LP position EQ position RP */
2469	#line 556 "pikchr.y"
2470	{yymsp[-5].minor.yy38=pik_position_assert(p,&yymsp[-3].minor.yy43,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy43);}
2471	#line 2496 "pikchr.c"
2472	break;
2473	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2474	#line 557 "pikchr.y"
2475	{yymsp[-2].minor.yy38=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2476	#line 2501 "pikchr.c"
2477	break;
2478	case 13: /* rvalue ::= PLACENAME */
2479	#line 568 "pikchr.y"
2480	{yylhsminor.yy265 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2481	#line 2506 "pikchr.c"
2482	yymsp[0].minor.yy265 = yylhsminor.yy265;
2483	break;
2484	case 14: /* pritem ::= FILL */
2485	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2486	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2487	#line 573 "pikchr.y"
2488	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2489	#line 2514 "pikchr.c"
2490	break;
2491	case 17: /* pritem ::= rvalue */
2492	#line 576 "pikchr.y"
2493	{pik_append_num(p,"",yymsp[0].minor.yy265);}
2494	#line 2519 "pikchr.c"
2495	break;
2496	case 18: /* pritem ::= STRING */
2497	#line 577 "pikchr.y"
2498	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2499	#line 2524 "pikchr.c"
2500	break;
2501	case 19: /* prsep ::= COMMA */
2502	#line 578 "pikchr.y"
2503	{pik_append(p, " ", 1);}
2504	#line 2529 "pikchr.c"
2505	break;
2506	case 20: /* unnamed_statement ::= basetype attribute_list */
2507	#line 581 "pikchr.y"
2508	{yylhsminor.yy38 = yymsp[-1].minor.yy38; pik_after_adding_attributes(p,yylhsminor.yy38);}
2509	#line 2534 "pikchr.c"
2510	yymsp[-1].minor.yy38 = yylhsminor.yy38;
2511	break;
2512	case 21: /* basetype ::= CLASSNAME */
2513	#line 583 "pikchr.y"
2514	{yylhsminor.yy38 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2515	#line 2540 "pikchr.c"
2516	yymsp[0].minor.yy38 = yylhsminor.yy38;
2517	break;
2518	case 22: /* basetype ::= STRING textposition */
2519	#line 585 "pikchr.y"
2520	{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy44; yylhsminor.yy38 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2521	#line 2546 "pikchr.c"
2522	yymsp[-1].minor.yy38 = yylhsminor.yy38;
2523	break;
2524	case 23: /* basetype ::= LB savelist statement_list RB */
2525	#line 587 "pikchr.y"
2526	{ p->list = yymsp[-2].minor.yy119; yymsp[-3].minor.yy38 = pik_elem_new(p,0,0,yymsp[-1].minor.yy119); if(yymsp[-3].minor.yy38) yymsp[-3].minor.yy38->errTok = yymsp[0].minor.yy0; }
2527	#line 2552 "pikchr.c"
2528	break;
2529	case 24: /* savelist ::= */
2530	#line 592 "pikchr.y"
2531	{yymsp[1].minor.yy119 = p->list; p->list = 0;}
2532	#line 2557 "pikchr.c"
2533	break;
2534	case 25: /* relexpr ::= expr */
2535	#line 599 "pikchr.y"
2536	{yylhsminor.yy200.rAbs = yymsp[0].minor.yy265; yylhsminor.yy200.rRel = 0;}
2537	#line 2562 "pikchr.c"
2538	yymsp[0].minor.yy200 = yylhsminor.yy200;
2539	break;
2540	case 26: /* relexpr ::= expr PERCENT */
2541	#line 600 "pikchr.y"
2542	{yylhsminor.yy200.rAbs = 0; yylhsminor.yy200.rRel = yymsp[-1].minor.yy265/100;}
2543	#line 2568 "pikchr.c"
2544	yymsp[-1].minor.yy200 = yylhsminor.yy200;
2545	break;
2546	case 27: /* optrelexpr ::= */
2547	#line 602 "pikchr.y"
2548	{yymsp[1].minor.yy200.rAbs = 0; yymsp[1].minor.yy200.rRel = 1.0;}
2549	#line 2574 "pikchr.c"
2550	break;
2551	case 28: /* attribute_list ::= relexpr alist */
2552	#line 604 "pikchr.y"
2553	{pik_add_direction(p,0,&yymsp[-1].minor.yy200);}
2554	#line 2579 "pikchr.c"
2555	break;
2556	case 29: /* attribute ::= numproperty relexpr */
2557	#line 608 "pikchr.y"
2558	{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200); }
2559	#line 2584 "pikchr.c"
2560	break;
2561	case 30: /* attribute ::= dashproperty expr */
2562	#line 609 "pikchr.y"
2563	{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy265); }
2564	#line 2589 "pikchr.c"
2565	break;
2566	case 31: /* attribute ::= dashproperty */
2567	#line 610 "pikchr.y"
2568	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2569	#line 2594 "pikchr.c"
2570	break;
2571	case 32: /* attribute ::= colorproperty rvalue */
2572	#line 611 "pikchr.y"
2573	{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265); }
2574	#line 2599 "pikchr.c"
2575	break;
2576	case 33: /* attribute ::= go direction optrelexpr */
2577	#line 612 "pikchr.y"
2578	{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy200);}
2579	#line 2604 "pikchr.c"
2580	break;
2581	case 34: /* attribute ::= go direction even position */
2582	#line 613 "pikchr.y"
2583	{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43);}
2584	#line 2609 "pikchr.c"
2585	break;
2586	case 35: /* attribute ::= CLOSE */
2587	#line 614 "pikchr.y"
2588	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2589	#line 2614 "pikchr.c"
2590	break;
2591	case 36: /* attribute ::= CHOP */
2592	#line 615 "pikchr.y"
2593	{ p->cur->bChop = 1; }
2594	#line 2619 "pikchr.c"
2595	break;
2596	case 37: /* attribute ::= FROM position */
2597	#line 616 "pikchr.y"
2598	{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2599	#line 2624 "pikchr.c"
2600	break;
2601	case 38: /* attribute ::= TO position */
2602	#line 617 "pikchr.y"
2603	{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy43); }
2604	#line 2629 "pikchr.c"
2605	break;
2606	case 39: /* attribute ::= THEN */
2607	#line 618 "pikchr.y"
2608	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2609	#line 2634 "pikchr.c"
2610	break;
2611	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2612	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2613	#line 620 "pikchr.y"
2614	{pik_move_hdg(p,&yymsp[-2].minor.yy200,&yymsp[-1].minor.yy0,yymsp[0].minor.yy265,0,&yymsp[-3].minor.yy0);}
2615	#line 2640 "pikchr.c"
2616	break;
2617	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2618	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2619	#line 621 "pikchr.y"
2620	{pik_move_hdg(p,&yymsp[-1].minor.yy200,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2621	#line 2646 "pikchr.c"
2622	break;
2623	case 44: /* attribute ::= AT position */
2624	#line 626 "pikchr.y"
2625	{ pik_set_at(p,0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2626	#line 2651 "pikchr.c"
2627	break;
2628	case 45: /* attribute ::= SAME */
2629	#line 628 "pikchr.y"
2630	{pik_same(p,0,&yymsp[0].minor.yy0);}
2631	#line 2656 "pikchr.c"
2632	break;
2633	case 46: /* attribute ::= SAME AS object */
2634	#line 629 "pikchr.y"
2635	{pik_same(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2636	#line 2661 "pikchr.c"
2637	break;
2638	case 47: /* attribute ::= STRING textposition */
2639	#line 630 "pikchr.y"
2640	{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy44);}
2641	#line 2666 "pikchr.c"
2642	break;
2643	case 48: /* attribute ::= FIT */
2644	#line 631 "pikchr.y"
2645	{pik_size_to_fit(p,&yymsp[0].minor.yy0,3); }
2646	#line 2671 "pikchr.c"
2647	break;
2648	case 49: /* attribute ::= BEHIND object */
2649	#line 632 "pikchr.y"
2650	{pik_behind(p,yymsp[0].minor.yy38);}
2651	#line 2676 "pikchr.c"
2652	break;
2653	case 50: /* withclause ::= DOT_E edge AT position */
2654	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2655	#line 640 "pikchr.y"
2656	{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy43,&yymsp[-1].minor.yy0); }
2657	#line 2682 "pikchr.c"
2658	break;
2659	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2660	#line 644 "pikchr.y"
2661	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2662	#line 2687 "pikchr.c"
2663	yymsp[0].minor.yy0 = yylhsminor.yy0;
2664	break;
2665	case 53: /* boolproperty ::= CW */
2666	#line 655 "pikchr.y"
2667	{p->cur->cw = 1;}
2668	#line 2693 "pikchr.c"
2669	break;
2670	case 54: /* boolproperty ::= CCW */
2671	#line 656 "pikchr.y"
2672	{p->cur->cw = 0;}
2673	#line 2698 "pikchr.c"
2674	break;
2675	case 55: /* boolproperty ::= LARROW */
2676	#line 657 "pikchr.y"
2677	{p->cur->larrow=1; p->cur->rarrow=0; }
2678	#line 2703 "pikchr.c"
2679	break;
2680	case 56: /* boolproperty ::= RARROW */
2681	#line 658 "pikchr.y"
2682	{p->cur->larrow=0; p->cur->rarrow=1; }
2683	#line 2708 "pikchr.c"
2684	break;
2685	case 57: /* boolproperty ::= LRARROW */
2686	#line 659 "pikchr.y"
2687	{p->cur->larrow=1; p->cur->rarrow=1; }
2688	#line 2713 "pikchr.c"
2689	break;
2690	case 58: /* boolproperty ::= INVIS */
2691	#line 660 "pikchr.y"
2692	{p->cur->sw = 0.0;}
2693	#line 2718 "pikchr.c"
2694	break;
2695	case 59: /* boolproperty ::= THICK */
2696	#line 661 "pikchr.y"
2697	{p->cur->sw *= 1.5;}
2698	#line 2723 "pikchr.c"
2699	break;
2700	case 60: /* boolproperty ::= THIN */
2701	#line 662 "pikchr.y"
2702	{p->cur->sw *= 0.67;}
2703	#line 2728 "pikchr.c"
2704	break;
2705	case 61: /* boolproperty ::= SOLID */
2706	#line 663 "pikchr.y"
2707	{p->cur->sw = pik_value(p,"thickness",9,0);
2708	p->cur->dotted = p->cur->dashed = 0.0;}
2709	#line 2734 "pikchr.c"
2710	break;
2711	case 62: /* textposition ::= */
2712	#line 666 "pikchr.y"
2713	{yymsp[1].minor.yy44 = 0;}
2714	#line 2739 "pikchr.c"
2715	break;
2716	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2717	#line 669 "pikchr.y"
2718	{yylhsminor.yy44 = (short int)pik_text_position(yymsp[-1].minor.yy44,&yymsp[0].minor.yy0);}
2719	#line 2744 "pikchr.c"
2720	yymsp[-1].minor.yy44 = yylhsminor.yy44;
2721	break;
2722	case 64: /* position ::= expr COMMA expr */
2723	#line 672 "pikchr.y"
2724	{yylhsminor.yy43.x=yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[0].minor.yy265;}
2725	#line 2750 "pikchr.c"
2726	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2727	break;
2728	case 65: /* position ::= place PLUS expr COMMA expr */
2729	#line 674 "pikchr.y"
2730	{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x+yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y+yymsp[0].minor.yy265;}
2731	#line 2756 "pikchr.c"
2732	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2733	break;
2734	case 66: /* position ::= place MINUS expr COMMA expr */
2735	#line 675 "pikchr.y"
2736	{yylhsminor.yy43.x=yymsp[-4].minor.yy43.x-yymsp[-2].minor.yy265; yylhsminor.yy43.y=yymsp[-4].minor.yy43.y-yymsp[0].minor.yy265;}
2737	#line 2762 "pikchr.c"
2738	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2739	break;
2740	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2741	#line 677 "pikchr.y"
2742	{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x+yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y+yymsp[-1].minor.yy265;}
2743	#line 2768 "pikchr.c"
2744	yymsp[-6].minor.yy43 = yylhsminor.yy43;
2745	break;
2746	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2747	#line 679 "pikchr.y"
2748	{yylhsminor.yy43.x=yymsp[-6].minor.yy43.x-yymsp[-3].minor.yy265; yylhsminor.yy43.y=yymsp[-6].minor.yy43.y-yymsp[-1].minor.yy265;}
2749	#line 2774 "pikchr.c"
2750	yymsp[-6].minor.yy43 = yylhsminor.yy43;
2751	break;
2752	case 69: /* position ::= LP position COMMA position RP */
2753	#line 680 "pikchr.y"
2754	{yymsp[-4].minor.yy43.x=yymsp[-3].minor.yy43.x; yymsp[-4].minor.yy43.y=yymsp[-1].minor.yy43.y;}
2755	#line 2780 "pikchr.c"
2756	break;
2757	case 70: /* position ::= LP position RP */
2758	#line 681 "pikchr.y"
2759	{yymsp[-2].minor.yy43=yymsp[-1].minor.yy43;}
2760	#line 2785 "pikchr.c"
2761	break;
2762	case 71: /* position ::= expr between position AND position */
2763	#line 683 "pikchr.y"
2764	{yylhsminor.yy43 = pik_position_between(yymsp[-4].minor.yy265,yymsp[-2].minor.yy43,yymsp[0].minor.yy43);}
2765	#line 2790 "pikchr.c"
2766	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2767	break;
2768	case 72: /* position ::= expr LT position COMMA position GT */
2769	#line 685 "pikchr.y"
2770	{yylhsminor.yy43 = pik_position_between(yymsp[-5].minor.yy265,yymsp[-3].minor.yy43,yymsp[-1].minor.yy43);}
2771	#line 2796 "pikchr.c"
2772	yymsp[-5].minor.yy43 = yylhsminor.yy43;
2773	break;
2774	case 73: /* position ::= expr ABOVE position */
2775	#line 686 "pikchr.y"
2776	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y += yymsp[-2].minor.yy265;}
2777	#line 2802 "pikchr.c"
2778	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2779	break;
2780	case 74: /* position ::= expr BELOW position */
2781	#line 687 "pikchr.y"
2782	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.y -= yymsp[-2].minor.yy265;}
2783	#line 2808 "pikchr.c"
2784	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2785	break;
2786	case 75: /* position ::= expr LEFT OF position */
2787	#line 688 "pikchr.y"
2788	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x -= yymsp[-3].minor.yy265;}
2789	#line 2814 "pikchr.c"
2790	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2791	break;
2792	case 76: /* position ::= expr RIGHT OF position */
2793	#line 689 "pikchr.y"
2794	{yylhsminor.yy43=yymsp[0].minor.yy43; yylhsminor.yy43.x += yymsp[-3].minor.yy265;}
2795	#line 2820 "pikchr.c"
2796	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2797	break;
2798	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2799	#line 691 "pikchr.y"
2800	{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-5].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2801	#line 2826 "pikchr.c"
2802	yymsp[-5].minor.yy43 = yylhsminor.yy43;
2803	break;
2804	case 78: /* position ::= expr HEADING EDGEPT OF position */
2805	#line 693 "pikchr.y"
2806	{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-4].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2807	#line 2832 "pikchr.c"
2808	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2809	break;
2810	case 79: /* position ::= expr EDGEPT OF position */
2811	#line 695 "pikchr.y"
2812	{yylhsminor.yy43 = pik_position_at_hdg(yymsp[-3].minor.yy265,&yymsp[-2].minor.yy0,yymsp[0].minor.yy43);}
2813	#line 2838 "pikchr.c"
2814	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2815	break;
2816	case 80: /* position ::= expr ON HEADING expr FROM position */
2817	#line 697 "pikchr.y"
2818	{yylhsminor.yy43 = pik_position_at_angle(yymsp[-5].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2819	#line 2844 "pikchr.c"
2820	yymsp[-5].minor.yy43 = yylhsminor.yy43;
2821	break;
2822	case 81: /* position ::= expr HEADING expr FROM position */
2823	#line 699 "pikchr.y"
2824	{yylhsminor.yy43 = pik_position_at_angle(yymsp[-4].minor.yy265,yymsp[-2].minor.yy265,yymsp[0].minor.yy43);}
2825	#line 2850 "pikchr.c"
2826	yymsp[-4].minor.yy43 = yylhsminor.yy43;
2827	break;
2828	case 82: /* place ::= edge OF object */
2829	#line 711 "pikchr.y"
2830	{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2831	#line 2856 "pikchr.c"
2832	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2833	break;
2834	case 83: /* place2 ::= object */
2835	#line 712 "pikchr.y"
2836	{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[0].minor.yy38,0);}
2837	#line 2862 "pikchr.c"
2838	yymsp[0].minor.yy43 = yylhsminor.yy43;
2839	break;
2840	case 84: /* place2 ::= object DOT_E edge */
2841	#line 713 "pikchr.y"
2842	{yylhsminor.yy43 = pik_place_of_elem(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2843	#line 2868 "pikchr.c"
2844	yymsp[-2].minor.yy43 = yylhsminor.yy43;
2845	break;
2846	case 85: /* place2 ::= NTH VERTEX OF object */
2847	#line 714 "pikchr.y"
2848	{yylhsminor.yy43 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy38);}
2849	#line 2874 "pikchr.c"
2850	yymsp[-3].minor.yy43 = yylhsminor.yy43;
2851	break;
2852	case 86: /* object ::= nth */
2853	#line 726 "pikchr.y"
2854	{yylhsminor.yy38 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2855	#line 2880 "pikchr.c"
2856	yymsp[0].minor.yy38 = yylhsminor.yy38;
2857	break;
2858	case 87: /* object ::= nth OF\|IN object */
2859	#line 727 "pikchr.y"
2860	{yylhsminor.yy38 = pik_find_nth(p,yymsp[0].minor.yy38,&yymsp[-2].minor.yy0);}
2861	#line 2886 "pikchr.c"
2862	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2863	break;
2864	case 88: /* objectname ::= PLACENAME */
2865	#line 729 "pikchr.y"
2866	{yylhsminor.yy38 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2867	#line 2892 "pikchr.c"
2868	yymsp[0].minor.yy38 = yylhsminor.yy38;
2869	break;
2870	case 89: /* objectname ::= objectname DOT_U PLACENAME */
2871	#line 731 "pikchr.y"
2872	{yylhsminor.yy38 = pik_find_byname(p,yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
2873	#line 2898 "pikchr.c"
2874	yymsp[-2].minor.yy38 = yylhsminor.yy38;
2875	break;
2876	case 90: /* nth ::= NTH CLASSNAME */
2877	#line 733 "pikchr.y"





2878	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2879	#line 2904 "pikchr.c"
2880	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2881	break;
2882	case 91: /* nth ::= NTH LAST CLASSNAME */
2883	#line 734 "pikchr.y"
2884	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2885	#line 2910 "pikchr.c"
2886	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2887	break;
2888	case 92: /* nth ::= LAST CLASSNAME */
2889	#line 735 "pikchr.y"
2890	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2891	#line 2916 "pikchr.c"
2892	break;
2893	case 93: /* nth ::= LAST */
2894	#line 736 "pikchr.y"
2895	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2896	#line 2921 "pikchr.c"
2897	yymsp[0].minor.yy0 = yylhsminor.yy0;
2898	break;
2899	case 94: /* nth ::= NTH LB RB */
2900	#line 737 "pikchr.y"
2901	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2902	#line 2927 "pikchr.c"
2903	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2904	break;
2905	case 95: /* nth ::= NTH LAST LB RB */
2906	#line 738 "pikchr.y"
2907	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2908	#line 2933 "pikchr.c"
2909	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2910	break;
2911	case 96: /* nth ::= LAST LB RB */
2912	#line 739 "pikchr.y"
2913	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2914	#line 2939 "pikchr.c"
2915	break;
2916	case 97: /* expr ::= expr PLUS expr */
2917	#line 741 "pikchr.y"
2918	{yylhsminor.yy265=yymsp[-2].minor.yy265+yymsp[0].minor.yy265;}
2919	#line 2944 "pikchr.c"
2920	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2921	break;
2922	case 98: /* expr ::= expr MINUS expr */
2923	#line 742 "pikchr.y"
2924	{yylhsminor.yy265=yymsp[-2].minor.yy265-yymsp[0].minor.yy265;}
2925	#line 2950 "pikchr.c"
2926	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2927	break;
2928	case 99: /* expr ::= expr STAR expr */
2929	#line 743 "pikchr.y"
2930	{yylhsminor.yy265=yymsp[-2].minor.yy265*yymsp[0].minor.yy265;}
2931	#line 2956 "pikchr.c"
2932	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2933	break;
2934	case 100: /* expr ::= expr SLASH expr */
2935	#line 744 "pikchr.y"
2936	{
2937	if( yymsp[0].minor.yy265==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy265 = 0.0; }
2938	else{ yylhsminor.yy265 = yymsp[-2].minor.yy265/yymsp[0].minor.yy265; }
2939	}
2940	#line 2965 "pikchr.c"
2941	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2942	break;
2943	case 101: /* expr ::= MINUS expr */
2944	#line 748 "pikchr.y"
2945	{yymsp[-1].minor.yy265=-yymsp[0].minor.yy265;}
2946	#line 2971 "pikchr.c"
2947	break;
2948	case 102: /* expr ::= PLUS expr */
2949	#line 749 "pikchr.y"
2950	{yymsp[-1].minor.yy265=yymsp[0].minor.yy265;}
2951	#line 2976 "pikchr.c"
2952	break;
2953	case 103: /* expr ::= LP expr RP */
2954	#line 750 "pikchr.y"
2955	{yymsp[-2].minor.yy265=yymsp[-1].minor.yy265;}
2956	#line 2981 "pikchr.c"
2957	break;
2958	case 104: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2959	#line 751 "pikchr.y"
2960	{yymsp[-2].minor.yy265=pik_get_var(p,&yymsp[-1].minor.yy0);}
2961	#line 2986 "pikchr.c"
2962	break;
2963	case 105: /* expr ::= NUMBER */
2964	#line 752 "pikchr.y"
2965	{yylhsminor.yy265=pik_atof(&yymsp[0].minor.yy0);}
2966	#line 2991 "pikchr.c"
2967	yymsp[0].minor.yy265 = yylhsminor.yy265;
2968	break;
2969	case 106: /* expr ::= ID */
2970	#line 753 "pikchr.y"
2971	{yylhsminor.yy265=pik_get_var(p,&yymsp[0].minor.yy0);}
2972	#line 2997 "pikchr.c"
2973	yymsp[0].minor.yy265 = yylhsminor.yy265;
2974	break;
2975	case 107: /* expr ::= FUNC1 LP expr RP */
2976	#line 754 "pikchr.y"
2977	{yylhsminor.yy265 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy265,0.0);}
2978	#line 3003 "pikchr.c"
2979	yymsp[-3].minor.yy265 = yylhsminor.yy265;
2980	break;
2981	case 108: /* expr ::= FUNC2 LP expr COMMA expr RP */
2982	#line 755 "pikchr.y"
2983	{yylhsminor.yy265 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy265,yymsp[-1].minor.yy265);}
2984	#line 3009 "pikchr.c"
2985	yymsp[-5].minor.yy265 = yylhsminor.yy265;
2986	break;
2987	case 109: /* expr ::= DIST LP position COMMA position RP */
2988	#line 756 "pikchr.y"
2989	{yymsp[-5].minor.yy265 = pik_dist(&yymsp[-3].minor.yy43,&yymsp[-1].minor.yy43);}
2990	#line 3015 "pikchr.c"

2991	break;
2992	case 110: /* expr ::= place2 DOT_XY X */
2993	#line 757 "pikchr.y"
2994	{yylhsminor.yy265 = yymsp[-2].minor.yy43.x;}
2995	#line 3020 "pikchr.c"
2996	yymsp[-2].minor.yy265 = yylhsminor.yy265;
2997	break;
2998	case 111: /* expr ::= place2 DOT_XY Y */
2999	#line 758 "pikchr.y"
3000	{yylhsminor.yy265 = yymsp[-2].minor.yy43.y;}
3001	#line 3026 "pikchr.c"
3002	yymsp[-2].minor.yy265 = yylhsminor.yy265;
3003	break;
3004	case 112: /* expr ::= object DOT_L numproperty */
3005	case 113: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==113);
3006	case 114: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==114);
3007	#line 759 "pikchr.y"
3008	{yylhsminor.yy265=pik_property_of(yymsp[-2].minor.yy38,&yymsp[0].minor.yy0);}
3009	#line 3034 "pikchr.c"
3010	yymsp[-2].minor.yy265 = yylhsminor.yy265;








3011	break;
3012	default:
3013	/* (115) lvalue ::= ID */ yytestcase(yyruleno==115);
3014	/* (116) lvalue ::= FILL */ yytestcase(yyruleno==116);
3015	/* (117) lvalue ::= COLOR */ yytestcase(yyruleno==117);
3016	/* (118) lvalue ::= THICKNESS */ yytestcase(yyruleno==118);
3017	/* (119) rvalue ::= expr */ yytestcase(yyruleno==119);
3018	/* (120) print ::= PRINT */ yytestcase(yyruleno==120);
3019	/* (121) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=121);
3020	/* (122) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==122);
3021	/* (123) direction ::= UP */ yytestcase(yyruleno==123);
3022	/* (124) direction ::= DOWN */ yytestcase(yyruleno==124);
3023	/* (125) direction ::= LEFT */ yytestcase(yyruleno==125);
3024	/* (126) direction ::= RIGHT */ yytestcase(yyruleno==126);
3025	/* (127) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=127);
3026	/* (128) attribute_list ::= alist */ yytestcase(yyruleno==128);
3027	/* (129) alist ::= */ yytestcase(yyruleno==129);
3028	/* (130) alist ::= alist attribute */ yytestcase(yyruleno==130);
3029	/* (131) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=131);
3030	/* (132) attribute ::= WITH withclause */ yytestcase(yyruleno==132);
3031	/* (133) go ::= GO */ yytestcase(yyruleno==133);
3032	/* (134) go ::= */ yytestcase(yyruleno==134);
3033	/* (135) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==135);
3034	/* (136) even ::= EVEN WITH */ yytestcase(yyruleno==136);
3035	/* (137) dashproperty ::= DOTTED */ yytestcase(yyruleno==137);
3036	/* (138) dashproperty ::= DASHED */ yytestcase(yyruleno==138);
3037	/* (139) colorproperty ::= FILL */ yytestcase(yyruleno==139);
3038	/* (140) colorproperty ::= COLOR */ yytestcase(yyruleno==140);
3039	/* (141) position ::= place */ yytestcase(yyruleno==141);
3040	/* (142) between ::= WAY BETWEEN */ yytestcase(yyruleno==142);
3041	/* (143) between ::= BETWEEN */ yytestcase(yyruleno==143);
3042	/* (144) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==144);
3043	/* (145) place ::= place2 */ yytestcase(yyruleno==145);
3044	/* (146) edge ::= CENTER */ yytestcase(yyruleno==146);
3045	/* (147) edge ::= EDGEPT */ yytestcase(yyruleno==147);
3046	/* (148) edge ::= TOP */ yytestcase(yyruleno==148);
3047	/* (149) edge ::= BOTTOM */ yytestcase(yyruleno==149);
3048	/* (150) edge ::= START */ yytestcase(yyruleno==150);
3049	/* (151) edge ::= END */ yytestcase(yyruleno==151);
3050	/* (152) edge ::= RIGHT */ yytestcase(yyruleno==152);
3051	/* (153) edge ::= LEFT */ yytestcase(yyruleno==153);
3052	/* (154) object ::= objectname */ yytestcase(yyruleno==154);
3053	break;
3054	/******** End reduce actions **********************************************/
3055	};
3056	assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
3057	yygoto = yyRuleInfoLhs[yyruleno];
	@@ -3115,11 +3134,11 @@
3115	pik_error(p, &TOKEN, "syntax error");
3116	}else{
3117	pik_error(p, 0, "syntax error");
3118	}
3119	UNUSED_PARAMETER(yymajor);
3120	#line 3145 "pikchr.c"
3121	/********** End %syntax_error code ****************************************/
3122	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3123	pik_parserCTX_STORE
3124	}
3125
	@@ -3348,11 +3367,11 @@
3348	#else
3349	(void)iToken;
3350	return 0;
3351	#endif
3352	}
3353	#line 764 "pikchr.y"
3354
3355
3356
3357	/* Chart of the 148 official CSS color names with their
3358	** corresponding RGB values thru Color Module Level 4:
	@@ -5032,11 +5051,11 @@
5032	int i; /* Loop counter */
5033	int iBump = 0; /* Bump the location of the error cursor */
5034	char zLineno[20]; /* Buffer in which to generate line numbers */
5035
5036	iErrPt = (int)(pErr->z - p->sIn.z);
5037	if( iErrPt>=p->sIn.n ){
5038	iErrPt = p->sIn.n-1;
5039	iBump = 1;
5040	}else{
5041	while( iErrPt>0 && (p->sIn.z[iErrPt]=='\n' \|\| p->sIn.z[iErrPt]=='\r') ){
5042	iErrPt--;
	@@ -7095,10 +7114,11 @@
7095	{ "the", 3, T_THE, 0, 0 },
7096	{ "then", 4, T_THEN, 0, 0 },
7097	{ "thick", 5, T_THICK, 0, 0 },
7098	{ "thickness", 9, T_THICKNESS, 0, 0 },
7099	{ "thin", 4, T_THIN, 0, 0 },

7100	{ "to", 2, T_TO, 0, 0 },
7101	{ "top", 3, T_TOP, 0, CP_N },
7102	{ "until", 5, T_UNTIL, 0, 0 },
7103	{ "up", 2, T_UP, DIR_UP, 0 },
7104	{ "vertex", 6, T_VERTEX, 0, 0 },
	@@ -7744,11 +7764,11 @@
7744	static char readFile(const char zFilename){
7745	FILE *in;
7746	size_t n;
7747	size_t nUsed = 0;
7748	size_t nAlloc = 0;
7749	char z = 0, zNew;
7750	in = strcmp(zFilename,"-")==0 ? stdin : fopen(zFilename, "rb");
7751	if( in==0 ){
7752	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
7753	return 0;
7754	}
	@@ -7940,6 +7960,6 @@
7940
7941
7942	#endif /* PIKCHR_TCL */
7943
7944
7945	#line 7970 "pikchr.c"
7946

	--- src/pikchr.c
	+++ src/pikchr.c
	@@ -566,20 +566,21 @@
566	#define T_TOP 83
567	#define T_BOTTOM 84
568	#define T_START 85
569	#define T_END 86
570	#define T_IN 87
571	#define T_THIS 88
572	#define T_DOT_U 89
573	#define T_LAST 90
574	#define T_NUMBER 91
575	#define T_FUNC1 92
576	#define T_FUNC2 93
577	#define T_DIST 94
578	#define T_DOT_XY 95
579	#define T_X 96
580	#define T_Y 97
581	#define T_DOT_L 98
582	#endif
583	/************** End token definitions *************************************/
584
585	/* The next sections is a series of control #defines.
586	** various aspects of the generated parser.
	@@ -635,22 +636,22 @@
636	#ifndef INTERFACE
637	# define INTERFACE 1
638	#endif
639	/*********** Begin control #defines ***************************************/
640	#define YYCODETYPE unsigned char
641	#define YYNOCODE 135
642	#define YYACTIONTYPE unsigned short int
643	#define pik_parserTOKENTYPE PToken
644	typedef union {
645	int yyinit;
646	pik_parserTOKENTYPE yy0;
647	PRel yy10;
648	PObj* yy36;
649	PPoint yy79;
650	PNum yy153;
651	short int yy164;
652	PList* yy227;
653	} YYMINORTYPE;
654	#ifndef YYSTACKDEPTH
655	#define YYSTACKDEPTH 100
656	#endif
657	#define pik_parserARG_SDECL
	@@ -663,21 +664,21 @@
664	#define pik_parserCTX_PARAM ,p
665	#define pik_parserCTX_FETCH Pik *p=yypParser->p;
666	#define pik_parserCTX_STORE yypParser->p=p;
667	#define YYFALLBACK 1
668	#define YYNSTATE 164
669	#define YYNRULE 156
670	#define YYNRULE_WITH_ACTION 116
671	#define YYNTOKEN 99
672	#define YY_MAX_SHIFT 163
673	#define YY_MIN_SHIFTREDUCE 287
674	#define YY_MAX_SHIFTREDUCE 442
675	#define YY_ERROR_ACTION 443
676	#define YY_ACCEPT_ACTION 444
677	#define YY_NO_ACTION 445
678	#define YY_MIN_REDUCE 446
679	#define YY_MAX_REDUCE 601
680	/*********** End control #defines *****************************************/
681	#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
682
683	/* Define the yytestcase() macro to be a no-op if is not already defined
684	** otherwise.
	@@ -740,333 +741,341 @@
741	** yy_reduce_ofst[] For each state, the offset into yy_action for
742	** shifting non-terminals after a reduce.
743	** yy_default[] Default action for each state.
744	**
745	********* Begin parsing tables ********************************************/
746	#define YY_ACTTAB_COUNT (1303)
747	static const YYACTIONTYPE yy_action[] = {
748	/* 0 */ 575, 495, 161, 119, 25, 452, 29, 74, 129, 148,
749	/* 10 */ 575, 492, 161, 119, 453, 113, 120, 161, 119, 530,
750	/* 20 */ 427, 428, 339, 559, 81, 30, 560, 561, 575, 64,
751	/* 30 */ 63, 62, 61, 322, 323, 9, 8, 33, 149, 32,
752	/* 40 */ 7, 71, 127, 38, 335, 66, 48, 37, 28, 339,
753	/* 50 */ 339, 339, 339, 425, 426, 340, 341, 342, 343, 344,
754	/* 60 */ 345, 346, 347, 348, 474, 528, 161, 119, 577, 77,
755	/* 70 */ 577, 73, 376, 148, 474, 533, 161, 119, 112, 113,
756	/* 80 */ 120, 161, 119, 128, 427, 428, 339, 357, 81, 531,
757	/* 90 */ 161, 119, 474, 36, 330, 13, 306, 322, 323, 9,
758	/* 100 */ 8, 33, 149, 32, 7, 71, 127, 328, 335, 66,
759	/* 110 */ 579, 310, 31, 339, 339, 339, 339, 425, 426, 340,
760	/* 120 */ 341, 342, 343, 344, 345, 346, 347, 348, 394, 435,
761	/* 130 */ 46, 59, 60, 64, 63, 62, 61, 54, 51, 376,
762	/* 140 */ 69, 108, 2, 47, 403, 83, 297, 435, 375, 84,
763	/* 150 */ 117, 80, 35, 308, 79, 133, 122, 126, 441, 440,
764	/* 160 */ 299, 123, 3, 404, 405, 406, 408, 80, 298, 308,
765	/* 170 */ 79, 4, 411, 412, 413, 414, 441, 440, 350, 350,
766	/* 180 */ 350, 350, 350, 350, 350, 350, 350, 350, 62, 61,
767	/* 190 */ 67, 434, 1, 75, 378, 158, 74, 76, 148, 411,
768	/* 200 */ 412, 413, 414, 124, 113, 120, 161, 119, 106, 434,
769	/* 210 */ 436, 437, 438, 439, 5, 375, 6, 117, 393, 155,
770	/* 220 */ 154, 153, 394, 435, 69, 59, 60, 149, 436, 437,
771	/* 230 */ 438, 439, 535, 376, 398, 399, 2, 424, 427, 428,
772	/* 240 */ 339, 156, 156, 156, 423, 394, 435, 65, 59, 60,
773	/* 250 */ 162, 131, 441, 440, 397, 72, 376, 148, 118, 2,
774	/* 260 */ 380, 157, 125, 113, 120, 161, 119, 339, 339, 339,
775	/* 270 */ 339, 425, 426, 535, 11, 441, 440, 394, 356, 535,
776	/* 280 */ 59, 60, 535, 379, 159, 434, 149, 12, 102, 446,
777	/* 290 */ 432, 42, 138, 14, 435, 139, 301, 302, 303, 36,
778	/* 300 */ 305, 430, 106, 16, 436, 437, 438, 439, 434, 375,
779	/* 310 */ 18, 117, 393, 155, 154, 153, 44, 142, 140, 64,
780	/* 320 */ 63, 62, 61, 441, 440, 106, 19, 436, 437, 438,
781	/* 330 */ 439, 45, 375, 20, 117, 393, 155, 154, 153, 68,
782	/* 340 */ 55, 114, 64, 63, 62, 61, 147, 146, 394, 473,
783	/* 350 */ 359, 59, 60, 43, 23, 391, 434, 106, 26, 376,
784	/* 360 */ 57, 58, 42, 49, 375, 392, 117, 393, 155, 154,
785	/* 370 */ 153, 64, 63, 62, 61, 436, 437, 438, 439, 384,
786	/* 380 */ 382, 383, 22, 21, 377, 473, 160, 70, 39, 445,
787	/* 390 */ 24, 445, 145, 141, 431, 142, 140, 64, 63, 62,
788	/* 400 */ 61, 394, 15, 445, 59, 60, 64, 63, 62, 61,
789	/* 410 */ 391, 445, 376, 445, 445, 42, 445, 445, 55, 391,
790	/* 420 */ 156, 156, 156, 445, 147, 146, 445, 52, 106, 445,
791	/* 430 */ 445, 43, 445, 445, 445, 375, 445, 117, 393, 155,
792	/* 440 */ 154, 153, 445, 394, 143, 445, 59, 60, 64, 63,
793	/* 450 */ 62, 61, 313, 445, 376, 378, 158, 42, 445, 445,
794	/* 460 */ 22, 21, 121, 447, 454, 29, 445, 445, 24, 450,
795	/* 470 */ 145, 141, 431, 142, 140, 64, 63, 62, 61, 445,
796	/* 480 */ 163, 106, 445, 445, 444, 27, 445, 445, 375, 445,
797	/* 490 */ 117, 393, 155, 154, 153, 445, 55, 74, 445, 148,
798	/* 500 */ 445, 445, 147, 146, 497, 113, 120, 161, 119, 43,
799	/* 510 */ 445, 394, 445, 445, 59, 60, 445, 445, 445, 118,
800	/* 520 */ 445, 445, 376, 106, 445, 42, 445, 445, 149, 445,
801	/* 530 */ 375, 445, 117, 393, 155, 154, 153, 445, 22, 21,
802	/* 540 */ 394, 144, 445, 59, 60, 445, 24, 445, 145, 141,
803	/* 550 */ 431, 376, 445, 445, 42, 445, 132, 130, 394, 445,
804	/* 560 */ 445, 59, 60, 109, 447, 454, 29, 445, 445, 376,
805	/* 570 */ 450, 445, 42, 445, 394, 445, 445, 59, 60, 445,
806	/* 580 */ 445, 163, 445, 445, 445, 102, 27, 445, 42, 445,
807	/* 590 */ 445, 106, 445, 64, 63, 62, 61, 445, 375, 445,
808	/* 600 */ 117, 393, 155, 154, 153, 394, 355, 445, 59, 60,
809	/* 610 */ 445, 445, 445, 445, 445, 74, 376, 148, 445, 40,
810	/* 620 */ 106, 445, 496, 113, 120, 161, 119, 375, 445, 117,
811	/* 630 */ 393, 155, 154, 153, 445, 448, 454, 29, 106, 445,
812	/* 640 */ 445, 450, 445, 445, 445, 375, 149, 117, 393, 155,
813	/* 650 */ 154, 153, 163, 445, 106, 445, 445, 27, 445, 445,
814	/* 660 */ 445, 375, 445, 117, 393, 155, 154, 153, 394, 445,
815	/* 670 */ 445, 59, 60, 64, 63, 62, 61, 445, 445, 376,
816	/* 680 */ 445, 445, 41, 445, 445, 106, 354, 64, 63, 62,
817	/* 690 */ 61, 445, 375, 445, 117, 393, 155, 154, 153, 445,
818	/* 700 */ 445, 445, 74, 445, 148, 445, 88, 445, 445, 490,
819	/* 710 */ 113, 120, 161, 119, 445, 120, 161, 119, 17, 74,
820	/* 720 */ 445, 148, 110, 110, 445, 445, 484, 113, 120, 161,
821	/* 730 */ 119, 445, 445, 149, 74, 445, 148, 152, 445, 445,
822	/* 740 */ 445, 483, 113, 120, 161, 119, 445, 445, 106, 445,
823	/* 750 */ 149, 445, 445, 107, 445, 375, 445, 117, 393, 155,
824	/* 760 */ 154, 153, 120, 161, 119, 149, 478, 74, 445, 148,
825	/* 770 */ 445, 88, 445, 445, 480, 113, 120, 161, 119, 445,
826	/* 780 */ 120, 161, 119, 74, 152, 148, 10, 479, 479, 445,
827	/* 790 */ 134, 113, 120, 161, 119, 445, 445, 445, 149, 74,
828	/* 800 */ 445, 148, 152, 445, 445, 445, 517, 113, 120, 161,
829	/* 810 */ 119, 445, 445, 74, 149, 148, 445, 445, 445, 445,
830	/* 820 */ 137, 113, 120, 161, 119, 74, 445, 148, 445, 445,
831	/* 830 */ 149, 445, 525, 113, 120, 161, 119, 445, 74, 445,
832	/* 840 */ 148, 445, 445, 445, 149, 527, 113, 120, 161, 119,
833	/* 850 */ 445, 445, 74, 445, 148, 445, 149, 445, 445, 524,
834	/* 860 */ 113, 120, 161, 119, 74, 445, 148, 445, 445, 149,
835	/* 870 */ 445, 526, 113, 120, 161, 119, 445, 445, 74, 445,
836	/* 880 */ 148, 445, 88, 149, 445, 523, 113, 120, 161, 119,
837	/* 890 */ 445, 120, 161, 119, 74, 149, 148, 85, 111, 111,
838	/* 900 */ 445, 522, 113, 120, 161, 119, 120, 161, 119, 149,
839	/* 910 */ 74, 445, 148, 152, 445, 445, 445, 521, 113, 120,
840	/* 920 */ 161, 119, 445, 445, 74, 149, 148, 445, 152, 445,
841	/* 930 */ 445, 520, 113, 120, 161, 119, 74, 445, 148, 445,
842	/* 940 */ 445, 149, 445, 519, 113, 120, 161, 119, 445, 74,
843	/* 950 */ 445, 148, 445, 445, 445, 149, 150, 113, 120, 161,
844	/* 960 */ 119, 445, 445, 74, 445, 148, 445, 149, 445, 445,
845	/* 970 */ 151, 113, 120, 161, 119, 74, 445, 148, 445, 445,
846	/* 980 */ 149, 445, 136, 113, 120, 161, 119, 445, 445, 74,
847	/* 990 */ 445, 148, 107, 445, 149, 445, 135, 113, 120, 161,
848	/* 1000 */ 119, 120, 161, 119, 445, 463, 149, 445, 88, 445,
849	/* 1010 */ 445, 445, 78, 78, 445, 445, 107, 120, 161, 119,
850	/* 1020 */ 149, 445, 445, 152, 82, 120, 161, 119, 445, 463,
851	/* 1030 */ 445, 466, 86, 34, 445, 88, 445, 569, 445, 152,
852	/* 1040 */ 445, 120, 161, 119, 120, 161, 119, 152, 107, 445,
853	/* 1050 */ 445, 475, 64, 63, 62, 61, 445, 120, 161, 119,
854	/* 1060 */ 98, 451, 445, 152, 89, 396, 152, 90, 445, 120,
855	/* 1070 */ 161, 119, 445, 120, 161, 119, 120, 161, 119, 152,
856	/* 1080 */ 445, 64, 63, 62, 61, 445, 445, 445, 445, 445,
857	/* 1090 */ 87, 152, 445, 99, 395, 152, 100, 445, 152, 120,
858	/* 1100 */ 161, 119, 120, 161, 119, 120, 161, 119, 445, 101,
859	/* 1110 */ 64, 63, 62, 61, 445, 445, 445, 445, 120, 161,
860	/* 1120 */ 119, 152, 91, 391, 152, 445, 445, 152, 103, 445,
861	/* 1130 */ 445, 120, 161, 119, 445, 92, 445, 120, 161, 119,
862	/* 1140 */ 152, 93, 445, 445, 120, 161, 119, 104, 445, 445,
863	/* 1150 */ 120, 161, 119, 152, 445, 445, 120, 161, 119, 152,
864	/* 1160 */ 445, 445, 445, 445, 94, 445, 152, 445, 445, 445,
865	/* 1170 */ 105, 445, 152, 120, 161, 119, 445, 95, 152, 120,
866	/* 1180 */ 161, 119, 96, 445, 445, 445, 120, 161, 119, 445,
867	/* 1190 */ 445, 120, 161, 119, 97, 152, 445, 445, 445, 445,
868	/* 1200 */ 549, 152, 445, 120, 161, 119, 548, 445, 152, 120,
869	/* 1210 */ 161, 119, 445, 152, 445, 120, 161, 119, 445, 445,
870	/* 1220 */ 445, 445, 445, 547, 445, 152, 445, 445, 445, 445,
871	/* 1230 */ 445, 152, 120, 161, 119, 546, 445, 152, 445, 115,
872	/* 1240 */ 445, 445, 116, 445, 120, 161, 119, 445, 120, 161,
873	/* 1250 */ 119, 120, 161, 119, 152, 64, 63, 62, 61, 64,
874	/* 1260 */ 63, 62, 61, 445, 445, 445, 152, 445, 445, 445,
875	/* 1270 */ 152, 445, 445, 152, 445, 445, 50, 445, 445, 445,
876	/* 1280 */ 53, 64, 63, 62, 61, 445, 445, 445, 445, 445,
877	/* 1290 */ 445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
878	/* 1300 */ 445, 445, 56,
879	};
880	static const YYCODETYPE yy_lookahead[] = {
881	/* 0 */ 0, 112, 113, 114, 133, 101, 102, 103, 105, 105,
882	/* 10 */ 10, 112, 113, 114, 110, 111, 112, 113, 114, 105,
883	/* 20 */ 20, 21, 22, 104, 24, 125, 107, 108, 28, 4,
884	/* 30 */ 5, 6, 7, 33, 34, 35, 36, 37, 134, 39,
885	/* 40 */ 40, 41, 42, 104, 44, 45, 107, 108, 106, 49,
886	/* 50 */ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
887	/* 60 */ 60, 61, 62, 63, 0, 112, 113, 114, 129, 130,
888	/* 70 */ 131, 103, 12, 105, 10, 112, 113, 114, 110, 111,
889	/* 80 */ 112, 113, 114, 105, 20, 21, 22, 17, 24, 112,
890	/* 90 */ 113, 114, 28, 10, 2, 25, 25, 33, 34, 35,
891	/* 100 */ 36, 37, 134, 39, 40, 41, 42, 2, 44, 45,
892	/* 110 */ 132, 28, 127, 49, 50, 51, 52, 53, 54, 55,
893	/* 120 */ 56, 57, 58, 59, 60, 61, 62, 63, 1, 2,
894	/* 130 */ 38, 4, 5, 4, 5, 6, 7, 4, 5, 12,
895	/* 140 */ 3, 81, 15, 38, 1, 115, 17, 2, 88, 115,
896	/* 150 */ 90, 24, 128, 26, 27, 12, 1, 14, 31, 32,
897	/* 160 */ 19, 18, 16, 20, 21, 22, 23, 24, 17, 26,
898	/* 170 */ 27, 15, 29, 30, 31, 32, 31, 32, 64, 65,
899	/* 180 */ 66, 67, 68, 69, 70, 71, 72, 73, 6, 7,
900	/* 190 */ 43, 64, 13, 48, 26, 27, 103, 48, 105, 29,
901	/* 200 */ 30, 31, 32, 110, 111, 112, 113, 114, 81, 64,
902	/* 210 */ 83, 84, 85, 86, 40, 88, 40, 90, 91, 92,
903	/* 220 */ 93, 94, 1, 2, 87, 4, 5, 134, 83, 84,
904	/* 230 */ 85, 86, 48, 12, 96, 97, 15, 41, 20, 21,
905	/* 240 */ 22, 20, 21, 22, 41, 1, 2, 98, 4, 5,
906	/* 250 */ 82, 47, 31, 32, 17, 103, 12, 105, 90, 15,
907	/* 260 */ 26, 27, 110, 111, 112, 113, 114, 49, 50, 51,
908	/* 270 */ 52, 53, 54, 89, 25, 31, 32, 1, 17, 95,
909	/* 280 */ 4, 5, 98, 26, 27, 64, 134, 74, 12, 0,
910	/* 290 */ 79, 15, 78, 3, 2, 80, 20, 21, 22, 10,
911	/* 300 */ 24, 79, 81, 3, 83, 84, 85, 86, 64, 88,
912	/* 310 */ 3, 90, 91, 92, 93, 94, 38, 2, 3, 4,
913	/* 320 */ 5, 6, 7, 31, 32, 81, 3, 83, 84, 85,
914	/* 330 */ 86, 16, 88, 3, 90, 91, 92, 93, 94, 3,
915	/* 340 */ 25, 95, 4, 5, 6, 7, 31, 32, 1, 2,
916	/* 350 */ 76, 4, 5, 38, 25, 17, 64, 81, 15, 12,
917	/* 360 */ 15, 15, 15, 25, 88, 17, 90, 91, 92, 93,
918	/* 370 */ 94, 4, 5, 6, 7, 83, 84, 85, 86, 28,
919	/* 380 */ 28, 28, 67, 68, 12, 38, 89, 3, 11, 135,
920	/* 390 */ 75, 135, 77, 78, 79, 2, 3, 4, 5, 6,
921	/* 400 */ 7, 1, 35, 135, 4, 5, 4, 5, 6, 7,
922	/* 410 */ 17, 135, 12, 135, 135, 15, 135, 135, 25, 17,
923	/* 420 */ 20, 21, 22, 135, 31, 32, 135, 25, 81, 135,
924	/* 430 */ 135, 38, 135, 135, 135, 88, 135, 90, 91, 92,
925	/* 440 */ 93, 94, 135, 1, 2, 135, 4, 5, 4, 5,
926	/* 450 */ 6, 7, 8, 135, 12, 26, 27, 15, 135, 135,
927	/* 460 */ 67, 68, 99, 100, 101, 102, 135, 135, 75, 106,
928	/* 470 */ 77, 78, 79, 2, 3, 4, 5, 6, 7, 135,
929	/* 480 */ 117, 81, 135, 135, 121, 122, 135, 135, 88, 135,
930	/* 490 */ 90, 91, 92, 93, 94, 135, 25, 103, 135, 105,
931	/* 500 */ 135, 135, 31, 32, 110, 111, 112, 113, 114, 38,
932	/* 510 */ 135, 1, 135, 135, 4, 5, 135, 135, 135, 90,
933	/* 520 */ 135, 135, 12, 81, 135, 15, 135, 135, 134, 135,
934	/* 530 */ 88, 135, 90, 91, 92, 93, 94, 135, 67, 68,
935	/* 540 */ 1, 2, 135, 4, 5, 135, 75, 135, 77, 78,
936	/* 550 */ 79, 12, 135, 135, 15, 135, 46, 47, 1, 135,
937	/* 560 */ 135, 4, 5, 99, 100, 101, 102, 135, 135, 12,
938	/* 570 */ 106, 135, 15, 135, 1, 135, 135, 4, 5, 135,
939	/* 580 */ 135, 117, 135, 135, 135, 12, 122, 135, 15, 135,
940	/* 590 */ 135, 81, 135, 4, 5, 6, 7, 135, 88, 135,
941	/* 600 */ 90, 91, 92, 93, 94, 1, 17, 135, 4, 5,
942	/* 610 */ 135, 135, 135, 135, 135, 103, 12, 105, 135, 15,
943	/* 620 */ 81, 135, 110, 111, 112, 113, 114, 88, 135, 90,
944	/* 630 */ 91, 92, 93, 94, 135, 100, 101, 102, 81, 135,
945	/* 640 */ 135, 106, 135, 135, 135, 88, 134, 90, 91, 92,
946	/* 650 */ 93, 94, 117, 135, 81, 135, 135, 122, 135, 135,
947	/* 660 */ 135, 88, 135, 90, 91, 92, 93, 94, 1, 135,
948	/* 670 */ 135, 4, 5, 4, 5, 6, 7, 135, 135, 12,
949	/* 680 */ 135, 135, 15, 135, 135, 81, 17, 4, 5, 6,
950	/* 690 */ 7, 135, 88, 135, 90, 91, 92, 93, 94, 135,
951	/* 700 */ 135, 135, 103, 135, 105, 135, 103, 135, 135, 110,
952	/* 710 */ 111, 112, 113, 114, 135, 112, 113, 114, 35, 103,
953	/* 720 */ 135, 105, 119, 120, 135, 135, 110, 111, 112, 113,
954	/* 730 */ 114, 135, 135, 134, 103, 135, 105, 134, 135, 135,
955	/* 740 */ 135, 110, 111, 112, 113, 114, 135, 135, 81, 135,
956	/* 750 */ 134, 135, 135, 103, 135, 88, 135, 90, 91, 92,
957	/* 760 */ 93, 94, 112, 113, 114, 134, 116, 103, 135, 105,
958	/* 770 */ 135, 103, 135, 135, 110, 111, 112, 113, 114, 135,
959	/* 780 */ 112, 113, 114, 103, 134, 105, 118, 119, 120, 135,
960	/* 790 */ 110, 111, 112, 113, 114, 135, 135, 135, 134, 103,
961	/* 800 */ 135, 105, 134, 135, 135, 135, 110, 111, 112, 113,
962	/* 810 */ 114, 135, 135, 103, 134, 105, 135, 135, 135, 135,
963	/* 820 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
964	/* 830 */ 134, 135, 110, 111, 112, 113, 114, 135, 103, 135,
965	/* 840 */ 105, 135, 135, 135, 134, 110, 111, 112, 113, 114,
966	/* 850 */ 135, 135, 103, 135, 105, 135, 134, 135, 135, 110,
967	/* 860 */ 111, 112, 113, 114, 103, 135, 105, 135, 135, 134,
968	/* 870 */ 135, 110, 111, 112, 113, 114, 135, 135, 103, 135,
969	/* 880 */ 105, 135, 103, 134, 135, 110, 111, 112, 113, 114,
970	/* 890 */ 135, 112, 113, 114, 103, 134, 105, 103, 119, 120,
971	/* 900 */ 135, 110, 111, 112, 113, 114, 112, 113, 114, 134,
972	/* 910 */ 103, 135, 105, 134, 135, 135, 135, 110, 111, 112,
973	/* 920 */ 113, 114, 135, 135, 103, 134, 105, 135, 134, 135,
974	/* 930 */ 135, 110, 111, 112, 113, 114, 103, 135, 105, 135,
975	/* 940 */ 135, 134, 135, 110, 111, 112, 113, 114, 135, 103,
976	/* 950 */ 135, 105, 135, 135, 135, 134, 110, 111, 112, 113,
977	/* 960 */ 114, 135, 135, 103, 135, 105, 135, 134, 135, 135,
978	/* 970 */ 110, 111, 112, 113, 114, 103, 135, 105, 135, 135,
979	/* 980 */ 134, 135, 110, 111, 112, 113, 114, 135, 135, 103,
980	/* 990 */ 135, 105, 103, 135, 134, 135, 110, 111, 112, 113,
981	/* 1000 */ 114, 112, 113, 114, 135, 116, 134, 135, 103, 135,
982	/* 1010 */ 135, 135, 123, 124, 135, 135, 103, 112, 113, 114,
983	/* 1020 */ 134, 135, 135, 134, 119, 112, 113, 114, 135, 116,
984	/* 1030 */ 135, 126, 103, 128, 135, 103, 135, 124, 135, 134,
985	/* 1040 */ 135, 112, 113, 114, 112, 113, 114, 134, 103, 135,
986	/* 1050 */ 135, 119, 4, 5, 6, 7, 135, 112, 113, 114,
987	/* 1060 */ 103, 116, 135, 134, 103, 17, 134, 103, 135, 112,
988	/* 1070 */ 113, 114, 135, 112, 113, 114, 112, 113, 114, 134,
989	/* 1080 */ 135, 4, 5, 6, 7, 135, 135, 135, 135, 135,
990	/* 1090 */ 103, 134, 135, 103, 17, 134, 103, 135, 134, 112,
991	/* 1100 */ 113, 114, 112, 113, 114, 112, 113, 114, 135, 103,
992	/* 1110 */ 4, 5, 6, 7, 135, 135, 135, 135, 112, 113,
993	/* 1120 */ 114, 134, 103, 17, 134, 135, 135, 134, 103, 135,
994	/* 1130 */ 135, 112, 113, 114, 135, 103, 135, 112, 113, 114,
995	/* 1140 */ 134, 103, 135, 135, 112, 113, 114, 103, 135, 135,
996	/* 1150 */ 112, 113, 114, 134, 135, 135, 112, 113, 114, 134,
997	/* 1160 */ 135, 135, 135, 135, 103, 135, 134, 135, 135, 135,
998	/* 1170 */ 103, 135, 134, 112, 113, 114, 135, 103, 134, 112,
999	/* 1180 */ 113, 114, 103, 135, 135, 135, 112, 113, 114, 135,
1000	/* 1190 */ 135, 112, 113, 114, 103, 134, 135, 135, 135, 135,
1001	/* 1200 */ 103, 134, 135, 112, 113, 114, 103, 135, 134, 112,
1002	/* 1210 */ 113, 114, 135, 134, 135, 112, 113, 114, 135, 135,
1003	/* 1220 */ 135, 135, 135, 103, 135, 134, 135, 135, 135, 135,
1004	/* 1230 */ 135, 134, 112, 113, 114, 103, 135, 134, 135, 103,
1005	/* 1240 */ 135, 135, 103, 135, 112, 113, 114, 135, 112, 113,
1006	/* 1250 */ 114, 112, 113, 114, 134, 4, 5, 6, 7, 4,
1007	/* 1260 */ 5, 6, 7, 135, 135, 135, 134, 135, 135, 135,
1008	/* 1270 */ 134, 135, 135, 134, 135, 135, 25, 135, 135, 135,
1009	/* 1280 */ 25, 4, 5, 6, 7, 135, 135, 135, 135, 135,
1010	/* 1290 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1011	/* 1300 */ 135, 135, 25, 135, 135, 135, 135, 135, 135, 135,
1012	/* 1310 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1013	/* 1320 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1014	/* 1330 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1015	/* 1340 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1016	/* 1350 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1017	/* 1360 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1018	/* 1370 */ 135, 135, 135, 135, 135, 135, 135, 135, 135, 135,
1019	/* 1380 */ 135, 99, 99, 99, 99, 99, 99, 99, 99, 99,
1020	/* 1390 */ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
1021	/* 1400 */ 99, 99,
1022	};
1023	#define YY_SHIFT_COUNT (163)
1024	#define YY_SHIFT_MIN (0)
1025	#define YY_SHIFT_MAX (1277)
1026	static const unsigned short int yy_shift_ofst[] = {
1027	/* 0 */ 143, 127, 221, 244, 244, 244, 244, 244, 244, 244,
1028	/* 10 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244,
1029	/* 20 */ 244, 244, 244, 244, 244, 244, 244, 276, 510, 557,
1030	/* 30 */ 276, 143, 347, 347, 0, 64, 143, 573, 557, 573,
1031	/* 40 */ 400, 400, 400, 442, 539, 557, 557, 557, 557, 557,
1032	/* 50 */ 557, 604, 557, 557, 667, 557, 557, 557, 557, 557,
1033	/* 60 */ 557, 557, 557, 557, 557, 218, 60, 60, 60, 60,
1034	/* 70 */ 60, 145, 315, 393, 471, 292, 292, 170, 71, 1303,
1035	/* 80 */ 1303, 1303, 1303, 114, 114, 338, 402, 129, 444, 367,
1036	/* 90 */ 683, 589, 1251, 669, 1255, 1048, 1277, 1077, 1106, 25,
1037	/* 100 */ 25, 25, 184, 25, 25, 25, 168, 25, 429, 83,
1038	/* 110 */ 92, 105, 70, 133, 138, 182, 182, 234, 257, 137,
1039	/* 120 */ 149, 289, 141, 155, 151, 146, 156, 147, 174, 176,
1040	/* 130 */ 196, 203, 204, 179, 237, 249, 213, 261, 211, 214,
1041	/* 140 */ 215, 222, 290, 300, 307, 278, 323, 330, 336, 246,
1042	/* 150 */ 274, 329, 246, 343, 345, 346, 348, 351, 352, 353,
1043	/* 160 */ 372, 297, 384, 377,
1044	};
1045	#define YY_REDUCE_COUNT (82)
1046	#define YY_REDUCE_MIN (-129)
1047	#define YY_REDUCE_MAX (1139)
1048	static const short yy_reduce_ofst[] = {
1049	/* 0 */ 363, -96, -32, 93, 152, 394, 512, 599, 616, 631,
1050	/* 10 */ 664, 680, 696, 710, 722, 735, 749, 761, 775, 791,
1051	/* 20 */ 807, 821, 833, 846, 860, 872, 886, 889, 668, 905,
1052	/* 30 */ 913, 464, 603, 779, -61, -61, 535, 650, 932, 945,
1053	/* 40 */ 794, 929, 957, 961, 964, 987, 990, 993, 1006, 1019,
1054	/* 50 */ 1025, 1032, 1038, 1044, 1061, 1067, 1074, 1079, 1091, 1097,
1055	/* 60 */ 1103, 1120, 1132, 1136, 1139, -81, -111, -101, -47, -37,
1056	/* 70 */ -23, -22, -129, -129, -129, -97, -86, -58, -100, -15,
1057	/* 80 */ 30, 34, 24,
1058	};
1059	static const YYACTIONTYPE yy_default[] = {
1060	/* 0 */ 449, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1061	/* 10 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1062	/* 20 */ 443, 443, 443, 443, 443, 443, 443, 443, 473, 576,
1063	/* 30 */ 443, 449, 580, 485, 581, 581, 449, 443, 443, 443,
1064	/* 40 */ 443, 443, 443, 443, 443, 443, 443, 443, 477, 443,
1065	/* 50 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1066	/* 60 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1067	/* 70 */ 443, 443, 443, 443, 443, 443, 443, 443, 455, 470,
1068	/* 80 */ 508, 508, 576, 468, 493, 443, 443, 443, 471, 443,
1069	/* 90 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 488,
1070	/* 100 */ 486, 476, 459, 512, 511, 510, 443, 566, 443, 443,
1071	/* 110 */ 443, 443, 443, 588, 443, 545, 544, 540, 443, 532,
1072	/* 120 */ 529, 443, 443, 443, 443, 443, 443, 491, 443, 443,
1073	/* 130 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1074	/* 140 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 592,
1075	/* 150 */ 443, 443, 443, 443, 443, 443, 443, 443, 443, 443,
1076	/* 160 */ 443, 601, 443, 443,
1077	};
1078	/******** End of lemon-generated parsing tables ***************************/
1079
1080	/* The next table maps tokens (terminal symbols) into fallback tokens.
1081	** If a construct like the following:
	@@ -1170,10 +1179,11 @@
1179	0, /* TOP => nothing */
1180	0, /* BOTTOM => nothing */
1181	0, /* START => nothing */
1182	0, /* END => nothing */
1183	0, /* IN => nothing */
1184	0, /* THIS => nothing */
1185	0, /* DOT_U => nothing */
1186	0, /* LAST => nothing */
1187	0, /* NUMBER => nothing */
1188	0, /* FUNC1 => nothing */
1189	0, /* FUNC2 => nothing */
	@@ -1356,56 +1366,57 @@
1366	/* 83 */ "TOP",
1367	/* 84 */ "BOTTOM",
1368	/* 85 */ "START",
1369	/* 86 */ "END",
1370	/* 87 */ "IN",
1371	/* 88 */ "THIS",
1372	/* 89 */ "DOT_U",
1373	/* 90 */ "LAST",
1374	/* 91 */ "NUMBER",
1375	/* 92 */ "FUNC1",
1376	/* 93 */ "FUNC2",
1377	/* 94 */ "DIST",
1378	/* 95 */ "DOT_XY",
1379	/* 96 */ "X",
1380	/* 97 */ "Y",
1381	/* 98 */ "DOT_L",
1382	/* 99 */ "statement_list",
1383	/* 100 */ "statement",
1384	/* 101 */ "unnamed_statement",
1385	/* 102 */ "basetype",
1386	/* 103 */ "expr",
1387	/* 104 */ "numproperty",
1388	/* 105 */ "edge",
1389	/* 106 */ "direction",
1390	/* 107 */ "dashproperty",
1391	/* 108 */ "colorproperty",
1392	/* 109 */ "locproperty",
1393	/* 110 */ "position",
1394	/* 111 */ "place",
1395	/* 112 */ "object",
1396	/* 113 */ "objectname",
1397	/* 114 */ "nth",
1398	/* 115 */ "textposition",
1399	/* 116 */ "rvalue",
1400	/* 117 */ "lvalue",
1401	/* 118 */ "even",
1402	/* 119 */ "relexpr",
1403	/* 120 */ "optrelexpr",
1404	/* 121 */ "document",
1405	/* 122 */ "print",
1406	/* 123 */ "prlist",
1407	/* 124 */ "pritem",
1408	/* 125 */ "prsep",
1409	/* 126 */ "attribute_list",
1410	/* 127 */ "savelist",
1411	/* 128 */ "alist",
1412	/* 129 */ "attribute",
1413	/* 130 */ "go",
1414	/* 131 */ "boolproperty",
1415	/* 132 */ "withclause",
1416	/* 133 */ "between",
1417	/* 134 */ "place2",
1418	};
1419	#endif /* defined(YYCOVERAGE) \|\| !defined(NDEBUG) */
1420
1421	#ifndef NDEBUG
1422	/* For tracing reduce actions, the names of all rules are required.
	@@ -1497,77 +1508,78 @@
1508	/* 83 */ "place2 ::= object",
1509	/* 84 */ "place2 ::= object DOT_E edge",
1510	/* 85 */ "place2 ::= NTH VERTEX OF object",
1511	/* 86 */ "object ::= nth",
1512	/* 87 */ "object ::= nth OF\|IN object",
1513	/* 88 */ "objectname ::= THIS",
1514	/* 89 */ "objectname ::= PLACENAME",
1515	/* 90 */ "objectname ::= objectname DOT_U PLACENAME",
1516	/* 91 */ "nth ::= NTH CLASSNAME",
1517	/* 92 */ "nth ::= NTH LAST CLASSNAME",
1518	/* 93 */ "nth ::= LAST CLASSNAME",
1519	/* 94 */ "nth ::= LAST",
1520	/* 95 */ "nth ::= NTH LB RB",
1521	/* 96 */ "nth ::= NTH LAST LB RB",
1522	/* 97 */ "nth ::= LAST LB RB",
1523	/* 98 */ "expr ::= expr PLUS expr",
1524	/* 99 */ "expr ::= expr MINUS expr",
1525	/* 100 */ "expr ::= expr STAR expr",
1526	/* 101 */ "expr ::= expr SLASH expr",
1527	/* 102 */ "expr ::= MINUS expr",
1528	/* 103 */ "expr ::= PLUS expr",
1529	/* 104 */ "expr ::= LP expr RP",
1530	/* 105 */ "expr ::= LP FILL\|COLOR\|THICKNESS RP",
1531	/* 106 */ "expr ::= NUMBER",
1532	/* 107 */ "expr ::= ID",
1533	/* 108 */ "expr ::= FUNC1 LP expr RP",
1534	/* 109 */ "expr ::= FUNC2 LP expr COMMA expr RP",
1535	/* 110 */ "expr ::= DIST LP position COMMA position RP",
1536	/* 111 */ "expr ::= place2 DOT_XY X",
1537	/* 112 */ "expr ::= place2 DOT_XY Y",
1538	/* 113 */ "expr ::= object DOT_L numproperty",
1539	/* 114 */ "expr ::= object DOT_L dashproperty",
1540	/* 115 */ "expr ::= object DOT_L colorproperty",
1541	/* 116 */ "lvalue ::= ID",
1542	/* 117 */ "lvalue ::= FILL",
1543	/* 118 */ "lvalue ::= COLOR",
1544	/* 119 */ "lvalue ::= THICKNESS",
1545	/* 120 */ "rvalue ::= expr",
1546	/* 121 */ "print ::= PRINT",
1547	/* 122 */ "prlist ::= pritem",
1548	/* 123 */ "prlist ::= prlist prsep pritem",
1549	/* 124 */ "direction ::= UP",
1550	/* 125 */ "direction ::= DOWN",
1551	/* 126 */ "direction ::= LEFT",
1552	/* 127 */ "direction ::= RIGHT",
1553	/* 128 */ "optrelexpr ::= relexpr",
1554	/* 129 */ "attribute_list ::= alist",
1555	/* 130 */ "alist ::=",
1556	/* 131 */ "alist ::= alist attribute",
1557	/* 132 */ "attribute ::= boolproperty",
1558	/* 133 */ "attribute ::= WITH withclause",
1559	/* 134 */ "go ::= GO",
1560	/* 135 */ "go ::=",
1561	/* 136 */ "even ::= UNTIL EVEN WITH",
1562	/* 137 */ "even ::= EVEN WITH",
1563	/* 138 */ "dashproperty ::= DOTTED",
1564	/* 139 */ "dashproperty ::= DASHED",
1565	/* 140 */ "colorproperty ::= FILL",
1566	/* 141 */ "colorproperty ::= COLOR",
1567	/* 142 */ "position ::= place",
1568	/* 143 */ "between ::= WAY BETWEEN",
1569	/* 144 */ "between ::= BETWEEN",
1570	/* 145 */ "between ::= OF THE WAY BETWEEN",
1571	/* 146 */ "place ::= place2",
1572	/* 147 */ "edge ::= CENTER",
1573	/* 148 */ "edge ::= EDGEPT",
1574	/* 149 */ "edge ::= TOP",
1575	/* 150 */ "edge ::= BOTTOM",
1576	/* 151 */ "edge ::= START",
1577	/* 152 */ "edge ::= END",
1578	/* 153 */ "edge ::= RIGHT",
1579	/* 154 */ "edge ::= LEFT",
1580	/* 155 */ "object ::= objectname",
1581	};
1582	#endif /* NDEBUG */
1583
1584
1585	#if YYSTACKDEPTH<=0
	@@ -1689,24 +1701,24 @@
1701	** Note: during a reduce, the only symbols destroyed are those
1702	** which appear on the RHS of the rule, but which are not used
1703	** inside the C code.
1704	*/
1705	/******* Begin destructor definitions *************************************/
1706	case 99: /* statement_list */
1707	{
1708	#line 494 "pikchr.y"
1709	pik_elist_free(p,(yypminor->yy227));
1710	#line 1735 "pikchr.c"
1711	}
1712	break;
1713	case 100: /* statement */
1714	case 101: /* unnamed_statement */
1715	case 102: /* basetype */
1716	{
1717	#line 496 "pikchr.y"
1718	pik_elem_free(p,(yypminor->yy36));
1719	#line 1744 "pikchr.c"
1720	}
1721	break;
1722	/******* End destructor definitions ***************************************/
1723	default: break; /* If no destructor action specified: do nothing */
1724	}
	@@ -1923,11 +1935,11 @@
1935	** stack every overflows */
1936	/****** Begin %stack_overflow code ****************************************/
1937	#line 528 "pikchr.y"
1938
1939	pik_error(p, 0, "parser stack overflow");
1940	#line 1965 "pikchr.c"
1941	/****** End %stack_overflow code ******************************************/
1942	pik_parserARG_STORE /* Suppress warning about unused %extra_argument var */
1943	pik_parserCTX_STORE
1944	}
1945
	@@ -1995,165 +2007,166 @@
2007	}
2008
2009	/* For rule J, yyRuleInfoLhs[J] contains the symbol on the left-hand side
2010	** of that rule */
2011	static const YYCODETYPE yyRuleInfoLhs[] = {
2012	121, /* (0) document ::= statement_list */
2013	99, /* (1) statement_list ::= statement */
2014	99, /* (2) statement_list ::= statement_list EOL statement */
2015	100, /* (3) statement ::= */
2016	100, /* (4) statement ::= direction */
2017	100, /* (5) statement ::= lvalue ASSIGN rvalue */
2018	100, /* (6) statement ::= PLACENAME COLON unnamed_statement */
2019	100, /* (7) statement ::= PLACENAME COLON position */
2020	100, /* (8) statement ::= unnamed_statement */
2021	100, /* (9) statement ::= print prlist */
2022	100, /* (10) statement ::= ASSERT LP expr EQ expr RP */
2023	100, /* (11) statement ::= ASSERT LP position EQ position RP */
2024	100, /* (12) statement ::= DEFINE ID CODEBLOCK */
2025	116, /* (13) rvalue ::= PLACENAME */
2026	124, /* (14) pritem ::= FILL */
2027	124, /* (15) pritem ::= COLOR */
2028	124, /* (16) pritem ::= THICKNESS */
2029	124, /* (17) pritem ::= rvalue */
2030	124, /* (18) pritem ::= STRING */
2031	125, /* (19) prsep ::= COMMA */
2032	101, /* (20) unnamed_statement ::= basetype attribute_list */
2033	102, /* (21) basetype ::= CLASSNAME */
2034	102, /* (22) basetype ::= STRING textposition */
2035	102, /* (23) basetype ::= LB savelist statement_list RB */
2036	127, /* (24) savelist ::= */
2037	119, /* (25) relexpr ::= expr */
2038	119, /* (26) relexpr ::= expr PERCENT */
2039	120, /* (27) optrelexpr ::= */
2040	126, /* (28) attribute_list ::= relexpr alist */
2041	129, /* (29) attribute ::= numproperty relexpr */
2042	129, /* (30) attribute ::= dashproperty expr */
2043	129, /* (31) attribute ::= dashproperty */
2044	129, /* (32) attribute ::= colorproperty rvalue */
2045	129, /* (33) attribute ::= go direction optrelexpr */
2046	129, /* (34) attribute ::= go direction even position */
2047	129, /* (35) attribute ::= CLOSE */
2048	129, /* (36) attribute ::= CHOP */
2049	129, /* (37) attribute ::= FROM position */
2050	129, /* (38) attribute ::= TO position */
2051	129, /* (39) attribute ::= THEN */
2052	129, /* (40) attribute ::= THEN optrelexpr HEADING expr */
2053	129, /* (41) attribute ::= THEN optrelexpr EDGEPT */
2054	129, /* (42) attribute ::= GO optrelexpr HEADING expr */
2055	129, /* (43) attribute ::= GO optrelexpr EDGEPT */
2056	129, /* (44) attribute ::= AT position */
2057	129, /* (45) attribute ::= SAME */
2058	129, /* (46) attribute ::= SAME AS object */
2059	129, /* (47) attribute ::= STRING textposition */
2060	129, /* (48) attribute ::= FIT */
2061	129, /* (49) attribute ::= BEHIND object */
2062	132, /* (50) withclause ::= DOT_E edge AT position */
2063	132, /* (51) withclause ::= edge AT position */
2064	104, /* (52) numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2065	131, /* (53) boolproperty ::= CW */
2066	131, /* (54) boolproperty ::= CCW */
2067	131, /* (55) boolproperty ::= LARROW */
2068	131, /* (56) boolproperty ::= RARROW */
2069	131, /* (57) boolproperty ::= LRARROW */
2070	131, /* (58) boolproperty ::= INVIS */
2071	131, /* (59) boolproperty ::= THICK */
2072	131, /* (60) boolproperty ::= THIN */
2073	131, /* (61) boolproperty ::= SOLID */
2074	115, /* (62) textposition ::= */
2075	115, /* (63) textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2076	110, /* (64) position ::= expr COMMA expr */
2077	110, /* (65) position ::= place PLUS expr COMMA expr */
2078	110, /* (66) position ::= place MINUS expr COMMA expr */
2079	110, /* (67) position ::= place PLUS LP expr COMMA expr RP */
2080	110, /* (68) position ::= place MINUS LP expr COMMA expr RP */
2081	110, /* (69) position ::= LP position COMMA position RP */
2082	110, /* (70) position ::= LP position RP */
2083	110, /* (71) position ::= expr between position AND position */
2084	110, /* (72) position ::= expr LT position COMMA position GT */
2085	110, /* (73) position ::= expr ABOVE position */
2086	110, /* (74) position ::= expr BELOW position */
2087	110, /* (75) position ::= expr LEFT OF position */
2088	110, /* (76) position ::= expr RIGHT OF position */
2089	110, /* (77) position ::= expr ON HEADING EDGEPT OF position */
2090	110, /* (78) position ::= expr HEADING EDGEPT OF position */
2091	110, /* (79) position ::= expr EDGEPT OF position */
2092	110, /* (80) position ::= expr ON HEADING expr FROM position */
2093	110, /* (81) position ::= expr HEADING expr FROM position */
2094	111, /* (82) place ::= edge OF object */
2095	134, /* (83) place2 ::= object */
2096	134, /* (84) place2 ::= object DOT_E edge */
2097	134, /* (85) place2 ::= NTH VERTEX OF object */
2098	112, /* (86) object ::= nth */
2099	112, /* (87) object ::= nth OF\|IN object */
2100	113, /* (88) objectname ::= THIS */
2101	113, /* (89) objectname ::= PLACENAME */
2102	113, /* (90) objectname ::= objectname DOT_U PLACENAME */
2103	114, /* (91) nth ::= NTH CLASSNAME */
2104	114, /* (92) nth ::= NTH LAST CLASSNAME */
2105	114, /* (93) nth ::= LAST CLASSNAME */
2106	114, /* (94) nth ::= LAST */
2107	114, /* (95) nth ::= NTH LB RB */
2108	114, /* (96) nth ::= NTH LAST LB RB */
2109	114, /* (97) nth ::= LAST LB RB */
2110	103, /* (98) expr ::= expr PLUS expr */
2111	103, /* (99) expr ::= expr MINUS expr */
2112	103, /* (100) expr ::= expr STAR expr */
2113	103, /* (101) expr ::= expr SLASH expr */
2114	103, /* (102) expr ::= MINUS expr */
2115	103, /* (103) expr ::= PLUS expr */
2116	103, /* (104) expr ::= LP expr RP */
2117	103, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2118	103, /* (106) expr ::= NUMBER */
2119	103, /* (107) expr ::= ID */
2120	103, /* (108) expr ::= FUNC1 LP expr RP */
2121	103, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2122	103, /* (110) expr ::= DIST LP position COMMA position RP */
2123	103, /* (111) expr ::= place2 DOT_XY X */
2124	103, /* (112) expr ::= place2 DOT_XY Y */
2125	103, /* (113) expr ::= object DOT_L numproperty */
2126	103, /* (114) expr ::= object DOT_L dashproperty */
2127	103, /* (115) expr ::= object DOT_L colorproperty */
2128	117, /* (116) lvalue ::= ID */
2129	117, /* (117) lvalue ::= FILL */
2130	117, /* (118) lvalue ::= COLOR */
2131	117, /* (119) lvalue ::= THICKNESS */
2132	116, /* (120) rvalue ::= expr */
2133	122, /* (121) print ::= PRINT */
2134	123, /* (122) prlist ::= pritem */
2135	123, /* (123) prlist ::= prlist prsep pritem */
2136	106, /* (124) direction ::= UP */
2137	106, /* (125) direction ::= DOWN */
2138	106, /* (126) direction ::= LEFT */
2139	106, /* (127) direction ::= RIGHT */
2140	120, /* (128) optrelexpr ::= relexpr */
2141	126, /* (129) attribute_list ::= alist */
2142	128, /* (130) alist ::= */
2143	128, /* (131) alist ::= alist attribute */
2144	129, /* (132) attribute ::= boolproperty */
2145	129, /* (133) attribute ::= WITH withclause */
2146	130, /* (134) go ::= GO */
2147	130, /* (135) go ::= */
2148	118, /* (136) even ::= UNTIL EVEN WITH */
2149	118, /* (137) even ::= EVEN WITH */
2150	107, /* (138) dashproperty ::= DOTTED */
2151	107, /* (139) dashproperty ::= DASHED */
2152	108, /* (140) colorproperty ::= FILL */
2153	108, /* (141) colorproperty ::= COLOR */
2154	110, /* (142) position ::= place */
2155	133, /* (143) between ::= WAY BETWEEN */
2156	133, /* (144) between ::= BETWEEN */
2157	133, /* (145) between ::= OF THE WAY BETWEEN */
2158	111, /* (146) place ::= place2 */
2159	105, /* (147) edge ::= CENTER */
2160	105, /* (148) edge ::= EDGEPT */
2161	105, /* (149) edge ::= TOP */
2162	105, /* (150) edge ::= BOTTOM */
2163	105, /* (151) edge ::= START */
2164	105, /* (152) edge ::= END */
2165	105, /* (153) edge ::= RIGHT */
2166	105, /* (154) edge ::= LEFT */
2167	112, /* (155) object ::= objectname */
2168	};
2169
2170	/* For rule J, yyRuleInfoNRhs[J] contains the negative of the number
2171	** of symbols on the right-hand side of that rule. */
2172	static const signed char yyRuleInfoNRhs[] = {
	@@ -2243,77 +2256,78 @@
2256	-1, /* (83) place2 ::= object */
2257	-3, /* (84) place2 ::= object DOT_E edge */
2258	-4, /* (85) place2 ::= NTH VERTEX OF object */
2259	-1, /* (86) object ::= nth */
2260	-3, /* (87) object ::= nth OF\|IN object */
2261	-1, /* (88) objectname ::= THIS */
2262	-1, /* (89) objectname ::= PLACENAME */
2263	-3, /* (90) objectname ::= objectname DOT_U PLACENAME */
2264	-2, /* (91) nth ::= NTH CLASSNAME */
2265	-3, /* (92) nth ::= NTH LAST CLASSNAME */
2266	-2, /* (93) nth ::= LAST CLASSNAME */
2267	-1, /* (94) nth ::= LAST */
2268	-3, /* (95) nth ::= NTH LB RB */
2269	-4, /* (96) nth ::= NTH LAST LB RB */
2270	-3, /* (97) nth ::= LAST LB RB */
2271	-3, /* (98) expr ::= expr PLUS expr */
2272	-3, /* (99) expr ::= expr MINUS expr */
2273	-3, /* (100) expr ::= expr STAR expr */
2274	-3, /* (101) expr ::= expr SLASH expr */
2275	-2, /* (102) expr ::= MINUS expr */
2276	-2, /* (103) expr ::= PLUS expr */
2277	-3, /* (104) expr ::= LP expr RP */
2278	-3, /* (105) expr ::= LP FILL\|COLOR\|THICKNESS RP */
2279	-1, /* (106) expr ::= NUMBER */
2280	-1, /* (107) expr ::= ID */
2281	-4, /* (108) expr ::= FUNC1 LP expr RP */
2282	-6, /* (109) expr ::= FUNC2 LP expr COMMA expr RP */
2283	-6, /* (110) expr ::= DIST LP position COMMA position RP */
2284	-3, /* (111) expr ::= place2 DOT_XY X */
2285	-3, /* (112) expr ::= place2 DOT_XY Y */
2286	-3, /* (113) expr ::= object DOT_L numproperty */
2287	-3, /* (114) expr ::= object DOT_L dashproperty */
2288	-3, /* (115) expr ::= object DOT_L colorproperty */
2289	-1, /* (116) lvalue ::= ID */
2290	-1, /* (117) lvalue ::= FILL */
2291	-1, /* (118) lvalue ::= COLOR */
2292	-1, /* (119) lvalue ::= THICKNESS */
2293	-1, /* (120) rvalue ::= expr */
2294	-1, /* (121) print ::= PRINT */
2295	-1, /* (122) prlist ::= pritem */
2296	-3, /* (123) prlist ::= prlist prsep pritem */
2297	-1, /* (124) direction ::= UP */
2298	-1, /* (125) direction ::= DOWN */
2299	-1, /* (126) direction ::= LEFT */
2300	-1, /* (127) direction ::= RIGHT */
2301	-1, /* (128) optrelexpr ::= relexpr */
2302	-1, /* (129) attribute_list ::= alist */
2303	0, /* (130) alist ::= */
2304	-2, /* (131) alist ::= alist attribute */
2305	-1, /* (132) attribute ::= boolproperty */
2306	-2, /* (133) attribute ::= WITH withclause */
2307	-1, /* (134) go ::= GO */
2308	0, /* (135) go ::= */
2309	-3, /* (136) even ::= UNTIL EVEN WITH */
2310	-2, /* (137) even ::= EVEN WITH */
2311	-1, /* (138) dashproperty ::= DOTTED */
2312	-1, /* (139) dashproperty ::= DASHED */
2313	-1, /* (140) colorproperty ::= FILL */
2314	-1, /* (141) colorproperty ::= COLOR */
2315	-1, /* (142) position ::= place */
2316	-2, /* (143) between ::= WAY BETWEEN */
2317	-1, /* (144) between ::= BETWEEN */
2318	-4, /* (145) between ::= OF THE WAY BETWEEN */
2319	-1, /* (146) place ::= place2 */
2320	-1, /* (147) edge ::= CENTER */
2321	-1, /* (148) edge ::= EDGEPT */
2322	-1, /* (149) edge ::= TOP */
2323	-1, /* (150) edge ::= BOTTOM */
2324	-1, /* (151) edge ::= START */
2325	-1, /* (152) edge ::= END */
2326	-1, /* (153) edge ::= RIGHT */
2327	-1, /* (154) edge ::= LEFT */
2328	-1, /* (155) object ::= objectname */
2329	};
2330
2331	static void yy_accept(yyParser); / Forward Declaration */
2332
2333	/*
	@@ -2402,656 +2416,661 @@
2416	*/
2417	/******** Begin reduce actions ********************************************/
2418	YYMINORTYPE yylhsminor;
2419	case 0: /* document ::= statement_list */
2420	#line 532 "pikchr.y"
2421	{pik_render(p,yymsp[0].minor.yy227);}
2422	#line 2447 "pikchr.c"
2423	break;
2424	case 1: /* statement_list ::= statement */
2425	#line 535 "pikchr.y"
2426	{ yylhsminor.yy227 = pik_elist_append(p,0,yymsp[0].minor.yy36); }
2427	#line 2452 "pikchr.c"
2428	yymsp[0].minor.yy227 = yylhsminor.yy227;
2429	break;
2430	case 2: /* statement_list ::= statement_list EOL statement */
2431	#line 537 "pikchr.y"
2432	{ yylhsminor.yy227 = pik_elist_append(p,yymsp[-2].minor.yy227,yymsp[0].minor.yy36); }
2433	#line 2458 "pikchr.c"
2434	yymsp[-2].minor.yy227 = yylhsminor.yy227;
2435	break;
2436	case 3: /* statement ::= */
2437	#line 540 "pikchr.y"
2438	{ yymsp[1].minor.yy36 = 0; }
2439	#line 2464 "pikchr.c"
2440	break;
2441	case 4: /* statement ::= direction */
2442	#line 541 "pikchr.y"
2443	{ pik_set_direction(p,yymsp[0].minor.yy0.eCode); yylhsminor.yy36=0; }
2444	#line 2469 "pikchr.c"
2445	yymsp[0].minor.yy36 = yylhsminor.yy36;
2446	break;
2447	case 5: /* statement ::= lvalue ASSIGN rvalue */
2448	#line 542 "pikchr.y"
2449	{pik_set_var(p,&yymsp[-2].minor.yy0,yymsp[0].minor.yy153,&yymsp[-1].minor.yy0); yylhsminor.yy36=0;}
2450	#line 2475 "pikchr.c"
2451	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2452	break;
2453	case 6: /* statement ::= PLACENAME COLON unnamed_statement */
2454	#line 544 "pikchr.y"
2455	{ yylhsminor.yy36 = yymsp[0].minor.yy36; pik_elem_setname(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0); }
2456	#line 2481 "pikchr.c"
2457	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2458	break;
2459	case 7: /* statement ::= PLACENAME COLON position */
2460	#line 546 "pikchr.y"
2461	{ yylhsminor.yy36 = pik_elem_new(p,0,0,0);
2462	if(yylhsminor.yy36){ yylhsminor.yy36->ptAt = yymsp[0].minor.yy79; pik_elem_setname(p,yylhsminor.yy36,&yymsp[-2].minor.yy0); }}
2463	#line 2488 "pikchr.c"
2464	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2465	break;
2466	case 8: /* statement ::= unnamed_statement */
2467	#line 548 "pikchr.y"
2468	{yylhsminor.yy36 = yymsp[0].minor.yy36;}
2469	#line 2494 "pikchr.c"
2470	yymsp[0].minor.yy36 = yylhsminor.yy36;
2471	break;
2472	case 9: /* statement ::= print prlist */
2473	#line 549 "pikchr.y"
2474	{pik_append(p,"<br>\n",5); yymsp[-1].minor.yy36=0;}
2475	#line 2500 "pikchr.c"
2476	break;
2477	case 10: /* statement ::= ASSERT LP expr EQ expr RP */
2478	#line 554 "pikchr.y"
2479	{yymsp[-5].minor.yy36=pik_assert(p,yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy153);}
2480	#line 2505 "pikchr.c"
2481	break;
2482	case 11: /* statement ::= ASSERT LP position EQ position RP */
2483	#line 556 "pikchr.y"
2484	{yymsp[-5].minor.yy36=pik_position_assert(p,&yymsp[-3].minor.yy79,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy79);}
2485	#line 2510 "pikchr.c"
2486	break;
2487	case 12: /* statement ::= DEFINE ID CODEBLOCK */
2488	#line 557 "pikchr.y"
2489	{yymsp[-2].minor.yy36=0; pik_add_macro(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
2490	#line 2515 "pikchr.c"
2491	break;
2492	case 13: /* rvalue ::= PLACENAME */
2493	#line 568 "pikchr.y"
2494	{yylhsminor.yy153 = pik_lookup_color(p,&yymsp[0].minor.yy0);}
2495	#line 2520 "pikchr.c"
2496	yymsp[0].minor.yy153 = yylhsminor.yy153;
2497	break;
2498	case 14: /* pritem ::= FILL */
2499	case 15: /* pritem ::= COLOR */ yytestcase(yyruleno==15);
2500	case 16: /* pritem ::= THICKNESS */ yytestcase(yyruleno==16);
2501	#line 573 "pikchr.y"
2502	{pik_append_num(p,"",pik_value(p,yymsp[0].minor.yy0.z,yymsp[0].minor.yy0.n,0));}
2503	#line 2528 "pikchr.c"
2504	break;
2505	case 17: /* pritem ::= rvalue */
2506	#line 576 "pikchr.y"
2507	{pik_append_num(p,"",yymsp[0].minor.yy153);}
2508	#line 2533 "pikchr.c"
2509	break;
2510	case 18: /* pritem ::= STRING */
2511	#line 577 "pikchr.y"
2512	{pik_append_text(p,yymsp[0].minor.yy0.z+1,yymsp[0].minor.yy0.n-2,0);}
2513	#line 2538 "pikchr.c"
2514	break;
2515	case 19: /* prsep ::= COMMA */
2516	#line 578 "pikchr.y"
2517	{pik_append(p, " ", 1);}
2518	#line 2543 "pikchr.c"
2519	break;
2520	case 20: /* unnamed_statement ::= basetype attribute_list */
2521	#line 581 "pikchr.y"
2522	{yylhsminor.yy36 = yymsp[-1].minor.yy36; pik_after_adding_attributes(p,yylhsminor.yy36);}
2523	#line 2548 "pikchr.c"
2524	yymsp[-1].minor.yy36 = yylhsminor.yy36;
2525	break;
2526	case 21: /* basetype ::= CLASSNAME */
2527	#line 583 "pikchr.y"
2528	{yylhsminor.yy36 = pik_elem_new(p,&yymsp[0].minor.yy0,0,0); }
2529	#line 2554 "pikchr.c"
2530	yymsp[0].minor.yy36 = yylhsminor.yy36;
2531	break;
2532	case 22: /* basetype ::= STRING textposition */
2533	#line 585 "pikchr.y"
2534	{yymsp[-1].minor.yy0.eCode = yymsp[0].minor.yy164; yylhsminor.yy36 = pik_elem_new(p,0,&yymsp[-1].minor.yy0,0); }
2535	#line 2560 "pikchr.c"
2536	yymsp[-1].minor.yy36 = yylhsminor.yy36;
2537	break;
2538	case 23: /* basetype ::= LB savelist statement_list RB */
2539	#line 587 "pikchr.y"
2540	{ p->list = yymsp[-2].minor.yy227; yymsp[-3].minor.yy36 = pik_elem_new(p,0,0,yymsp[-1].minor.yy227); if(yymsp[-3].minor.yy36) yymsp[-3].minor.yy36->errTok = yymsp[0].minor.yy0; }
2541	#line 2566 "pikchr.c"
2542	break;
2543	case 24: /* savelist ::= */
2544	#line 592 "pikchr.y"
2545	{yymsp[1].minor.yy227 = p->list; p->list = 0;}
2546	#line 2571 "pikchr.c"
2547	break;
2548	case 25: /* relexpr ::= expr */
2549	#line 599 "pikchr.y"
2550	{yylhsminor.yy10.rAbs = yymsp[0].minor.yy153; yylhsminor.yy10.rRel = 0;}
2551	#line 2576 "pikchr.c"
2552	yymsp[0].minor.yy10 = yylhsminor.yy10;
2553	break;
2554	case 26: /* relexpr ::= expr PERCENT */
2555	#line 600 "pikchr.y"
2556	{yylhsminor.yy10.rAbs = 0; yylhsminor.yy10.rRel = yymsp[-1].minor.yy153/100;}
2557	#line 2582 "pikchr.c"
2558	yymsp[-1].minor.yy10 = yylhsminor.yy10;
2559	break;
2560	case 27: /* optrelexpr ::= */
2561	#line 602 "pikchr.y"
2562	{yymsp[1].minor.yy10.rAbs = 0; yymsp[1].minor.yy10.rRel = 1.0;}
2563	#line 2588 "pikchr.c"
2564	break;
2565	case 28: /* attribute_list ::= relexpr alist */
2566	#line 604 "pikchr.y"
2567	{pik_add_direction(p,0,&yymsp[-1].minor.yy10);}
2568	#line 2593 "pikchr.c"
2569	break;
2570	case 29: /* attribute ::= numproperty relexpr */
2571	#line 608 "pikchr.y"
2572	{ pik_set_numprop(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10); }
2573	#line 2598 "pikchr.c"
2574	break;
2575	case 30: /* attribute ::= dashproperty expr */
2576	#line 609 "pikchr.y"
2577	{ pik_set_dashed(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy153); }
2578	#line 2603 "pikchr.c"
2579	break;
2580	case 31: /* attribute ::= dashproperty */
2581	#line 610 "pikchr.y"
2582	{ pik_set_dashed(p,&yymsp[0].minor.yy0,0); }
2583	#line 2608 "pikchr.c"
2584	break;
2585	case 32: /* attribute ::= colorproperty rvalue */
2586	#line 611 "pikchr.y"
2587	{ pik_set_clrprop(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153); }
2588	#line 2613 "pikchr.c"
2589	break;
2590	case 33: /* attribute ::= go direction optrelexpr */
2591	#line 612 "pikchr.y"
2592	{ pik_add_direction(p,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy10);}
2593	#line 2618 "pikchr.c"
2594	break;
2595	case 34: /* attribute ::= go direction even position */
2596	#line 613 "pikchr.y"
2597	{pik_evenwith(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79);}
2598	#line 2623 "pikchr.c"
2599	break;
2600	case 35: /* attribute ::= CLOSE */
2601	#line 614 "pikchr.y"
2602	{ pik_close_path(p,&yymsp[0].minor.yy0); }
2603	#line 2628 "pikchr.c"
2604	break;
2605	case 36: /* attribute ::= CHOP */
2606	#line 615 "pikchr.y"
2607	{ p->cur->bChop = 1; }
2608	#line 2633 "pikchr.c"
2609	break;
2610	case 37: /* attribute ::= FROM position */
2611	#line 616 "pikchr.y"
2612	{ pik_set_from(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
2613	#line 2638 "pikchr.c"
2614	break;
2615	case 38: /* attribute ::= TO position */
2616	#line 617 "pikchr.y"
2617	{ pik_add_to(p,p->cur,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy79); }
2618	#line 2643 "pikchr.c"
2619	break;
2620	case 39: /* attribute ::= THEN */
2621	#line 618 "pikchr.y"
2622	{ pik_then(p, &yymsp[0].minor.yy0, p->cur); }
2623	#line 2648 "pikchr.c"
2624	break;
2625	case 40: /* attribute ::= THEN optrelexpr HEADING expr */
2626	case 42: /* attribute ::= GO optrelexpr HEADING expr */ yytestcase(yyruleno==42);
2627	#line 620 "pikchr.y"
2628	{pik_move_hdg(p,&yymsp[-2].minor.yy10,&yymsp[-1].minor.yy0,yymsp[0].minor.yy153,0,&yymsp[-3].minor.yy0);}
2629	#line 2654 "pikchr.c"
2630	break;
2631	case 41: /* attribute ::= THEN optrelexpr EDGEPT */
2632	case 43: /* attribute ::= GO optrelexpr EDGEPT */ yytestcase(yyruleno==43);
2633	#line 621 "pikchr.y"
2634	{pik_move_hdg(p,&yymsp[-1].minor.yy10,0,0,&yymsp[0].minor.yy0,&yymsp[-2].minor.yy0);}
2635	#line 2660 "pikchr.c"
2636	break;
2637	case 44: /* attribute ::= AT position */
2638	#line 626 "pikchr.y"
2639	{ pik_set_at(p,0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
2640	#line 2665 "pikchr.c"
2641	break;
2642	case 45: /* attribute ::= SAME */
2643	#line 628 "pikchr.y"
2644	{pik_same(p,0,&yymsp[0].minor.yy0);}
2645	#line 2670 "pikchr.c"
2646	break;
2647	case 46: /* attribute ::= SAME AS object */
2648	#line 629 "pikchr.y"
2649	{pik_same(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
2650	#line 2675 "pikchr.c"
2651	break;
2652	case 47: /* attribute ::= STRING textposition */
2653	#line 630 "pikchr.y"
2654	{pik_add_txt(p,&yymsp[-1].minor.yy0,yymsp[0].minor.yy164);}
2655	#line 2680 "pikchr.c"
2656	break;
2657	case 48: /* attribute ::= FIT */
2658	#line 631 "pikchr.y"
2659	{pik_size_to_fit(p,&yymsp[0].minor.yy0,3); }
2660	#line 2685 "pikchr.c"
2661	break;
2662	case 49: /* attribute ::= BEHIND object */
2663	#line 632 "pikchr.y"
2664	{pik_behind(p,yymsp[0].minor.yy36);}
2665	#line 2690 "pikchr.c"
2666	break;
2667	case 50: /* withclause ::= DOT_E edge AT position */
2668	case 51: /* withclause ::= edge AT position */ yytestcase(yyruleno==51);
2669	#line 640 "pikchr.y"
2670	{ pik_set_at(p,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy79,&yymsp[-1].minor.yy0); }
2671	#line 2696 "pikchr.c"
2672	break;
2673	case 52: /* numproperty ::= HEIGHT\|WIDTH\|RADIUS\|DIAMETER\|THICKNESS */
2674	#line 644 "pikchr.y"
2675	{yylhsminor.yy0 = yymsp[0].minor.yy0;}
2676	#line 2701 "pikchr.c"
2677	yymsp[0].minor.yy0 = yylhsminor.yy0;
2678	break;
2679	case 53: /* boolproperty ::= CW */
2680	#line 655 "pikchr.y"
2681	{p->cur->cw = 1;}
2682	#line 2707 "pikchr.c"
2683	break;
2684	case 54: /* boolproperty ::= CCW */
2685	#line 656 "pikchr.y"
2686	{p->cur->cw = 0;}
2687	#line 2712 "pikchr.c"
2688	break;
2689	case 55: /* boolproperty ::= LARROW */
2690	#line 657 "pikchr.y"
2691	{p->cur->larrow=1; p->cur->rarrow=0; }
2692	#line 2717 "pikchr.c"
2693	break;
2694	case 56: /* boolproperty ::= RARROW */
2695	#line 658 "pikchr.y"
2696	{p->cur->larrow=0; p->cur->rarrow=1; }
2697	#line 2722 "pikchr.c"
2698	break;
2699	case 57: /* boolproperty ::= LRARROW */
2700	#line 659 "pikchr.y"
2701	{p->cur->larrow=1; p->cur->rarrow=1; }
2702	#line 2727 "pikchr.c"
2703	break;
2704	case 58: /* boolproperty ::= INVIS */
2705	#line 660 "pikchr.y"
2706	{p->cur->sw = 0.0;}
2707	#line 2732 "pikchr.c"
2708	break;
2709	case 59: /* boolproperty ::= THICK */
2710	#line 661 "pikchr.y"
2711	{p->cur->sw *= 1.5;}
2712	#line 2737 "pikchr.c"
2713	break;
2714	case 60: /* boolproperty ::= THIN */
2715	#line 662 "pikchr.y"
2716	{p->cur->sw *= 0.67;}
2717	#line 2742 "pikchr.c"
2718	break;
2719	case 61: /* boolproperty ::= SOLID */
2720	#line 663 "pikchr.y"
2721	{p->cur->sw = pik_value(p,"thickness",9,0);
2722	p->cur->dotted = p->cur->dashed = 0.0;}
2723	#line 2748 "pikchr.c"
2724	break;
2725	case 62: /* textposition ::= */
2726	#line 666 "pikchr.y"
2727	{yymsp[1].minor.yy164 = 0;}
2728	#line 2753 "pikchr.c"
2729	break;
2730	case 63: /* textposition ::= textposition CENTER\|LJUST\|RJUST\|ABOVE\|BELOW\|ITALIC\|BOLD\|ALIGNED\|BIG\|SMALL */
2731	#line 669 "pikchr.y"
2732	{yylhsminor.yy164 = (short int)pik_text_position(yymsp[-1].minor.yy164,&yymsp[0].minor.yy0);}
2733	#line 2758 "pikchr.c"
2734	yymsp[-1].minor.yy164 = yylhsminor.yy164;
2735	break;
2736	case 64: /* position ::= expr COMMA expr */
2737	#line 672 "pikchr.y"
2738	{yylhsminor.yy79.x=yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[0].minor.yy153;}
2739	#line 2764 "pikchr.c"
2740	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2741	break;
2742	case 65: /* position ::= place PLUS expr COMMA expr */
2743	#line 674 "pikchr.y"
2744	{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x+yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y+yymsp[0].minor.yy153;}
2745	#line 2770 "pikchr.c"
2746	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2747	break;
2748	case 66: /* position ::= place MINUS expr COMMA expr */
2749	#line 675 "pikchr.y"
2750	{yylhsminor.yy79.x=yymsp[-4].minor.yy79.x-yymsp[-2].minor.yy153; yylhsminor.yy79.y=yymsp[-4].minor.yy79.y-yymsp[0].minor.yy153;}
2751	#line 2776 "pikchr.c"
2752	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2753	break;
2754	case 67: /* position ::= place PLUS LP expr COMMA expr RP */
2755	#line 677 "pikchr.y"
2756	{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x+yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y+yymsp[-1].minor.yy153;}
2757	#line 2782 "pikchr.c"
2758	yymsp[-6].minor.yy79 = yylhsminor.yy79;
2759	break;
2760	case 68: /* position ::= place MINUS LP expr COMMA expr RP */
2761	#line 679 "pikchr.y"
2762	{yylhsminor.yy79.x=yymsp[-6].minor.yy79.x-yymsp[-3].minor.yy153; yylhsminor.yy79.y=yymsp[-6].minor.yy79.y-yymsp[-1].minor.yy153;}
2763	#line 2788 "pikchr.c"
2764	yymsp[-6].minor.yy79 = yylhsminor.yy79;
2765	break;
2766	case 69: /* position ::= LP position COMMA position RP */
2767	#line 680 "pikchr.y"
2768	{yymsp[-4].minor.yy79.x=yymsp[-3].minor.yy79.x; yymsp[-4].minor.yy79.y=yymsp[-1].minor.yy79.y;}
2769	#line 2794 "pikchr.c"
2770	break;
2771	case 70: /* position ::= LP position RP */
2772	#line 681 "pikchr.y"
2773	{yymsp[-2].minor.yy79=yymsp[-1].minor.yy79;}
2774	#line 2799 "pikchr.c"
2775	break;
2776	case 71: /* position ::= expr between position AND position */
2777	#line 683 "pikchr.y"
2778	{yylhsminor.yy79 = pik_position_between(yymsp[-4].minor.yy153,yymsp[-2].minor.yy79,yymsp[0].minor.yy79);}
2779	#line 2804 "pikchr.c"
2780	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2781	break;
2782	case 72: /* position ::= expr LT position COMMA position GT */
2783	#line 685 "pikchr.y"
2784	{yylhsminor.yy79 = pik_position_between(yymsp[-5].minor.yy153,yymsp[-3].minor.yy79,yymsp[-1].minor.yy79);}
2785	#line 2810 "pikchr.c"
2786	yymsp[-5].minor.yy79 = yylhsminor.yy79;
2787	break;
2788	case 73: /* position ::= expr ABOVE position */
2789	#line 686 "pikchr.y"
2790	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y += yymsp[-2].minor.yy153;}
2791	#line 2816 "pikchr.c"
2792	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2793	break;
2794	case 74: /* position ::= expr BELOW position */
2795	#line 687 "pikchr.y"
2796	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.y -= yymsp[-2].minor.yy153;}
2797	#line 2822 "pikchr.c"
2798	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2799	break;
2800	case 75: /* position ::= expr LEFT OF position */
2801	#line 688 "pikchr.y"
2802	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x -= yymsp[-3].minor.yy153;}
2803	#line 2828 "pikchr.c"
2804	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2805	break;
2806	case 76: /* position ::= expr RIGHT OF position */
2807	#line 689 "pikchr.y"
2808	{yylhsminor.yy79=yymsp[0].minor.yy79; yylhsminor.yy79.x += yymsp[-3].minor.yy153;}
2809	#line 2834 "pikchr.c"
2810	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2811	break;
2812	case 77: /* position ::= expr ON HEADING EDGEPT OF position */
2813	#line 691 "pikchr.y"
2814	{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-5].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
2815	#line 2840 "pikchr.c"
2816	yymsp[-5].minor.yy79 = yylhsminor.yy79;
2817	break;
2818	case 78: /* position ::= expr HEADING EDGEPT OF position */
2819	#line 693 "pikchr.y"
2820	{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-4].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
2821	#line 2846 "pikchr.c"
2822	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2823	break;
2824	case 79: /* position ::= expr EDGEPT OF position */
2825	#line 695 "pikchr.y"
2826	{yylhsminor.yy79 = pik_position_at_hdg(yymsp[-3].minor.yy153,&yymsp[-2].minor.yy0,yymsp[0].minor.yy79);}
2827	#line 2852 "pikchr.c"
2828	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2829	break;
2830	case 80: /* position ::= expr ON HEADING expr FROM position */
2831	#line 697 "pikchr.y"
2832	{yylhsminor.yy79 = pik_position_at_angle(yymsp[-5].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
2833	#line 2858 "pikchr.c"
2834	yymsp[-5].minor.yy79 = yylhsminor.yy79;
2835	break;
2836	case 81: /* position ::= expr HEADING expr FROM position */
2837	#line 699 "pikchr.y"
2838	{yylhsminor.yy79 = pik_position_at_angle(yymsp[-4].minor.yy153,yymsp[-2].minor.yy153,yymsp[0].minor.yy79);}
2839	#line 2864 "pikchr.c"
2840	yymsp[-4].minor.yy79 = yylhsminor.yy79;
2841	break;
2842	case 82: /* place ::= edge OF object */
2843	#line 711 "pikchr.y"
2844	{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
2845	#line 2870 "pikchr.c"
2846	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2847	break;
2848	case 83: /* place2 ::= object */
2849	#line 712 "pikchr.y"
2850	{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[0].minor.yy36,0);}
2851	#line 2876 "pikchr.c"
2852	yymsp[0].minor.yy79 = yylhsminor.yy79;
2853	break;
2854	case 84: /* place2 ::= object DOT_E edge */
2855	#line 713 "pikchr.y"
2856	{yylhsminor.yy79 = pik_place_of_elem(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
2857	#line 2882 "pikchr.c"
2858	yymsp[-2].minor.yy79 = yylhsminor.yy79;
2859	break;
2860	case 85: /* place2 ::= NTH VERTEX OF object */
2861	#line 714 "pikchr.y"
2862	{yylhsminor.yy79 = pik_nth_vertex(p,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,yymsp[0].minor.yy36);}
2863	#line 2888 "pikchr.c"
2864	yymsp[-3].minor.yy79 = yylhsminor.yy79;
2865	break;
2866	case 86: /* object ::= nth */
2867	#line 726 "pikchr.y"
2868	{yylhsminor.yy36 = pik_find_nth(p,0,&yymsp[0].minor.yy0);}
2869	#line 2894 "pikchr.c"
2870	yymsp[0].minor.yy36 = yylhsminor.yy36;
2871	break;
2872	case 87: /* object ::= nth OF\|IN object */
2873	#line 727 "pikchr.y"
2874	{yylhsminor.yy36 = pik_find_nth(p,yymsp[0].minor.yy36,&yymsp[-2].minor.yy0);}
2875	#line 2900 "pikchr.c"
2876	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2877	break;
2878	case 88: /* objectname ::= THIS */
2879	#line 729 "pikchr.y"
2880	{yymsp[0].minor.yy36 = p->cur;}
2881	#line 2906 "pikchr.c"
2882	break;
2883	case 89: /* objectname ::= PLACENAME */
2884	#line 730 "pikchr.y"
2885	{yylhsminor.yy36 = pik_find_byname(p,0,&yymsp[0].minor.yy0);}
2886	#line 2911 "pikchr.c"
2887	yymsp[0].minor.yy36 = yylhsminor.yy36;
2888	break;
2889	case 90: /* objectname ::= objectname DOT_U PLACENAME */
2890	#line 732 "pikchr.y"
2891	{yylhsminor.yy36 = pik_find_byname(p,yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
2892	#line 2917 "pikchr.c"
2893	yymsp[-2].minor.yy36 = yylhsminor.yy36;
2894	break;
2895	case 91: /* nth ::= NTH CLASSNAME */
2896	#line 734 "pikchr.y"
2897	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-1].minor.yy0); }
2898	#line 2923 "pikchr.c"
2899	yymsp[-1].minor.yy0 = yylhsminor.yy0;
2900	break;
2901	case 92: /* nth ::= NTH LAST CLASSNAME */
2902	#line 735 "pikchr.y"
2903	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-2].minor.yy0); }
2904	#line 2929 "pikchr.c"
2905	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2906	break;
2907	case 93: /* nth ::= LAST CLASSNAME */
2908	#line 736 "pikchr.y"
2909	{yymsp[-1].minor.yy0=yymsp[0].minor.yy0; yymsp[-1].minor.yy0.eCode = -1;}
2910	#line 2935 "pikchr.c"
2911	break;
2912	case 94: /* nth ::= LAST */
2913	#line 737 "pikchr.y"
2914	{yylhsminor.yy0=yymsp[0].minor.yy0; yylhsminor.yy0.eCode = -1;}
2915	#line 2940 "pikchr.c"
2916	yymsp[0].minor.yy0 = yylhsminor.yy0;
2917	break;
2918	case 95: /* nth ::= NTH LB RB */
2919	#line 738 "pikchr.y"
2920	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = pik_nth_value(p,&yymsp[-2].minor.yy0);}
2921	#line 2946 "pikchr.c"
2922	yymsp[-2].minor.yy0 = yylhsminor.yy0;
2923	break;
2924	case 96: /* nth ::= NTH LAST LB RB */
2925	#line 739 "pikchr.y"
2926	{yylhsminor.yy0=yymsp[-1].minor.yy0; yylhsminor.yy0.eCode = -pik_nth_value(p,&yymsp[-3].minor.yy0);}
2927	#line 2952 "pikchr.c"
2928	yymsp[-3].minor.yy0 = yylhsminor.yy0;
2929	break;
2930	case 97: /* nth ::= LAST LB RB */
2931	#line 740 "pikchr.y"
2932	{yymsp[-2].minor.yy0=yymsp[-1].minor.yy0; yymsp[-2].minor.yy0.eCode = -1; }
2933	#line 2958 "pikchr.c"
2934	break;
2935	case 98: /* expr ::= expr PLUS expr */
2936	#line 742 "pikchr.y"
2937	{yylhsminor.yy153=yymsp[-2].minor.yy153+yymsp[0].minor.yy153;}
2938	#line 2963 "pikchr.c"
2939	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2940	break;
2941	case 99: /* expr ::= expr MINUS expr */
2942	#line 743 "pikchr.y"
2943	{yylhsminor.yy153=yymsp[-2].minor.yy153-yymsp[0].minor.yy153;}
2944	#line 2969 "pikchr.c"
2945	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2946	break;
2947	case 100: /* expr ::= expr STAR expr */
2948	#line 744 "pikchr.y"
2949	{yylhsminor.yy153=yymsp[-2].minor.yy153*yymsp[0].minor.yy153;}
2950	#line 2975 "pikchr.c"
2951	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2952	break;
2953	case 101: /* expr ::= expr SLASH expr */
2954	#line 745 "pikchr.y"
2955	{
2956	if( yymsp[0].minor.yy153==0.0 ){ pik_error(p, &yymsp[-1].minor.yy0, "division by zero"); yylhsminor.yy153 = 0.0; }
2957	else{ yylhsminor.yy153 = yymsp[-2].minor.yy153/yymsp[0].minor.yy153; }
2958	}
2959	#line 2984 "pikchr.c"
2960	yymsp[-2].minor.yy153 = yylhsminor.yy153;
2961	break;
2962	case 102: /* expr ::= MINUS expr */
2963	#line 749 "pikchr.y"
2964	{yymsp[-1].minor.yy153=-yymsp[0].minor.yy153;}
2965	#line 2990 "pikchr.c"
2966	break;
2967	case 103: /* expr ::= PLUS expr */
2968	#line 750 "pikchr.y"
2969	{yymsp[-1].minor.yy153=yymsp[0].minor.yy153;}
2970	#line 2995 "pikchr.c"
2971	break;
2972	case 104: /* expr ::= LP expr RP */





2973	#line 751 "pikchr.y"
2974	{yymsp[-2].minor.yy153=yymsp[-1].minor.yy153;}
2975	#line 3000 "pikchr.c"
2976	break;
2977	case 105: /* expr ::= LP FILL\|COLOR\|THICKNESS RP */
2978	#line 752 "pikchr.y"
2979	{yymsp[-2].minor.yy153=pik_get_var(p,&yymsp[-1].minor.yy0);}
2980	#line 3005 "pikchr.c"

2981	break;
2982	case 106: /* expr ::= NUMBER */
2983	#line 753 "pikchr.y"
2984	{yylhsminor.yy153=pik_atof(&yymsp[0].minor.yy0);}
2985	#line 3010 "pikchr.c"
2986	yymsp[0].minor.yy153 = yylhsminor.yy153;
2987	break;
2988	case 107: /* expr ::= ID */
2989	#line 754 "pikchr.y"
2990	{yylhsminor.yy153=pik_get_var(p,&yymsp[0].minor.yy0);}
2991	#line 3016 "pikchr.c"
2992	yymsp[0].minor.yy153 = yylhsminor.yy153;
2993	break;
2994	case 108: /* expr ::= FUNC1 LP expr RP */
2995	#line 755 "pikchr.y"
2996	{yylhsminor.yy153 = pik_func(p,&yymsp[-3].minor.yy0,yymsp[-1].minor.yy153,0.0);}
2997	#line 3022 "pikchr.c"
2998	yymsp[-3].minor.yy153 = yylhsminor.yy153;
2999	break;
3000	case 109: /* expr ::= FUNC2 LP expr COMMA expr RP */
3001	#line 756 "pikchr.y"
3002	{yylhsminor.yy153 = pik_func(p,&yymsp[-5].minor.yy0,yymsp[-3].minor.yy153,yymsp[-1].minor.yy153);}
3003	#line 3028 "pikchr.c"
3004	yymsp[-5].minor.yy153 = yylhsminor.yy153;
3005	break;
3006	case 110: /* expr ::= DIST LP position COMMA position RP */
3007	#line 757 "pikchr.y"
3008	{yymsp[-5].minor.yy153 = pik_dist(&yymsp[-3].minor.yy79,&yymsp[-1].minor.yy79);}
3009	#line 3034 "pikchr.c"

3010	break;
3011	case 111: /* expr ::= place2 DOT_XY X */
3012	#line 758 "pikchr.y"
3013	{yylhsminor.yy153 = yymsp[-2].minor.yy79.x;}
3014	#line 3039 "pikchr.c"
3015	yymsp[-2].minor.yy153 = yylhsminor.yy153;
3016	break;
3017	case 112: /* expr ::= place2 DOT_XY Y */


3018	#line 759 "pikchr.y"
3019	{yylhsminor.yy153 = yymsp[-2].minor.yy79.y;}
3020	#line 3045 "pikchr.c"
3021	yymsp[-2].minor.yy153 = yylhsminor.yy153;
3022	break;
3023	case 113: /* expr ::= object DOT_L numproperty */
3024	case 114: /* expr ::= object DOT_L dashproperty */ yytestcase(yyruleno==114);
3025	case 115: /* expr ::= object DOT_L colorproperty */ yytestcase(yyruleno==115);
3026	#line 760 "pikchr.y"
3027	{yylhsminor.yy153=pik_property_of(yymsp[-2].minor.yy36,&yymsp[0].minor.yy0);}
3028	#line 3053 "pikchr.c"
3029	yymsp[-2].minor.yy153 = yylhsminor.yy153;
3030	break;
3031	default:
3032	/* (116) lvalue ::= ID */ yytestcase(yyruleno==116);
3033	/* (117) lvalue ::= FILL */ yytestcase(yyruleno==117);
3034	/* (118) lvalue ::= COLOR */ yytestcase(yyruleno==118);
3035	/* (119) lvalue ::= THICKNESS */ yytestcase(yyruleno==119);
3036	/* (120) rvalue ::= expr */ yytestcase(yyruleno==120);
3037	/* (121) print ::= PRINT */ yytestcase(yyruleno==121);
3038	/* (122) prlist ::= pritem (OPTIMIZED OUT) */ assert(yyruleno!=122);
3039	/* (123) prlist ::= prlist prsep pritem */ yytestcase(yyruleno==123);
3040	/* (124) direction ::= UP */ yytestcase(yyruleno==124);
3041	/* (125) direction ::= DOWN */ yytestcase(yyruleno==125);
3042	/* (126) direction ::= LEFT */ yytestcase(yyruleno==126);
3043	/* (127) direction ::= RIGHT */ yytestcase(yyruleno==127);
3044	/* (128) optrelexpr ::= relexpr (OPTIMIZED OUT) */ assert(yyruleno!=128);
3045	/* (129) attribute_list ::= alist */ yytestcase(yyruleno==129);
3046	/* (130) alist ::= */ yytestcase(yyruleno==130);
3047	/* (131) alist ::= alist attribute */ yytestcase(yyruleno==131);
3048	/* (132) attribute ::= boolproperty (OPTIMIZED OUT) */ assert(yyruleno!=132);
3049	/* (133) attribute ::= WITH withclause */ yytestcase(yyruleno==133);
3050	/* (134) go ::= GO */ yytestcase(yyruleno==134);
3051	/* (135) go ::= */ yytestcase(yyruleno==135);
3052	/* (136) even ::= UNTIL EVEN WITH */ yytestcase(yyruleno==136);
3053	/* (137) even ::= EVEN WITH */ yytestcase(yyruleno==137);
3054	/* (138) dashproperty ::= DOTTED */ yytestcase(yyruleno==138);
3055	/* (139) dashproperty ::= DASHED */ yytestcase(yyruleno==139);
3056	/* (140) colorproperty ::= FILL */ yytestcase(yyruleno==140);
3057	/* (141) colorproperty ::= COLOR */ yytestcase(yyruleno==141);
3058	/* (142) position ::= place */ yytestcase(yyruleno==142);
3059	/* (143) between ::= WAY BETWEEN */ yytestcase(yyruleno==143);
3060	/* (144) between ::= BETWEEN */ yytestcase(yyruleno==144);
3061	/* (145) between ::= OF THE WAY BETWEEN */ yytestcase(yyruleno==145);
3062	/* (146) place ::= place2 */ yytestcase(yyruleno==146);
3063	/* (147) edge ::= CENTER */ yytestcase(yyruleno==147);
3064	/* (148) edge ::= EDGEPT */ yytestcase(yyruleno==148);
3065	/* (149) edge ::= TOP */ yytestcase(yyruleno==149);
3066	/* (150) edge ::= BOTTOM */ yytestcase(yyruleno==150);
3067	/* (151) edge ::= START */ yytestcase(yyruleno==151);
3068	/* (152) edge ::= END */ yytestcase(yyruleno==152);
3069	/* (153) edge ::= RIGHT */ yytestcase(yyruleno==153);
3070	/* (154) edge ::= LEFT */ yytestcase(yyruleno==154);
3071	/* (155) object ::= objectname */ yytestcase(yyruleno==155);
3072	break;
3073	/******** End reduce actions **********************************************/
3074	};
3075	assert( yyruleno<sizeof(yyRuleInfoLhs)/sizeof(yyRuleInfoLhs[0]) );
3076	yygoto = yyRuleInfoLhs[yyruleno];
	@@ -3115,11 +3134,11 @@
3134	pik_error(p, &TOKEN, "syntax error");
3135	}else{
3136	pik_error(p, 0, "syntax error");
3137	}
3138	UNUSED_PARAMETER(yymajor);
3139	#line 3164 "pikchr.c"
3140	/********** End %syntax_error code ****************************************/
3141	pik_parserARG_STORE /* Suppress warning about unused %extra_argument variable */
3142	pik_parserCTX_STORE
3143	}
3144
	@@ -3348,11 +3367,11 @@
3367	#else
3368	(void)iToken;
3369	return 0;
3370	#endif
3371	}
3372	#line 765 "pikchr.y"
3373
3374
3375
3376	/* Chart of the 148 official CSS color names with their
3377	** corresponding RGB values thru Color Module Level 4:
	@@ -5032,11 +5051,11 @@
5051	int i; /* Loop counter */
5052	int iBump = 0; /* Bump the location of the error cursor */
5053	char zLineno[20]; /* Buffer in which to generate line numbers */
5054
5055	iErrPt = (int)(pErr->z - p->sIn.z);
5056	if( iErrPt>=(int)p->sIn.n ){
5057	iErrPt = p->sIn.n-1;
5058	iBump = 1;
5059	}else{
5060	while( iErrPt>0 && (p->sIn.z[iErrPt]=='\n' \|\| p->sIn.z[iErrPt]=='\r') ){
5061	iErrPt--;
	@@ -7095,10 +7114,11 @@
7114	{ "the", 3, T_THE, 0, 0 },
7115	{ "then", 4, T_THEN, 0, 0 },
7116	{ "thick", 5, T_THICK, 0, 0 },
7117	{ "thickness", 9, T_THICKNESS, 0, 0 },
7118	{ "thin", 4, T_THIN, 0, 0 },
7119	{ "this", 4, T_THIS, 0, 0 },
7120	{ "to", 2, T_TO, 0, 0 },
7121	{ "top", 3, T_TOP, 0, CP_N },
7122	{ "until", 5, T_UNTIL, 0, 0 },
7123	{ "up", 2, T_UP, DIR_UP, 0 },
7124	{ "vertex", 6, T_VERTEX, 0, 0 },
	@@ -7744,11 +7764,11 @@
7764	static char readFile(const char zFilename){
7765	FILE *in;
7766	size_t n;
7767	size_t nUsed = 0;
7768	size_t nAlloc = 0;
7769	char z = 0, zNew = 0;
7770	in = strcmp(zFilename,"-")==0 ? stdin : fopen(zFilename, "rb");
7771	if( in==0 ){
7772	fprintf(stderr, "cannot open \"%s\" for reading\n", zFilename);
7773	return 0;
7774	}
	@@ -7940,6 +7960,6 @@
7960
7961
7962	#endif /* PIKCHR_TCL */
7963
7964
7965	#line 7990 "pikchr.c"
7966

M src/wikiformat.c

+10 -7

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -33,10 +33,11 @@
33	33	#define WIKI_LINKSONLY 0x020 /* No markup. Only decorate links */
34	34	#define WIKI_NEWLINE 0x040 /* Honor \n - break lines at each \n */
35	35	#define WIKI_MARKDOWNLINKS 0x080 /* Resolve hyperlinks as in markdown */
36	36	#define WIKI_SAFE 0x100 /* Make the result safe for embedding */
37	37	#define WIKI_TARGET_BLANK 0x200 /* Hyperlinks go to a new window */
	38	+#define WIKI_NOBRACKET 0x400 /* Omit extra [..] around hyperlinks */
38	39	#endif
39	40
40	41
41	42	/*
42	43	** These are the only markup attributes allowed.
		@@ -1279,47 +1280,49 @@
1279	1280	blob_appendf(pOut, "<a href=\"%h\"%s>", zTarget, zExtra);
1280	1281	}else if( zTarget[0]=='#' ){
1281	1282	blob_appendf(pOut, "<a href=\"%h\"%s>", zTarget, zExtra);
1282	1283	}else if( is_valid_hname(zTarget) ){
1283	1284	int isClosed = 0;
	1285	+ const char *zLB = (mFlags & WIKI_NOBRACKET)==0 ? "[" : "";
1284	1286	if( strlen(zTarget)<=HNAME_MAX && is_ticket(zTarget, &isClosed) ){
1285	1287	/* Special display processing for tickets. Display the hyperlink
1286	1288	** as crossed out if the ticket is closed.
1287	1289	*/
1288	1290	if( isClosed ){
1289	1291	if( g.perm.Hyperlink ){
1290	1292	blob_appendf(pOut,
1291		- "%z<span class=\"wikiTagCancelled\">[",
1292		- xhref(zExtraNS,"%R/info/%s",zTarget)
	1293	+ "%z<span class=\"wikiTagCancelled\">%s",
	1294	+ xhref(zExtraNS,"%R/info/%s",zTarget), zLB
1293	1295	);
1294	1296	zTerm = "]</span></a>";
1295	1297	}else{
1296		- blob_appendf(pOut,"<span class=\"wikiTagCancelled\">[");
	1298	+ blob_appendf(pOut,"<span class=\"wikiTagCancelled\">%s", zLB);
1297	1299	zTerm = "]</span>";
1298	1300	}
1299	1301	}else{
1300	1302	if( g.perm.Hyperlink ){
1301		- blob_appendf(pOut,"%z[", xhref(zExtraNS,"%R/info/%s", zTarget));
	1303	+ blob_appendf(pOut,"%z%s", xhref(zExtraNS,"%R/info/%s", zTarget),zLB);
1302	1304	zTerm = "]</a>";
1303	1305	}else{
1304		- blob_appendf(pOut, "[");
	1306	+ blob_appendf(pOut, "%s", zLB);
1305	1307	zTerm = "]";
1306	1308	}
1307	1309	}
1308	1310	}else if( !in_this_repo(zTarget) ){
1309	1311	if( (mFlags & (WIKI_LINKSONLY\|WIKI_NOBADLINKS))!=0 ){
1310	1312	zTerm = "";
1311	1313	}else{
1312		- blob_appendf(pOut, "<span class=\"brokenlink\">[");
	1314	+ blob_appendf(pOut, "<span class=\"brokenlink\">%s", zLB);
1313	1315	zTerm = "]</span>";
1314	1316	}
1315	1317	}else if( g.perm.Hyperlink ){
1316		- blob_appendf(pOut, "%z[",xhref(zExtraNS, "%R/info/%s", zTarget));
	1318	+ blob_appendf(pOut, "%z%s",xhref(zExtraNS, "%R/info/%s", zTarget), zLB);
1317	1319	zTerm = "]</a>";
1318	1320	}else{
1319	1321	zTerm = "";
1320	1322	}
	1323	+ if( zTerm[0]==']' && (mFlags & WIKI_NOBRACKET)!=0 ) zTerm++;
1321	1324	}else if( (zRemote = interwiki_url(zTarget))!=0 ){
1322	1325	blob_appendf(pOut, "<a href=\"%z\"%s>", zRemote, zExtra);
1323	1326	zTerm = "</a>";
1324	1327	}else if( (z = validWikiPageName(mFlags, zTarget))!=0 ){
1325	1328	/* The link is to a valid wiki page name */
1326	1329

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -33,10 +33,11 @@
33	#define WIKI_LINKSONLY 0x020 /* No markup. Only decorate links */
34	#define WIKI_NEWLINE 0x040 /* Honor \n - break lines at each \n */
35	#define WIKI_MARKDOWNLINKS 0x080 /* Resolve hyperlinks as in markdown */
36	#define WIKI_SAFE 0x100 /* Make the result safe for embedding */
37	#define WIKI_TARGET_BLANK 0x200 /* Hyperlinks go to a new window */

38	#endif
39
40
41	/*
42	** These are the only markup attributes allowed.
	@@ -1279,47 +1280,49 @@
1279	blob_appendf(pOut, "<a href=\"%h\"%s>", zTarget, zExtra);
1280	}else if( zTarget[0]=='#' ){
1281	blob_appendf(pOut, "<a href=\"%h\"%s>", zTarget, zExtra);
1282	}else if( is_valid_hname(zTarget) ){
1283	int isClosed = 0;

1284	if( strlen(zTarget)<=HNAME_MAX && is_ticket(zTarget, &isClosed) ){
1285	/* Special display processing for tickets. Display the hyperlink
1286	** as crossed out if the ticket is closed.
1287	*/
1288	if( isClosed ){
1289	if( g.perm.Hyperlink ){
1290	blob_appendf(pOut,
1291	"%z<span class=\"wikiTagCancelled\">[",
1292	xhref(zExtraNS,"%R/info/%s",zTarget)
1293	);
1294	zTerm = "]</span></a>";
1295	}else{
1296	blob_appendf(pOut,"<span class=\"wikiTagCancelled\">[");
1297	zTerm = "]</span>";
1298	}
1299	}else{
1300	if( g.perm.Hyperlink ){
1301	blob_appendf(pOut,"%z[", xhref(zExtraNS,"%R/info/%s", zTarget));
1302	zTerm = "]</a>";
1303	}else{
1304	blob_appendf(pOut, "[");
1305	zTerm = "]";
1306	}
1307	}
1308	}else if( !in_this_repo(zTarget) ){
1309	if( (mFlags & (WIKI_LINKSONLY\|WIKI_NOBADLINKS))!=0 ){
1310	zTerm = "";
1311	}else{
1312	blob_appendf(pOut, "<span class=\"brokenlink\">[");
1313	zTerm = "]</span>";
1314	}
1315	}else if( g.perm.Hyperlink ){
1316	blob_appendf(pOut, "%z[",xhref(zExtraNS, "%R/info/%s", zTarget));
1317	zTerm = "]</a>";
1318	}else{
1319	zTerm = "";
1320	}

1321	}else if( (zRemote = interwiki_url(zTarget))!=0 ){
1322	blob_appendf(pOut, "<a href=\"%z\"%s>", zRemote, zExtra);
1323	zTerm = "</a>";
1324	}else if( (z = validWikiPageName(mFlags, zTarget))!=0 ){
1325	/* The link is to a valid wiki page name */
1326

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -33,10 +33,11 @@
33	#define WIKI_LINKSONLY 0x020 /* No markup. Only decorate links */
34	#define WIKI_NEWLINE 0x040 /* Honor \n - break lines at each \n */
35	#define WIKI_MARKDOWNLINKS 0x080 /* Resolve hyperlinks as in markdown */
36	#define WIKI_SAFE 0x100 /* Make the result safe for embedding */
37	#define WIKI_TARGET_BLANK 0x200 /* Hyperlinks go to a new window */
38	#define WIKI_NOBRACKET 0x400 /* Omit extra [..] around hyperlinks */
39	#endif
40
41
42	/*
43	** These are the only markup attributes allowed.
	@@ -1279,47 +1280,49 @@
1280	blob_appendf(pOut, "<a href=\"%h\"%s>", zTarget, zExtra);
1281	}else if( zTarget[0]=='#' ){
1282	blob_appendf(pOut, "<a href=\"%h\"%s>", zTarget, zExtra);
1283	}else if( is_valid_hname(zTarget) ){
1284	int isClosed = 0;
1285	const char *zLB = (mFlags & WIKI_NOBRACKET)==0 ? "[" : "";
1286	if( strlen(zTarget)<=HNAME_MAX && is_ticket(zTarget, &isClosed) ){
1287	/* Special display processing for tickets. Display the hyperlink
1288	** as crossed out if the ticket is closed.
1289	*/
1290	if( isClosed ){
1291	if( g.perm.Hyperlink ){
1292	blob_appendf(pOut,
1293	"%z<span class=\"wikiTagCancelled\">%s",
1294	xhref(zExtraNS,"%R/info/%s",zTarget), zLB
1295	);
1296	zTerm = "]</span></a>";
1297	}else{
1298	blob_appendf(pOut,"<span class=\"wikiTagCancelled\">%s", zLB);
1299	zTerm = "]</span>";
1300	}
1301	}else{
1302	if( g.perm.Hyperlink ){
1303	blob_appendf(pOut,"%z%s", xhref(zExtraNS,"%R/info/%s", zTarget),zLB);
1304	zTerm = "]</a>";
1305	}else{
1306	blob_appendf(pOut, "%s", zLB);
1307	zTerm = "]";
1308	}
1309	}
1310	}else if( !in_this_repo(zTarget) ){
1311	if( (mFlags & (WIKI_LINKSONLY\|WIKI_NOBADLINKS))!=0 ){
1312	zTerm = "";
1313	}else{
1314	blob_appendf(pOut, "<span class=\"brokenlink\">%s", zLB);
1315	zTerm = "]</span>";
1316	}
1317	}else if( g.perm.Hyperlink ){
1318	blob_appendf(pOut, "%z%s",xhref(zExtraNS, "%R/info/%s", zTarget), zLB);
1319	zTerm = "]</a>";
1320	}else{
1321	zTerm = "";
1322	}
1323	if( zTerm[0]==']' && (mFlags & WIKI_NOBRACKET)!=0 ) zTerm++;
1324	}else if( (zRemote = interwiki_url(zTarget))!=0 ){
1325	blob_appendf(pOut, "<a href=\"%z\"%s>", zRemote, zExtra);
1326	zTerm = "</a>";
1327	}else if( (z = validWikiPageName(mFlags, zTarget))!=0 ){
1328	/* The link is to a valid wiki page name */
1329

M win/Makefile.msc

+722 -425

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -12,13 +12,17 @@
12	12	SRCDIR = $(B)\src
13	13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	14	BUILDDIR = Build
15	15	!message Using default build directory, $(BUILDDIR)
16	16	!endif
	17	+# Top of build/staging/object directory subtree
17	18	T = $(BUILDDIR)
	19	+# Where object and other intermediate binary files will go
18	20	OBJDIR = $(T)
	21	+# Staging area for translated or generated sources
19	22	OX = $(OBJDIR)
	23	+# Extensions for this platform
20	24	O = .obj
21	25	E = .exe
22	26	P = .pdb
23	27
24	28	!ifndef INSTALLDIR
		@@ -37,20 +41,32 @@
37	41	#
38	42	!if !exist("$(B)\.fossil-settings")
39	43	!error Please specify path to project base directory: B="path/to/fossil"
40	44	!endif
41	45
42		-# Create build directory during preprocessing if needed.
	46	+# Create build, object and staging directory during preprocessing if needed.
43	47	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
	48	+!endif
	49	+!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
	50	+!endif
	51	+!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
44	52	!endif
45	53
46	54	# Perl is only necessary if OpenSSL support is enabled and it is built from
47	55	# source code. The PERLDIR environment variable, if it exists, should point
48	56	# to the directory containing the main Perl executable specified here (i.e.
49	57	# "perl.exe").
50		-!ifndef PERL
	58	+!if $(FOSSIL_BUILD_SSL)!=0
	59	+! if !defined(PERL) && [where PERL.exe > nul 2>&1]
	60	+PERL = perl.exe
	61	+!undef PERLDIR
	62	+! elseif !defined(PERL)
	63	+! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
51	64	PERL = perl.exe
	65	+! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
	66	+! endif
	67	+! endif
52	68	!endif
53	69
54	70	# Enable debugging symbols?
55	71	!ifndef DEBUG
56	72	DEBUG = 0
		@@ -199,30 +215,30 @@
199	215	!endif
200	216
201	217	!if $(FOSSIL_ENABLE_WINXP)!=0
202	218	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
203	219	CFLAGS = $(CFLAGS) $(XPCFLAGS)
204		-!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	220	+! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
205	221	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
206		-!else
	222	+! else
207	223	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
208		-!endif
	224	+! endif
209	225	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
210	226	!endif
211	227
212	228	!if $(FOSSIL_DYNAMIC_BUILD)!=0
213		-!if $(DEBUG)!=0
214		-CRTFLAGS = /MDd
215		-!else
216		-CRTFLAGS = /MD
217		-!endif
218		-!else
219		-!if $(DEBUG)!=0
220		-CRTFLAGS = /MTd
221		-!else
222		-CRTFLAGS = /MT
223		-!endif
	229	+! if $(DEBUG)!=0
	230	+CRTFLAGS = /MDd
	231	+! else
	232	+CRTFLAGS = /MD
	233	+! endif
	234	+!else
	235	+! if $(DEBUG)!=0
	236	+CRTFLAGS = /MTd
	237	+! else
	238	+CRTFLAGS = /MT
	239	+! endif
224	240	!endif
225	241
226	242	!if $(DEBUG)!=0
227	243	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
228	244	LDFLAGS = $(LDFLAGS) /DEBUG
		@@ -509,115 +525,117 @@
509	525	"$(OX)\winhttp.c" \
510	526	"$(OX)\xfer.c" \
511	527	"$(OX)\xfersetup.c" \
512	528	"$(OX)\zip.c"
513	529
514		-EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
515		- "$(SRCDIR)\..\skins\ardoise\details.txt" \
516		- "$(SRCDIR)\..\skins\ardoise\footer.txt" \
517		- "$(SRCDIR)\..\skins\ardoise\header.txt" \
518		- "$(SRCDIR)\..\skins\black_and_white\css.txt" \
519		- "$(SRCDIR)\..\skins\black_and_white\details.txt" \
520		- "$(SRCDIR)\..\skins\black_and_white\footer.txt" \
521		- "$(SRCDIR)\..\skins\black_and_white\header.txt" \
522		- "$(SRCDIR)\..\skins\blitz\css.txt" \
523		- "$(SRCDIR)\..\skins\blitz\details.txt" \
524		- "$(SRCDIR)\..\skins\blitz\footer.txt" \
525		- "$(SRCDIR)\..\skins\blitz\header.txt" \
526		- "$(SRCDIR)\..\skins\blitz\ticket.txt" \
527		- "$(SRCDIR)\..\skins\bootstrap\css.txt" \
528		- "$(SRCDIR)\..\skins\bootstrap\details.txt" \
529		- "$(SRCDIR)\..\skins\bootstrap\footer.txt" \
530		- "$(SRCDIR)\..\skins\bootstrap\header.txt" \
531		- "$(SRCDIR)\..\skins\darkmode\css.txt" \
532		- "$(SRCDIR)\..\skins\darkmode\details.txt" \
533		- "$(SRCDIR)\..\skins\darkmode\footer.txt" \
534		- "$(SRCDIR)\..\skins\darkmode\header.txt" \
535		- "$(SRCDIR)\..\skins\default\css.txt" \
536		- "$(SRCDIR)\..\skins\default\details.txt" \
537		- "$(SRCDIR)\..\skins\default\footer.txt" \
538		- "$(SRCDIR)\..\skins\default\header.txt" \
539		- "$(SRCDIR)\..\skins\eagle\css.txt" \
540		- "$(SRCDIR)\..\skins\eagle\details.txt" \
541		- "$(SRCDIR)\..\skins\eagle\footer.txt" \
542		- "$(SRCDIR)\..\skins\eagle\header.txt" \
543		- "$(SRCDIR)\..\skins\khaki\css.txt" \
544		- "$(SRCDIR)\..\skins\khaki\details.txt" \
545		- "$(SRCDIR)\..\skins\khaki\footer.txt" \
546		- "$(SRCDIR)\..\skins\khaki\header.txt" \
547		- "$(SRCDIR)\..\skins\original\css.txt" \
548		- "$(SRCDIR)\..\skins\original\details.txt" \
549		- "$(SRCDIR)\..\skins\original\footer.txt" \
550		- "$(SRCDIR)\..\skins\original\header.txt" \
551		- "$(SRCDIR)\..\skins\plain_gray\css.txt" \
552		- "$(SRCDIR)\..\skins\plain_gray\details.txt" \
553		- "$(SRCDIR)\..\skins\plain_gray\footer.txt" \
554		- "$(SRCDIR)\..\skins\plain_gray\header.txt" \
555		- "$(SRCDIR)\..\skins\xekri\css.txt" \
556		- "$(SRCDIR)\..\skins\xekri\details.txt" \
557		- "$(SRCDIR)\..\skins\xekri\footer.txt" \
558		- "$(SRCDIR)\..\skins\xekri\header.txt" \
559		- "$(SRCDIR)\accordion.js" \
560		- "$(SRCDIR)\alerts\bflat2.wav" \
561		- "$(SRCDIR)\alerts\bflat3.wav" \
562		- "$(SRCDIR)\alerts\bloop.wav" \
563		- "$(SRCDIR)\alerts\plunk.wav" \
564		- "$(SRCDIR)\chat.js" \
565		- "$(SRCDIR)\ci_edit.js" \
566		- "$(SRCDIR)\copybtn.js" \
567		- "$(SRCDIR)\default.css" \
568		- "$(SRCDIR)\diff.tcl" \
569		- "$(SRCDIR)\forum.js" \
570		- "$(SRCDIR)\fossil.bootstrap.js" \
571		- "$(SRCDIR)\fossil.confirmer.js" \
572		- "$(SRCDIR)\fossil.copybutton.js" \
573		- "$(SRCDIR)\fossil.dom.js" \
574		- "$(SRCDIR)\fossil.fetch.js" \
575		- "$(SRCDIR)\fossil.numbered-lines.js" \
576		- "$(SRCDIR)\fossil.page.fileedit.js" \
577		- "$(SRCDIR)\fossil.page.forumpost.js" \
578		- "$(SRCDIR)\fossil.page.pikchrshow.js" \
579		- "$(SRCDIR)\fossil.page.wikiedit.js" \
580		- "$(SRCDIR)\fossil.pikchr.js" \
581		- "$(SRCDIR)\fossil.popupwidget.js" \
582		- "$(SRCDIR)\fossil.storage.js" \
583		- "$(SRCDIR)\fossil.tabs.js" \
584		- "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
585		- "$(SRCDIR)\graph.js" \
586		- "$(SRCDIR)\hbmenu.js" \
587		- "$(SRCDIR)\href.js" \
588		- "$(SRCDIR)\login.js" \
589		- "$(SRCDIR)\markdown.md" \
590		- "$(SRCDIR)\menu.js" \
591		- "$(SRCDIR)\sbsdiff.js" \
592		- "$(SRCDIR)\scroll.js" \
593		- "$(SRCDIR)\skin.js" \
594		- "$(SRCDIR)\sorttable.js" \
595		- "$(SRCDIR)\sounds\0.wav" \
596		- "$(SRCDIR)\sounds\1.wav" \
597		- "$(SRCDIR)\sounds\2.wav" \
598		- "$(SRCDIR)\sounds\3.wav" \
599		- "$(SRCDIR)\sounds\4.wav" \
600		- "$(SRCDIR)\sounds\5.wav" \
601		- "$(SRCDIR)\sounds\6.wav" \
602		- "$(SRCDIR)\sounds\7.wav" \
603		- "$(SRCDIR)\sounds\8.wav" \
604		- "$(SRCDIR)\sounds\9.wav" \
605		- "$(SRCDIR)\sounds\a.wav" \
606		- "$(SRCDIR)\sounds\b.wav" \
607		- "$(SRCDIR)\sounds\c.wav" \
608		- "$(SRCDIR)\sounds\d.wav" \
609		- "$(SRCDIR)\sounds\e.wav" \
610		- "$(SRCDIR)\sounds\f.wav" \
611		- "$(SRCDIR)\style.admin_log.css" \
612		- "$(SRCDIR)\style.fileedit.css" \
613		- "$(SRCDIR)\style.wikiedit.css" \
614		- "$(SRCDIR)\tree.js" \
615		- "$(SRCDIR)\useredit.js" \
616		- "$(SRCDIR)\wiki.wiki"
617		-
618		-OBJ = "$(OX)\add$O" \
	530	+EXTRA_FILES = \
	531	+ "$(SRCDIR)\..\skins\ardoise\css.txt" \
	532	+ "$(SRCDIR)\..\skins\ardoise\details.txt" \
	533	+ "$(SRCDIR)\..\skins\ardoise\footer.txt" \
	534	+ "$(SRCDIR)\..\skins\ardoise\header.txt" \
	535	+ "$(SRCDIR)\..\skins\black_and_white\css.txt" \
	536	+ "$(SRCDIR)\..\skins\black_and_white\details.txt" \
	537	+ "$(SRCDIR)\..\skins\black_and_white\footer.txt" \
	538	+ "$(SRCDIR)\..\skins\black_and_white\header.txt" \
	539	+ "$(SRCDIR)\..\skins\blitz\css.txt" \
	540	+ "$(SRCDIR)\..\skins\blitz\details.txt" \
	541	+ "$(SRCDIR)\..\skins\blitz\footer.txt" \
	542	+ "$(SRCDIR)\..\skins\blitz\header.txt" \
	543	+ "$(SRCDIR)\..\skins\blitz\ticket.txt" \
	544	+ "$(SRCDIR)\..\skins\bootstrap\css.txt" \
	545	+ "$(SRCDIR)\..\skins\bootstrap\details.txt" \
	546	+ "$(SRCDIR)\..\skins\bootstrap\footer.txt" \
	547	+ "$(SRCDIR)\..\skins\bootstrap\header.txt" \
	548	+ "$(SRCDIR)\..\skins\darkmode\css.txt" \
	549	+ "$(SRCDIR)\..\skins\darkmode\details.txt" \
	550	+ "$(SRCDIR)\..\skins\darkmode\footer.txt" \
	551	+ "$(SRCDIR)\..\skins\darkmode\header.txt" \
	552	+ "$(SRCDIR)\..\skins\default\css.txt" \
	553	+ "$(SRCDIR)\..\skins\default\details.txt" \
	554	+ "$(SRCDIR)\..\skins\default\footer.txt" \
	555	+ "$(SRCDIR)\..\skins\default\header.txt" \
	556	+ "$(SRCDIR)\..\skins\eagle\css.txt" \
	557	+ "$(SRCDIR)\..\skins\eagle\details.txt" \
	558	+ "$(SRCDIR)\..\skins\eagle\footer.txt" \
	559	+ "$(SRCDIR)\..\skins\eagle\header.txt" \
	560	+ "$(SRCDIR)\..\skins\khaki\css.txt" \
	561	+ "$(SRCDIR)\..\skins\khaki\details.txt" \
	562	+ "$(SRCDIR)\..\skins\khaki\footer.txt" \
	563	+ "$(SRCDIR)\..\skins\khaki\header.txt" \
	564	+ "$(SRCDIR)\..\skins\original\css.txt" \
	565	+ "$(SRCDIR)\..\skins\original\details.txt" \
	566	+ "$(SRCDIR)\..\skins\original\footer.txt" \
	567	+ "$(SRCDIR)\..\skins\original\header.txt" \
	568	+ "$(SRCDIR)\..\skins\plain_gray\css.txt" \
	569	+ "$(SRCDIR)\..\skins\plain_gray\details.txt" \
	570	+ "$(SRCDIR)\..\skins\plain_gray\footer.txt" \
	571	+ "$(SRCDIR)\..\skins\plain_gray\header.txt" \
	572	+ "$(SRCDIR)\..\skins\xekri\css.txt" \
	573	+ "$(SRCDIR)\..\skins\xekri\details.txt" \
	574	+ "$(SRCDIR)\..\skins\xekri\footer.txt" \
	575	+ "$(SRCDIR)\..\skins\xekri\header.txt" \
	576	+ "$(SRCDIR)\accordion.js" \
	577	+ "$(SRCDIR)\alerts\bflat2.wav" \
	578	+ "$(SRCDIR)\alerts\bflat3.wav" \
	579	+ "$(SRCDIR)\alerts\bloop.wav" \
	580	+ "$(SRCDIR)\alerts\plunk.wav" \
	581	+ "$(SRCDIR)\chat.js" \
	582	+ "$(SRCDIR)\ci_edit.js" \
	583	+ "$(SRCDIR)\copybtn.js" \
	584	+ "$(SRCDIR)\default.css" \
	585	+ "$(SRCDIR)\diff.tcl" \
	586	+ "$(SRCDIR)\forum.js" \
	587	+ "$(SRCDIR)\fossil.bootstrap.js" \
	588	+ "$(SRCDIR)\fossil.confirmer.js" \
	589	+ "$(SRCDIR)\fossil.copybutton.js" \
	590	+ "$(SRCDIR)\fossil.dom.js" \
	591	+ "$(SRCDIR)\fossil.fetch.js" \
	592	+ "$(SRCDIR)\fossil.numbered-lines.js" \
	593	+ "$(SRCDIR)\fossil.page.fileedit.js" \
	594	+ "$(SRCDIR)\fossil.page.forumpost.js" \
	595	+ "$(SRCDIR)\fossil.page.pikchrshow.js" \
	596	+ "$(SRCDIR)\fossil.page.wikiedit.js" \
	597	+ "$(SRCDIR)\fossil.pikchr.js" \
	598	+ "$(SRCDIR)\fossil.popupwidget.js" \
	599	+ "$(SRCDIR)\fossil.storage.js" \
	600	+ "$(SRCDIR)\fossil.tabs.js" \
	601	+ "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
	602	+ "$(SRCDIR)\graph.js" \
	603	+ "$(SRCDIR)\hbmenu.js" \
	604	+ "$(SRCDIR)\href.js" \
	605	+ "$(SRCDIR)\login.js" \
	606	+ "$(SRCDIR)\markdown.md" \
	607	+ "$(SRCDIR)\menu.js" \
	608	+ "$(SRCDIR)\sbsdiff.js" \
	609	+ "$(SRCDIR)\scroll.js" \
	610	+ "$(SRCDIR)\skin.js" \
	611	+ "$(SRCDIR)\sorttable.js" \
	612	+ "$(SRCDIR)\sounds\0.wav" \
	613	+ "$(SRCDIR)\sounds\1.wav" \
	614	+ "$(SRCDIR)\sounds\2.wav" \
	615	+ "$(SRCDIR)\sounds\3.wav" \
	616	+ "$(SRCDIR)\sounds\4.wav" \
	617	+ "$(SRCDIR)\sounds\5.wav" \
	618	+ "$(SRCDIR)\sounds\6.wav" \
	619	+ "$(SRCDIR)\sounds\7.wav" \
	620	+ "$(SRCDIR)\sounds\8.wav" \
	621	+ "$(SRCDIR)\sounds\9.wav" \
	622	+ "$(SRCDIR)\sounds\a.wav" \
	623	+ "$(SRCDIR)\sounds\b.wav" \
	624	+ "$(SRCDIR)\sounds\c.wav" \
	625	+ "$(SRCDIR)\sounds\d.wav" \
	626	+ "$(SRCDIR)\sounds\e.wav" \
	627	+ "$(SRCDIR)\sounds\f.wav" \
	628	+ "$(SRCDIR)\style.admin_log.css" \
	629	+ "$(SRCDIR)\style.fileedit.css" \
	630	+ "$(SRCDIR)\style.wikiedit.css" \
	631	+ "$(SRCDIR)\tree.js" \
	632	+ "$(SRCDIR)\useredit.js" \
	633	+ "$(SRCDIR)\wiki.wiki"
	634	+
	635	+OBJ = \
	636	+ "$(OX)\add$O" \
619	637	"$(OX)\ajax$O" \
620	638	"$(OX)\alerts$O" \
621	639	"$(OX)\allrepo$O" \
622	640	"$(OX)\attach$O" \
623	641	"$(OX)\backlink$O" \
		@@ -766,15 +784,15 @@
766	784	"$(OX)\wikiformat$O" \
767	785	"$(OX)\winfile$O" \
768	786	"$(OX)\winhttp$O" \
769	787	"$(OX)\xfer$O" \
770	788	"$(OX)\xfersetup$O" \
771		- "$(OX)\zip$O" \
	789	+ "$(OX)\zip$O"
772	790	!if $(FOSSIL_ENABLE_MINIZ)!=0
773		- "$(OX)\miniz$O" \
	791	+OBJ = $(OBJ) "$(OX)\miniz$O"
774	792	!endif
775		- "$(OX)\fossil.res"
	793	+OBJ = $(OBJ) "$(OX)\fossil.res"
776	794
777	795
778	796	!ifndef BASEAPPNAME
779	797	BASEAPPNAME = fossil
780	798	!endif
		@@ -781,11 +799,11 @@
781	799
782	800	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
783	801	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
784	802	APPTARGETS =
785	803
786		-all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
	804	+all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
787	805
788	806	$(BASEAPPNAME): "$(APPNAME)"
789	807
790	808	$(BASEAPPNAME)$(E): "$(APPNAME)"
791	809
		@@ -797,55 +815,49 @@
797	815	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
798	816	!if $(DEBUG)!=0
799	817	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
800	818	!endif
801	819
802		-$(OX):
803		- if not exist $@\. mkdir $@
804		-
805		-!if "$(BUILDDIR)"!="$(OX)"
806		-$(BUILDDIR):
807		- if not exist $@\. mkdir $@
808		-!endif
809		-
	820	+ZLIB_X = "$(OX)\zlib_built"
810	821	!if $(FOSSIL_BUILD_ZLIB)
811	822	zlib $(ZLIB_X):
812	823	@echo Building zlib from "$(ZLIBDIR)"...
813	824	!if $(FOSSIL_ENABLE_WINXP)!=0
814	825	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
815	826	!else
816	827	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
817	828	!endif
818		- copy nul $(ZLIB_X)
	829	+ cmd /E:ON /c date /T > $(ZLIB_X)
819	830
820	831	clean-zlib:
821	832	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
822	833	!endif
823	834
824	835	!if $(FOSSIL_ENABLE_SSL)!=0
825	836	OPENSSL_X = "$(OX)\openssl.opts"
826	837	openssl $(OPENSSL_X):
827	838	@echo Building OpenSSL from "$(SSLDIR)"...
828		-!ifdef PERLDIR
	839	+! ifdef PERLDIR
829	840	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
830		-!else
	841	+! else
831	842	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
832		-!endif
833		-!if $(FOSSIL_ENABLE_WINXP)!=0
	843	+! endif
	844	+! if $(FOSSIL_ENABLE_WINXP)!=0
834	845	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
835		-!else
	846	+! else
836	847	@pushd "$(SSLDIR)" && $(MAKE) && popd
837		- echo $(SSLCONFIG) > $(OPENSSL_X)
838		-!endif
	848	+! endif
	849	+ echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
	850	+ cmd /E:ON /c date /T >> $(OPENSSL_X)
839	851
840	852	clean-openssl:
841	853	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
842	854	-del $(OPENSSL_X)
843	855
844		-!if $(FOSSIL_BUILD_SSL)!=0
	856	+! if $(FOSSIL_BUILD_SSL)!=0
845	857	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
846		-!endif
	858	+! endif
847	859
848	860	!endif
849	861
850	862	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
851	863	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
		@@ -1016,30 +1028,15 @@
1016	1028	echo "$(OX)\miniz.obj" >> $@
1017	1029	!endif
1018	1030	echo $(LIBS) >> $@
1019	1031
1020	1032
1021		-# This target gets the project tools built.
1022		-toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1023		-
1024		-"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1025		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026		-
1027		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1028		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029		-
1030		-"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1031		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032		-
1033		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1034		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035		-
1036		-"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1037		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1038		-
1039		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1040		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1033	+{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
	1034	+ $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1035	+
	1036	+# This target gets the project tools built.
	1037	+toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1041	1038
1042	1039	!if $(USE_SEE)!=0
1043	1040	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1044	1041	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1045	1042	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
		@@ -1130,716 +1127,1016 @@
1130	1127	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1131	1128	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1132	1129	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1133	1130
1134	1131	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1135		- echo "$(SRCDIR)\../skins/ardoise/css.txt" > $@
1136		- echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1137		- echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1138		- echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1139		- echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1140		- echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1141		- echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1142		- echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1143		- echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1144		- echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1145		- echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1146		- echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1147		- echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1148		- echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1149		- echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1150		- echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1151		- echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1152		- echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1153		- echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1154		- echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1155		- echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1156		- echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1157		- echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1158		- echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1159		- echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1160		- echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1161		- echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1162		- echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1163		- echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1164		- echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1165		- echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1166		- echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1167		- echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1168		- echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1169		- echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1170		- echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1171		- echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1172		- echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1173		- echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1174		- echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1175		- echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1176		- echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1177		- echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1178		- echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1179		- echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1180		- echo "$(SRCDIR)\accordion.js" >> $@
1181		- echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1182		- echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1183		- echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1184		- echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1185		- echo "$(SRCDIR)\chat.js" >> $@
1186		- echo "$(SRCDIR)\ci_edit.js" >> $@
1187		- echo "$(SRCDIR)\copybtn.js" >> $@
1188		- echo "$(SRCDIR)\default.css" >> $@
1189		- echo "$(SRCDIR)\diff.tcl" >> $@
1190		- echo "$(SRCDIR)\forum.js" >> $@
1191		- echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1192		- echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1193		- echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1194		- echo "$(SRCDIR)\fossil.dom.js" >> $@
1195		- echo "$(SRCDIR)\fossil.fetch.js" >> $@
1196		- echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1197		- echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1198		- echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1199		- echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1200		- echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1201		- echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1202		- echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1203		- echo "$(SRCDIR)\fossil.storage.js" >> $@
1204		- echo "$(SRCDIR)\fossil.tabs.js" >> $@
1205		- echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1206		- echo "$(SRCDIR)\graph.js" >> $@
1207		- echo "$(SRCDIR)\hbmenu.js" >> $@
1208		- echo "$(SRCDIR)\href.js" >> $@
1209		- echo "$(SRCDIR)\login.js" >> $@
1210		- echo "$(SRCDIR)\markdown.md" >> $@
1211		- echo "$(SRCDIR)\menu.js" >> $@
1212		- echo "$(SRCDIR)\sbsdiff.js" >> $@
1213		- echo "$(SRCDIR)\scroll.js" >> $@
1214		- echo "$(SRCDIR)\skin.js" >> $@
1215		- echo "$(SRCDIR)\sorttable.js" >> $@
1216		- echo "$(SRCDIR)\sounds/0.wav" >> $@
1217		- echo "$(SRCDIR)\sounds/1.wav" >> $@
1218		- echo "$(SRCDIR)\sounds/2.wav" >> $@
1219		- echo "$(SRCDIR)\sounds/3.wav" >> $@
1220		- echo "$(SRCDIR)\sounds/4.wav" >> $@
1221		- echo "$(SRCDIR)\sounds/5.wav" >> $@
1222		- echo "$(SRCDIR)\sounds/6.wav" >> $@
1223		- echo "$(SRCDIR)\sounds/7.wav" >> $@
1224		- echo "$(SRCDIR)\sounds/8.wav" >> $@
1225		- echo "$(SRCDIR)\sounds/9.wav" >> $@
1226		- echo "$(SRCDIR)\sounds/a.wav" >> $@
1227		- echo "$(SRCDIR)\sounds/b.wav" >> $@
1228		- echo "$(SRCDIR)\sounds/c.wav" >> $@
1229		- echo "$(SRCDIR)\sounds/d.wav" >> $@
1230		- echo "$(SRCDIR)\sounds/e.wav" >> $@
1231		- echo "$(SRCDIR)\sounds/f.wav" >> $@
1232		- echo "$(SRCDIR)\style.admin_log.css" >> $@
1233		- echo "$(SRCDIR)\style.fileedit.css" >> $@
1234		- echo "$(SRCDIR)\style.wikiedit.css" >> $@
1235		- echo "$(SRCDIR)\tree.js" >> $@
1236		- echo "$(SRCDIR)\useredit.js" >> $@
1237		- echo "$(SRCDIR)\wiki.wiki" >> $@
1238		-
	1132	+ -echo. > $@
	1133	+ @echo "$(SRCDIR)\../skins/ardoise/css.txt" >> $@
	1134	+ @echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
	1135	+ @echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
	1136	+ @echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
	1137	+ @echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
	1138	+ @echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
	1139	+ @echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
	1140	+ @echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
	1141	+ @echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
	1142	+ @echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
	1143	+ @echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
	1144	+ @echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
	1145	+ @echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
	1146	+ @echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
	1147	+ @echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
	1148	+ @echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
	1149	+ @echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
	1150	+ @echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
	1151	+ @echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
	1152	+ @echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
	1153	+ @echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
	1154	+ @echo "$(SRCDIR)\../skins/default/css.txt" >> $@
	1155	+ @echo "$(SRCDIR)\../skins/default/details.txt" >> $@
	1156	+ @echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
	1157	+ @echo "$(SRCDIR)\../skins/default/header.txt" >> $@
	1158	+ @echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
	1159	+ @echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
	1160	+ @echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
	1161	+ @echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
	1162	+ @echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
	1163	+ @echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
	1164	+ @echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
	1165	+ @echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
	1166	+ @echo "$(SRCDIR)\../skins/original/css.txt" >> $@
	1167	+ @echo "$(SRCDIR)\../skins/original/details.txt" >> $@
	1168	+ @echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
	1169	+ @echo "$(SRCDIR)\../skins/original/header.txt" >> $@
	1170	+ @echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
	1171	+ @echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
	1172	+ @echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
	1173	+ @echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
	1174	+ @echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
	1175	+ @echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
	1176	+ @echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
	1177	+ @echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
	1178	+ @echo "$(SRCDIR)\accordion.js" >> $@
	1179	+ @echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
	1180	+ @echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
	1181	+ @echo "$(SRCDIR)\alerts/bloop.wav" >> $@
	1182	+ @echo "$(SRCDIR)\alerts/plunk.wav" >> $@
	1183	+ @echo "$(SRCDIR)\chat.js" >> $@
	1184	+ @echo "$(SRCDIR)\ci_edit.js" >> $@
	1185	+ @echo "$(SRCDIR)\copybtn.js" >> $@
	1186	+ @echo "$(SRCDIR)\default.css" >> $@
	1187	+ @echo "$(SRCDIR)\diff.tcl" >> $@
	1188	+ @echo "$(SRCDIR)\forum.js" >> $@
	1189	+ @echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
	1190	+ @echo "$(SRCDIR)\fossil.confirmer.js" >> $@
	1191	+ @echo "$(SRCDIR)\fossil.copybutton.js" >> $@
	1192	+ @echo "$(SRCDIR)\fossil.dom.js" >> $@
	1193	+ @echo "$(SRCDIR)\fossil.fetch.js" >> $@
	1194	+ @echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
	1195	+ @echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
	1196	+ @echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
	1197	+ @echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
	1198	+ @echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
	1199	+ @echo "$(SRCDIR)\fossil.pikchr.js" >> $@
	1200	+ @echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
	1201	+ @echo "$(SRCDIR)\fossil.storage.js" >> $@
	1202	+ @echo "$(SRCDIR)\fossil.tabs.js" >> $@
	1203	+ @echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
	1204	+ @echo "$(SRCDIR)\graph.js" >> $@
	1205	+ @echo "$(SRCDIR)\hbmenu.js" >> $@
	1206	+ @echo "$(SRCDIR)\href.js" >> $@
	1207	+ @echo "$(SRCDIR)\login.js" >> $@
	1208	+ @echo "$(SRCDIR)\markdown.md" >> $@
	1209	+ @echo "$(SRCDIR)\menu.js" >> $@
	1210	+ @echo "$(SRCDIR)\sbsdiff.js" >> $@
	1211	+ @echo "$(SRCDIR)\scroll.js" >> $@
	1212	+ @echo "$(SRCDIR)\skin.js" >> $@
	1213	+ @echo "$(SRCDIR)\sorttable.js" >> $@
	1214	+ @echo "$(SRCDIR)\sounds/0.wav" >> $@
	1215	+ @echo "$(SRCDIR)\sounds/1.wav" >> $@
	1216	+ @echo "$(SRCDIR)\sounds/2.wav" >> $@
	1217	+ @echo "$(SRCDIR)\sounds/3.wav" >> $@
	1218	+ @echo "$(SRCDIR)\sounds/4.wav" >> $@
	1219	+ @echo "$(SRCDIR)\sounds/5.wav" >> $@
	1220	+ @echo "$(SRCDIR)\sounds/6.wav" >> $@
	1221	+ @echo "$(SRCDIR)\sounds/7.wav" >> $@
	1222	+ @echo "$(SRCDIR)\sounds/8.wav" >> $@
	1223	+ @echo "$(SRCDIR)\sounds/9.wav" >> $@
	1224	+ @echo "$(SRCDIR)\sounds/a.wav" >> $@
	1225	+ @echo "$(SRCDIR)\sounds/b.wav" >> $@
	1226	+ @echo "$(SRCDIR)\sounds/c.wav" >> $@
	1227	+ @echo "$(SRCDIR)\sounds/d.wav" >> $@
	1228	+ @echo "$(SRCDIR)\sounds/e.wav" >> $@
	1229	+ @echo "$(SRCDIR)\sounds/f.wav" >> $@
	1230	+ @echo "$(SRCDIR)\style.admin_log.css" >> $@
	1231	+ @echo "$(SRCDIR)\style.fileedit.css" >> $@
	1232	+ @echo "$(SRCDIR)\style.wikiedit.css" >> $@
	1233	+ @echo "$(SRCDIR)\tree.js" >> $@
	1234	+ @echo "$(SRCDIR)\useredit.js" >> $@
	1235	+ @echo "$(SRCDIR)\wiki.wiki" >> $@
	1236	+{$(OX)\}.c{$(OX)\}.h:
	1237	+ "$(OBJDIR)\makeheaders$E" $**:$@
1239	1238	{$(SRCDIR)\}.c{$(OX)\}.c:
1240	1239	"$(OBJDIR)\translate$E" $** > $@
1241		-
1242		-{$(OX)}.c{$(OX)}.h :
1243		- "$(OBJDIR)\makeheaders$E" $**:$@
1244		-
1245	1240	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1246	1241	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1247	1242
	1243	+"$(OX)\add.c" : "$(SRCDIR)\add.c"
	1244	+"$(OX)\add.h" : "$(OX)\add.c"
1248	1245	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1249	1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1250	1247
	1248	+"$(OX)\ajax.c" : "$(SRCDIR)\ajax.c"
	1249	+"$(OX)\ajax.h" : "$(OX)\ajax.c"
1251	1250	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1252	1251	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1253	1252
	1253	+"$(OX)\alerts.c" : "$(SRCDIR)\alerts.c"
	1254	+"$(OX)\alerts.h" : "$(OX)\alerts.c"
1254	1255	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1255	1256	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1256	1257
	1258	+"$(OX)\allrepo.c" : "$(SRCDIR)\allrepo.c"
	1259	+"$(OX)\allrepo.h" : "$(OX)\allrepo.c"
1257	1260	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1258	1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1259	1262
	1263	+"$(OX)\attach.c" : "$(SRCDIR)\attach.c"
	1264	+"$(OX)\attach.h" : "$(OX)\attach.c"
1260	1265	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1261	1266	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1262	1267
	1268	+"$(OX)\backlink.c" : "$(SRCDIR)\backlink.c"
	1269	+"$(OX)\backlink.h" : "$(OX)\backlink.c"
1263	1270	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1264	1271	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1265	1272
	1273	+"$(OX)\backoffice.c" : "$(SRCDIR)\backoffice.c"
	1274	+"$(OX)\backoffice.h" : "$(OX)\backoffice.c"
1266	1275	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1267	1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1268	1277
	1278	+"$(OX)\bag.c" : "$(SRCDIR)\bag.c"
	1279	+"$(OX)\bag.h" : "$(OX)\bag.c"
1269	1280	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1270	1281	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1271	1282
	1283	+"$(OX)\bisect.c" : "$(SRCDIR)\bisect.c"
	1284	+"$(OX)\bisect.h" : "$(OX)\bisect.c"
1272	1285	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1273	1286	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1274	1287
	1288	+"$(OX)\blob.c" : "$(SRCDIR)\blob.c"
	1289	+"$(OX)\blob.h" : "$(OX)\blob.c"
1275	1290	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1276	1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1277	1292
	1293	+"$(OX)\branch.c" : "$(SRCDIR)\branch.c"
	1294	+"$(OX)\branch.h" : "$(OX)\branch.c"
1278	1295	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1279	1296	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1280	1297
	1298	+"$(OX)\browse.c" : "$(SRCDIR)\browse.c"
	1299	+"$(OX)\browse.h" : "$(OX)\browse.c"
1281	1300	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1282	1301	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1283	1302
	1303	+"$(OX)\builtin.c" : "$(SRCDIR)\builtin.c"
	1304	+"$(OX)\builtin.h" : "$(OX)\builtin.c"
1284	1305	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1285	1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1286	1307
	1308	+"$(OX)\bundle.c" : "$(SRCDIR)\bundle.c"
	1309	+"$(OX)\bundle.h" : "$(OX)\bundle.c"
1287	1310	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1288	1311	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1289	1312
	1313	+"$(OX)\cache.c" : "$(SRCDIR)\cache.c"
	1314	+"$(OX)\cache.h" : "$(OX)\cache.c"
1290	1315	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1291	1316	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1292	1317
	1318	+"$(OX)\capabilities.c" : "$(SRCDIR)\capabilities.c"
	1319	+"$(OX)\capabilities.h" : "$(OX)\capabilities.c"
1293	1320	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1294	1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1295	1322
	1323	+"$(OX)\captcha.c" : "$(SRCDIR)\captcha.c"
	1324	+"$(OX)\captcha.h" : "$(OX)\captcha.c"
1296	1325	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1297	1326	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1298	1327
	1328	+"$(OX)\cgi.c" : "$(SRCDIR)\cgi.c"
	1329	+"$(OX)\cgi.h" : "$(OX)\cgi.c"
1299	1330	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1300	1331	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1301	1332
	1333	+"$(OX)\chat.c" : "$(SRCDIR)\chat.c"
	1334	+"$(OX)\chat.h" : "$(OX)\chat.c"
1302	1335	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1303	1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1304	1337
	1338	+"$(OX)\checkin.c" : "$(SRCDIR)\checkin.c"
	1339	+"$(OX)\checkin.h" : "$(OX)\checkin.c"
1305	1340	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1306	1341	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1307	1342
	1343	+"$(OX)\checkout.c" : "$(SRCDIR)\checkout.c"
	1344	+"$(OX)\checkout.h" : "$(OX)\checkout.c"
1308	1345	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1309	1346	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1310	1347
	1348	+"$(OX)\clearsign.c" : "$(SRCDIR)\clearsign.c"
	1349	+"$(OX)\clearsign.h" : "$(OX)\clearsign.c"
1311	1350	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1312	1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1313	1352
	1353	+"$(OX)\clone.c" : "$(SRCDIR)\clone.c"
	1354	+"$(OX)\clone.h" : "$(OX)\clone.c"
1314	1355	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1315	1356	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1316	1357
	1358	+"$(OX)\color.c" : "$(SRCDIR)\color.c"
	1359	+"$(OX)\color.h" : "$(OX)\color.c"
1317	1360	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1318	1361	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1319	1362
	1363	+"$(OX)\comformat.c" : "$(SRCDIR)\comformat.c"
	1364	+"$(OX)\comformat.h" : "$(OX)\comformat.c"
1320	1365	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1321	1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1322	1367
	1368	+"$(OX)\configure.c" : "$(SRCDIR)\configure.c"
	1369	+"$(OX)\configure.h" : "$(OX)\configure.c"
1323	1370	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1324	1371	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1325	1372
	1373	+"$(OX)\content.c" : "$(SRCDIR)\content.c"
	1374	+"$(OX)\content.h" : "$(OX)\content.c"
1326	1375	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1327	1376	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1328	1377
	1378	+"$(OX)\cookies.c" : "$(SRCDIR)\cookies.c"
	1379	+"$(OX)\cookies.h" : "$(OX)\cookies.c"
1329	1380	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1330	1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1331	1382
	1383	+"$(OX)\db.c" : "$(SRCDIR)\db.c"
	1384	+"$(OX)\db.h" : "$(OX)\db.c"
1332	1385	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1333	1386	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1334	1387
	1388	+"$(OX)\delta.c" : "$(SRCDIR)\delta.c"
	1389	+"$(OX)\delta.h" : "$(OX)\delta.c"
1335	1390	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1336	1391	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1337	1392
	1393	+"$(OX)\deltacmd.c" : "$(SRCDIR)\deltacmd.c"
	1394	+"$(OX)\deltacmd.h" : "$(OX)\deltacmd.c"
1338	1395	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1339	1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1340	1397
	1398	+"$(OX)\deltafunc.c" : "$(SRCDIR)\deltafunc.c"
	1399	+"$(OX)\deltafunc.h" : "$(OX)\deltafunc.c"
1341	1400	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1342	1401	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1343	1402
	1403	+"$(OX)\descendants.c" : "$(SRCDIR)\descendants.c"
	1404	+"$(OX)\descendants.h" : "$(OX)\descendants.c"
1344	1405	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1345	1406	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1346	1407
	1408	+"$(OX)\diff.c" : "$(SRCDIR)\diff.c"
	1409	+"$(OX)\diff.h" : "$(OX)\diff.c"
1347	1410	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1348	1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1349	1412
	1413	+"$(OX)\diffcmd.c" : "$(SRCDIR)\diffcmd.c"
	1414	+"$(OX)\diffcmd.h" : "$(OX)\diffcmd.c"
1350	1415	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1351	1416	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1352	1417
	1418	+"$(OX)\dispatch.c" : "$(SRCDIR)\dispatch.c"
	1419	+"$(OX)\dispatch.h" : "$(OX)\dispatch.c"
1353	1420	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1354	1421	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1355	1422
	1423	+"$(OX)\doc.c" : "$(SRCDIR)\doc.c"
	1424	+"$(OX)\doc.h" : "$(OX)\doc.c"
1356	1425	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1357	1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1358	1427
	1428	+"$(OX)\encode.c" : "$(SRCDIR)\encode.c"
	1429	+"$(OX)\encode.h" : "$(OX)\encode.c"
1359	1430	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1360	1431	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1361	1432
	1433	+"$(OX)\etag.c" : "$(SRCDIR)\etag.c"
	1434	+"$(OX)\etag.h" : "$(OX)\etag.c"
1362	1435	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1363	1436	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1364	1437
	1438	+"$(OX)\event.c" : "$(SRCDIR)\event.c"
	1439	+"$(OX)\event.h" : "$(OX)\event.c"
1365	1440	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1366	1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1367	1442
	1443	+"$(OX)\export.c" : "$(SRCDIR)\export.c"
	1444	+"$(OX)\export.h" : "$(OX)\export.c"
1368	1445	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1369	1446	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1370	1447
	1448	+"$(OX)\extcgi.c" : "$(SRCDIR)\extcgi.c"
	1449	+"$(OX)\extcgi.h" : "$(OX)\extcgi.c"
1371	1450	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1372	1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1373	1452
	1453	+"$(OX)\file.c" : "$(SRCDIR)\file.c"
	1454	+"$(OX)\file.h" : "$(OX)\file.c"
1374	1455	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1375	1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1376	1457
	1458	+"$(OX)\fileedit.c" : "$(SRCDIR)\fileedit.c"
	1459	+"$(OX)\fileedit.h" : "$(OX)\fileedit.c"
1377	1460	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1378	1461	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1379	1462
	1463	+"$(OX)\finfo.c" : "$(SRCDIR)\finfo.c"
	1464	+"$(OX)\finfo.h" : "$(OX)\finfo.c"
1380	1465	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1381	1466	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1382	1467
	1468	+"$(OX)\foci.c" : "$(SRCDIR)\foci.c"
	1469	+"$(OX)\foci.h" : "$(OX)\foci.c"
1383	1470	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1384	1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1385	1472
	1473	+"$(OX)\forum.c" : "$(SRCDIR)\forum.c"
	1474	+"$(OX)\forum.h" : "$(OX)\forum.c"
1386	1475	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1387	1476	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1388	1477
	1478	+"$(OX)\fshell.c" : "$(SRCDIR)\fshell.c"
	1479	+"$(OX)\fshell.h" : "$(OX)\fshell.c"
1389	1480	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1390	1481	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1391	1482
	1483	+"$(OX)\fusefs.c" : "$(SRCDIR)\fusefs.c"
	1484	+"$(OX)\fusefs.h" : "$(OX)\fusefs.c"
1392	1485	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1393	1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1394	1487
	1488	+"$(OX)\fuzz.c" : "$(SRCDIR)\fuzz.c"
	1489	+"$(OX)\fuzz.h" : "$(OX)\fuzz.c"
1395	1490	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1396	1491	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1397	1492
	1493	+"$(OX)\glob.c" : "$(SRCDIR)\glob.c"
	1494	+"$(OX)\glob.h" : "$(OX)\glob.c"
1398	1495	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1399	1496	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1400	1497
	1498	+"$(OX)\graph.c" : "$(SRCDIR)\graph.c"
	1499	+"$(OX)\graph.h" : "$(OX)\graph.c"
1401	1500	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1402	1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1403	1502
	1503	+"$(OX)\gzip.c" : "$(SRCDIR)\gzip.c"
	1504	+"$(OX)\gzip.h" : "$(OX)\gzip.c"
1404	1505	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1405	1506	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1406	1507
	1508	+"$(OX)\hname.c" : "$(SRCDIR)\hname.c"
	1509	+"$(OX)\hname.h" : "$(OX)\hname.c"
1407	1510	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1408	1511	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1409	1512
	1513	+"$(OX)\hook.c" : "$(SRCDIR)\hook.c"
	1514	+"$(OX)\hook.h" : "$(OX)\hook.c"
1410	1515	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1411	1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1412	1517
	1518	+"$(OX)\http.c" : "$(SRCDIR)\http.c"
	1519	+"$(OX)\http.h" : "$(OX)\http.c"
1413	1520	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1414	1521	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1415	1522
	1523	+"$(OX)\http_socket.c" : "$(SRCDIR)\http_socket.c"
	1524	+"$(OX)\http_socket.h" : "$(OX)\http_socket.c"
1416	1525	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1417	1526	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1418	1527
	1528	+"$(OX)\http_ssl.c" : "$(SRCDIR)\http_ssl.c"
	1529	+"$(OX)\http_ssl.h" : "$(OX)\http_ssl.c"
1419	1530	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1420	1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1421	1532
	1533	+"$(OX)\http_transport.c" : "$(SRCDIR)\http_transport.c"
	1534	+"$(OX)\http_transport.h" : "$(OX)\http_transport.c"
1422	1535	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1423	1536	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1424	1537
	1538	+"$(OX)\import.c" : "$(SRCDIR)\import.c"
	1539	+"$(OX)\import.h" : "$(OX)\import.c"
1425	1540	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1426	1541	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1427	1542
	1543	+"$(OX)\info.c" : "$(SRCDIR)\info.c"
	1544	+"$(OX)\info.h" : "$(OX)\info.c"
1428	1545	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1429	1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1430	1547
	1548	+"$(OX)\interwiki.c" : "$(SRCDIR)\interwiki.c"
	1549	+"$(OX)\interwiki.h" : "$(OX)\interwiki.c"
1431	1550	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1432	1551	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1433	1552
	1553	+"$(OX)\json.c" : "$(SRCDIR)\json.c"
	1554	+"$(OX)\json.h" : "$(OX)\json.c"
1434	1555	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1435	1556	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1436	1557
	1558	+"$(OX)\json_artifact.c" : "$(SRCDIR)\json_artifact.c"
	1559	+"$(OX)\json_artifact.h" : "$(OX)\json_artifact.c"
1437	1560	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1438	1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1439	1562
	1563	+"$(OX)\json_branch.c" : "$(SRCDIR)\json_branch.c"
	1564	+"$(OX)\json_branch.h" : "$(OX)\json_branch.c"
1440	1565	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1441	1566	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1442	1567
	1568	+"$(OX)\json_config.c" : "$(SRCDIR)\json_config.c"
	1569	+"$(OX)\json_config.h" : "$(OX)\json_config.c"
1443	1570	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1444	1571	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1445	1572
	1573	+"$(OX)\json_diff.c" : "$(SRCDIR)\json_diff.c"
	1574	+"$(OX)\json_diff.h" : "$(OX)\json_diff.c"
1446	1575	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1447	1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1448	1577
	1578	+"$(OX)\json_dir.c" : "$(SRCDIR)\json_dir.c"
	1579	+"$(OX)\json_dir.h" : "$(OX)\json_dir.c"
1449	1580	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1450	1581	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1451	1582
	1583	+"$(OX)\json_finfo.c" : "$(SRCDIR)\json_finfo.c"
	1584	+"$(OX)\json_finfo.h" : "$(OX)\json_finfo.c"
1452	1585	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1453	1586	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1454	1587
	1588	+"$(OX)\json_login.c" : "$(SRCDIR)\json_login.c"
	1589	+"$(OX)\json_login.h" : "$(OX)\json_login.c"
1455	1590	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1456	1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1457	1592
	1593	+"$(OX)\json_query.c" : "$(SRCDIR)\json_query.c"
	1594	+"$(OX)\json_query.h" : "$(OX)\json_query.c"
1458	1595	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1459	1596	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1460	1597
	1598	+"$(OX)\json_report.c" : "$(SRCDIR)\json_report.c"
	1599	+"$(OX)\json_report.h" : "$(OX)\json_report.c"
1461	1600	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1462	1601	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1463	1602
	1603	+"$(OX)\json_status.c" : "$(SRCDIR)\json_status.c"
	1604	+"$(OX)\json_status.h" : "$(OX)\json_status.c"
1464	1605	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1465	1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1466	1607
	1608	+"$(OX)\json_tag.c" : "$(SRCDIR)\json_tag.c"
	1609	+"$(OX)\json_tag.h" : "$(OX)\json_tag.c"
1467	1610	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1468	1611	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1469	1612
	1613	+"$(OX)\json_timeline.c" : "$(SRCDIR)\json_timeline.c"
	1614	+"$(OX)\json_timeline.h" : "$(OX)\json_timeline.c"
1470	1615	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1471	1616	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1472	1617
	1618	+"$(OX)\json_user.c" : "$(SRCDIR)\json_user.c"
	1619	+"$(OX)\json_user.h" : "$(OX)\json_user.c"
1473	1620	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1474	1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1475	1622
	1623	+"$(OX)\json_wiki.c" : "$(SRCDIR)\json_wiki.c"
	1624	+"$(OX)\json_wiki.h" : "$(OX)\json_wiki.c"
1476	1625	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1477	1626	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1478	1627
	1628	+"$(OX)\leaf.c" : "$(SRCDIR)\leaf.c"
	1629	+"$(OX)\leaf.h" : "$(OX)\leaf.c"
1479	1630	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1480	1631	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1481	1632
	1633	+"$(OX)\loadctrl.c" : "$(SRCDIR)\loadctrl.c"
	1634	+"$(OX)\loadctrl.h" : "$(OX)\loadctrl.c"
1482	1635	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1483	1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1484	1637
	1638	+"$(OX)\login.c" : "$(SRCDIR)\login.c"
	1639	+"$(OX)\login.h" : "$(OX)\login.c"
1485	1640	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1486	1641	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1487	1642
	1643	+"$(OX)\lookslike.c" : "$(SRCDIR)\lookslike.c"
	1644	+"$(OX)\lookslike.h" : "$(OX)\lookslike.c"
1488	1645	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1489	1646	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1490	1647
	1648	+"$(OX)\main.c" : "$(SRCDIR)\main.c"
	1649	+"$(OX)\main.h" : "$(OX)\main.c"
1491	1650	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1492	1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1493	1652
	1653	+"$(OX)\manifest.c" : "$(SRCDIR)\manifest.c"
	1654	+"$(OX)\manifest.h" : "$(OX)\manifest.c"
1494	1655	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1495	1656	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1496	1657
	1658	+"$(OX)\markdown.c" : "$(SRCDIR)\markdown.c"
	1659	+"$(OX)\markdown.h" : "$(OX)\markdown.c"
1497	1660	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1498	1661	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1499	1662
	1663	+"$(OX)\markdown_html.c" : "$(SRCDIR)\markdown_html.c"
	1664	+"$(OX)\markdown_html.h" : "$(OX)\markdown_html.c"
1500	1665	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1501	1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1502	1667
	1668	+"$(OX)\md5.c" : "$(SRCDIR)\md5.c"
	1669	+"$(OX)\md5.h" : "$(OX)\md5.c"
1503	1670	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1504	1671	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1505	1672
	1673	+"$(OX)\merge.c" : "$(SRCDIR)\merge.c"
	1674	+"$(OX)\merge.h" : "$(OX)\merge.c"
1506	1675	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1507	1676	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1508	1677
	1678	+"$(OX)\merge3.c" : "$(SRCDIR)\merge3.c"
	1679	+"$(OX)\merge3.h" : "$(OX)\merge3.c"
1509	1680	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1510	1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1511	1682
	1683	+"$(OX)\moderate.c" : "$(SRCDIR)\moderate.c"
	1684	+"$(OX)\moderate.h" : "$(OX)\moderate.c"
1512	1685	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1513	1686	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1514	1687
	1688	+"$(OX)\name.c" : "$(SRCDIR)\name.c"
	1689	+"$(OX)\name.h" : "$(OX)\name.c"
1515	1690	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1516	1691	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1517	1692
	1693	+"$(OX)\path.c" : "$(SRCDIR)\path.c"
	1694	+"$(OX)\path.h" : "$(OX)\path.c"
1518	1695	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1519	1696	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1520	1697
	1698	+"$(OX)\piechart.c" : "$(SRCDIR)\piechart.c"
	1699	+"$(OX)\piechart.h" : "$(OX)\piechart.c"
1521	1700	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1522	1701	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1523	1702
	1703	+"$(OX)\pikchr.c" : "$(SRCDIR)\pikchr.c"
	1704	+"$(OX)\pikchr.h" : "$(OX)\pikchr.c"
1524	1705	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1525	1706	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1526	1707
	1708	+"$(OX)\pikchrshow.c" : "$(SRCDIR)\pikchrshow.c"
	1709	+"$(OX)\pikchrshow.h" : "$(OX)\pikchrshow.c"
1527	1710	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1528	1711	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1529	1712
	1713	+"$(OX)\pivot.c" : "$(SRCDIR)\pivot.c"
	1714	+"$(OX)\pivot.h" : "$(OX)\pivot.c"
1530	1715	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1531	1716	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1532	1717
	1718	+"$(OX)\popen.c" : "$(SRCDIR)\popen.c"
	1719	+"$(OX)\popen.h" : "$(OX)\popen.c"
1533	1720	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1534	1721	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1535	1722
	1723	+"$(OX)\pqueue.c" : "$(SRCDIR)\pqueue.c"
	1724	+"$(OX)\pqueue.h" : "$(OX)\pqueue.c"
1536	1725	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1537	1726	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1538	1727
	1728	+"$(OX)\printf.c" : "$(SRCDIR)\printf.c"
	1729	+"$(OX)\printf.h" : "$(OX)\printf.c"
1539	1730	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1540	1731	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1541	1732
	1733	+"$(OX)\publish.c" : "$(SRCDIR)\publish.c"
	1734	+"$(OX)\publish.h" : "$(OX)\publish.c"
1542	1735	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1543	1736	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1544	1737
	1738	+"$(OX)\purge.c" : "$(SRCDIR)\purge.c"
	1739	+"$(OX)\purge.h" : "$(OX)\purge.c"
1545	1740	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1546	1741	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1547	1742
	1743	+"$(OX)\rebuild.c" : "$(SRCDIR)\rebuild.c"
	1744	+"$(OX)\rebuild.h" : "$(OX)\rebuild.c"
1548	1745	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1549	1746	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1550	1747
	1748	+"$(OX)\regexp.c" : "$(SRCDIR)\regexp.c"
	1749	+"$(OX)\regexp.h" : "$(OX)\regexp.c"
1551	1750	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1552	1751	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1553	1752
	1753	+"$(OX)\repolist.c" : "$(SRCDIR)\repolist.c"
	1754	+"$(OX)\repolist.h" : "$(OX)\repolist.c"
1554	1755	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1555	1756	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1556	1757
	1758	+"$(OX)\report.c" : "$(SRCDIR)\report.c"
	1759	+"$(OX)\report.h" : "$(OX)\report.c"
1557	1760	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1558	1761	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1559	1762
	1763	+"$(OX)\rss.c" : "$(SRCDIR)\rss.c"
	1764	+"$(OX)\rss.h" : "$(OX)\rss.c"
1560	1765	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1561	1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1562	1767
	1768	+"$(OX)\schema.c" : "$(SRCDIR)\schema.c"
	1769	+"$(OX)\schema.h" : "$(OX)\schema.c"
1563	1770	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1564	1771	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1565	1772
	1773	+"$(OX)\search.c" : "$(SRCDIR)\search.c"
	1774	+"$(OX)\search.h" : "$(OX)\search.c"
1566	1775	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1567	1776	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1568	1777
	1778	+"$(OX)\security_audit.c" : "$(SRCDIR)\security_audit.c"
	1779	+"$(OX)\security_audit.h" : "$(OX)\security_audit.c"
1569	1780	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1570	1781	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1571	1782
	1783	+"$(OX)\setup.c" : "$(SRCDIR)\setup.c"
	1784	+"$(OX)\setup.h" : "$(OX)\setup.c"
1572	1785	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1573	1786	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1574	1787
	1788	+"$(OX)\setupuser.c" : "$(SRCDIR)\setupuser.c"
	1789	+"$(OX)\setupuser.h" : "$(OX)\setupuser.c"
1575	1790	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1576	1791	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1577	1792
	1793	+"$(OX)\sha1.c" : "$(SRCDIR)\sha1.c"
	1794	+"$(OX)\sha1.h" : "$(OX)\sha1.c"
1578	1795	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1579	1796	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1580	1797
	1798	+"$(OX)\sha1hard.c" : "$(SRCDIR)\sha1hard.c"
	1799	+"$(OX)\sha1hard.h" : "$(OX)\sha1hard.c"
1581	1800	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1582	1801	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1583	1802
	1803	+"$(OX)\sha3.c" : "$(SRCDIR)\sha3.c"
	1804	+"$(OX)\sha3.h" : "$(OX)\sha3.c"
1584	1805	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1585	1806	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1586	1807
	1808	+"$(OX)\shun.c" : "$(SRCDIR)\shun.c"
	1809	+"$(OX)\shun.h" : "$(OX)\shun.c"
1587	1810	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1588	1811	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1589	1812
	1813	+"$(OX)\sitemap.c" : "$(SRCDIR)\sitemap.c"
	1814	+"$(OX)\sitemap.h" : "$(OX)\sitemap.c"
1590	1815	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1591	1816	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1592	1817
	1818	+"$(OX)\skins.c" : "$(SRCDIR)\skins.c"
	1819	+"$(OX)\skins.h" : "$(OX)\skins.c"
1593	1820	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1594	1821	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1595	1822
	1823	+"$(OX)\smtp.c" : "$(SRCDIR)\smtp.c"
	1824	+"$(OX)\smtp.h" : "$(OX)\smtp.c"
1596	1825	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1597	1826	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1598	1827
	1828	+"$(OX)\sqlcmd.c" : "$(SRCDIR)\sqlcmd.c"
	1829	+"$(OX)\sqlcmd.h" : "$(OX)\sqlcmd.c"
1599	1830	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1600	1831	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1601	1832
	1833	+"$(OX)\stash.c" : "$(SRCDIR)\stash.c"
	1834	+"$(OX)\stash.h" : "$(OX)\stash.c"
1602	1835	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1603	1836	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1604	1837
	1838	+"$(OX)\stat.c" : "$(SRCDIR)\stat.c"
	1839	+"$(OX)\stat.h" : "$(OX)\stat.c"
1605	1840	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1606	1841	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1607	1842
	1843	+"$(OX)\statrep.c" : "$(SRCDIR)\statrep.c"
	1844	+"$(OX)\statrep.h" : "$(OX)\statrep.c"
1608	1845	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1609	1846	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1610	1847
	1848	+"$(OX)\style.c" : "$(SRCDIR)\style.c"
	1849	+"$(OX)\style.h" : "$(OX)\style.c"
1611	1850	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1612	1851	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1613	1852
	1853	+"$(OX)\sync.c" : "$(SRCDIR)\sync.c"
	1854	+"$(OX)\sync.h" : "$(OX)\sync.c"
1614	1855	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1615	1856	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1616	1857
	1858	+"$(OX)\tag.c" : "$(SRCDIR)\tag.c"
	1859	+"$(OX)\tag.h" : "$(OX)\tag.c"
1617	1860	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1618	1861	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1619	1862
	1863	+"$(OX)\tar.c" : "$(SRCDIR)\tar.c"
	1864	+"$(OX)\tar.h" : "$(OX)\tar.c"
1620	1865	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1621	1866	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1622	1867
	1868	+"$(OX)\terminal.c" : "$(SRCDIR)\terminal.c"
	1869	+"$(OX)\terminal.h" : "$(OX)\terminal.c"
1623	1870	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1624	1871	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1625	1872
	1873	+"$(OX)\th_main.c" : "$(SRCDIR)\th_main.c"
	1874	+"$(OX)\th_main.h" : "$(OX)\th_main.c"
1626	1875	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1627	1876	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1628	1877
	1878	+"$(OX)\timeline.c" : "$(SRCDIR)\timeline.c"
	1879	+"$(OX)\timeline.h" : "$(OX)\timeline.c"
1629	1880	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1630	1881	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1631	1882
	1883	+"$(OX)\tkt.c" : "$(SRCDIR)\tkt.c"
	1884	+"$(OX)\tkt.h" : "$(OX)\tkt.c"
1632	1885	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1633	1886	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1634	1887
	1888	+"$(OX)\tktsetup.c" : "$(SRCDIR)\tktsetup.c"
	1889	+"$(OX)\tktsetup.h" : "$(OX)\tktsetup.c"
1635	1890	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1636	1891	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1637	1892
	1893	+"$(OX)\undo.c" : "$(SRCDIR)\undo.c"
	1894	+"$(OX)\undo.h" : "$(OX)\undo.c"
1638	1895	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1639	1896	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1640	1897
	1898	+"$(OX)\unicode.c" : "$(SRCDIR)\unicode.c"
	1899	+"$(OX)\unicode.h" : "$(OX)\unicode.c"
1641	1900	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1642	1901	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1643	1902
	1903	+"$(OX)\unversioned.c" : "$(SRCDIR)\unversioned.c"
	1904	+"$(OX)\unversioned.h" : "$(OX)\unversioned.c"
1644	1905	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1645	1906	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1646	1907
	1908	+"$(OX)\update.c" : "$(SRCDIR)\update.c"
	1909	+"$(OX)\update.h" : "$(OX)\update.c"
1647	1910	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1648	1911	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1649	1912
	1913	+"$(OX)\url.c" : "$(SRCDIR)\url.c"
	1914	+"$(OX)\url.h" : "$(OX)\url.c"
1650	1915	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1651	1916	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1652	1917
	1918	+"$(OX)\user.c" : "$(SRCDIR)\user.c"
	1919	+"$(OX)\user.h" : "$(OX)\user.c"
1653	1920	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1654	1921	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1655	1922
	1923	+"$(OX)\utf8.c" : "$(SRCDIR)\utf8.c"
	1924	+"$(OX)\utf8.h" : "$(OX)\utf8.c"
1656	1925	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1657	1926	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1658	1927
	1928	+"$(OX)\util.c" : "$(SRCDIR)\util.c"
	1929	+"$(OX)\util.h" : "$(OX)\util.c"
1659	1930	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1660	1931	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1661	1932
	1933	+"$(OX)\verify.c" : "$(SRCDIR)\verify.c"
	1934	+"$(OX)\verify.h" : "$(OX)\verify.c"
1662	1935	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1663	1936	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1664	1937
	1938	+"$(OX)\vfile.c" : "$(SRCDIR)\vfile.c"
	1939	+"$(OX)\vfile.h" : "$(OX)\vfile.c"
1665	1940	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1666	1941	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1667	1942
	1943	+"$(OX)\webmail.c" : "$(SRCDIR)\webmail.c"
	1944	+"$(OX)\webmail.h" : "$(OX)\webmail.c"
1668	1945	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1669	1946	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1670	1947
	1948	+"$(OX)\wiki.c" : "$(SRCDIR)\wiki.c"
	1949	+"$(OX)\wiki.h" : "$(OX)\wiki.c"
1671	1950	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1672	1951	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1673	1952
	1953	+"$(OX)\wikiformat.c" : "$(SRCDIR)\wikiformat.c"
	1954	+"$(OX)\wikiformat.h" : "$(OX)\wikiformat.c"
1674	1955	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1675	1956	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1676	1957
	1958	+"$(OX)\winfile.c" : "$(SRCDIR)\winfile.c"
	1959	+"$(OX)\winfile.h" : "$(OX)\winfile.c"
1677	1960	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1678	1961	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1679	1962
	1963	+"$(OX)\winhttp.c" : "$(SRCDIR)\winhttp.c"
	1964	+"$(OX)\winhttp.h" : "$(OX)\winhttp.c"
1680	1965	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1681	1966	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1682	1967
	1968	+"$(OX)\xfer.c" : "$(SRCDIR)\xfer.c"
	1969	+"$(OX)\xfer.h" : "$(OX)\xfer.c"
1683	1970	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1684	1971	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1685	1972
	1973	+"$(OX)\xfersetup.c" : "$(SRCDIR)\xfersetup.c"
	1974	+"$(OX)\xfersetup.h" : "$(OX)\xfersetup.c"
1686	1975	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1687	1976	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1688	1977
	1978	+"$(OX)\zip.c" : "$(SRCDIR)\zip.c"
	1979	+"$(OX)\zip.h" : "$(OX)\zip.c"
1689	1980	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1690	1981	$(RCC) /fo $@ $**
1691	1982
1692		-"$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1693		- "$(OBJDIR)\makeheaders$E" "$(OX)\add.c":"$(OX)\add.h" \
1694		- "$(OX)\ajax.c":"$(OX)\ajax.h" \
1695		- "$(OX)\alerts.c":"$(OX)\alerts.h" \
1696		- "$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1697		- "$(OX)\attach.c":"$(OX)\attach.h" \
1698		- "$(OX)\backlink.c":"$(OX)\backlink.h" \
1699		- "$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1700		- "$(OX)\bag.c":"$(OX)\bag.h" \
1701		- "$(OX)\bisect.c":"$(OX)\bisect.h" \
1702		- "$(OX)\blob.c":"$(OX)\blob.h" \
1703		- "$(OX)\branch.c":"$(OX)\branch.h" \
1704		- "$(OX)\browse.c":"$(OX)\browse.h" \
1705		- "$(OX)\builtin.c":"$(OX)\builtin.h" \
1706		- "$(OX)\bundle.c":"$(OX)\bundle.h" \
1707		- "$(OX)\cache.c":"$(OX)\cache.h" \
1708		- "$(OX)\capabilities.c":"$(OX)\capabilities.h" \
1709		- "$(OX)\captcha.c":"$(OX)\captcha.h" \
1710		- "$(OX)\cgi.c":"$(OX)\cgi.h" \
1711		- "$(OX)\chat.c":"$(OX)\chat.h" \
1712		- "$(OX)\checkin.c":"$(OX)\checkin.h" \
1713		- "$(OX)\checkout.c":"$(OX)\checkout.h" \
1714		- "$(OX)\clearsign.c":"$(OX)\clearsign.h" \
1715		- "$(OX)\clone.c":"$(OX)\clone.h" \
1716		- "$(OX)\color.c":"$(OX)\color.h" \
1717		- "$(OX)\comformat.c":"$(OX)\comformat.h" \
1718		- "$(OX)\configure.c":"$(OX)\configure.h" \
1719		- "$(OX)\content.c":"$(OX)\content.h" \
1720		- "$(OX)\cookies.c":"$(OX)\cookies.h" \
1721		- "$(OX)\db.c":"$(OX)\db.h" \
1722		- "$(OX)\delta.c":"$(OX)\delta.h" \
1723		- "$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
1724		- "$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
1725		- "$(OX)\descendants.c":"$(OX)\descendants.h" \
1726		- "$(OX)\diff.c":"$(OX)\diff.h" \
1727		- "$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
1728		- "$(OX)\dispatch.c":"$(OX)\dispatch.h" \
1729		- "$(OX)\doc.c":"$(OX)\doc.h" \
1730		- "$(OX)\encode.c":"$(OX)\encode.h" \
1731		- "$(OX)\etag.c":"$(OX)\etag.h" \
1732		- "$(OX)\event.c":"$(OX)\event.h" \
1733		- "$(OX)\export.c":"$(OX)\export.h" \
1734		- "$(OX)\extcgi.c":"$(OX)\extcgi.h" \
1735		- "$(OX)\file.c":"$(OX)\file.h" \
1736		- "$(OX)\fileedit.c":"$(OX)\fileedit.h" \
1737		- "$(OX)\finfo.c":"$(OX)\finfo.h" \
1738		- "$(OX)\foci.c":"$(OX)\foci.h" \
1739		- "$(OX)\forum.c":"$(OX)\forum.h" \
1740		- "$(OX)\fshell.c":"$(OX)\fshell.h" \
1741		- "$(OX)\fusefs.c":"$(OX)\fusefs.h" \
1742		- "$(OX)\fuzz.c":"$(OX)\fuzz.h" \
1743		- "$(OX)\glob.c":"$(OX)\glob.h" \
1744		- "$(OX)\graph.c":"$(OX)\graph.h" \
1745		- "$(OX)\gzip.c":"$(OX)\gzip.h" \
1746		- "$(OX)\hname.c":"$(OX)\hname.h" \
1747		- "$(OX)\hook.c":"$(OX)\hook.h" \
1748		- "$(OX)\http.c":"$(OX)\http.h" \
1749		- "$(OX)\http_socket.c":"$(OX)\http_socket.h" \
1750		- "$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
1751		- "$(OX)\http_transport.c":"$(OX)\http_transport.h" \
1752		- "$(OX)\import.c":"$(OX)\import.h" \
1753		- "$(OX)\info.c":"$(OX)\info.h" \
1754		- "$(OX)\interwiki.c":"$(OX)\interwiki.h" \
1755		- "$(OX)\json.c":"$(OX)\json.h" \
1756		- "$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
1757		- "$(OX)\json_branch.c":"$(OX)\json_branch.h" \
1758		- "$(OX)\json_config.c":"$(OX)\json_config.h" \
1759		- "$(OX)\json_diff.c":"$(OX)\json_diff.h" \
1760		- "$(OX)\json_dir.c":"$(OX)\json_dir.h" \
1761		- "$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
1762		- "$(OX)\json_login.c":"$(OX)\json_login.h" \
1763		- "$(OX)\json_query.c":"$(OX)\json_query.h" \
1764		- "$(OX)\json_report.c":"$(OX)\json_report.h" \
1765		- "$(OX)\json_status.c":"$(OX)\json_status.h" \
1766		- "$(OX)\json_tag.c":"$(OX)\json_tag.h" \
1767		- "$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
1768		- "$(OX)\json_user.c":"$(OX)\json_user.h" \
1769		- "$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
1770		- "$(OX)\leaf.c":"$(OX)\leaf.h" \
1771		- "$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
1772		- "$(OX)\login.c":"$(OX)\login.h" \
1773		- "$(OX)\lookslike.c":"$(OX)\lookslike.h" \
1774		- "$(OX)\main.c":"$(OX)\main.h" \
1775		- "$(OX)\manifest.c":"$(OX)\manifest.h" \
1776		- "$(OX)\markdown.c":"$(OX)\markdown.h" \
1777		- "$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
1778		- "$(OX)\md5.c":"$(OX)\md5.h" \
1779		- "$(OX)\merge.c":"$(OX)\merge.h" \
1780		- "$(OX)\merge3.c":"$(OX)\merge3.h" \
1781		- "$(OX)\moderate.c":"$(OX)\moderate.h" \
1782		- "$(OX)\name.c":"$(OX)\name.h" \
1783		- "$(OX)\path.c":"$(OX)\path.h" \
1784		- "$(OX)\piechart.c":"$(OX)\piechart.h" \
1785		- "$(OX)\pikchr.c":"$(OX)\pikchr.h" \
1786		- "$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
1787		- "$(OX)\pivot.c":"$(OX)\pivot.h" \
1788		- "$(OX)\popen.c":"$(OX)\popen.h" \
1789		- "$(OX)\pqueue.c":"$(OX)\pqueue.h" \
1790		- "$(OX)\printf.c":"$(OX)\printf.h" \
1791		- "$(OX)\publish.c":"$(OX)\publish.h" \
1792		- "$(OX)\purge.c":"$(OX)\purge.h" \
1793		- "$(OX)\rebuild.c":"$(OX)\rebuild.h" \
1794		- "$(OX)\regexp.c":"$(OX)\regexp.h" \
1795		- "$(OX)\repolist.c":"$(OX)\repolist.h" \
1796		- "$(OX)\report.c":"$(OX)\report.h" \
1797		- "$(OX)\rss.c":"$(OX)\rss.h" \
1798		- "$(OX)\schema.c":"$(OX)\schema.h" \
1799		- "$(OX)\search.c":"$(OX)\search.h" \
1800		- "$(OX)\security_audit.c":"$(OX)\security_audit.h" \
1801		- "$(OX)\setup.c":"$(OX)\setup.h" \
1802		- "$(OX)\setupuser.c":"$(OX)\setupuser.h" \
1803		- "$(OX)\sha1.c":"$(OX)\sha1.h" \
1804		- "$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
1805		- "$(OX)\sha3.c":"$(OX)\sha3.h" \
1806		- "$(OX)\shun.c":"$(OX)\shun.h" \
1807		- "$(OX)\sitemap.c":"$(OX)\sitemap.h" \
1808		- "$(OX)\skins.c":"$(OX)\skins.h" \
1809		- "$(OX)\smtp.c":"$(OX)\smtp.h" \
1810		- "$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
1811		- "$(OX)\stash.c":"$(OX)\stash.h" \
1812		- "$(OX)\stat.c":"$(OX)\stat.h" \
1813		- "$(OX)\statrep.c":"$(OX)\statrep.h" \
1814		- "$(OX)\style.c":"$(OX)\style.h" \
1815		- "$(OX)\sync.c":"$(OX)\sync.h" \
1816		- "$(OX)\tag.c":"$(OX)\tag.h" \
1817		- "$(OX)\tar.c":"$(OX)\tar.h" \
1818		- "$(OX)\terminal.c":"$(OX)\terminal.h" \
1819		- "$(OX)\th_main.c":"$(OX)\th_main.h" \
1820		- "$(OX)\timeline.c":"$(OX)\timeline.h" \
1821		- "$(OX)\tkt.c":"$(OX)\tkt.h" \
1822		- "$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
1823		- "$(OX)\undo.c":"$(OX)\undo.h" \
1824		- "$(OX)\unicode.c":"$(OX)\unicode.h" \
1825		- "$(OX)\unversioned.c":"$(OX)\unversioned.h" \
1826		- "$(OX)\update.c":"$(OX)\update.h" \
1827		- "$(OX)\url.c":"$(OX)\url.h" \
1828		- "$(OX)\user.c":"$(OX)\user.h" \
1829		- "$(OX)\utf8.c":"$(OX)\utf8.h" \
1830		- "$(OX)\util.c":"$(OX)\util.h" \
1831		- "$(OX)\verify.c":"$(OX)\verify.h" \
1832		- "$(OX)\vfile.c":"$(OX)\vfile.h" \
1833		- "$(OX)\webmail.c":"$(OX)\webmail.h" \
1834		- "$(OX)\wiki.c":"$(OX)\wiki.h" \
1835		- "$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
1836		- "$(OX)\winfile.c":"$(OX)\winfile.h" \
1837		- "$(OX)\winhttp.c":"$(OX)\winhttp.h" \
1838		- "$(OX)\xfer.c":"$(OX)\xfer.h" \
1839		- "$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
1840		- "$(OX)\zip.c":"$(OX)\zip.h" \
1841		- "$(SRCDIR)\sqlite3.h" \
1842		- "$(SRCDIR)\th.h" \
1843		- "$(OX)\VERSION.h" \
1844		- "$(SRCDIR)\cson_amalgamation.h"
1845		- @copy /Y nul: $@
	1983	+
	1984	+DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
	1985	+GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
	1986	+
	1987	+!if $(DEPHEADERGEN)==0
	1988	+GEN_HEADERS = $(GEN_HEADERS) \
	1989	+ "$(OX)\add.c":"$(OX)\add.h" \
	1990	+ "$(OX)\ajax.c":"$(OX)\ajax.h" \
	1991	+ "$(OX)\alerts.c":"$(OX)\alerts.h" \
	1992	+ "$(OX)\allrepo.c":"$(OX)\allrepo.h" \
	1993	+ "$(OX)\attach.c":"$(OX)\attach.h" \
	1994	+ "$(OX)\backlink.c":"$(OX)\backlink.h" \
	1995	+ "$(OX)\backoffice.c":"$(OX)\backoffice.h" \
	1996	+ "$(OX)\bag.c":"$(OX)\bag.h" \
	1997	+ "$(OX)\bisect.c":"$(OX)\bisect.h" \
	1998	+ "$(OX)\blob.c":"$(OX)\blob.h" \
	1999	+ "$(OX)\branch.c":"$(OX)\branch.h" \
	2000	+ "$(OX)\browse.c":"$(OX)\browse.h" \
	2001	+ "$(OX)\builtin.c":"$(OX)\builtin.h" \
	2002	+ "$(OX)\bundle.c":"$(OX)\bundle.h" \
	2003	+ "$(OX)\cache.c":"$(OX)\cache.h" \
	2004	+ "$(OX)\capabilities.c":"$(OX)\capabilities.h" \
	2005	+ "$(OX)\captcha.c":"$(OX)\captcha.h" \
	2006	+ "$(OX)\cgi.c":"$(OX)\cgi.h" \
	2007	+ "$(OX)\chat.c":"$(OX)\chat.h" \
	2008	+ "$(OX)\checkin.c":"$(OX)\checkin.h" \
	2009	+ "$(OX)\checkout.c":"$(OX)\checkout.h" \
	2010	+ "$(OX)\clearsign.c":"$(OX)\clearsign.h" \
	2011	+ "$(OX)\clone.c":"$(OX)\clone.h" \
	2012	+ "$(OX)\color.c":"$(OX)\color.h" \
	2013	+ "$(OX)\comformat.c":"$(OX)\comformat.h" \
	2014	+ "$(OX)\configure.c":"$(OX)\configure.h" \
	2015	+ "$(OX)\content.c":"$(OX)\content.h" \
	2016	+ "$(OX)\cookies.c":"$(OX)\cookies.h" \
	2017	+ "$(OX)\db.c":"$(OX)\db.h" \
	2018	+ "$(OX)\delta.c":"$(OX)\delta.h" \
	2019	+ "$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
	2020	+ "$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
	2021	+ "$(OX)\descendants.c":"$(OX)\descendants.h" \
	2022	+ "$(OX)\diff.c":"$(OX)\diff.h" \
	2023	+ "$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
	2024	+ "$(OX)\dispatch.c":"$(OX)\dispatch.h" \
	2025	+ "$(OX)\doc.c":"$(OX)\doc.h" \
	2026	+ "$(OX)\encode.c":"$(OX)\encode.h" \
	2027	+ "$(OX)\etag.c":"$(OX)\etag.h" \
	2028	+ "$(OX)\event.c":"$(OX)\event.h" \
	2029	+ "$(OX)\export.c":"$(OX)\export.h" \
	2030	+ "$(OX)\extcgi.c":"$(OX)\extcgi.h" \
	2031	+ "$(OX)\file.c":"$(OX)\file.h" \
	2032	+ "$(OX)\fileedit.c":"$(OX)\fileedit.h" \
	2033	+ "$(OX)\finfo.c":"$(OX)\finfo.h" \
	2034	+ "$(OX)\foci.c":"$(OX)\foci.h" \
	2035	+ "$(OX)\forum.c":"$(OX)\forum.h" \
	2036	+ "$(OX)\fshell.c":"$(OX)\fshell.h" \
	2037	+ "$(OX)\fusefs.c":"$(OX)\fusefs.h" \
	2038	+ "$(OX)\fuzz.c":"$(OX)\fuzz.h" \
	2039	+ "$(OX)\glob.c":"$(OX)\glob.h" \
	2040	+ "$(OX)\graph.c":"$(OX)\graph.h" \
	2041	+ "$(OX)\gzip.c":"$(OX)\gzip.h" \
	2042	+ "$(OX)\hname.c":"$(OX)\hname.h" \
	2043	+ "$(OX)\hook.c":"$(OX)\hook.h" \
	2044	+ "$(OX)\http.c":"$(OX)\http.h" \
	2045	+ "$(OX)\http_socket.c":"$(OX)\http_socket.h" \
	2046	+ "$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
	2047	+ "$(OX)\http_transport.c":"$(OX)\http_transport.h" \
	2048	+ "$(OX)\import.c":"$(OX)\import.h" \
	2049	+ "$(OX)\info.c":"$(OX)\info.h" \
	2050	+ "$(OX)\interwiki.c":"$(OX)\interwiki.h" \
	2051	+ "$(OX)\json.c":"$(OX)\json.h" \
	2052	+ "$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
	2053	+ "$(OX)\json_branch.c":"$(OX)\json_branch.h" \
	2054	+ "$(OX)\json_config.c":"$(OX)\json_config.h" \
	2055	+ "$(OX)\json_diff.c":"$(OX)\json_diff.h" \
	2056	+ "$(OX)\json_dir.c":"$(OX)\json_dir.h" \
	2057	+ "$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
	2058	+ "$(OX)\json_login.c":"$(OX)\json_login.h" \
	2059	+ "$(OX)\json_query.c":"$(OX)\json_query.h" \
	2060	+ "$(OX)\json_report.c":"$(OX)\json_report.h" \
	2061	+ "$(OX)\json_status.c":"$(OX)\json_status.h" \
	2062	+ "$(OX)\json_tag.c":"$(OX)\json_tag.h" \
	2063	+ "$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
	2064	+ "$(OX)\json_user.c":"$(OX)\json_user.h" \
	2065	+ "$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
	2066	+ "$(OX)\leaf.c":"$(OX)\leaf.h" \
	2067	+ "$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
	2068	+ "$(OX)\login.c":"$(OX)\login.h" \
	2069	+ "$(OX)\lookslike.c":"$(OX)\lookslike.h" \
	2070	+ "$(OX)\main.c":"$(OX)\main.h" \
	2071	+ "$(OX)\manifest.c":"$(OX)\manifest.h" \
	2072	+ "$(OX)\markdown.c":"$(OX)\markdown.h" \
	2073	+ "$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
	2074	+ "$(OX)\md5.c":"$(OX)\md5.h" \
	2075	+ "$(OX)\merge.c":"$(OX)\merge.h" \
	2076	+ "$(OX)\merge3.c":"$(OX)\merge3.h" \
	2077	+ "$(OX)\moderate.c":"$(OX)\moderate.h" \
	2078	+ "$(OX)\name.c":"$(OX)\name.h" \
	2079	+ "$(OX)\path.c":"$(OX)\path.h" \
	2080	+ "$(OX)\piechart.c":"$(OX)\piechart.h" \
	2081	+ "$(OX)\pikchr.c":"$(OX)\pikchr.h" \
	2082	+ "$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
	2083	+ "$(OX)\pivot.c":"$(OX)\pivot.h" \
	2084	+ "$(OX)\popen.c":"$(OX)\popen.h" \
	2085	+ "$(OX)\pqueue.c":"$(OX)\pqueue.h" \
	2086	+ "$(OX)\printf.c":"$(OX)\printf.h" \
	2087	+ "$(OX)\publish.c":"$(OX)\publish.h" \
	2088	+ "$(OX)\purge.c":"$(OX)\purge.h" \
	2089	+ "$(OX)\rebuild.c":"$(OX)\rebuild.h" \
	2090	+ "$(OX)\regexp.c":"$(OX)\regexp.h" \
	2091	+ "$(OX)\repolist.c":"$(OX)\repolist.h" \
	2092	+ "$(OX)\report.c":"$(OX)\report.h" \
	2093	+ "$(OX)\rss.c":"$(OX)\rss.h" \
	2094	+ "$(OX)\schema.c":"$(OX)\schema.h" \
	2095	+ "$(OX)\search.c":"$(OX)\search.h" \
	2096	+ "$(OX)\security_audit.c":"$(OX)\security_audit.h" \
	2097	+ "$(OX)\setup.c":"$(OX)\setup.h" \
	2098	+ "$(OX)\setupuser.c":"$(OX)\setupuser.h" \
	2099	+ "$(OX)\sha1.c":"$(OX)\sha1.h" \
	2100	+ "$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
	2101	+ "$(OX)\sha3.c":"$(OX)\sha3.h" \
	2102	+ "$(OX)\shun.c":"$(OX)\shun.h" \
	2103	+ "$(OX)\sitemap.c":"$(OX)\sitemap.h" \
	2104	+ "$(OX)\skins.c":"$(OX)\skins.h" \
	2105	+ "$(OX)\smtp.c":"$(OX)\smtp.h" \
	2106	+ "$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
	2107	+ "$(OX)\stash.c":"$(OX)\stash.h" \
	2108	+ "$(OX)\stat.c":"$(OX)\stat.h" \
	2109	+ "$(OX)\statrep.c":"$(OX)\statrep.h" \
	2110	+ "$(OX)\style.c":"$(OX)\style.h" \
	2111	+ "$(OX)\sync.c":"$(OX)\sync.h" \
	2112	+ "$(OX)\tag.c":"$(OX)\tag.h" \
	2113	+ "$(OX)\tar.c":"$(OX)\tar.h" \
	2114	+ "$(OX)\terminal.c":"$(OX)\terminal.h" \
	2115	+ "$(OX)\th_main.c":"$(OX)\th_main.h" \
	2116	+ "$(OX)\timeline.c":"$(OX)\timeline.h" \
	2117	+ "$(OX)\tkt.c":"$(OX)\tkt.h" \
	2118	+ "$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
	2119	+ "$(OX)\undo.c":"$(OX)\undo.h" \
	2120	+ "$(OX)\unicode.c":"$(OX)\unicode.h" \
	2121	+ "$(OX)\unversioned.c":"$(OX)\unversioned.h" \
	2122	+ "$(OX)\update.c":"$(OX)\update.h" \
	2123	+ "$(OX)\url.c":"$(OX)\url.h" \
	2124	+ "$(OX)\user.c":"$(OX)\user.h" \
	2125	+ "$(OX)\utf8.c":"$(OX)\utf8.h" \
	2126	+ "$(OX)\util.c":"$(OX)\util.h" \
	2127	+ "$(OX)\verify.c":"$(OX)\verify.h" \
	2128	+ "$(OX)\vfile.c":"$(OX)\vfile.h" \
	2129	+ "$(OX)\webmail.c":"$(OX)\webmail.h" \
	2130	+ "$(OX)\wiki.c":"$(OX)\wiki.h" \
	2131	+ "$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
	2132	+ "$(OX)\winfile.c":"$(OX)\winfile.h" \
	2133	+ "$(OX)\winhttp.c":"$(OX)\winhttp.h" \
	2134	+ "$(OX)\xfer.c":"$(OX)\xfer.h" \
	2135	+ "$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
	2136	+ "$(OX)\zip.c":"$(OX)\zip.h"
	2137	+!endif
	2138	+
	2139	+"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
	2140	+ "$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
	2141	+ @copy /Y NUL $@
	2142	+
1846	2143

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,13 +12,17 @@
12	SRCDIR = $(B)\src
13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	BUILDDIR = Build
15	!message Using default build directory, $(BUILDDIR)
16	!endif

17	T = $(BUILDDIR)

18	OBJDIR = $(T)

19	OX = $(OBJDIR)

20	O = .obj
21	E = .exe
22	P = .pdb
23
24	!ifndef INSTALLDIR
	@@ -37,20 +41,32 @@
37	#
38	!if !exist("$(B)\.fossil-settings")
39	!error Please specify path to project base directory: B="path/to/fossil"
40	!endif
41
42	# Create build directory during preprocessing if needed.
43	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]




44	!endif
45
46	# Perl is only necessary if OpenSSL support is enabled and it is built from
47	# source code. The PERLDIR environment variable, if it exists, should point
48	# to the directory containing the main Perl executable specified here (i.e.
49	# "perl.exe").
50	!ifndef PERL





51	PERL = perl.exe



52	!endif
53
54	# Enable debugging symbols?
55	!ifndef DEBUG
56	DEBUG = 0
	@@ -199,30 +215,30 @@
199	!endif
200
201	!if $(FOSSIL_ENABLE_WINXP)!=0
202	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
203	CFLAGS = $(CFLAGS) $(XPCFLAGS)
204	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
205	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
206	!else
207	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
208	!endif
209	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
210	!endif
211
212	!if $(FOSSIL_DYNAMIC_BUILD)!=0
213	!if $(DEBUG)!=0
214	CRTFLAGS = /MDd
215	!else
216	CRTFLAGS = /MD
217	!endif
218	!else
219	!if $(DEBUG)!=0
220	CRTFLAGS = /MTd
221	!else
222	CRTFLAGS = /MT
223	!endif
224	!endif
225
226	!if $(DEBUG)!=0
227	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
228	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -509,115 +525,117 @@
509	"$(OX)\winhttp.c" \
510	"$(OX)\xfer.c" \
511	"$(OX)\xfersetup.c" \
512	"$(OX)\zip.c"
513
514	EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
515	"$(SRCDIR)\..\skins\ardoise\details.txt" \
516	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
517	"$(SRCDIR)\..\skins\ardoise\header.txt" \
518	"$(SRCDIR)\..\skins\black_and_white\css.txt" \
519	"$(SRCDIR)\..\skins\black_and_white\details.txt" \
520	"$(SRCDIR)\..\skins\black_and_white\footer.txt" \
521	"$(SRCDIR)\..\skins\black_and_white\header.txt" \
522	"$(SRCDIR)\..\skins\blitz\css.txt" \
523	"$(SRCDIR)\..\skins\blitz\details.txt" \
524	"$(SRCDIR)\..\skins\blitz\footer.txt" \
525	"$(SRCDIR)\..\skins\blitz\header.txt" \
526	"$(SRCDIR)\..\skins\blitz\ticket.txt" \
527	"$(SRCDIR)\..\skins\bootstrap\css.txt" \
528	"$(SRCDIR)\..\skins\bootstrap\details.txt" \
529	"$(SRCDIR)\..\skins\bootstrap\footer.txt" \
530	"$(SRCDIR)\..\skins\bootstrap\header.txt" \
531	"$(SRCDIR)\..\skins\darkmode\css.txt" \
532	"$(SRCDIR)\..\skins\darkmode\details.txt" \
533	"$(SRCDIR)\..\skins\darkmode\footer.txt" \
534	"$(SRCDIR)\..\skins\darkmode\header.txt" \
535	"$(SRCDIR)\..\skins\default\css.txt" \
536	"$(SRCDIR)\..\skins\default\details.txt" \
537	"$(SRCDIR)\..\skins\default\footer.txt" \
538	"$(SRCDIR)\..\skins\default\header.txt" \
539	"$(SRCDIR)\..\skins\eagle\css.txt" \
540	"$(SRCDIR)\..\skins\eagle\details.txt" \
541	"$(SRCDIR)\..\skins\eagle\footer.txt" \
542	"$(SRCDIR)\..\skins\eagle\header.txt" \
543	"$(SRCDIR)\..\skins\khaki\css.txt" \
544	"$(SRCDIR)\..\skins\khaki\details.txt" \
545	"$(SRCDIR)\..\skins\khaki\footer.txt" \
546	"$(SRCDIR)\..\skins\khaki\header.txt" \
547	"$(SRCDIR)\..\skins\original\css.txt" \
548	"$(SRCDIR)\..\skins\original\details.txt" \
549	"$(SRCDIR)\..\skins\original\footer.txt" \
550	"$(SRCDIR)\..\skins\original\header.txt" \
551	"$(SRCDIR)\..\skins\plain_gray\css.txt" \
552	"$(SRCDIR)\..\skins\plain_gray\details.txt" \
553	"$(SRCDIR)\..\skins\plain_gray\footer.txt" \
554	"$(SRCDIR)\..\skins\plain_gray\header.txt" \
555	"$(SRCDIR)\..\skins\xekri\css.txt" \
556	"$(SRCDIR)\..\skins\xekri\details.txt" \
557	"$(SRCDIR)\..\skins\xekri\footer.txt" \
558	"$(SRCDIR)\..\skins\xekri\header.txt" \
559	"$(SRCDIR)\accordion.js" \
560	"$(SRCDIR)\alerts\bflat2.wav" \
561	"$(SRCDIR)\alerts\bflat3.wav" \
562	"$(SRCDIR)\alerts\bloop.wav" \
563	"$(SRCDIR)\alerts\plunk.wav" \
564	"$(SRCDIR)\chat.js" \
565	"$(SRCDIR)\ci_edit.js" \
566	"$(SRCDIR)\copybtn.js" \
567	"$(SRCDIR)\default.css" \
568	"$(SRCDIR)\diff.tcl" \
569	"$(SRCDIR)\forum.js" \
570	"$(SRCDIR)\fossil.bootstrap.js" \
571	"$(SRCDIR)\fossil.confirmer.js" \
572	"$(SRCDIR)\fossil.copybutton.js" \
573	"$(SRCDIR)\fossil.dom.js" \
574	"$(SRCDIR)\fossil.fetch.js" \
575	"$(SRCDIR)\fossil.numbered-lines.js" \
576	"$(SRCDIR)\fossil.page.fileedit.js" \
577	"$(SRCDIR)\fossil.page.forumpost.js" \
578	"$(SRCDIR)\fossil.page.pikchrshow.js" \
579	"$(SRCDIR)\fossil.page.wikiedit.js" \
580	"$(SRCDIR)\fossil.pikchr.js" \
581	"$(SRCDIR)\fossil.popupwidget.js" \
582	"$(SRCDIR)\fossil.storage.js" \
583	"$(SRCDIR)\fossil.tabs.js" \
584	"$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
585	"$(SRCDIR)\graph.js" \
586	"$(SRCDIR)\hbmenu.js" \
587	"$(SRCDIR)\href.js" \
588	"$(SRCDIR)\login.js" \
589	"$(SRCDIR)\markdown.md" \
590	"$(SRCDIR)\menu.js" \
591	"$(SRCDIR)\sbsdiff.js" \
592	"$(SRCDIR)\scroll.js" \
593	"$(SRCDIR)\skin.js" \
594	"$(SRCDIR)\sorttable.js" \
595	"$(SRCDIR)\sounds\0.wav" \
596	"$(SRCDIR)\sounds\1.wav" \
597	"$(SRCDIR)\sounds\2.wav" \
598	"$(SRCDIR)\sounds\3.wav" \
599	"$(SRCDIR)\sounds\4.wav" \
600	"$(SRCDIR)\sounds\5.wav" \
601	"$(SRCDIR)\sounds\6.wav" \
602	"$(SRCDIR)\sounds\7.wav" \
603	"$(SRCDIR)\sounds\8.wav" \
604	"$(SRCDIR)\sounds\9.wav" \
605	"$(SRCDIR)\sounds\a.wav" \
606	"$(SRCDIR)\sounds\b.wav" \
607	"$(SRCDIR)\sounds\c.wav" \
608	"$(SRCDIR)\sounds\d.wav" \
609	"$(SRCDIR)\sounds\e.wav" \
610	"$(SRCDIR)\sounds\f.wav" \
611	"$(SRCDIR)\style.admin_log.css" \
612	"$(SRCDIR)\style.fileedit.css" \
613	"$(SRCDIR)\style.wikiedit.css" \
614	"$(SRCDIR)\tree.js" \
615	"$(SRCDIR)\useredit.js" \
616	"$(SRCDIR)\wiki.wiki"
617
618	OBJ = "$(OX)\add$O" \


619	"$(OX)\ajax$O" \
620	"$(OX)\alerts$O" \
621	"$(OX)\allrepo$O" \
622	"$(OX)\attach$O" \
623	"$(OX)\backlink$O" \
	@@ -766,15 +784,15 @@
766	"$(OX)\wikiformat$O" \
767	"$(OX)\winfile$O" \
768	"$(OX)\winhttp$O" \
769	"$(OX)\xfer$O" \
770	"$(OX)\xfersetup$O" \
771	"$(OX)\zip$O" \
772	!if $(FOSSIL_ENABLE_MINIZ)!=0
773	"$(OX)\miniz$O" \
774	!endif
775	"$(OX)\fossil.res"
776
777
778	!ifndef BASEAPPNAME
779	BASEAPPNAME = fossil
780	!endif
	@@ -781,11 +799,11 @@
781
782	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
783	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
784	APPTARGETS =
785
786	all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
787
788	$(BASEAPPNAME): "$(APPNAME)"
789
790	$(BASEAPPNAME)$(E): "$(APPNAME)"
791
	@@ -797,55 +815,49 @@
797	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
798	!if $(DEBUG)!=0
799	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
800	!endif
801
802	$(OX):
803	if not exist $@\. mkdir $@
804
805	!if "$(BUILDDIR)"!="$(OX)"
806	$(BUILDDIR):
807	if not exist $@\. mkdir $@
808	!endif
809
810	!if $(FOSSIL_BUILD_ZLIB)
811	zlib $(ZLIB_X):
812	@echo Building zlib from "$(ZLIBDIR)"...
813	!if $(FOSSIL_ENABLE_WINXP)!=0
814	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
815	!else
816	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
817	!endif
818	copy nul $(ZLIB_X)
819
820	clean-zlib:
821	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
822	!endif
823
824	!if $(FOSSIL_ENABLE_SSL)!=0
825	OPENSSL_X = "$(OX)\openssl.opts"
826	openssl $(OPENSSL_X):
827	@echo Building OpenSSL from "$(SSLDIR)"...
828	!ifdef PERLDIR
829	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
830	!else
831	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
832	!endif
833	!if $(FOSSIL_ENABLE_WINXP)!=0
834	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
835	!else
836	@pushd "$(SSLDIR)" && $(MAKE) && popd
837	echo $(SSLCONFIG) > $(OPENSSL_X)
838	!endif

839
840	clean-openssl:
841	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
842	-del $(OPENSSL_X)
843
844	!if $(FOSSIL_BUILD_SSL)!=0
845	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
846	!endif
847
848	!endif
849
850	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
851	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1016,30 +1028,15 @@
1016	echo "$(OX)\miniz.obj" >> $@
1017	!endif
1018	echo $(LIBS) >> $@
1019
1020
1021	# This target gets the project tools built.
1022	toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1023
1024	"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1025	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026
1027	"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1028	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029
1030	"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1031	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032
1033	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1037	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1038
1039	"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1040	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1041
1042	!if $(USE_SEE)!=0
1043	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1044	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1045	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
	@@ -1130,716 +1127,1016 @@
1130	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1131	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1132	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1133
1134	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1135	echo "$(SRCDIR)\../skins/ardoise/css.txt" > $@
1136	echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1137	echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1138	echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1139	echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1140	echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1141	echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1142	echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1143	echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1144	echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1145	echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1146	echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1147	echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1148	echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1149	echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1150	echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1151	echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1152	echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1153	echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1154	echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1155	echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1156	echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1157	echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1158	echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1159	echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1160	echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1161	echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1162	echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1163	echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1164	echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1165	echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1166	echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1167	echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1168	echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1169	echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1170	echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1171	echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1172	echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1173	echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1174	echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1175	echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1176	echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1177	echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1178	echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1179	echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1180	echo "$(SRCDIR)\accordion.js" >> $@
1181	echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1182	echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1183	echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1184	echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1185	echo "$(SRCDIR)\chat.js" >> $@
1186	echo "$(SRCDIR)\ci_edit.js" >> $@
1187	echo "$(SRCDIR)\copybtn.js" >> $@
1188	echo "$(SRCDIR)\default.css" >> $@
1189	echo "$(SRCDIR)\diff.tcl" >> $@
1190	echo "$(SRCDIR)\forum.js" >> $@
1191	echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1192	echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1193	echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1194	echo "$(SRCDIR)\fossil.dom.js" >> $@
1195	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1196	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1197	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1198	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1199	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1200	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1201	echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1202	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1203	echo "$(SRCDIR)\fossil.storage.js" >> $@
1204	echo "$(SRCDIR)\fossil.tabs.js" >> $@
1205	echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1206	echo "$(SRCDIR)\graph.js" >> $@
1207	echo "$(SRCDIR)\hbmenu.js" >> $@
1208	echo "$(SRCDIR)\href.js" >> $@
1209	echo "$(SRCDIR)\login.js" >> $@
1210	echo "$(SRCDIR)\markdown.md" >> $@
1211	echo "$(SRCDIR)\menu.js" >> $@
1212	echo "$(SRCDIR)\sbsdiff.js" >> $@
1213	echo "$(SRCDIR)\scroll.js" >> $@
1214	echo "$(SRCDIR)\skin.js" >> $@
1215	echo "$(SRCDIR)\sorttable.js" >> $@
1216	echo "$(SRCDIR)\sounds/0.wav" >> $@
1217	echo "$(SRCDIR)\sounds/1.wav" >> $@
1218	echo "$(SRCDIR)\sounds/2.wav" >> $@
1219	echo "$(SRCDIR)\sounds/3.wav" >> $@
1220	echo "$(SRCDIR)\sounds/4.wav" >> $@
1221	echo "$(SRCDIR)\sounds/5.wav" >> $@
1222	echo "$(SRCDIR)\sounds/6.wav" >> $@
1223	echo "$(SRCDIR)\sounds/7.wav" >> $@
1224	echo "$(SRCDIR)\sounds/8.wav" >> $@
1225	echo "$(SRCDIR)\sounds/9.wav" >> $@
1226	echo "$(SRCDIR)\sounds/a.wav" >> $@
1227	echo "$(SRCDIR)\sounds/b.wav" >> $@
1228	echo "$(SRCDIR)\sounds/c.wav" >> $@
1229	echo "$(SRCDIR)\sounds/d.wav" >> $@
1230	echo "$(SRCDIR)\sounds/e.wav" >> $@
1231	echo "$(SRCDIR)\sounds/f.wav" >> $@
1232	echo "$(SRCDIR)\style.admin_log.css" >> $@
1233	echo "$(SRCDIR)\style.fileedit.css" >> $@
1234	echo "$(SRCDIR)\style.wikiedit.css" >> $@
1235	echo "$(SRCDIR)\tree.js" >> $@
1236	echo "$(SRCDIR)\useredit.js" >> $@
1237	echo "$(SRCDIR)\wiki.wiki" >> $@
1238


1239	{$(SRCDIR)\}.c{$(OX)\}.c:
1240	"$(OBJDIR)\translate$E" $** > $@
1241
1242	{$(OX)}.c{$(OX)}.h :
1243	"$(OBJDIR)\makeheaders$E" $**:$@
1244
1245	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1247


1248	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1249	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1250


1251	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1252	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1253


1254	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1255	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1256


1257	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1258	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1259


1260	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1262


1263	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1264	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1265


1266	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1267	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1268


1269	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1270	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1271


1272	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1273	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1274


1275	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1277


1278	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1279	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1280


1281	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1282	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1283


1284	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1285	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1286


1287	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1288	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1289


1290	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1292


1293	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1294	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1295


1296	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1297	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1298


1299	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1300	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1301


1302	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1303	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1304


1305	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1307


1308	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1309	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1310


1311	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1312	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1313


1314	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1315	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1316


1317	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1318	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1319


1320	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1322


1323	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1324	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1325


1326	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1327	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1328


1329	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1330	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1331


1332	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1333	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1334


1335	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1337


1338	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1339	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1340


1341	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1342	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1343


1344	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1345	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1346


1347	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1348	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1349


1350	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1352


1353	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1354	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1355


1356	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1357	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1358


1359	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1360	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1361


1362	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1363	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1364


1365	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1367


1368	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1369	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1370


1371	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1372	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1373


1374	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1375	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1376


1377	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1378	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1379


1380	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1382


1383	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1384	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1385


1386	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1387	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1388


1389	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1390	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1391


1392	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1393	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1394


1395	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1397


1398	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1399	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1400


1401	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1402	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1403


1404	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1405	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1406


1407	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1408	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1409


1410	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1412


1413	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1414	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1415


1416	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1417	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1418


1419	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1420	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1421


1422	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1423	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1424


1425	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1427


1428	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1429	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1430


1431	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1432	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1433


1434	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1435	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1436


1437	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1438	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1439


1440	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1442


1443	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1444	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1445


1446	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1447	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1448


1449	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1450	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1451


1452	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1453	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1454


1455	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1457


1458	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1459	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1460


1461	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1462	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1463


1464	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1465	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1466


1467	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1468	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1469


1470	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1472


1473	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1474	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1475


1476	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1477	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1478


1479	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1480	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1481


1482	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1483	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1484


1485	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1487


1488	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1489	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1490


1491	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1492	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1493


1494	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1495	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1496


1497	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1498	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1499


1500	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1502


1503	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1504	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1505


1506	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1507	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1508


1509	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1510	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1511


1512	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1513	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1514


1515	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1517


1518	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1519	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1520


1521	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1522	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1523


1524	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1525	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1526


1527	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1528	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1529


1530	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1532


1533	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1534	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1535


1536	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1537	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1538


1539	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1540	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1541


1542	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1543	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1544


1545	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1547


1548	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1549	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1550


1551	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1552	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1553


1554	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1555	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1556


1557	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1558	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1559


1560	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1562


1563	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1564	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1565


1566	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1567	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1568


1569	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1570	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1571


1572	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1573	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1574


1575	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1577


1578	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1579	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1580


1581	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1582	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1583


1584	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1585	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1586


1587	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1588	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1589


1590	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1592


1593	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1594	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1595


1596	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1597	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1598


1599	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1600	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1601


1602	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1603	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1604


1605	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1607


1608	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1609	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1610


1611	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1612	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1613


1614	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1615	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1616


1617	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1618	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1619


1620	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1622


1623	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1624	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1625


1626	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1627	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1628


1629	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1630	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1631


1632	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1633	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1634


1635	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1637


1638	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1639	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1640


1641	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1642	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1643


1644	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1645	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1646


1647	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1648	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1649


1650	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1652


1653	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1654	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1655


1656	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1657	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1658


1659	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1660	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1661


1662	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1663	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1664


1665	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1667


1668	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1669	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1670


1671	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1672	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1673


1674	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1675	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1676


1677	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1678	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1679


1680	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1682


1683	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1684	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1685


1686	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1687	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1688


1689	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1690	$(RCC) /fo $@ $**
1691
1692	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1693	"$(OBJDIR)\makeheaders$E" "$(OX)\add.c":"$(OX)\add.h" \
1694	"$(OX)\ajax.c":"$(OX)\ajax.h" \
1695	"$(OX)\alerts.c":"$(OX)\alerts.h" \
1696	"$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1697	"$(OX)\attach.c":"$(OX)\attach.h" \
1698	"$(OX)\backlink.c":"$(OX)\backlink.h" \
1699	"$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1700	"$(OX)\bag.c":"$(OX)\bag.h" \
1701	"$(OX)\bisect.c":"$(OX)\bisect.h" \
1702	"$(OX)\blob.c":"$(OX)\blob.h" \
1703	"$(OX)\branch.c":"$(OX)\branch.h" \
1704	"$(OX)\browse.c":"$(OX)\browse.h" \
1705	"$(OX)\builtin.c":"$(OX)\builtin.h" \
1706	"$(OX)\bundle.c":"$(OX)\bundle.h" \
1707	"$(OX)\cache.c":"$(OX)\cache.h" \
1708	"$(OX)\capabilities.c":"$(OX)\capabilities.h" \
1709	"$(OX)\captcha.c":"$(OX)\captcha.h" \
1710	"$(OX)\cgi.c":"$(OX)\cgi.h" \
1711	"$(OX)\chat.c":"$(OX)\chat.h" \
1712	"$(OX)\checkin.c":"$(OX)\checkin.h" \
1713	"$(OX)\checkout.c":"$(OX)\checkout.h" \
1714	"$(OX)\clearsign.c":"$(OX)\clearsign.h" \
1715	"$(OX)\clone.c":"$(OX)\clone.h" \
1716	"$(OX)\color.c":"$(OX)\color.h" \
1717	"$(OX)\comformat.c":"$(OX)\comformat.h" \
1718	"$(OX)\configure.c":"$(OX)\configure.h" \
1719	"$(OX)\content.c":"$(OX)\content.h" \
1720	"$(OX)\cookies.c":"$(OX)\cookies.h" \
1721	"$(OX)\db.c":"$(OX)\db.h" \
1722	"$(OX)\delta.c":"$(OX)\delta.h" \
1723	"$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
1724	"$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
1725	"$(OX)\descendants.c":"$(OX)\descendants.h" \
1726	"$(OX)\diff.c":"$(OX)\diff.h" \
1727	"$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
1728	"$(OX)\dispatch.c":"$(OX)\dispatch.h" \
1729	"$(OX)\doc.c":"$(OX)\doc.h" \
1730	"$(OX)\encode.c":"$(OX)\encode.h" \
1731	"$(OX)\etag.c":"$(OX)\etag.h" \
1732	"$(OX)\event.c":"$(OX)\event.h" \
1733	"$(OX)\export.c":"$(OX)\export.h" \
1734	"$(OX)\extcgi.c":"$(OX)\extcgi.h" \
1735	"$(OX)\file.c":"$(OX)\file.h" \
1736	"$(OX)\fileedit.c":"$(OX)\fileedit.h" \
1737	"$(OX)\finfo.c":"$(OX)\finfo.h" \
1738	"$(OX)\foci.c":"$(OX)\foci.h" \
1739	"$(OX)\forum.c":"$(OX)\forum.h" \
1740	"$(OX)\fshell.c":"$(OX)\fshell.h" \
1741	"$(OX)\fusefs.c":"$(OX)\fusefs.h" \
1742	"$(OX)\fuzz.c":"$(OX)\fuzz.h" \
1743	"$(OX)\glob.c":"$(OX)\glob.h" \
1744	"$(OX)\graph.c":"$(OX)\graph.h" \
1745	"$(OX)\gzip.c":"$(OX)\gzip.h" \
1746	"$(OX)\hname.c":"$(OX)\hname.h" \
1747	"$(OX)\hook.c":"$(OX)\hook.h" \
1748	"$(OX)\http.c":"$(OX)\http.h" \
1749	"$(OX)\http_socket.c":"$(OX)\http_socket.h" \
1750	"$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
1751	"$(OX)\http_transport.c":"$(OX)\http_transport.h" \
1752	"$(OX)\import.c":"$(OX)\import.h" \
1753	"$(OX)\info.c":"$(OX)\info.h" \
1754	"$(OX)\interwiki.c":"$(OX)\interwiki.h" \
1755	"$(OX)\json.c":"$(OX)\json.h" \
1756	"$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
1757	"$(OX)\json_branch.c":"$(OX)\json_branch.h" \
1758	"$(OX)\json_config.c":"$(OX)\json_config.h" \
1759	"$(OX)\json_diff.c":"$(OX)\json_diff.h" \
1760	"$(OX)\json_dir.c":"$(OX)\json_dir.h" \
1761	"$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
1762	"$(OX)\json_login.c":"$(OX)\json_login.h" \
1763	"$(OX)\json_query.c":"$(OX)\json_query.h" \
1764	"$(OX)\json_report.c":"$(OX)\json_report.h" \
1765	"$(OX)\json_status.c":"$(OX)\json_status.h" \
1766	"$(OX)\json_tag.c":"$(OX)\json_tag.h" \
1767	"$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
1768	"$(OX)\json_user.c":"$(OX)\json_user.h" \
1769	"$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
1770	"$(OX)\leaf.c":"$(OX)\leaf.h" \
1771	"$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
1772	"$(OX)\login.c":"$(OX)\login.h" \
1773	"$(OX)\lookslike.c":"$(OX)\lookslike.h" \
1774	"$(OX)\main.c":"$(OX)\main.h" \
1775	"$(OX)\manifest.c":"$(OX)\manifest.h" \
1776	"$(OX)\markdown.c":"$(OX)\markdown.h" \
1777	"$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
1778	"$(OX)\md5.c":"$(OX)\md5.h" \
1779	"$(OX)\merge.c":"$(OX)\merge.h" \
1780	"$(OX)\merge3.c":"$(OX)\merge3.h" \
1781	"$(OX)\moderate.c":"$(OX)\moderate.h" \
1782	"$(OX)\name.c":"$(OX)\name.h" \
1783	"$(OX)\path.c":"$(OX)\path.h" \
1784	"$(OX)\piechart.c":"$(OX)\piechart.h" \
1785	"$(OX)\pikchr.c":"$(OX)\pikchr.h" \
1786	"$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
1787	"$(OX)\pivot.c":"$(OX)\pivot.h" \
1788	"$(OX)\popen.c":"$(OX)\popen.h" \
1789	"$(OX)\pqueue.c":"$(OX)\pqueue.h" \
1790	"$(OX)\printf.c":"$(OX)\printf.h" \
1791	"$(OX)\publish.c":"$(OX)\publish.h" \
1792	"$(OX)\purge.c":"$(OX)\purge.h" \
1793	"$(OX)\rebuild.c":"$(OX)\rebuild.h" \
1794	"$(OX)\regexp.c":"$(OX)\regexp.h" \
1795	"$(OX)\repolist.c":"$(OX)\repolist.h" \
1796	"$(OX)\report.c":"$(OX)\report.h" \
1797	"$(OX)\rss.c":"$(OX)\rss.h" \
1798	"$(OX)\schema.c":"$(OX)\schema.h" \
1799	"$(OX)\search.c":"$(OX)\search.h" \
1800	"$(OX)\security_audit.c":"$(OX)\security_audit.h" \
1801	"$(OX)\setup.c":"$(OX)\setup.h" \
1802	"$(OX)\setupuser.c":"$(OX)\setupuser.h" \
1803	"$(OX)\sha1.c":"$(OX)\sha1.h" \
1804	"$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
1805	"$(OX)\sha3.c":"$(OX)\sha3.h" \
1806	"$(OX)\shun.c":"$(OX)\shun.h" \
1807	"$(OX)\sitemap.c":"$(OX)\sitemap.h" \
1808	"$(OX)\skins.c":"$(OX)\skins.h" \
1809	"$(OX)\smtp.c":"$(OX)\smtp.h" \
1810	"$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
1811	"$(OX)\stash.c":"$(OX)\stash.h" \
1812	"$(OX)\stat.c":"$(OX)\stat.h" \
1813	"$(OX)\statrep.c":"$(OX)\statrep.h" \
1814	"$(OX)\style.c":"$(OX)\style.h" \
1815	"$(OX)\sync.c":"$(OX)\sync.h" \
1816	"$(OX)\tag.c":"$(OX)\tag.h" \
1817	"$(OX)\tar.c":"$(OX)\tar.h" \
1818	"$(OX)\terminal.c":"$(OX)\terminal.h" \
1819	"$(OX)\th_main.c":"$(OX)\th_main.h" \
1820	"$(OX)\timeline.c":"$(OX)\timeline.h" \
1821	"$(OX)\tkt.c":"$(OX)\tkt.h" \
1822	"$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
1823	"$(OX)\undo.c":"$(OX)\undo.h" \
1824	"$(OX)\unicode.c":"$(OX)\unicode.h" \
1825	"$(OX)\unversioned.c":"$(OX)\unversioned.h" \
1826	"$(OX)\update.c":"$(OX)\update.h" \
1827	"$(OX)\url.c":"$(OX)\url.h" \
1828	"$(OX)\user.c":"$(OX)\user.h" \
1829	"$(OX)\utf8.c":"$(OX)\utf8.h" \
1830	"$(OX)\util.c":"$(OX)\util.h" \
1831	"$(OX)\verify.c":"$(OX)\verify.h" \
1832	"$(OX)\vfile.c":"$(OX)\vfile.h" \
1833	"$(OX)\webmail.c":"$(OX)\webmail.h" \
1834	"$(OX)\wiki.c":"$(OX)\wiki.h" \
1835	"$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
1836	"$(OX)\winfile.c":"$(OX)\winfile.h" \
1837	"$(OX)\winhttp.c":"$(OX)\winhttp.h" \
1838	"$(OX)\xfer.c":"$(OX)\xfer.h" \
1839	"$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
1840	"$(OX)\zip.c":"$(OX)\zip.h" \
1841	"$(SRCDIR)\sqlite3.h" \
1842	"$(SRCDIR)\th.h" \
1843	"$(OX)\VERSION.h" \
1844	"$(SRCDIR)\cson_amalgamation.h"
1845	@copy /Y nul: $@






1846

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,13 +12,17 @@
12	SRCDIR = $(B)\src
13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	BUILDDIR = Build
15	!message Using default build directory, $(BUILDDIR)
16	!endif
17	# Top of build/staging/object directory subtree
18	T = $(BUILDDIR)
19	# Where object and other intermediate binary files will go
20	OBJDIR = $(T)
21	# Staging area for translated or generated sources
22	OX = $(OBJDIR)
23	# Extensions for this platform
24	O = .obj
25	E = .exe
26	P = .pdb
27
28	!ifndef INSTALLDIR
	@@ -37,20 +41,32 @@
41	#
42	!if !exist("$(B)\.fossil-settings")
43	!error Please specify path to project base directory: B="path/to/fossil"
44	!endif
45
46	# Create build, object and staging directory during preprocessing if needed.
47	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
48	!endif
49	!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
50	!endif
51	!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
52	!endif
53
54	# Perl is only necessary if OpenSSL support is enabled and it is built from
55	# source code. The PERLDIR environment variable, if it exists, should point
56	# to the directory containing the main Perl executable specified here (i.e.
57	# "perl.exe").
58	!if $(FOSSIL_BUILD_SSL)!=0
59	! if !defined(PERL) && [where PERL.exe > nul 2>&1]
60	PERL = perl.exe
61	!undef PERLDIR
62	! elseif !defined(PERL)
63	! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
64	PERL = perl.exe
65	! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
66	! endif
67	! endif
68	!endif
69
70	# Enable debugging symbols?
71	!ifndef DEBUG
72	DEBUG = 0
	@@ -199,30 +215,30 @@
215	!endif
216
217	!if $(FOSSIL_ENABLE_WINXP)!=0
218	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
219	CFLAGS = $(CFLAGS) $(XPCFLAGS)
220	! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
221	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
222	! else
223	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
224	! endif
225	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
226	!endif
227
228	!if $(FOSSIL_DYNAMIC_BUILD)!=0
229	! if $(DEBUG)!=0
230	CRTFLAGS = /MDd
231	! else
232	CRTFLAGS = /MD
233	! endif
234	!else
235	! if $(DEBUG)!=0
236	CRTFLAGS = /MTd
237	! else
238	CRTFLAGS = /MT
239	! endif
240	!endif
241
242	!if $(DEBUG)!=0
243	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
244	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -509,115 +525,117 @@
525	"$(OX)\winhttp.c" \
526	"$(OX)\xfer.c" \
527	"$(OX)\xfersetup.c" \
528	"$(OX)\zip.c"
529
530	EXTRA_FILES = \
531	"$(SRCDIR)\..\skins\ardoise\css.txt" \
532	"$(SRCDIR)\..\skins\ardoise\details.txt" \
533	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
534	"$(SRCDIR)\..\skins\ardoise\header.txt" \
535	"$(SRCDIR)\..\skins\black_and_white\css.txt" \
536	"$(SRCDIR)\..\skins\black_and_white\details.txt" \
537	"$(SRCDIR)\..\skins\black_and_white\footer.txt" \
538	"$(SRCDIR)\..\skins\black_and_white\header.txt" \
539	"$(SRCDIR)\..\skins\blitz\css.txt" \
540	"$(SRCDIR)\..\skins\blitz\details.txt" \
541	"$(SRCDIR)\..\skins\blitz\footer.txt" \
542	"$(SRCDIR)\..\skins\blitz\header.txt" \
543	"$(SRCDIR)\..\skins\blitz\ticket.txt" \
544	"$(SRCDIR)\..\skins\bootstrap\css.txt" \
545	"$(SRCDIR)\..\skins\bootstrap\details.txt" \
546	"$(SRCDIR)\..\skins\bootstrap\footer.txt" \
547	"$(SRCDIR)\..\skins\bootstrap\header.txt" \
548	"$(SRCDIR)\..\skins\darkmode\css.txt" \
549	"$(SRCDIR)\..\skins\darkmode\details.txt" \
550	"$(SRCDIR)\..\skins\darkmode\footer.txt" \
551	"$(SRCDIR)\..\skins\darkmode\header.txt" \
552	"$(SRCDIR)\..\skins\default\css.txt" \
553	"$(SRCDIR)\..\skins\default\details.txt" \
554	"$(SRCDIR)\..\skins\default\footer.txt" \
555	"$(SRCDIR)\..\skins\default\header.txt" \
556	"$(SRCDIR)\..\skins\eagle\css.txt" \
557	"$(SRCDIR)\..\skins\eagle\details.txt" \
558	"$(SRCDIR)\..\skins\eagle\footer.txt" \
559	"$(SRCDIR)\..\skins\eagle\header.txt" \
560	"$(SRCDIR)\..\skins\khaki\css.txt" \
561	"$(SRCDIR)\..\skins\khaki\details.txt" \
562	"$(SRCDIR)\..\skins\khaki\footer.txt" \
563	"$(SRCDIR)\..\skins\khaki\header.txt" \
564	"$(SRCDIR)\..\skins\original\css.txt" \
565	"$(SRCDIR)\..\skins\original\details.txt" \
566	"$(SRCDIR)\..\skins\original\footer.txt" \
567	"$(SRCDIR)\..\skins\original\header.txt" \
568	"$(SRCDIR)\..\skins\plain_gray\css.txt" \
569	"$(SRCDIR)\..\skins\plain_gray\details.txt" \
570	"$(SRCDIR)\..\skins\plain_gray\footer.txt" \
571	"$(SRCDIR)\..\skins\plain_gray\header.txt" \
572	"$(SRCDIR)\..\skins\xekri\css.txt" \
573	"$(SRCDIR)\..\skins\xekri\details.txt" \
574	"$(SRCDIR)\..\skins\xekri\footer.txt" \
575	"$(SRCDIR)\..\skins\xekri\header.txt" \
576	"$(SRCDIR)\accordion.js" \
577	"$(SRCDIR)\alerts\bflat2.wav" \
578	"$(SRCDIR)\alerts\bflat3.wav" \
579	"$(SRCDIR)\alerts\bloop.wav" \
580	"$(SRCDIR)\alerts\plunk.wav" \
581	"$(SRCDIR)\chat.js" \
582	"$(SRCDIR)\ci_edit.js" \
583	"$(SRCDIR)\copybtn.js" \
584	"$(SRCDIR)\default.css" \
585	"$(SRCDIR)\diff.tcl" \
586	"$(SRCDIR)\forum.js" \
587	"$(SRCDIR)\fossil.bootstrap.js" \
588	"$(SRCDIR)\fossil.confirmer.js" \
589	"$(SRCDIR)\fossil.copybutton.js" \
590	"$(SRCDIR)\fossil.dom.js" \
591	"$(SRCDIR)\fossil.fetch.js" \
592	"$(SRCDIR)\fossil.numbered-lines.js" \
593	"$(SRCDIR)\fossil.page.fileedit.js" \
594	"$(SRCDIR)\fossil.page.forumpost.js" \
595	"$(SRCDIR)\fossil.page.pikchrshow.js" \
596	"$(SRCDIR)\fossil.page.wikiedit.js" \
597	"$(SRCDIR)\fossil.pikchr.js" \
598	"$(SRCDIR)\fossil.popupwidget.js" \
599	"$(SRCDIR)\fossil.storage.js" \
600	"$(SRCDIR)\fossil.tabs.js" \
601	"$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
602	"$(SRCDIR)\graph.js" \
603	"$(SRCDIR)\hbmenu.js" \
604	"$(SRCDIR)\href.js" \
605	"$(SRCDIR)\login.js" \
606	"$(SRCDIR)\markdown.md" \
607	"$(SRCDIR)\menu.js" \
608	"$(SRCDIR)\sbsdiff.js" \
609	"$(SRCDIR)\scroll.js" \
610	"$(SRCDIR)\skin.js" \
611	"$(SRCDIR)\sorttable.js" \
612	"$(SRCDIR)\sounds\0.wav" \
613	"$(SRCDIR)\sounds\1.wav" \
614	"$(SRCDIR)\sounds\2.wav" \
615	"$(SRCDIR)\sounds\3.wav" \
616	"$(SRCDIR)\sounds\4.wav" \
617	"$(SRCDIR)\sounds\5.wav" \
618	"$(SRCDIR)\sounds\6.wav" \
619	"$(SRCDIR)\sounds\7.wav" \
620	"$(SRCDIR)\sounds\8.wav" \
621	"$(SRCDIR)\sounds\9.wav" \
622	"$(SRCDIR)\sounds\a.wav" \
623	"$(SRCDIR)\sounds\b.wav" \
624	"$(SRCDIR)\sounds\c.wav" \
625	"$(SRCDIR)\sounds\d.wav" \
626	"$(SRCDIR)\sounds\e.wav" \
627	"$(SRCDIR)\sounds\f.wav" \
628	"$(SRCDIR)\style.admin_log.css" \
629	"$(SRCDIR)\style.fileedit.css" \
630	"$(SRCDIR)\style.wikiedit.css" \
631	"$(SRCDIR)\tree.js" \
632	"$(SRCDIR)\useredit.js" \
633	"$(SRCDIR)\wiki.wiki"
634
635	OBJ = \
636	"$(OX)\add$O" \
637	"$(OX)\ajax$O" \
638	"$(OX)\alerts$O" \
639	"$(OX)\allrepo$O" \
640	"$(OX)\attach$O" \
641	"$(OX)\backlink$O" \
	@@ -766,15 +784,15 @@
784	"$(OX)\wikiformat$O" \
785	"$(OX)\winfile$O" \
786	"$(OX)\winhttp$O" \
787	"$(OX)\xfer$O" \
788	"$(OX)\xfersetup$O" \
789	"$(OX)\zip$O"
790	!if $(FOSSIL_ENABLE_MINIZ)!=0
791	OBJ = $(OBJ) "$(OX)\miniz$O"
792	!endif
793	OBJ = $(OBJ) "$(OX)\fossil.res"
794
795
796	!ifndef BASEAPPNAME
797	BASEAPPNAME = fossil
798	!endif
	@@ -781,11 +799,11 @@
799
800	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
801	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
802	APPTARGETS =
803
804	all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
805
806	$(BASEAPPNAME): "$(APPNAME)"
807
808	$(BASEAPPNAME)$(E): "$(APPNAME)"
809
	@@ -797,55 +815,49 @@
815	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
816	!if $(DEBUG)!=0
817	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
818	!endif
819
820	ZLIB_X = "$(OX)\zlib_built"







821	!if $(FOSSIL_BUILD_ZLIB)
822	zlib $(ZLIB_X):
823	@echo Building zlib from "$(ZLIBDIR)"...
824	!if $(FOSSIL_ENABLE_WINXP)!=0
825	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
826	!else
827	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
828	!endif
829	cmd /E:ON /c date /T > $(ZLIB_X)
830
831	clean-zlib:
832	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
833	!endif
834
835	!if $(FOSSIL_ENABLE_SSL)!=0
836	OPENSSL_X = "$(OX)\openssl.opts"
837	openssl $(OPENSSL_X):
838	@echo Building OpenSSL from "$(SSLDIR)"...
839	! ifdef PERLDIR
840	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
841	! else
842	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
843	! endif
844	! if $(FOSSIL_ENABLE_WINXP)!=0
845	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
846	! else
847	@pushd "$(SSLDIR)" && $(MAKE) && popd
848	! endif
849	echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
850	cmd /E:ON /c date /T >> $(OPENSSL_X)
851
852	clean-openssl:
853	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
854	-del $(OPENSSL_X)
855
856	! if $(FOSSIL_BUILD_SSL)!=0
857	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
858	! endif
859
860	!endif
861
862	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
863	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1016,30 +1028,15 @@
1028	echo "$(OX)\miniz.obj" >> $@
1029	!endif
1030	echo $(LIBS) >> $@
1031
1032
1033	{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	# This target gets the project tools built.
1037	toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"















1038
1039	!if $(USE_SEE)!=0
1040	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1041	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1042	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
	@@ -1130,716 +1127,1016 @@
1127	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1128	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1129	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1130
1131	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1132	-echo. > $@
1133	@echo "$(SRCDIR)\../skins/ardoise/css.txt" >> $@
1134	@echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1135	@echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1136	@echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1137	@echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1138	@echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1139	@echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1140	@echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1141	@echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1142	@echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1143	@echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1144	@echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1145	@echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1146	@echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1147	@echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1148	@echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1149	@echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1150	@echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1151	@echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1152	@echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1153	@echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1154	@echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1155	@echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1156	@echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1157	@echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1158	@echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1159	@echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1160	@echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1161	@echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1162	@echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1163	@echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1164	@echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1165	@echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1166	@echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1167	@echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1168	@echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1169	@echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1170	@echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1171	@echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1172	@echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1173	@echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1174	@echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1175	@echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1176	@echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1177	@echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1178	@echo "$(SRCDIR)\accordion.js" >> $@
1179	@echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1180	@echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1181	@echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1182	@echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1183	@echo "$(SRCDIR)\chat.js" >> $@
1184	@echo "$(SRCDIR)\ci_edit.js" >> $@
1185	@echo "$(SRCDIR)\copybtn.js" >> $@
1186	@echo "$(SRCDIR)\default.css" >> $@
1187	@echo "$(SRCDIR)\diff.tcl" >> $@
1188	@echo "$(SRCDIR)\forum.js" >> $@
1189	@echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1190	@echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1191	@echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1192	@echo "$(SRCDIR)\fossil.dom.js" >> $@
1193	@echo "$(SRCDIR)\fossil.fetch.js" >> $@
1194	@echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1195	@echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1196	@echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1197	@echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1198	@echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1199	@echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1200	@echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1201	@echo "$(SRCDIR)\fossil.storage.js" >> $@
1202	@echo "$(SRCDIR)\fossil.tabs.js" >> $@
1203	@echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1204	@echo "$(SRCDIR)\graph.js" >> $@
1205	@echo "$(SRCDIR)\hbmenu.js" >> $@
1206	@echo "$(SRCDIR)\href.js" >> $@
1207	@echo "$(SRCDIR)\login.js" >> $@
1208	@echo "$(SRCDIR)\markdown.md" >> $@
1209	@echo "$(SRCDIR)\menu.js" >> $@
1210	@echo "$(SRCDIR)\sbsdiff.js" >> $@
1211	@echo "$(SRCDIR)\scroll.js" >> $@
1212	@echo "$(SRCDIR)\skin.js" >> $@
1213	@echo "$(SRCDIR)\sorttable.js" >> $@
1214	@echo "$(SRCDIR)\sounds/0.wav" >> $@
1215	@echo "$(SRCDIR)\sounds/1.wav" >> $@
1216	@echo "$(SRCDIR)\sounds/2.wav" >> $@
1217	@echo "$(SRCDIR)\sounds/3.wav" >> $@
1218	@echo "$(SRCDIR)\sounds/4.wav" >> $@
1219	@echo "$(SRCDIR)\sounds/5.wav" >> $@
1220	@echo "$(SRCDIR)\sounds/6.wav" >> $@
1221	@echo "$(SRCDIR)\sounds/7.wav" >> $@
1222	@echo "$(SRCDIR)\sounds/8.wav" >> $@
1223	@echo "$(SRCDIR)\sounds/9.wav" >> $@
1224	@echo "$(SRCDIR)\sounds/a.wav" >> $@
1225	@echo "$(SRCDIR)\sounds/b.wav" >> $@
1226	@echo "$(SRCDIR)\sounds/c.wav" >> $@
1227	@echo "$(SRCDIR)\sounds/d.wav" >> $@
1228	@echo "$(SRCDIR)\sounds/e.wav" >> $@
1229	@echo "$(SRCDIR)\sounds/f.wav" >> $@
1230	@echo "$(SRCDIR)\style.admin_log.css" >> $@
1231	@echo "$(SRCDIR)\style.fileedit.css" >> $@
1232	@echo "$(SRCDIR)\style.wikiedit.css" >> $@
1233	@echo "$(SRCDIR)\tree.js" >> $@
1234	@echo "$(SRCDIR)\useredit.js" >> $@
1235	@echo "$(SRCDIR)\wiki.wiki" >> $@
1236	{$(OX)\}.c{$(OX)\}.h:
1237	"$(OBJDIR)\makeheaders$E" $**:$@
1238	{$(SRCDIR)\}.c{$(OX)\}.c:
1239	"$(OBJDIR)\translate$E" $** > $@




1240	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1241	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1242
1243	"$(OX)\add.c" : "$(SRCDIR)\add.c"
1244	"$(OX)\add.h" : "$(OX)\add.c"
1245	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1247
1248	"$(OX)\ajax.c" : "$(SRCDIR)\ajax.c"
1249	"$(OX)\ajax.h" : "$(OX)\ajax.c"
1250	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1251	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1252
1253	"$(OX)\alerts.c" : "$(SRCDIR)\alerts.c"
1254	"$(OX)\alerts.h" : "$(OX)\alerts.c"
1255	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1256	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1257
1258	"$(OX)\allrepo.c" : "$(SRCDIR)\allrepo.c"
1259	"$(OX)\allrepo.h" : "$(OX)\allrepo.c"
1260	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1262
1263	"$(OX)\attach.c" : "$(SRCDIR)\attach.c"
1264	"$(OX)\attach.h" : "$(OX)\attach.c"
1265	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1266	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1267
1268	"$(OX)\backlink.c" : "$(SRCDIR)\backlink.c"
1269	"$(OX)\backlink.h" : "$(OX)\backlink.c"
1270	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1271	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1272
1273	"$(OX)\backoffice.c" : "$(SRCDIR)\backoffice.c"
1274	"$(OX)\backoffice.h" : "$(OX)\backoffice.c"
1275	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1277
1278	"$(OX)\bag.c" : "$(SRCDIR)\bag.c"
1279	"$(OX)\bag.h" : "$(OX)\bag.c"
1280	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1281	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1282
1283	"$(OX)\bisect.c" : "$(SRCDIR)\bisect.c"
1284	"$(OX)\bisect.h" : "$(OX)\bisect.c"
1285	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1286	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1287
1288	"$(OX)\blob.c" : "$(SRCDIR)\blob.c"
1289	"$(OX)\blob.h" : "$(OX)\blob.c"
1290	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1292
1293	"$(OX)\branch.c" : "$(SRCDIR)\branch.c"
1294	"$(OX)\branch.h" : "$(OX)\branch.c"
1295	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1296	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1297
1298	"$(OX)\browse.c" : "$(SRCDIR)\browse.c"
1299	"$(OX)\browse.h" : "$(OX)\browse.c"
1300	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1301	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1302
1303	"$(OX)\builtin.c" : "$(SRCDIR)\builtin.c"
1304	"$(OX)\builtin.h" : "$(OX)\builtin.c"
1305	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1307
1308	"$(OX)\bundle.c" : "$(SRCDIR)\bundle.c"
1309	"$(OX)\bundle.h" : "$(OX)\bundle.c"
1310	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1311	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1312
1313	"$(OX)\cache.c" : "$(SRCDIR)\cache.c"
1314	"$(OX)\cache.h" : "$(OX)\cache.c"
1315	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1316	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1317
1318	"$(OX)\capabilities.c" : "$(SRCDIR)\capabilities.c"
1319	"$(OX)\capabilities.h" : "$(OX)\capabilities.c"
1320	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1322
1323	"$(OX)\captcha.c" : "$(SRCDIR)\captcha.c"
1324	"$(OX)\captcha.h" : "$(OX)\captcha.c"
1325	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1326	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1327
1328	"$(OX)\cgi.c" : "$(SRCDIR)\cgi.c"
1329	"$(OX)\cgi.h" : "$(OX)\cgi.c"
1330	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1331	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1332
1333	"$(OX)\chat.c" : "$(SRCDIR)\chat.c"
1334	"$(OX)\chat.h" : "$(OX)\chat.c"
1335	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1337
1338	"$(OX)\checkin.c" : "$(SRCDIR)\checkin.c"
1339	"$(OX)\checkin.h" : "$(OX)\checkin.c"
1340	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1341	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1342
1343	"$(OX)\checkout.c" : "$(SRCDIR)\checkout.c"
1344	"$(OX)\checkout.h" : "$(OX)\checkout.c"
1345	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1346	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1347
1348	"$(OX)\clearsign.c" : "$(SRCDIR)\clearsign.c"
1349	"$(OX)\clearsign.h" : "$(OX)\clearsign.c"
1350	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1352
1353	"$(OX)\clone.c" : "$(SRCDIR)\clone.c"
1354	"$(OX)\clone.h" : "$(OX)\clone.c"
1355	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1356	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1357
1358	"$(OX)\color.c" : "$(SRCDIR)\color.c"
1359	"$(OX)\color.h" : "$(OX)\color.c"
1360	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1361	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1362
1363	"$(OX)\comformat.c" : "$(SRCDIR)\comformat.c"
1364	"$(OX)\comformat.h" : "$(OX)\comformat.c"
1365	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1367
1368	"$(OX)\configure.c" : "$(SRCDIR)\configure.c"
1369	"$(OX)\configure.h" : "$(OX)\configure.c"
1370	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1371	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1372
1373	"$(OX)\content.c" : "$(SRCDIR)\content.c"
1374	"$(OX)\content.h" : "$(OX)\content.c"
1375	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1376	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1377
1378	"$(OX)\cookies.c" : "$(SRCDIR)\cookies.c"
1379	"$(OX)\cookies.h" : "$(OX)\cookies.c"
1380	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1382
1383	"$(OX)\db.c" : "$(SRCDIR)\db.c"
1384	"$(OX)\db.h" : "$(OX)\db.c"
1385	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1386	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1387
1388	"$(OX)\delta.c" : "$(SRCDIR)\delta.c"
1389	"$(OX)\delta.h" : "$(OX)\delta.c"
1390	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1391	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1392
1393	"$(OX)\deltacmd.c" : "$(SRCDIR)\deltacmd.c"
1394	"$(OX)\deltacmd.h" : "$(OX)\deltacmd.c"
1395	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1397
1398	"$(OX)\deltafunc.c" : "$(SRCDIR)\deltafunc.c"
1399	"$(OX)\deltafunc.h" : "$(OX)\deltafunc.c"
1400	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1401	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1402
1403	"$(OX)\descendants.c" : "$(SRCDIR)\descendants.c"
1404	"$(OX)\descendants.h" : "$(OX)\descendants.c"
1405	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1406	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1407
1408	"$(OX)\diff.c" : "$(SRCDIR)\diff.c"
1409	"$(OX)\diff.h" : "$(OX)\diff.c"
1410	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1412
1413	"$(OX)\diffcmd.c" : "$(SRCDIR)\diffcmd.c"
1414	"$(OX)\diffcmd.h" : "$(OX)\diffcmd.c"
1415	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1416	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1417
1418	"$(OX)\dispatch.c" : "$(SRCDIR)\dispatch.c"
1419	"$(OX)\dispatch.h" : "$(OX)\dispatch.c"
1420	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1421	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1422
1423	"$(OX)\doc.c" : "$(SRCDIR)\doc.c"
1424	"$(OX)\doc.h" : "$(OX)\doc.c"
1425	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1427
1428	"$(OX)\encode.c" : "$(SRCDIR)\encode.c"
1429	"$(OX)\encode.h" : "$(OX)\encode.c"
1430	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1431	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1432
1433	"$(OX)\etag.c" : "$(SRCDIR)\etag.c"
1434	"$(OX)\etag.h" : "$(OX)\etag.c"
1435	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1436	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1437
1438	"$(OX)\event.c" : "$(SRCDIR)\event.c"
1439	"$(OX)\event.h" : "$(OX)\event.c"
1440	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1442
1443	"$(OX)\export.c" : "$(SRCDIR)\export.c"
1444	"$(OX)\export.h" : "$(OX)\export.c"
1445	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1446	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1447
1448	"$(OX)\extcgi.c" : "$(SRCDIR)\extcgi.c"
1449	"$(OX)\extcgi.h" : "$(OX)\extcgi.c"
1450	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1452
1453	"$(OX)\file.c" : "$(SRCDIR)\file.c"
1454	"$(OX)\file.h" : "$(OX)\file.c"
1455	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1457
1458	"$(OX)\fileedit.c" : "$(SRCDIR)\fileedit.c"
1459	"$(OX)\fileedit.h" : "$(OX)\fileedit.c"
1460	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1461	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1462
1463	"$(OX)\finfo.c" : "$(SRCDIR)\finfo.c"
1464	"$(OX)\finfo.h" : "$(OX)\finfo.c"
1465	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1466	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1467
1468	"$(OX)\foci.c" : "$(SRCDIR)\foci.c"
1469	"$(OX)\foci.h" : "$(OX)\foci.c"
1470	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1472
1473	"$(OX)\forum.c" : "$(SRCDIR)\forum.c"
1474	"$(OX)\forum.h" : "$(OX)\forum.c"
1475	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1476	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1477
1478	"$(OX)\fshell.c" : "$(SRCDIR)\fshell.c"
1479	"$(OX)\fshell.h" : "$(OX)\fshell.c"
1480	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1481	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1482
1483	"$(OX)\fusefs.c" : "$(SRCDIR)\fusefs.c"
1484	"$(OX)\fusefs.h" : "$(OX)\fusefs.c"
1485	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1487
1488	"$(OX)\fuzz.c" : "$(SRCDIR)\fuzz.c"
1489	"$(OX)\fuzz.h" : "$(OX)\fuzz.c"
1490	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1491	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1492
1493	"$(OX)\glob.c" : "$(SRCDIR)\glob.c"
1494	"$(OX)\glob.h" : "$(OX)\glob.c"
1495	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1496	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1497
1498	"$(OX)\graph.c" : "$(SRCDIR)\graph.c"
1499	"$(OX)\graph.h" : "$(OX)\graph.c"
1500	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1502
1503	"$(OX)\gzip.c" : "$(SRCDIR)\gzip.c"
1504	"$(OX)\gzip.h" : "$(OX)\gzip.c"
1505	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1506	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1507
1508	"$(OX)\hname.c" : "$(SRCDIR)\hname.c"
1509	"$(OX)\hname.h" : "$(OX)\hname.c"
1510	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1511	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1512
1513	"$(OX)\hook.c" : "$(SRCDIR)\hook.c"
1514	"$(OX)\hook.h" : "$(OX)\hook.c"
1515	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1517
1518	"$(OX)\http.c" : "$(SRCDIR)\http.c"
1519	"$(OX)\http.h" : "$(OX)\http.c"
1520	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1521	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1522
1523	"$(OX)\http_socket.c" : "$(SRCDIR)\http_socket.c"
1524	"$(OX)\http_socket.h" : "$(OX)\http_socket.c"
1525	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1526	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1527
1528	"$(OX)\http_ssl.c" : "$(SRCDIR)\http_ssl.c"
1529	"$(OX)\http_ssl.h" : "$(OX)\http_ssl.c"
1530	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1532
1533	"$(OX)\http_transport.c" : "$(SRCDIR)\http_transport.c"
1534	"$(OX)\http_transport.h" : "$(OX)\http_transport.c"
1535	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1536	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1537
1538	"$(OX)\import.c" : "$(SRCDIR)\import.c"
1539	"$(OX)\import.h" : "$(OX)\import.c"
1540	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1541	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1542
1543	"$(OX)\info.c" : "$(SRCDIR)\info.c"
1544	"$(OX)\info.h" : "$(OX)\info.c"
1545	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1547
1548	"$(OX)\interwiki.c" : "$(SRCDIR)\interwiki.c"
1549	"$(OX)\interwiki.h" : "$(OX)\interwiki.c"
1550	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1551	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1552
1553	"$(OX)\json.c" : "$(SRCDIR)\json.c"
1554	"$(OX)\json.h" : "$(OX)\json.c"
1555	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1556	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1557
1558	"$(OX)\json_artifact.c" : "$(SRCDIR)\json_artifact.c"
1559	"$(OX)\json_artifact.h" : "$(OX)\json_artifact.c"
1560	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1562
1563	"$(OX)\json_branch.c" : "$(SRCDIR)\json_branch.c"
1564	"$(OX)\json_branch.h" : "$(OX)\json_branch.c"
1565	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1566	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1567
1568	"$(OX)\json_config.c" : "$(SRCDIR)\json_config.c"
1569	"$(OX)\json_config.h" : "$(OX)\json_config.c"
1570	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1571	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1572
1573	"$(OX)\json_diff.c" : "$(SRCDIR)\json_diff.c"
1574	"$(OX)\json_diff.h" : "$(OX)\json_diff.c"
1575	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1577
1578	"$(OX)\json_dir.c" : "$(SRCDIR)\json_dir.c"
1579	"$(OX)\json_dir.h" : "$(OX)\json_dir.c"
1580	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1581	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1582
1583	"$(OX)\json_finfo.c" : "$(SRCDIR)\json_finfo.c"
1584	"$(OX)\json_finfo.h" : "$(OX)\json_finfo.c"
1585	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1586	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1587
1588	"$(OX)\json_login.c" : "$(SRCDIR)\json_login.c"
1589	"$(OX)\json_login.h" : "$(OX)\json_login.c"
1590	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1592
1593	"$(OX)\json_query.c" : "$(SRCDIR)\json_query.c"
1594	"$(OX)\json_query.h" : "$(OX)\json_query.c"
1595	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1596	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1597
1598	"$(OX)\json_report.c" : "$(SRCDIR)\json_report.c"
1599	"$(OX)\json_report.h" : "$(OX)\json_report.c"
1600	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1601	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1602
1603	"$(OX)\json_status.c" : "$(SRCDIR)\json_status.c"
1604	"$(OX)\json_status.h" : "$(OX)\json_status.c"
1605	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1607
1608	"$(OX)\json_tag.c" : "$(SRCDIR)\json_tag.c"
1609	"$(OX)\json_tag.h" : "$(OX)\json_tag.c"
1610	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1611	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1612
1613	"$(OX)\json_timeline.c" : "$(SRCDIR)\json_timeline.c"
1614	"$(OX)\json_timeline.h" : "$(OX)\json_timeline.c"
1615	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1616	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1617
1618	"$(OX)\json_user.c" : "$(SRCDIR)\json_user.c"
1619	"$(OX)\json_user.h" : "$(OX)\json_user.c"
1620	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1622
1623	"$(OX)\json_wiki.c" : "$(SRCDIR)\json_wiki.c"
1624	"$(OX)\json_wiki.h" : "$(OX)\json_wiki.c"
1625	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1626	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1627
1628	"$(OX)\leaf.c" : "$(SRCDIR)\leaf.c"
1629	"$(OX)\leaf.h" : "$(OX)\leaf.c"
1630	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1631	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1632
1633	"$(OX)\loadctrl.c" : "$(SRCDIR)\loadctrl.c"
1634	"$(OX)\loadctrl.h" : "$(OX)\loadctrl.c"
1635	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1637
1638	"$(OX)\login.c" : "$(SRCDIR)\login.c"
1639	"$(OX)\login.h" : "$(OX)\login.c"
1640	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1641	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1642
1643	"$(OX)\lookslike.c" : "$(SRCDIR)\lookslike.c"
1644	"$(OX)\lookslike.h" : "$(OX)\lookslike.c"
1645	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1646	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1647
1648	"$(OX)\main.c" : "$(SRCDIR)\main.c"
1649	"$(OX)\main.h" : "$(OX)\main.c"
1650	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1652
1653	"$(OX)\manifest.c" : "$(SRCDIR)\manifest.c"
1654	"$(OX)\manifest.h" : "$(OX)\manifest.c"
1655	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1656	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1657
1658	"$(OX)\markdown.c" : "$(SRCDIR)\markdown.c"
1659	"$(OX)\markdown.h" : "$(OX)\markdown.c"
1660	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1661	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1662
1663	"$(OX)\markdown_html.c" : "$(SRCDIR)\markdown_html.c"
1664	"$(OX)\markdown_html.h" : "$(OX)\markdown_html.c"
1665	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1667
1668	"$(OX)\md5.c" : "$(SRCDIR)\md5.c"
1669	"$(OX)\md5.h" : "$(OX)\md5.c"
1670	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1671	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1672
1673	"$(OX)\merge.c" : "$(SRCDIR)\merge.c"
1674	"$(OX)\merge.h" : "$(OX)\merge.c"
1675	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1676	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1677
1678	"$(OX)\merge3.c" : "$(SRCDIR)\merge3.c"
1679	"$(OX)\merge3.h" : "$(OX)\merge3.c"
1680	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1682
1683	"$(OX)\moderate.c" : "$(SRCDIR)\moderate.c"
1684	"$(OX)\moderate.h" : "$(OX)\moderate.c"
1685	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1686	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1687
1688	"$(OX)\name.c" : "$(SRCDIR)\name.c"
1689	"$(OX)\name.h" : "$(OX)\name.c"
1690	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1691	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1692
1693	"$(OX)\path.c" : "$(SRCDIR)\path.c"
1694	"$(OX)\path.h" : "$(OX)\path.c"
1695	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1696	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1697
1698	"$(OX)\piechart.c" : "$(SRCDIR)\piechart.c"
1699	"$(OX)\piechart.h" : "$(OX)\piechart.c"
1700	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1701	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1702
1703	"$(OX)\pikchr.c" : "$(SRCDIR)\pikchr.c"
1704	"$(OX)\pikchr.h" : "$(OX)\pikchr.c"
1705	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1706	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1707
1708	"$(OX)\pikchrshow.c" : "$(SRCDIR)\pikchrshow.c"
1709	"$(OX)\pikchrshow.h" : "$(OX)\pikchrshow.c"
1710	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1711	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1712
1713	"$(OX)\pivot.c" : "$(SRCDIR)\pivot.c"
1714	"$(OX)\pivot.h" : "$(OX)\pivot.c"
1715	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1716	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1717
1718	"$(OX)\popen.c" : "$(SRCDIR)\popen.c"
1719	"$(OX)\popen.h" : "$(OX)\popen.c"
1720	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1721	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1722
1723	"$(OX)\pqueue.c" : "$(SRCDIR)\pqueue.c"
1724	"$(OX)\pqueue.h" : "$(OX)\pqueue.c"
1725	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1726	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1727
1728	"$(OX)\printf.c" : "$(SRCDIR)\printf.c"
1729	"$(OX)\printf.h" : "$(OX)\printf.c"
1730	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1731	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1732
1733	"$(OX)\publish.c" : "$(SRCDIR)\publish.c"
1734	"$(OX)\publish.h" : "$(OX)\publish.c"
1735	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1736	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1737
1738	"$(OX)\purge.c" : "$(SRCDIR)\purge.c"
1739	"$(OX)\purge.h" : "$(OX)\purge.c"
1740	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1741	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1742
1743	"$(OX)\rebuild.c" : "$(SRCDIR)\rebuild.c"
1744	"$(OX)\rebuild.h" : "$(OX)\rebuild.c"
1745	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1746	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1747
1748	"$(OX)\regexp.c" : "$(SRCDIR)\regexp.c"
1749	"$(OX)\regexp.h" : "$(OX)\regexp.c"
1750	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1751	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1752
1753	"$(OX)\repolist.c" : "$(SRCDIR)\repolist.c"
1754	"$(OX)\repolist.h" : "$(OX)\repolist.c"
1755	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1756	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1757
1758	"$(OX)\report.c" : "$(SRCDIR)\report.c"
1759	"$(OX)\report.h" : "$(OX)\report.c"
1760	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1761	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1762
1763	"$(OX)\rss.c" : "$(SRCDIR)\rss.c"
1764	"$(OX)\rss.h" : "$(OX)\rss.c"
1765	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1767
1768	"$(OX)\schema.c" : "$(SRCDIR)\schema.c"
1769	"$(OX)\schema.h" : "$(OX)\schema.c"
1770	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1771	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1772
1773	"$(OX)\search.c" : "$(SRCDIR)\search.c"
1774	"$(OX)\search.h" : "$(OX)\search.c"
1775	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1776	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1777
1778	"$(OX)\security_audit.c" : "$(SRCDIR)\security_audit.c"
1779	"$(OX)\security_audit.h" : "$(OX)\security_audit.c"
1780	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1781	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1782
1783	"$(OX)\setup.c" : "$(SRCDIR)\setup.c"
1784	"$(OX)\setup.h" : "$(OX)\setup.c"
1785	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1786	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1787
1788	"$(OX)\setupuser.c" : "$(SRCDIR)\setupuser.c"
1789	"$(OX)\setupuser.h" : "$(OX)\setupuser.c"
1790	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1791	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1792
1793	"$(OX)\sha1.c" : "$(SRCDIR)\sha1.c"
1794	"$(OX)\sha1.h" : "$(OX)\sha1.c"
1795	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1796	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1797
1798	"$(OX)\sha1hard.c" : "$(SRCDIR)\sha1hard.c"
1799	"$(OX)\sha1hard.h" : "$(OX)\sha1hard.c"
1800	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1801	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1802
1803	"$(OX)\sha3.c" : "$(SRCDIR)\sha3.c"
1804	"$(OX)\sha3.h" : "$(OX)\sha3.c"
1805	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1806	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1807
1808	"$(OX)\shun.c" : "$(SRCDIR)\shun.c"
1809	"$(OX)\shun.h" : "$(OX)\shun.c"
1810	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1811	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1812
1813	"$(OX)\sitemap.c" : "$(SRCDIR)\sitemap.c"
1814	"$(OX)\sitemap.h" : "$(OX)\sitemap.c"
1815	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1816	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1817
1818	"$(OX)\skins.c" : "$(SRCDIR)\skins.c"
1819	"$(OX)\skins.h" : "$(OX)\skins.c"
1820	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1821	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1822
1823	"$(OX)\smtp.c" : "$(SRCDIR)\smtp.c"
1824	"$(OX)\smtp.h" : "$(OX)\smtp.c"
1825	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1826	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1827
1828	"$(OX)\sqlcmd.c" : "$(SRCDIR)\sqlcmd.c"
1829	"$(OX)\sqlcmd.h" : "$(OX)\sqlcmd.c"
1830	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1831	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1832
1833	"$(OX)\stash.c" : "$(SRCDIR)\stash.c"
1834	"$(OX)\stash.h" : "$(OX)\stash.c"
1835	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1836	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1837
1838	"$(OX)\stat.c" : "$(SRCDIR)\stat.c"
1839	"$(OX)\stat.h" : "$(OX)\stat.c"
1840	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1841	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1842
1843	"$(OX)\statrep.c" : "$(SRCDIR)\statrep.c"
1844	"$(OX)\statrep.h" : "$(OX)\statrep.c"
1845	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1846	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1847
1848	"$(OX)\style.c" : "$(SRCDIR)\style.c"
1849	"$(OX)\style.h" : "$(OX)\style.c"
1850	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1851	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1852
1853	"$(OX)\sync.c" : "$(SRCDIR)\sync.c"
1854	"$(OX)\sync.h" : "$(OX)\sync.c"
1855	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1856	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1857
1858	"$(OX)\tag.c" : "$(SRCDIR)\tag.c"
1859	"$(OX)\tag.h" : "$(OX)\tag.c"
1860	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1861	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1862
1863	"$(OX)\tar.c" : "$(SRCDIR)\tar.c"
1864	"$(OX)\tar.h" : "$(OX)\tar.c"
1865	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1866	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1867
1868	"$(OX)\terminal.c" : "$(SRCDIR)\terminal.c"
1869	"$(OX)\terminal.h" : "$(OX)\terminal.c"
1870	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1871	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1872
1873	"$(OX)\th_main.c" : "$(SRCDIR)\th_main.c"
1874	"$(OX)\th_main.h" : "$(OX)\th_main.c"
1875	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1876	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1877
1878	"$(OX)\timeline.c" : "$(SRCDIR)\timeline.c"
1879	"$(OX)\timeline.h" : "$(OX)\timeline.c"
1880	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1881	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1882
1883	"$(OX)\tkt.c" : "$(SRCDIR)\tkt.c"
1884	"$(OX)\tkt.h" : "$(OX)\tkt.c"
1885	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1886	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1887
1888	"$(OX)\tktsetup.c" : "$(SRCDIR)\tktsetup.c"
1889	"$(OX)\tktsetup.h" : "$(OX)\tktsetup.c"
1890	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1891	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1892
1893	"$(OX)\undo.c" : "$(SRCDIR)\undo.c"
1894	"$(OX)\undo.h" : "$(OX)\undo.c"
1895	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1896	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1897
1898	"$(OX)\unicode.c" : "$(SRCDIR)\unicode.c"
1899	"$(OX)\unicode.h" : "$(OX)\unicode.c"
1900	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1901	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1902
1903	"$(OX)\unversioned.c" : "$(SRCDIR)\unversioned.c"
1904	"$(OX)\unversioned.h" : "$(OX)\unversioned.c"
1905	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1906	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1907
1908	"$(OX)\update.c" : "$(SRCDIR)\update.c"
1909	"$(OX)\update.h" : "$(OX)\update.c"
1910	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1911	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1912
1913	"$(OX)\url.c" : "$(SRCDIR)\url.c"
1914	"$(OX)\url.h" : "$(OX)\url.c"
1915	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1916	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1917
1918	"$(OX)\user.c" : "$(SRCDIR)\user.c"
1919	"$(OX)\user.h" : "$(OX)\user.c"
1920	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1921	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1922
1923	"$(OX)\utf8.c" : "$(SRCDIR)\utf8.c"
1924	"$(OX)\utf8.h" : "$(OX)\utf8.c"
1925	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1926	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1927
1928	"$(OX)\util.c" : "$(SRCDIR)\util.c"
1929	"$(OX)\util.h" : "$(OX)\util.c"
1930	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1931	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1932
1933	"$(OX)\verify.c" : "$(SRCDIR)\verify.c"
1934	"$(OX)\verify.h" : "$(OX)\verify.c"
1935	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1936	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1937
1938	"$(OX)\vfile.c" : "$(SRCDIR)\vfile.c"
1939	"$(OX)\vfile.h" : "$(OX)\vfile.c"
1940	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1941	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1942
1943	"$(OX)\webmail.c" : "$(SRCDIR)\webmail.c"
1944	"$(OX)\webmail.h" : "$(OX)\webmail.c"
1945	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1946	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1947
1948	"$(OX)\wiki.c" : "$(SRCDIR)\wiki.c"
1949	"$(OX)\wiki.h" : "$(OX)\wiki.c"
1950	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1951	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1952
1953	"$(OX)\wikiformat.c" : "$(SRCDIR)\wikiformat.c"
1954	"$(OX)\wikiformat.h" : "$(OX)\wikiformat.c"
1955	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1956	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1957
1958	"$(OX)\winfile.c" : "$(SRCDIR)\winfile.c"
1959	"$(OX)\winfile.h" : "$(OX)\winfile.c"
1960	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1961	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1962
1963	"$(OX)\winhttp.c" : "$(SRCDIR)\winhttp.c"
1964	"$(OX)\winhttp.h" : "$(OX)\winhttp.c"
1965	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1966	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1967
1968	"$(OX)\xfer.c" : "$(SRCDIR)\xfer.c"
1969	"$(OX)\xfer.h" : "$(OX)\xfer.c"
1970	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1971	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1972
1973	"$(OX)\xfersetup.c" : "$(SRCDIR)\xfersetup.c"
1974	"$(OX)\xfersetup.h" : "$(OX)\xfersetup.c"
1975	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1976	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1977
1978	"$(OX)\zip.c" : "$(SRCDIR)\zip.c"
1979	"$(OX)\zip.h" : "$(OX)\zip.c"
1980	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1981	$(RCC) /fo $@ $**
1982
1983
1984	DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1985	GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
1986
1987	!if $(DEPHEADERGEN)==0
1988	GEN_HEADERS = $(GEN_HEADERS) \
1989	"$(OX)\add.c":"$(OX)\add.h" \
1990	"$(OX)\ajax.c":"$(OX)\ajax.h" \
1991	"$(OX)\alerts.c":"$(OX)\alerts.h" \
1992	"$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1993	"$(OX)\attach.c":"$(OX)\attach.h" \
1994	"$(OX)\backlink.c":"$(OX)\backlink.h" \
1995	"$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1996	"$(OX)\bag.c":"$(OX)\bag.h" \
1997	"$(OX)\bisect.c":"$(OX)\bisect.h" \
1998	"$(OX)\blob.c":"$(OX)\blob.h" \
1999	"$(OX)\branch.c":"$(OX)\branch.h" \
2000	"$(OX)\browse.c":"$(OX)\browse.h" \
2001	"$(OX)\builtin.c":"$(OX)\builtin.h" \
2002	"$(OX)\bundle.c":"$(OX)\bundle.h" \
2003	"$(OX)\cache.c":"$(OX)\cache.h" \
2004	"$(OX)\capabilities.c":"$(OX)\capabilities.h" \
2005	"$(OX)\captcha.c":"$(OX)\captcha.h" \
2006	"$(OX)\cgi.c":"$(OX)\cgi.h" \
2007	"$(OX)\chat.c":"$(OX)\chat.h" \
2008	"$(OX)\checkin.c":"$(OX)\checkin.h" \
2009	"$(OX)\checkout.c":"$(OX)\checkout.h" \
2010	"$(OX)\clearsign.c":"$(OX)\clearsign.h" \
2011	"$(OX)\clone.c":"$(OX)\clone.h" \
2012	"$(OX)\color.c":"$(OX)\color.h" \
2013	"$(OX)\comformat.c":"$(OX)\comformat.h" \
2014	"$(OX)\configure.c":"$(OX)\configure.h" \
2015	"$(OX)\content.c":"$(OX)\content.h" \
2016	"$(OX)\cookies.c":"$(OX)\cookies.h" \
2017	"$(OX)\db.c":"$(OX)\db.h" \
2018	"$(OX)\delta.c":"$(OX)\delta.h" \
2019	"$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
2020	"$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
2021	"$(OX)\descendants.c":"$(OX)\descendants.h" \
2022	"$(OX)\diff.c":"$(OX)\diff.h" \
2023	"$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
2024	"$(OX)\dispatch.c":"$(OX)\dispatch.h" \
2025	"$(OX)\doc.c":"$(OX)\doc.h" \
2026	"$(OX)\encode.c":"$(OX)\encode.h" \
2027	"$(OX)\etag.c":"$(OX)\etag.h" \
2028	"$(OX)\event.c":"$(OX)\event.h" \
2029	"$(OX)\export.c":"$(OX)\export.h" \
2030	"$(OX)\extcgi.c":"$(OX)\extcgi.h" \
2031	"$(OX)\file.c":"$(OX)\file.h" \
2032	"$(OX)\fileedit.c":"$(OX)\fileedit.h" \
2033	"$(OX)\finfo.c":"$(OX)\finfo.h" \
2034	"$(OX)\foci.c":"$(OX)\foci.h" \
2035	"$(OX)\forum.c":"$(OX)\forum.h" \
2036	"$(OX)\fshell.c":"$(OX)\fshell.h" \
2037	"$(OX)\fusefs.c":"$(OX)\fusefs.h" \
2038	"$(OX)\fuzz.c":"$(OX)\fuzz.h" \
2039	"$(OX)\glob.c":"$(OX)\glob.h" \
2040	"$(OX)\graph.c":"$(OX)\graph.h" \
2041	"$(OX)\gzip.c":"$(OX)\gzip.h" \
2042	"$(OX)\hname.c":"$(OX)\hname.h" \
2043	"$(OX)\hook.c":"$(OX)\hook.h" \
2044	"$(OX)\http.c":"$(OX)\http.h" \
2045	"$(OX)\http_socket.c":"$(OX)\http_socket.h" \
2046	"$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
2047	"$(OX)\http_transport.c":"$(OX)\http_transport.h" \
2048	"$(OX)\import.c":"$(OX)\import.h" \
2049	"$(OX)\info.c":"$(OX)\info.h" \
2050	"$(OX)\interwiki.c":"$(OX)\interwiki.h" \
2051	"$(OX)\json.c":"$(OX)\json.h" \
2052	"$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
2053	"$(OX)\json_branch.c":"$(OX)\json_branch.h" \
2054	"$(OX)\json_config.c":"$(OX)\json_config.h" \
2055	"$(OX)\json_diff.c":"$(OX)\json_diff.h" \
2056	"$(OX)\json_dir.c":"$(OX)\json_dir.h" \
2057	"$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
2058	"$(OX)\json_login.c":"$(OX)\json_login.h" \
2059	"$(OX)\json_query.c":"$(OX)\json_query.h" \
2060	"$(OX)\json_report.c":"$(OX)\json_report.h" \
2061	"$(OX)\json_status.c":"$(OX)\json_status.h" \
2062	"$(OX)\json_tag.c":"$(OX)\json_tag.h" \
2063	"$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
2064	"$(OX)\json_user.c":"$(OX)\json_user.h" \
2065	"$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
2066	"$(OX)\leaf.c":"$(OX)\leaf.h" \
2067	"$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
2068	"$(OX)\login.c":"$(OX)\login.h" \
2069	"$(OX)\lookslike.c":"$(OX)\lookslike.h" \
2070	"$(OX)\main.c":"$(OX)\main.h" \
2071	"$(OX)\manifest.c":"$(OX)\manifest.h" \
2072	"$(OX)\markdown.c":"$(OX)\markdown.h" \
2073	"$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
2074	"$(OX)\md5.c":"$(OX)\md5.h" \
2075	"$(OX)\merge.c":"$(OX)\merge.h" \
2076	"$(OX)\merge3.c":"$(OX)\merge3.h" \
2077	"$(OX)\moderate.c":"$(OX)\moderate.h" \
2078	"$(OX)\name.c":"$(OX)\name.h" \
2079	"$(OX)\path.c":"$(OX)\path.h" \
2080	"$(OX)\piechart.c":"$(OX)\piechart.h" \
2081	"$(OX)\pikchr.c":"$(OX)\pikchr.h" \
2082	"$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
2083	"$(OX)\pivot.c":"$(OX)\pivot.h" \
2084	"$(OX)\popen.c":"$(OX)\popen.h" \
2085	"$(OX)\pqueue.c":"$(OX)\pqueue.h" \
2086	"$(OX)\printf.c":"$(OX)\printf.h" \
2087	"$(OX)\publish.c":"$(OX)\publish.h" \
2088	"$(OX)\purge.c":"$(OX)\purge.h" \
2089	"$(OX)\rebuild.c":"$(OX)\rebuild.h" \
2090	"$(OX)\regexp.c":"$(OX)\regexp.h" \
2091	"$(OX)\repolist.c":"$(OX)\repolist.h" \
2092	"$(OX)\report.c":"$(OX)\report.h" \
2093	"$(OX)\rss.c":"$(OX)\rss.h" \
2094	"$(OX)\schema.c":"$(OX)\schema.h" \
2095	"$(OX)\search.c":"$(OX)\search.h" \
2096	"$(OX)\security_audit.c":"$(OX)\security_audit.h" \
2097	"$(OX)\setup.c":"$(OX)\setup.h" \
2098	"$(OX)\setupuser.c":"$(OX)\setupuser.h" \
2099	"$(OX)\sha1.c":"$(OX)\sha1.h" \
2100	"$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
2101	"$(OX)\sha3.c":"$(OX)\sha3.h" \
2102	"$(OX)\shun.c":"$(OX)\shun.h" \
2103	"$(OX)\sitemap.c":"$(OX)\sitemap.h" \
2104	"$(OX)\skins.c":"$(OX)\skins.h" \
2105	"$(OX)\smtp.c":"$(OX)\smtp.h" \
2106	"$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
2107	"$(OX)\stash.c":"$(OX)\stash.h" \
2108	"$(OX)\stat.c":"$(OX)\stat.h" \
2109	"$(OX)\statrep.c":"$(OX)\statrep.h" \
2110	"$(OX)\style.c":"$(OX)\style.h" \
2111	"$(OX)\sync.c":"$(OX)\sync.h" \
2112	"$(OX)\tag.c":"$(OX)\tag.h" \
2113	"$(OX)\tar.c":"$(OX)\tar.h" \
2114	"$(OX)\terminal.c":"$(OX)\terminal.h" \
2115	"$(OX)\th_main.c":"$(OX)\th_main.h" \
2116	"$(OX)\timeline.c":"$(OX)\timeline.h" \
2117	"$(OX)\tkt.c":"$(OX)\tkt.h" \
2118	"$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
2119	"$(OX)\undo.c":"$(OX)\undo.h" \
2120	"$(OX)\unicode.c":"$(OX)\unicode.h" \
2121	"$(OX)\unversioned.c":"$(OX)\unversioned.h" \
2122	"$(OX)\update.c":"$(OX)\update.h" \
2123	"$(OX)\url.c":"$(OX)\url.h" \
2124	"$(OX)\user.c":"$(OX)\user.h" \
2125	"$(OX)\utf8.c":"$(OX)\utf8.h" \
2126	"$(OX)\util.c":"$(OX)\util.h" \
2127	"$(OX)\verify.c":"$(OX)\verify.h" \
2128	"$(OX)\vfile.c":"$(OX)\vfile.h" \
2129	"$(OX)\webmail.c":"$(OX)\webmail.h" \
2130	"$(OX)\wiki.c":"$(OX)\wiki.h" \
2131	"$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
2132	"$(OX)\winfile.c":"$(OX)\winfile.h" \
2133	"$(OX)\winhttp.c":"$(OX)\winhttp.h" \
2134	"$(OX)\xfer.c":"$(OX)\xfer.h" \
2135	"$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
2136	"$(OX)\zip.c":"$(OX)\zip.h"
2137	!endif
2138
2139	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
2140	"$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
2141	@copy /Y NUL $@
2142
2143

M win/Makefile.msc

+722 -425

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -12,13 +12,17 @@
12	12	SRCDIR = $(B)\src
13	13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	14	BUILDDIR = Build
15	15	!message Using default build directory, $(BUILDDIR)
16	16	!endif
	17	+# Top of build/staging/object directory subtree
17	18	T = $(BUILDDIR)
	19	+# Where object and other intermediate binary files will go
18	20	OBJDIR = $(T)
	21	+# Staging area for translated or generated sources
19	22	OX = $(OBJDIR)
	23	+# Extensions for this platform
20	24	O = .obj
21	25	E = .exe
22	26	P = .pdb
23	27
24	28	!ifndef INSTALLDIR
		@@ -37,20 +41,32 @@
37	41	#
38	42	!if !exist("$(B)\.fossil-settings")
39	43	!error Please specify path to project base directory: B="path/to/fossil"
40	44	!endif
41	45
42		-# Create build directory during preprocessing if needed.
	46	+# Create build, object and staging directory during preprocessing if needed.
43	47	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
	48	+!endif
	49	+!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
	50	+!endif
	51	+!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
44	52	!endif
45	53
46	54	# Perl is only necessary if OpenSSL support is enabled and it is built from
47	55	# source code. The PERLDIR environment variable, if it exists, should point
48	56	# to the directory containing the main Perl executable specified here (i.e.
49	57	# "perl.exe").
50		-!ifndef PERL
	58	+!if $(FOSSIL_BUILD_SSL)!=0
	59	+! if !defined(PERL) && [where PERL.exe > nul 2>&1]
	60	+PERL = perl.exe
	61	+!undef PERLDIR
	62	+! elseif !defined(PERL)
	63	+! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
51	64	PERL = perl.exe
	65	+! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
	66	+! endif
	67	+! endif
52	68	!endif
53	69
54	70	# Enable debugging symbols?
55	71	!ifndef DEBUG
56	72	DEBUG = 0
		@@ -199,30 +215,30 @@
199	215	!endif
200	216
201	217	!if $(FOSSIL_ENABLE_WINXP)!=0
202	218	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
203	219	CFLAGS = $(CFLAGS) $(XPCFLAGS)
204		-!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	220	+! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
205	221	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
206		-!else
	222	+! else
207	223	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
208		-!endif
	224	+! endif
209	225	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
210	226	!endif
211	227
212	228	!if $(FOSSIL_DYNAMIC_BUILD)!=0
213		-!if $(DEBUG)!=0
214		-CRTFLAGS = /MDd
215		-!else
216		-CRTFLAGS = /MD
217		-!endif
218		-!else
219		-!if $(DEBUG)!=0
220		-CRTFLAGS = /MTd
221		-!else
222		-CRTFLAGS = /MT
223		-!endif
	229	+! if $(DEBUG)!=0
	230	+CRTFLAGS = /MDd
	231	+! else
	232	+CRTFLAGS = /MD
	233	+! endif
	234	+!else
	235	+! if $(DEBUG)!=0
	236	+CRTFLAGS = /MTd
	237	+! else
	238	+CRTFLAGS = /MT
	239	+! endif
224	240	!endif
225	241
226	242	!if $(DEBUG)!=0
227	243	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
228	244	LDFLAGS = $(LDFLAGS) /DEBUG
		@@ -509,115 +525,117 @@
509	525	"$(OX)\winhttp.c" \
510	526	"$(OX)\xfer.c" \
511	527	"$(OX)\xfersetup.c" \
512	528	"$(OX)\zip.c"
513	529
514		-EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
515		- "$(SRCDIR)\..\skins\ardoise\details.txt" \
516		- "$(SRCDIR)\..\skins\ardoise\footer.txt" \
517		- "$(SRCDIR)\..\skins\ardoise\header.txt" \
518		- "$(SRCDIR)\..\skins\black_and_white\css.txt" \
519		- "$(SRCDIR)\..\skins\black_and_white\details.txt" \
520		- "$(SRCDIR)\..\skins\black_and_white\footer.txt" \
521		- "$(SRCDIR)\..\skins\black_and_white\header.txt" \
522		- "$(SRCDIR)\..\skins\blitz\css.txt" \
523		- "$(SRCDIR)\..\skins\blitz\details.txt" \
524		- "$(SRCDIR)\..\skins\blitz\footer.txt" \
525		- "$(SRCDIR)\..\skins\blitz\header.txt" \
526		- "$(SRCDIR)\..\skins\blitz\ticket.txt" \
527		- "$(SRCDIR)\..\skins\bootstrap\css.txt" \
528		- "$(SRCDIR)\..\skins\bootstrap\details.txt" \
529		- "$(SRCDIR)\..\skins\bootstrap\footer.txt" \
530		- "$(SRCDIR)\..\skins\bootstrap\header.txt" \
531		- "$(SRCDIR)\..\skins\darkmode\css.txt" \
532		- "$(SRCDIR)\..\skins\darkmode\details.txt" \
533		- "$(SRCDIR)\..\skins\darkmode\footer.txt" \
534		- "$(SRCDIR)\..\skins\darkmode\header.txt" \
535		- "$(SRCDIR)\..\skins\default\css.txt" \
536		- "$(SRCDIR)\..\skins\default\details.txt" \
537		- "$(SRCDIR)\..\skins\default\footer.txt" \
538		- "$(SRCDIR)\..\skins\default\header.txt" \
539		- "$(SRCDIR)\..\skins\eagle\css.txt" \
540		- "$(SRCDIR)\..\skins\eagle\details.txt" \
541		- "$(SRCDIR)\..\skins\eagle\footer.txt" \
542		- "$(SRCDIR)\..\skins\eagle\header.txt" \
543		- "$(SRCDIR)\..\skins\khaki\css.txt" \
544		- "$(SRCDIR)\..\skins\khaki\details.txt" \
545		- "$(SRCDIR)\..\skins\khaki\footer.txt" \
546		- "$(SRCDIR)\..\skins\khaki\header.txt" \
547		- "$(SRCDIR)\..\skins\original\css.txt" \
548		- "$(SRCDIR)\..\skins\original\details.txt" \
549		- "$(SRCDIR)\..\skins\original\footer.txt" \
550		- "$(SRCDIR)\..\skins\original\header.txt" \
551		- "$(SRCDIR)\..\skins\plain_gray\css.txt" \
552		- "$(SRCDIR)\..\skins\plain_gray\details.txt" \
553		- "$(SRCDIR)\..\skins\plain_gray\footer.txt" \
554		- "$(SRCDIR)\..\skins\plain_gray\header.txt" \
555		- "$(SRCDIR)\..\skins\xekri\css.txt" \
556		- "$(SRCDIR)\..\skins\xekri\details.txt" \
557		- "$(SRCDIR)\..\skins\xekri\footer.txt" \
558		- "$(SRCDIR)\..\skins\xekri\header.txt" \
559		- "$(SRCDIR)\accordion.js" \
560		- "$(SRCDIR)\alerts\bflat2.wav" \
561		- "$(SRCDIR)\alerts\bflat3.wav" \
562		- "$(SRCDIR)\alerts\bloop.wav" \
563		- "$(SRCDIR)\alerts\plunk.wav" \
564		- "$(SRCDIR)\chat.js" \
565		- "$(SRCDIR)\ci_edit.js" \
566		- "$(SRCDIR)\copybtn.js" \
567		- "$(SRCDIR)\default.css" \
568		- "$(SRCDIR)\diff.tcl" \
569		- "$(SRCDIR)\forum.js" \
570		- "$(SRCDIR)\fossil.bootstrap.js" \
571		- "$(SRCDIR)\fossil.confirmer.js" \
572		- "$(SRCDIR)\fossil.copybutton.js" \
573		- "$(SRCDIR)\fossil.dom.js" \
574		- "$(SRCDIR)\fossil.fetch.js" \
575		- "$(SRCDIR)\fossil.numbered-lines.js" \
576		- "$(SRCDIR)\fossil.page.fileedit.js" \
577		- "$(SRCDIR)\fossil.page.forumpost.js" \
578		- "$(SRCDIR)\fossil.page.pikchrshow.js" \
579		- "$(SRCDIR)\fossil.page.wikiedit.js" \
580		- "$(SRCDIR)\fossil.pikchr.js" \
581		- "$(SRCDIR)\fossil.popupwidget.js" \
582		- "$(SRCDIR)\fossil.storage.js" \
583		- "$(SRCDIR)\fossil.tabs.js" \
584		- "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
585		- "$(SRCDIR)\graph.js" \
586		- "$(SRCDIR)\hbmenu.js" \
587		- "$(SRCDIR)\href.js" \
588		- "$(SRCDIR)\login.js" \
589		- "$(SRCDIR)\markdown.md" \
590		- "$(SRCDIR)\menu.js" \
591		- "$(SRCDIR)\sbsdiff.js" \
592		- "$(SRCDIR)\scroll.js" \
593		- "$(SRCDIR)\skin.js" \
594		- "$(SRCDIR)\sorttable.js" \
595		- "$(SRCDIR)\sounds\0.wav" \
596		- "$(SRCDIR)\sounds\1.wav" \
597		- "$(SRCDIR)\sounds\2.wav" \
598		- "$(SRCDIR)\sounds\3.wav" \
599		- "$(SRCDIR)\sounds\4.wav" \
600		- "$(SRCDIR)\sounds\5.wav" \
601		- "$(SRCDIR)\sounds\6.wav" \
602		- "$(SRCDIR)\sounds\7.wav" \
603		- "$(SRCDIR)\sounds\8.wav" \
604		- "$(SRCDIR)\sounds\9.wav" \
605		- "$(SRCDIR)\sounds\a.wav" \
606		- "$(SRCDIR)\sounds\b.wav" \
607		- "$(SRCDIR)\sounds\c.wav" \
608		- "$(SRCDIR)\sounds\d.wav" \
609		- "$(SRCDIR)\sounds\e.wav" \
610		- "$(SRCDIR)\sounds\f.wav" \
611		- "$(SRCDIR)\style.admin_log.css" \
612		- "$(SRCDIR)\style.fileedit.css" \
613		- "$(SRCDIR)\style.wikiedit.css" \
614		- "$(SRCDIR)\tree.js" \
615		- "$(SRCDIR)\useredit.js" \
616		- "$(SRCDIR)\wiki.wiki"
617		-
618		-OBJ = "$(OX)\add$O" \
	530	+EXTRA_FILES = \
	531	+ "$(SRCDIR)\..\skins\ardoise\css.txt" \
	532	+ "$(SRCDIR)\..\skins\ardoise\details.txt" \
	533	+ "$(SRCDIR)\..\skins\ardoise\footer.txt" \
	534	+ "$(SRCDIR)\..\skins\ardoise\header.txt" \
	535	+ "$(SRCDIR)\..\skins\black_and_white\css.txt" \
	536	+ "$(SRCDIR)\..\skins\black_and_white\details.txt" \
	537	+ "$(SRCDIR)\..\skins\black_and_white\footer.txt" \
	538	+ "$(SRCDIR)\..\skins\black_and_white\header.txt" \
	539	+ "$(SRCDIR)\..\skins\blitz\css.txt" \
	540	+ "$(SRCDIR)\..\skins\blitz\details.txt" \
	541	+ "$(SRCDIR)\..\skins\blitz\footer.txt" \
	542	+ "$(SRCDIR)\..\skins\blitz\header.txt" \
	543	+ "$(SRCDIR)\..\skins\blitz\ticket.txt" \
	544	+ "$(SRCDIR)\..\skins\bootstrap\css.txt" \
	545	+ "$(SRCDIR)\..\skins\bootstrap\details.txt" \
	546	+ "$(SRCDIR)\..\skins\bootstrap\footer.txt" \
	547	+ "$(SRCDIR)\..\skins\bootstrap\header.txt" \
	548	+ "$(SRCDIR)\..\skins\darkmode\css.txt" \
	549	+ "$(SRCDIR)\..\skins\darkmode\details.txt" \
	550	+ "$(SRCDIR)\..\skins\darkmode\footer.txt" \
	551	+ "$(SRCDIR)\..\skins\darkmode\header.txt" \
	552	+ "$(SRCDIR)\..\skins\default\css.txt" \
	553	+ "$(SRCDIR)\..\skins\default\details.txt" \
	554	+ "$(SRCDIR)\..\skins\default\footer.txt" \
	555	+ "$(SRCDIR)\..\skins\default\header.txt" \
	556	+ "$(SRCDIR)\..\skins\eagle\css.txt" \
	557	+ "$(SRCDIR)\..\skins\eagle\details.txt" \
	558	+ "$(SRCDIR)\..\skins\eagle\footer.txt" \
	559	+ "$(SRCDIR)\..\skins\eagle\header.txt" \
	560	+ "$(SRCDIR)\..\skins\khaki\css.txt" \
	561	+ "$(SRCDIR)\..\skins\khaki\details.txt" \
	562	+ "$(SRCDIR)\..\skins\khaki\footer.txt" \
	563	+ "$(SRCDIR)\..\skins\khaki\header.txt" \
	564	+ "$(SRCDIR)\..\skins\original\css.txt" \
	565	+ "$(SRCDIR)\..\skins\original\details.txt" \
	566	+ "$(SRCDIR)\..\skins\original\footer.txt" \
	567	+ "$(SRCDIR)\..\skins\original\header.txt" \
	568	+ "$(SRCDIR)\..\skins\plain_gray\css.txt" \
	569	+ "$(SRCDIR)\..\skins\plain_gray\details.txt" \
	570	+ "$(SRCDIR)\..\skins\plain_gray\footer.txt" \
	571	+ "$(SRCDIR)\..\skins\plain_gray\header.txt" \
	572	+ "$(SRCDIR)\..\skins\xekri\css.txt" \
	573	+ "$(SRCDIR)\..\skins\xekri\details.txt" \
	574	+ "$(SRCDIR)\..\skins\xekri\footer.txt" \
	575	+ "$(SRCDIR)\..\skins\xekri\header.txt" \
	576	+ "$(SRCDIR)\accordion.js" \
	577	+ "$(SRCDIR)\alerts\bflat2.wav" \
	578	+ "$(SRCDIR)\alerts\bflat3.wav" \
	579	+ "$(SRCDIR)\alerts\bloop.wav" \
	580	+ "$(SRCDIR)\alerts\plunk.wav" \
	581	+ "$(SRCDIR)\chat.js" \
	582	+ "$(SRCDIR)\ci_edit.js" \
	583	+ "$(SRCDIR)\copybtn.js" \
	584	+ "$(SRCDIR)\default.css" \
	585	+ "$(SRCDIR)\diff.tcl" \
	586	+ "$(SRCDIR)\forum.js" \
	587	+ "$(SRCDIR)\fossil.bootstrap.js" \
	588	+ "$(SRCDIR)\fossil.confirmer.js" \
	589	+ "$(SRCDIR)\fossil.copybutton.js" \
	590	+ "$(SRCDIR)\fossil.dom.js" \
	591	+ "$(SRCDIR)\fossil.fetch.js" \
	592	+ "$(SRCDIR)\fossil.numbered-lines.js" \
	593	+ "$(SRCDIR)\fossil.page.fileedit.js" \
	594	+ "$(SRCDIR)\fossil.page.forumpost.js" \
	595	+ "$(SRCDIR)\fossil.page.pikchrshow.js" \
	596	+ "$(SRCDIR)\fossil.page.wikiedit.js" \
	597	+ "$(SRCDIR)\fossil.pikchr.js" \
	598	+ "$(SRCDIR)\fossil.popupwidget.js" \
	599	+ "$(SRCDIR)\fossil.storage.js" \
	600	+ "$(SRCDIR)\fossil.tabs.js" \
	601	+ "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
	602	+ "$(SRCDIR)\graph.js" \
	603	+ "$(SRCDIR)\hbmenu.js" \
	604	+ "$(SRCDIR)\href.js" \
	605	+ "$(SRCDIR)\login.js" \
	606	+ "$(SRCDIR)\markdown.md" \
	607	+ "$(SRCDIR)\menu.js" \
	608	+ "$(SRCDIR)\sbsdiff.js" \
	609	+ "$(SRCDIR)\scroll.js" \
	610	+ "$(SRCDIR)\skin.js" \
	611	+ "$(SRCDIR)\sorttable.js" \
	612	+ "$(SRCDIR)\sounds\0.wav" \
	613	+ "$(SRCDIR)\sounds\1.wav" \
	614	+ "$(SRCDIR)\sounds\2.wav" \
	615	+ "$(SRCDIR)\sounds\3.wav" \
	616	+ "$(SRCDIR)\sounds\4.wav" \
	617	+ "$(SRCDIR)\sounds\5.wav" \
	618	+ "$(SRCDIR)\sounds\6.wav" \
	619	+ "$(SRCDIR)\sounds\7.wav" \
	620	+ "$(SRCDIR)\sounds\8.wav" \
	621	+ "$(SRCDIR)\sounds\9.wav" \
	622	+ "$(SRCDIR)\sounds\a.wav" \
	623	+ "$(SRCDIR)\sounds\b.wav" \
	624	+ "$(SRCDIR)\sounds\c.wav" \
	625	+ "$(SRCDIR)\sounds\d.wav" \
	626	+ "$(SRCDIR)\sounds\e.wav" \
	627	+ "$(SRCDIR)\sounds\f.wav" \
	628	+ "$(SRCDIR)\style.admin_log.css" \
	629	+ "$(SRCDIR)\style.fileedit.css" \
	630	+ "$(SRCDIR)\style.wikiedit.css" \
	631	+ "$(SRCDIR)\tree.js" \
	632	+ "$(SRCDIR)\useredit.js" \
	633	+ "$(SRCDIR)\wiki.wiki"
	634	+
	635	+OBJ = \
	636	+ "$(OX)\add$O" \
619	637	"$(OX)\ajax$O" \
620	638	"$(OX)\alerts$O" \
621	639	"$(OX)\allrepo$O" \
622	640	"$(OX)\attach$O" \
623	641	"$(OX)\backlink$O" \
		@@ -766,15 +784,15 @@
766	784	"$(OX)\wikiformat$O" \
767	785	"$(OX)\winfile$O" \
768	786	"$(OX)\winhttp$O" \
769	787	"$(OX)\xfer$O" \
770	788	"$(OX)\xfersetup$O" \
771		- "$(OX)\zip$O" \
	789	+ "$(OX)\zip$O"
772	790	!if $(FOSSIL_ENABLE_MINIZ)!=0
773		- "$(OX)\miniz$O" \
	791	+OBJ = $(OBJ) "$(OX)\miniz$O"
774	792	!endif
775		- "$(OX)\fossil.res"
	793	+OBJ = $(OBJ) "$(OX)\fossil.res"
776	794
777	795
778	796	!ifndef BASEAPPNAME
779	797	BASEAPPNAME = fossil
780	798	!endif
		@@ -781,11 +799,11 @@
781	799
782	800	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
783	801	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
784	802	APPTARGETS =
785	803
786		-all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
	804	+all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
787	805
788	806	$(BASEAPPNAME): "$(APPNAME)"
789	807
790	808	$(BASEAPPNAME)$(E): "$(APPNAME)"
791	809
		@@ -797,55 +815,49 @@
797	815	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
798	816	!if $(DEBUG)!=0
799	817	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
800	818	!endif
801	819
802		-$(OX):
803		- if not exist $@\. mkdir $@
804		-
805		-!if "$(BUILDDIR)"!="$(OX)"
806		-$(BUILDDIR):
807		- if not exist $@\. mkdir $@
808		-!endif
809		-
	820	+ZLIB_X = "$(OX)\zlib_built"
810	821	!if $(FOSSIL_BUILD_ZLIB)
811	822	zlib $(ZLIB_X):
812	823	@echo Building zlib from "$(ZLIBDIR)"...
813	824	!if $(FOSSIL_ENABLE_WINXP)!=0
814	825	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
815	826	!else
816	827	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
817	828	!endif
818		- copy nul $(ZLIB_X)
	829	+ cmd /E:ON /c date /T > $(ZLIB_X)
819	830
820	831	clean-zlib:
821	832	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
822	833	!endif
823	834
824	835	!if $(FOSSIL_ENABLE_SSL)!=0
825	836	OPENSSL_X = "$(OX)\openssl.opts"
826	837	openssl $(OPENSSL_X):
827	838	@echo Building OpenSSL from "$(SSLDIR)"...
828		-!ifdef PERLDIR
	839	+! ifdef PERLDIR
829	840	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
830		-!else
	841	+! else
831	842	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
832		-!endif
833		-!if $(FOSSIL_ENABLE_WINXP)!=0
	843	+! endif
	844	+! if $(FOSSIL_ENABLE_WINXP)!=0
834	845	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
835		-!else
	846	+! else
836	847	@pushd "$(SSLDIR)" && $(MAKE) && popd
837		- echo $(SSLCONFIG) > $(OPENSSL_X)
838		-!endif
	848	+! endif
	849	+ echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
	850	+ cmd /E:ON /c date /T >> $(OPENSSL_X)
839	851
840	852	clean-openssl:
841	853	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
842	854	-del $(OPENSSL_X)
843	855
844		-!if $(FOSSIL_BUILD_SSL)!=0
	856	+! if $(FOSSIL_BUILD_SSL)!=0
845	857	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
846		-!endif
	858	+! endif
847	859
848	860	!endif
849	861
850	862	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
851	863	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
		@@ -1016,30 +1028,15 @@
1016	1028	echo "$(OX)\miniz.obj" >> $@
1017	1029	!endif
1018	1030	echo $(LIBS) >> $@
1019	1031
1020	1032
1021		-# This target gets the project tools built.
1022		-toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1023		-
1024		-"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1025		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026		-
1027		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1028		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029		-
1030		-"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1031		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032		-
1033		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1034		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035		-
1036		-"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1037		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1038		-
1039		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1040		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1033	+{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
	1034	+ $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1035	+
	1036	+# This target gets the project tools built.
	1037	+toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1041	1038
1042	1039	!if $(USE_SEE)!=0
1043	1040	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1044	1041	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1045	1042	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
		@@ -1130,716 +1127,1016 @@
1130	1127	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1131	1128	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1132	1129	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1133	1130
1134	1131	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1135		- echo "$(SRCDIR)\../skins/ardoise/css.txt" > $@
1136		- echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1137		- echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1138		- echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1139		- echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1140		- echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1141		- echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1142		- echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1143		- echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1144		- echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1145		- echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1146		- echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1147		- echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1148		- echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1149		- echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1150		- echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1151		- echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1152		- echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1153		- echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1154		- echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1155		- echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1156		- echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1157		- echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1158		- echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1159		- echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1160		- echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1161		- echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1162		- echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1163		- echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1164		- echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1165		- echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1166		- echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1167		- echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1168		- echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1169		- echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1170		- echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1171		- echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1172		- echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1173		- echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1174		- echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1175		- echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1176		- echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1177		- echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1178		- echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1179		- echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1180		- echo "$(SRCDIR)\accordion.js" >> $@
1181		- echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1182		- echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1183		- echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1184		- echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1185		- echo "$(SRCDIR)\chat.js" >> $@
1186		- echo "$(SRCDIR)\ci_edit.js" >> $@
1187		- echo "$(SRCDIR)\copybtn.js" >> $@
1188		- echo "$(SRCDIR)\default.css" >> $@
1189		- echo "$(SRCDIR)\diff.tcl" >> $@
1190		- echo "$(SRCDIR)\forum.js" >> $@
1191		- echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1192		- echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1193		- echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1194		- echo "$(SRCDIR)\fossil.dom.js" >> $@
1195		- echo "$(SRCDIR)\fossil.fetch.js" >> $@
1196		- echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1197		- echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1198		- echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1199		- echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1200		- echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1201		- echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1202		- echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1203		- echo "$(SRCDIR)\fossil.storage.js" >> $@
1204		- echo "$(SRCDIR)\fossil.tabs.js" >> $@
1205		- echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1206		- echo "$(SRCDIR)\graph.js" >> $@
1207		- echo "$(SRCDIR)\hbmenu.js" >> $@
1208		- echo "$(SRCDIR)\href.js" >> $@
1209		- echo "$(SRCDIR)\login.js" >> $@
1210		- echo "$(SRCDIR)\markdown.md" >> $@
1211		- echo "$(SRCDIR)\menu.js" >> $@
1212		- echo "$(SRCDIR)\sbsdiff.js" >> $@
1213		- echo "$(SRCDIR)\scroll.js" >> $@
1214		- echo "$(SRCDIR)\skin.js" >> $@
1215		- echo "$(SRCDIR)\sorttable.js" >> $@
1216		- echo "$(SRCDIR)\sounds/0.wav" >> $@
1217		- echo "$(SRCDIR)\sounds/1.wav" >> $@
1218		- echo "$(SRCDIR)\sounds/2.wav" >> $@
1219		- echo "$(SRCDIR)\sounds/3.wav" >> $@
1220		- echo "$(SRCDIR)\sounds/4.wav" >> $@
1221		- echo "$(SRCDIR)\sounds/5.wav" >> $@
1222		- echo "$(SRCDIR)\sounds/6.wav" >> $@
1223		- echo "$(SRCDIR)\sounds/7.wav" >> $@
1224		- echo "$(SRCDIR)\sounds/8.wav" >> $@
1225		- echo "$(SRCDIR)\sounds/9.wav" >> $@
1226		- echo "$(SRCDIR)\sounds/a.wav" >> $@
1227		- echo "$(SRCDIR)\sounds/b.wav" >> $@
1228		- echo "$(SRCDIR)\sounds/c.wav" >> $@
1229		- echo "$(SRCDIR)\sounds/d.wav" >> $@
1230		- echo "$(SRCDIR)\sounds/e.wav" >> $@
1231		- echo "$(SRCDIR)\sounds/f.wav" >> $@
1232		- echo "$(SRCDIR)\style.admin_log.css" >> $@
1233		- echo "$(SRCDIR)\style.fileedit.css" >> $@
1234		- echo "$(SRCDIR)\style.wikiedit.css" >> $@
1235		- echo "$(SRCDIR)\tree.js" >> $@
1236		- echo "$(SRCDIR)\useredit.js" >> $@
1237		- echo "$(SRCDIR)\wiki.wiki" >> $@
1238		-
	1132	+ -echo. > $@
	1133	+ @echo "$(SRCDIR)\../skins/ardoise/css.txt" >> $@
	1134	+ @echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
	1135	+ @echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
	1136	+ @echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
	1137	+ @echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
	1138	+ @echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
	1139	+ @echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
	1140	+ @echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
	1141	+ @echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
	1142	+ @echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
	1143	+ @echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
	1144	+ @echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
	1145	+ @echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
	1146	+ @echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
	1147	+ @echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
	1148	+ @echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
	1149	+ @echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
	1150	+ @echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
	1151	+ @echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
	1152	+ @echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
	1153	+ @echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
	1154	+ @echo "$(SRCDIR)\../skins/default/css.txt" >> $@
	1155	+ @echo "$(SRCDIR)\../skins/default/details.txt" >> $@
	1156	+ @echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
	1157	+ @echo "$(SRCDIR)\../skins/default/header.txt" >> $@
	1158	+ @echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
	1159	+ @echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
	1160	+ @echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
	1161	+ @echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
	1162	+ @echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
	1163	+ @echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
	1164	+ @echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
	1165	+ @echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
	1166	+ @echo "$(SRCDIR)\../skins/original/css.txt" >> $@
	1167	+ @echo "$(SRCDIR)\../skins/original/details.txt" >> $@
	1168	+ @echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
	1169	+ @echo "$(SRCDIR)\../skins/original/header.txt" >> $@
	1170	+ @echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
	1171	+ @echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
	1172	+ @echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
	1173	+ @echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
	1174	+ @echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
	1175	+ @echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
	1176	+ @echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
	1177	+ @echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
	1178	+ @echo "$(SRCDIR)\accordion.js" >> $@
	1179	+ @echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
	1180	+ @echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
	1181	+ @echo "$(SRCDIR)\alerts/bloop.wav" >> $@
	1182	+ @echo "$(SRCDIR)\alerts/plunk.wav" >> $@
	1183	+ @echo "$(SRCDIR)\chat.js" >> $@
	1184	+ @echo "$(SRCDIR)\ci_edit.js" >> $@
	1185	+ @echo "$(SRCDIR)\copybtn.js" >> $@
	1186	+ @echo "$(SRCDIR)\default.css" >> $@
	1187	+ @echo "$(SRCDIR)\diff.tcl" >> $@
	1188	+ @echo "$(SRCDIR)\forum.js" >> $@
	1189	+ @echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
	1190	+ @echo "$(SRCDIR)\fossil.confirmer.js" >> $@
	1191	+ @echo "$(SRCDIR)\fossil.copybutton.js" >> $@
	1192	+ @echo "$(SRCDIR)\fossil.dom.js" >> $@
	1193	+ @echo "$(SRCDIR)\fossil.fetch.js" >> $@
	1194	+ @echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
	1195	+ @echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
	1196	+ @echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
	1197	+ @echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
	1198	+ @echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
	1199	+ @echo "$(SRCDIR)\fossil.pikchr.js" >> $@
	1200	+ @echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
	1201	+ @echo "$(SRCDIR)\fossil.storage.js" >> $@
	1202	+ @echo "$(SRCDIR)\fossil.tabs.js" >> $@
	1203	+ @echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
	1204	+ @echo "$(SRCDIR)\graph.js" >> $@
	1205	+ @echo "$(SRCDIR)\hbmenu.js" >> $@
	1206	+ @echo "$(SRCDIR)\href.js" >> $@
	1207	+ @echo "$(SRCDIR)\login.js" >> $@
	1208	+ @echo "$(SRCDIR)\markdown.md" >> $@
	1209	+ @echo "$(SRCDIR)\menu.js" >> $@
	1210	+ @echo "$(SRCDIR)\sbsdiff.js" >> $@
	1211	+ @echo "$(SRCDIR)\scroll.js" >> $@
	1212	+ @echo "$(SRCDIR)\skin.js" >> $@
	1213	+ @echo "$(SRCDIR)\sorttable.js" >> $@
	1214	+ @echo "$(SRCDIR)\sounds/0.wav" >> $@
	1215	+ @echo "$(SRCDIR)\sounds/1.wav" >> $@
	1216	+ @echo "$(SRCDIR)\sounds/2.wav" >> $@
	1217	+ @echo "$(SRCDIR)\sounds/3.wav" >> $@
	1218	+ @echo "$(SRCDIR)\sounds/4.wav" >> $@
	1219	+ @echo "$(SRCDIR)\sounds/5.wav" >> $@
	1220	+ @echo "$(SRCDIR)\sounds/6.wav" >> $@
	1221	+ @echo "$(SRCDIR)\sounds/7.wav" >> $@
	1222	+ @echo "$(SRCDIR)\sounds/8.wav" >> $@
	1223	+ @echo "$(SRCDIR)\sounds/9.wav" >> $@
	1224	+ @echo "$(SRCDIR)\sounds/a.wav" >> $@
	1225	+ @echo "$(SRCDIR)\sounds/b.wav" >> $@
	1226	+ @echo "$(SRCDIR)\sounds/c.wav" >> $@
	1227	+ @echo "$(SRCDIR)\sounds/d.wav" >> $@
	1228	+ @echo "$(SRCDIR)\sounds/e.wav" >> $@
	1229	+ @echo "$(SRCDIR)\sounds/f.wav" >> $@
	1230	+ @echo "$(SRCDIR)\style.admin_log.css" >> $@
	1231	+ @echo "$(SRCDIR)\style.fileedit.css" >> $@
	1232	+ @echo "$(SRCDIR)\style.wikiedit.css" >> $@
	1233	+ @echo "$(SRCDIR)\tree.js" >> $@
	1234	+ @echo "$(SRCDIR)\useredit.js" >> $@
	1235	+ @echo "$(SRCDIR)\wiki.wiki" >> $@
	1236	+{$(OX)\}.c{$(OX)\}.h:
	1237	+ "$(OBJDIR)\makeheaders$E" $**:$@
1239	1238	{$(SRCDIR)\}.c{$(OX)\}.c:
1240	1239	"$(OBJDIR)\translate$E" $** > $@
1241		-
1242		-{$(OX)}.c{$(OX)}.h :
1243		- "$(OBJDIR)\makeheaders$E" $**:$@
1244		-
1245	1240	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1246	1241	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1247	1242
	1243	+"$(OX)\add.c" : "$(SRCDIR)\add.c"
	1244	+"$(OX)\add.h" : "$(OX)\add.c"
1248	1245	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1249	1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1250	1247
	1248	+"$(OX)\ajax.c" : "$(SRCDIR)\ajax.c"
	1249	+"$(OX)\ajax.h" : "$(OX)\ajax.c"
1251	1250	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1252	1251	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1253	1252
	1253	+"$(OX)\alerts.c" : "$(SRCDIR)\alerts.c"
	1254	+"$(OX)\alerts.h" : "$(OX)\alerts.c"
1254	1255	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1255	1256	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1256	1257
	1258	+"$(OX)\allrepo.c" : "$(SRCDIR)\allrepo.c"
	1259	+"$(OX)\allrepo.h" : "$(OX)\allrepo.c"
1257	1260	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1258	1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1259	1262
	1263	+"$(OX)\attach.c" : "$(SRCDIR)\attach.c"
	1264	+"$(OX)\attach.h" : "$(OX)\attach.c"
1260	1265	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1261	1266	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1262	1267
	1268	+"$(OX)\backlink.c" : "$(SRCDIR)\backlink.c"
	1269	+"$(OX)\backlink.h" : "$(OX)\backlink.c"
1263	1270	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1264	1271	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1265	1272
	1273	+"$(OX)\backoffice.c" : "$(SRCDIR)\backoffice.c"
	1274	+"$(OX)\backoffice.h" : "$(OX)\backoffice.c"
1266	1275	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1267	1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1268	1277
	1278	+"$(OX)\bag.c" : "$(SRCDIR)\bag.c"
	1279	+"$(OX)\bag.h" : "$(OX)\bag.c"
1269	1280	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1270	1281	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1271	1282
	1283	+"$(OX)\bisect.c" : "$(SRCDIR)\bisect.c"
	1284	+"$(OX)\bisect.h" : "$(OX)\bisect.c"
1272	1285	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1273	1286	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1274	1287
	1288	+"$(OX)\blob.c" : "$(SRCDIR)\blob.c"
	1289	+"$(OX)\blob.h" : "$(OX)\blob.c"
1275	1290	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1276	1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1277	1292
	1293	+"$(OX)\branch.c" : "$(SRCDIR)\branch.c"
	1294	+"$(OX)\branch.h" : "$(OX)\branch.c"
1278	1295	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1279	1296	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1280	1297
	1298	+"$(OX)\browse.c" : "$(SRCDIR)\browse.c"
	1299	+"$(OX)\browse.h" : "$(OX)\browse.c"
1281	1300	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1282	1301	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1283	1302
	1303	+"$(OX)\builtin.c" : "$(SRCDIR)\builtin.c"
	1304	+"$(OX)\builtin.h" : "$(OX)\builtin.c"
1284	1305	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1285	1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1286	1307
	1308	+"$(OX)\bundle.c" : "$(SRCDIR)\bundle.c"
	1309	+"$(OX)\bundle.h" : "$(OX)\bundle.c"
1287	1310	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1288	1311	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1289	1312
	1313	+"$(OX)\cache.c" : "$(SRCDIR)\cache.c"
	1314	+"$(OX)\cache.h" : "$(OX)\cache.c"
1290	1315	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1291	1316	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1292	1317
	1318	+"$(OX)\capabilities.c" : "$(SRCDIR)\capabilities.c"
	1319	+"$(OX)\capabilities.h" : "$(OX)\capabilities.c"
1293	1320	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1294	1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1295	1322
	1323	+"$(OX)\captcha.c" : "$(SRCDIR)\captcha.c"
	1324	+"$(OX)\captcha.h" : "$(OX)\captcha.c"
1296	1325	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1297	1326	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1298	1327
	1328	+"$(OX)\cgi.c" : "$(SRCDIR)\cgi.c"
	1329	+"$(OX)\cgi.h" : "$(OX)\cgi.c"
1299	1330	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1300	1331	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1301	1332
	1333	+"$(OX)\chat.c" : "$(SRCDIR)\chat.c"
	1334	+"$(OX)\chat.h" : "$(OX)\chat.c"
1302	1335	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1303	1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1304	1337
	1338	+"$(OX)\checkin.c" : "$(SRCDIR)\checkin.c"
	1339	+"$(OX)\checkin.h" : "$(OX)\checkin.c"
1305	1340	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1306	1341	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1307	1342
	1343	+"$(OX)\checkout.c" : "$(SRCDIR)\checkout.c"
	1344	+"$(OX)\checkout.h" : "$(OX)\checkout.c"
1308	1345	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1309	1346	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1310	1347
	1348	+"$(OX)\clearsign.c" : "$(SRCDIR)\clearsign.c"
	1349	+"$(OX)\clearsign.h" : "$(OX)\clearsign.c"
1311	1350	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1312	1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1313	1352
	1353	+"$(OX)\clone.c" : "$(SRCDIR)\clone.c"
	1354	+"$(OX)\clone.h" : "$(OX)\clone.c"
1314	1355	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1315	1356	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1316	1357
	1358	+"$(OX)\color.c" : "$(SRCDIR)\color.c"
	1359	+"$(OX)\color.h" : "$(OX)\color.c"
1317	1360	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1318	1361	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1319	1362
	1363	+"$(OX)\comformat.c" : "$(SRCDIR)\comformat.c"
	1364	+"$(OX)\comformat.h" : "$(OX)\comformat.c"
1320	1365	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1321	1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1322	1367
	1368	+"$(OX)\configure.c" : "$(SRCDIR)\configure.c"
	1369	+"$(OX)\configure.h" : "$(OX)\configure.c"
1323	1370	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1324	1371	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1325	1372
	1373	+"$(OX)\content.c" : "$(SRCDIR)\content.c"
	1374	+"$(OX)\content.h" : "$(OX)\content.c"
1326	1375	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1327	1376	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1328	1377
	1378	+"$(OX)\cookies.c" : "$(SRCDIR)\cookies.c"
	1379	+"$(OX)\cookies.h" : "$(OX)\cookies.c"
1329	1380	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1330	1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1331	1382
	1383	+"$(OX)\db.c" : "$(SRCDIR)\db.c"
	1384	+"$(OX)\db.h" : "$(OX)\db.c"
1332	1385	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1333	1386	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1334	1387
	1388	+"$(OX)\delta.c" : "$(SRCDIR)\delta.c"
	1389	+"$(OX)\delta.h" : "$(OX)\delta.c"
1335	1390	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1336	1391	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1337	1392
	1393	+"$(OX)\deltacmd.c" : "$(SRCDIR)\deltacmd.c"
	1394	+"$(OX)\deltacmd.h" : "$(OX)\deltacmd.c"
1338	1395	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1339	1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1340	1397
	1398	+"$(OX)\deltafunc.c" : "$(SRCDIR)\deltafunc.c"
	1399	+"$(OX)\deltafunc.h" : "$(OX)\deltafunc.c"
1341	1400	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1342	1401	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1343	1402
	1403	+"$(OX)\descendants.c" : "$(SRCDIR)\descendants.c"
	1404	+"$(OX)\descendants.h" : "$(OX)\descendants.c"
1344	1405	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1345	1406	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1346	1407
	1408	+"$(OX)\diff.c" : "$(SRCDIR)\diff.c"
	1409	+"$(OX)\diff.h" : "$(OX)\diff.c"
1347	1410	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1348	1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1349	1412
	1413	+"$(OX)\diffcmd.c" : "$(SRCDIR)\diffcmd.c"
	1414	+"$(OX)\diffcmd.h" : "$(OX)\diffcmd.c"
1350	1415	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1351	1416	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1352	1417
	1418	+"$(OX)\dispatch.c" : "$(SRCDIR)\dispatch.c"
	1419	+"$(OX)\dispatch.h" : "$(OX)\dispatch.c"
1353	1420	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1354	1421	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1355	1422
	1423	+"$(OX)\doc.c" : "$(SRCDIR)\doc.c"
	1424	+"$(OX)\doc.h" : "$(OX)\doc.c"
1356	1425	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1357	1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1358	1427
	1428	+"$(OX)\encode.c" : "$(SRCDIR)\encode.c"
	1429	+"$(OX)\encode.h" : "$(OX)\encode.c"
1359	1430	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1360	1431	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1361	1432
	1433	+"$(OX)\etag.c" : "$(SRCDIR)\etag.c"
	1434	+"$(OX)\etag.h" : "$(OX)\etag.c"
1362	1435	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1363	1436	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1364	1437
	1438	+"$(OX)\event.c" : "$(SRCDIR)\event.c"
	1439	+"$(OX)\event.h" : "$(OX)\event.c"
1365	1440	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1366	1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1367	1442
	1443	+"$(OX)\export.c" : "$(SRCDIR)\export.c"
	1444	+"$(OX)\export.h" : "$(OX)\export.c"
1368	1445	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1369	1446	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1370	1447
	1448	+"$(OX)\extcgi.c" : "$(SRCDIR)\extcgi.c"
	1449	+"$(OX)\extcgi.h" : "$(OX)\extcgi.c"
1371	1450	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1372	1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1373	1452
	1453	+"$(OX)\file.c" : "$(SRCDIR)\file.c"
	1454	+"$(OX)\file.h" : "$(OX)\file.c"
1374	1455	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1375	1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1376	1457
	1458	+"$(OX)\fileedit.c" : "$(SRCDIR)\fileedit.c"
	1459	+"$(OX)\fileedit.h" : "$(OX)\fileedit.c"
1377	1460	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1378	1461	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1379	1462
	1463	+"$(OX)\finfo.c" : "$(SRCDIR)\finfo.c"
	1464	+"$(OX)\finfo.h" : "$(OX)\finfo.c"
1380	1465	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1381	1466	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1382	1467
	1468	+"$(OX)\foci.c" : "$(SRCDIR)\foci.c"
	1469	+"$(OX)\foci.h" : "$(OX)\foci.c"
1383	1470	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1384	1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1385	1472
	1473	+"$(OX)\forum.c" : "$(SRCDIR)\forum.c"
	1474	+"$(OX)\forum.h" : "$(OX)\forum.c"
1386	1475	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1387	1476	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1388	1477
	1478	+"$(OX)\fshell.c" : "$(SRCDIR)\fshell.c"
	1479	+"$(OX)\fshell.h" : "$(OX)\fshell.c"
1389	1480	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1390	1481	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1391	1482
	1483	+"$(OX)\fusefs.c" : "$(SRCDIR)\fusefs.c"
	1484	+"$(OX)\fusefs.h" : "$(OX)\fusefs.c"
1392	1485	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1393	1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1394	1487
	1488	+"$(OX)\fuzz.c" : "$(SRCDIR)\fuzz.c"
	1489	+"$(OX)\fuzz.h" : "$(OX)\fuzz.c"
1395	1490	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1396	1491	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1397	1492
	1493	+"$(OX)\glob.c" : "$(SRCDIR)\glob.c"
	1494	+"$(OX)\glob.h" : "$(OX)\glob.c"
1398	1495	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1399	1496	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1400	1497
	1498	+"$(OX)\graph.c" : "$(SRCDIR)\graph.c"
	1499	+"$(OX)\graph.h" : "$(OX)\graph.c"
1401	1500	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1402	1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1403	1502
	1503	+"$(OX)\gzip.c" : "$(SRCDIR)\gzip.c"
	1504	+"$(OX)\gzip.h" : "$(OX)\gzip.c"
1404	1505	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1405	1506	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1406	1507
	1508	+"$(OX)\hname.c" : "$(SRCDIR)\hname.c"
	1509	+"$(OX)\hname.h" : "$(OX)\hname.c"
1407	1510	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1408	1511	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1409	1512
	1513	+"$(OX)\hook.c" : "$(SRCDIR)\hook.c"
	1514	+"$(OX)\hook.h" : "$(OX)\hook.c"
1410	1515	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1411	1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1412	1517
	1518	+"$(OX)\http.c" : "$(SRCDIR)\http.c"
	1519	+"$(OX)\http.h" : "$(OX)\http.c"
1413	1520	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1414	1521	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1415	1522
	1523	+"$(OX)\http_socket.c" : "$(SRCDIR)\http_socket.c"
	1524	+"$(OX)\http_socket.h" : "$(OX)\http_socket.c"
1416	1525	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1417	1526	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1418	1527
	1528	+"$(OX)\http_ssl.c" : "$(SRCDIR)\http_ssl.c"
	1529	+"$(OX)\http_ssl.h" : "$(OX)\http_ssl.c"
1419	1530	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1420	1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1421	1532
	1533	+"$(OX)\http_transport.c" : "$(SRCDIR)\http_transport.c"
	1534	+"$(OX)\http_transport.h" : "$(OX)\http_transport.c"
1422	1535	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1423	1536	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1424	1537
	1538	+"$(OX)\import.c" : "$(SRCDIR)\import.c"
	1539	+"$(OX)\import.h" : "$(OX)\import.c"
1425	1540	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1426	1541	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1427	1542
	1543	+"$(OX)\info.c" : "$(SRCDIR)\info.c"
	1544	+"$(OX)\info.h" : "$(OX)\info.c"
1428	1545	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1429	1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1430	1547
	1548	+"$(OX)\interwiki.c" : "$(SRCDIR)\interwiki.c"
	1549	+"$(OX)\interwiki.h" : "$(OX)\interwiki.c"
1431	1550	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1432	1551	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1433	1552
	1553	+"$(OX)\json.c" : "$(SRCDIR)\json.c"
	1554	+"$(OX)\json.h" : "$(OX)\json.c"
1434	1555	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1435	1556	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1436	1557
	1558	+"$(OX)\json_artifact.c" : "$(SRCDIR)\json_artifact.c"
	1559	+"$(OX)\json_artifact.h" : "$(OX)\json_artifact.c"
1437	1560	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1438	1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1439	1562
	1563	+"$(OX)\json_branch.c" : "$(SRCDIR)\json_branch.c"
	1564	+"$(OX)\json_branch.h" : "$(OX)\json_branch.c"
1440	1565	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1441	1566	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1442	1567
	1568	+"$(OX)\json_config.c" : "$(SRCDIR)\json_config.c"
	1569	+"$(OX)\json_config.h" : "$(OX)\json_config.c"
1443	1570	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1444	1571	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1445	1572
	1573	+"$(OX)\json_diff.c" : "$(SRCDIR)\json_diff.c"
	1574	+"$(OX)\json_diff.h" : "$(OX)\json_diff.c"
1446	1575	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1447	1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1448	1577
	1578	+"$(OX)\json_dir.c" : "$(SRCDIR)\json_dir.c"
	1579	+"$(OX)\json_dir.h" : "$(OX)\json_dir.c"
1449	1580	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1450	1581	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1451	1582
	1583	+"$(OX)\json_finfo.c" : "$(SRCDIR)\json_finfo.c"
	1584	+"$(OX)\json_finfo.h" : "$(OX)\json_finfo.c"
1452	1585	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1453	1586	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1454	1587
	1588	+"$(OX)\json_login.c" : "$(SRCDIR)\json_login.c"
	1589	+"$(OX)\json_login.h" : "$(OX)\json_login.c"
1455	1590	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1456	1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1457	1592
	1593	+"$(OX)\json_query.c" : "$(SRCDIR)\json_query.c"
	1594	+"$(OX)\json_query.h" : "$(OX)\json_query.c"
1458	1595	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1459	1596	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1460	1597
	1598	+"$(OX)\json_report.c" : "$(SRCDIR)\json_report.c"
	1599	+"$(OX)\json_report.h" : "$(OX)\json_report.c"
1461	1600	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1462	1601	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1463	1602
	1603	+"$(OX)\json_status.c" : "$(SRCDIR)\json_status.c"
	1604	+"$(OX)\json_status.h" : "$(OX)\json_status.c"
1464	1605	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1465	1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1466	1607
	1608	+"$(OX)\json_tag.c" : "$(SRCDIR)\json_tag.c"
	1609	+"$(OX)\json_tag.h" : "$(OX)\json_tag.c"
1467	1610	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1468	1611	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1469	1612
	1613	+"$(OX)\json_timeline.c" : "$(SRCDIR)\json_timeline.c"
	1614	+"$(OX)\json_timeline.h" : "$(OX)\json_timeline.c"
1470	1615	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1471	1616	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1472	1617
	1618	+"$(OX)\json_user.c" : "$(SRCDIR)\json_user.c"
	1619	+"$(OX)\json_user.h" : "$(OX)\json_user.c"
1473	1620	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1474	1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1475	1622
	1623	+"$(OX)\json_wiki.c" : "$(SRCDIR)\json_wiki.c"
	1624	+"$(OX)\json_wiki.h" : "$(OX)\json_wiki.c"
1476	1625	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1477	1626	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1478	1627
	1628	+"$(OX)\leaf.c" : "$(SRCDIR)\leaf.c"
	1629	+"$(OX)\leaf.h" : "$(OX)\leaf.c"
1479	1630	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1480	1631	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1481	1632
	1633	+"$(OX)\loadctrl.c" : "$(SRCDIR)\loadctrl.c"
	1634	+"$(OX)\loadctrl.h" : "$(OX)\loadctrl.c"
1482	1635	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1483	1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1484	1637
	1638	+"$(OX)\login.c" : "$(SRCDIR)\login.c"
	1639	+"$(OX)\login.h" : "$(OX)\login.c"
1485	1640	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1486	1641	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1487	1642
	1643	+"$(OX)\lookslike.c" : "$(SRCDIR)\lookslike.c"
	1644	+"$(OX)\lookslike.h" : "$(OX)\lookslike.c"
1488	1645	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1489	1646	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1490	1647
	1648	+"$(OX)\main.c" : "$(SRCDIR)\main.c"
	1649	+"$(OX)\main.h" : "$(OX)\main.c"
1491	1650	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1492	1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1493	1652
	1653	+"$(OX)\manifest.c" : "$(SRCDIR)\manifest.c"
	1654	+"$(OX)\manifest.h" : "$(OX)\manifest.c"
1494	1655	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1495	1656	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1496	1657
	1658	+"$(OX)\markdown.c" : "$(SRCDIR)\markdown.c"
	1659	+"$(OX)\markdown.h" : "$(OX)\markdown.c"
1497	1660	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1498	1661	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1499	1662
	1663	+"$(OX)\markdown_html.c" : "$(SRCDIR)\markdown_html.c"
	1664	+"$(OX)\markdown_html.h" : "$(OX)\markdown_html.c"
1500	1665	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1501	1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1502	1667
	1668	+"$(OX)\md5.c" : "$(SRCDIR)\md5.c"
	1669	+"$(OX)\md5.h" : "$(OX)\md5.c"
1503	1670	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1504	1671	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1505	1672
	1673	+"$(OX)\merge.c" : "$(SRCDIR)\merge.c"
	1674	+"$(OX)\merge.h" : "$(OX)\merge.c"
1506	1675	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1507	1676	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1508	1677
	1678	+"$(OX)\merge3.c" : "$(SRCDIR)\merge3.c"
	1679	+"$(OX)\merge3.h" : "$(OX)\merge3.c"
1509	1680	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1510	1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1511	1682
	1683	+"$(OX)\moderate.c" : "$(SRCDIR)\moderate.c"
	1684	+"$(OX)\moderate.h" : "$(OX)\moderate.c"
1512	1685	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1513	1686	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1514	1687
	1688	+"$(OX)\name.c" : "$(SRCDIR)\name.c"
	1689	+"$(OX)\name.h" : "$(OX)\name.c"
1515	1690	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1516	1691	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1517	1692
	1693	+"$(OX)\path.c" : "$(SRCDIR)\path.c"
	1694	+"$(OX)\path.h" : "$(OX)\path.c"
1518	1695	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1519	1696	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1520	1697
	1698	+"$(OX)\piechart.c" : "$(SRCDIR)\piechart.c"
	1699	+"$(OX)\piechart.h" : "$(OX)\piechart.c"
1521	1700	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1522	1701	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1523	1702
	1703	+"$(OX)\pikchr.c" : "$(SRCDIR)\pikchr.c"
	1704	+"$(OX)\pikchr.h" : "$(OX)\pikchr.c"
1524	1705	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1525	1706	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1526	1707
	1708	+"$(OX)\pikchrshow.c" : "$(SRCDIR)\pikchrshow.c"
	1709	+"$(OX)\pikchrshow.h" : "$(OX)\pikchrshow.c"
1527	1710	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1528	1711	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1529	1712
	1713	+"$(OX)\pivot.c" : "$(SRCDIR)\pivot.c"
	1714	+"$(OX)\pivot.h" : "$(OX)\pivot.c"
1530	1715	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1531	1716	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1532	1717
	1718	+"$(OX)\popen.c" : "$(SRCDIR)\popen.c"
	1719	+"$(OX)\popen.h" : "$(OX)\popen.c"
1533	1720	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1534	1721	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1535	1722
	1723	+"$(OX)\pqueue.c" : "$(SRCDIR)\pqueue.c"
	1724	+"$(OX)\pqueue.h" : "$(OX)\pqueue.c"
1536	1725	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1537	1726	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1538	1727
	1728	+"$(OX)\printf.c" : "$(SRCDIR)\printf.c"
	1729	+"$(OX)\printf.h" : "$(OX)\printf.c"
1539	1730	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1540	1731	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1541	1732
	1733	+"$(OX)\publish.c" : "$(SRCDIR)\publish.c"
	1734	+"$(OX)\publish.h" : "$(OX)\publish.c"
1542	1735	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1543	1736	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1544	1737
	1738	+"$(OX)\purge.c" : "$(SRCDIR)\purge.c"
	1739	+"$(OX)\purge.h" : "$(OX)\purge.c"
1545	1740	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1546	1741	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1547	1742
	1743	+"$(OX)\rebuild.c" : "$(SRCDIR)\rebuild.c"
	1744	+"$(OX)\rebuild.h" : "$(OX)\rebuild.c"
1548	1745	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1549	1746	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1550	1747
	1748	+"$(OX)\regexp.c" : "$(SRCDIR)\regexp.c"
	1749	+"$(OX)\regexp.h" : "$(OX)\regexp.c"
1551	1750	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1552	1751	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1553	1752
	1753	+"$(OX)\repolist.c" : "$(SRCDIR)\repolist.c"
	1754	+"$(OX)\repolist.h" : "$(OX)\repolist.c"
1554	1755	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1555	1756	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1556	1757
	1758	+"$(OX)\report.c" : "$(SRCDIR)\report.c"
	1759	+"$(OX)\report.h" : "$(OX)\report.c"
1557	1760	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1558	1761	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1559	1762
	1763	+"$(OX)\rss.c" : "$(SRCDIR)\rss.c"
	1764	+"$(OX)\rss.h" : "$(OX)\rss.c"
1560	1765	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1561	1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1562	1767
	1768	+"$(OX)\schema.c" : "$(SRCDIR)\schema.c"
	1769	+"$(OX)\schema.h" : "$(OX)\schema.c"
1563	1770	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1564	1771	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1565	1772
	1773	+"$(OX)\search.c" : "$(SRCDIR)\search.c"
	1774	+"$(OX)\search.h" : "$(OX)\search.c"
1566	1775	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1567	1776	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1568	1777
	1778	+"$(OX)\security_audit.c" : "$(SRCDIR)\security_audit.c"
	1779	+"$(OX)\security_audit.h" : "$(OX)\security_audit.c"
1569	1780	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1570	1781	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1571	1782
	1783	+"$(OX)\setup.c" : "$(SRCDIR)\setup.c"
	1784	+"$(OX)\setup.h" : "$(OX)\setup.c"
1572	1785	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1573	1786	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1574	1787
	1788	+"$(OX)\setupuser.c" : "$(SRCDIR)\setupuser.c"
	1789	+"$(OX)\setupuser.h" : "$(OX)\setupuser.c"
1575	1790	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1576	1791	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1577	1792
	1793	+"$(OX)\sha1.c" : "$(SRCDIR)\sha1.c"
	1794	+"$(OX)\sha1.h" : "$(OX)\sha1.c"
1578	1795	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1579	1796	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1580	1797
	1798	+"$(OX)\sha1hard.c" : "$(SRCDIR)\sha1hard.c"
	1799	+"$(OX)\sha1hard.h" : "$(OX)\sha1hard.c"
1581	1800	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1582	1801	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1583	1802
	1803	+"$(OX)\sha3.c" : "$(SRCDIR)\sha3.c"
	1804	+"$(OX)\sha3.h" : "$(OX)\sha3.c"
1584	1805	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1585	1806	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1586	1807
	1808	+"$(OX)\shun.c" : "$(SRCDIR)\shun.c"
	1809	+"$(OX)\shun.h" : "$(OX)\shun.c"
1587	1810	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1588	1811	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1589	1812
	1813	+"$(OX)\sitemap.c" : "$(SRCDIR)\sitemap.c"
	1814	+"$(OX)\sitemap.h" : "$(OX)\sitemap.c"
1590	1815	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1591	1816	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1592	1817
	1818	+"$(OX)\skins.c" : "$(SRCDIR)\skins.c"
	1819	+"$(OX)\skins.h" : "$(OX)\skins.c"
1593	1820	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1594	1821	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1595	1822
	1823	+"$(OX)\smtp.c" : "$(SRCDIR)\smtp.c"
	1824	+"$(OX)\smtp.h" : "$(OX)\smtp.c"
1596	1825	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1597	1826	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1598	1827
	1828	+"$(OX)\sqlcmd.c" : "$(SRCDIR)\sqlcmd.c"
	1829	+"$(OX)\sqlcmd.h" : "$(OX)\sqlcmd.c"
1599	1830	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1600	1831	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1601	1832
	1833	+"$(OX)\stash.c" : "$(SRCDIR)\stash.c"
	1834	+"$(OX)\stash.h" : "$(OX)\stash.c"
1602	1835	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1603	1836	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1604	1837
	1838	+"$(OX)\stat.c" : "$(SRCDIR)\stat.c"
	1839	+"$(OX)\stat.h" : "$(OX)\stat.c"
1605	1840	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1606	1841	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1607	1842
	1843	+"$(OX)\statrep.c" : "$(SRCDIR)\statrep.c"
	1844	+"$(OX)\statrep.h" : "$(OX)\statrep.c"
1608	1845	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1609	1846	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1610	1847
	1848	+"$(OX)\style.c" : "$(SRCDIR)\style.c"
	1849	+"$(OX)\style.h" : "$(OX)\style.c"
1611	1850	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1612	1851	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1613	1852
	1853	+"$(OX)\sync.c" : "$(SRCDIR)\sync.c"
	1854	+"$(OX)\sync.h" : "$(OX)\sync.c"
1614	1855	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1615	1856	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1616	1857
	1858	+"$(OX)\tag.c" : "$(SRCDIR)\tag.c"
	1859	+"$(OX)\tag.h" : "$(OX)\tag.c"
1617	1860	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1618	1861	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1619	1862
	1863	+"$(OX)\tar.c" : "$(SRCDIR)\tar.c"
	1864	+"$(OX)\tar.h" : "$(OX)\tar.c"
1620	1865	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1621	1866	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1622	1867
	1868	+"$(OX)\terminal.c" : "$(SRCDIR)\terminal.c"
	1869	+"$(OX)\terminal.h" : "$(OX)\terminal.c"
1623	1870	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1624	1871	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1625	1872
	1873	+"$(OX)\th_main.c" : "$(SRCDIR)\th_main.c"
	1874	+"$(OX)\th_main.h" : "$(OX)\th_main.c"
1626	1875	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1627	1876	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1628	1877
	1878	+"$(OX)\timeline.c" : "$(SRCDIR)\timeline.c"
	1879	+"$(OX)\timeline.h" : "$(OX)\timeline.c"
1629	1880	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1630	1881	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1631	1882
	1883	+"$(OX)\tkt.c" : "$(SRCDIR)\tkt.c"
	1884	+"$(OX)\tkt.h" : "$(OX)\tkt.c"
1632	1885	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1633	1886	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1634	1887
	1888	+"$(OX)\tktsetup.c" : "$(SRCDIR)\tktsetup.c"
	1889	+"$(OX)\tktsetup.h" : "$(OX)\tktsetup.c"
1635	1890	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1636	1891	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1637	1892
	1893	+"$(OX)\undo.c" : "$(SRCDIR)\undo.c"
	1894	+"$(OX)\undo.h" : "$(OX)\undo.c"
1638	1895	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1639	1896	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1640	1897
	1898	+"$(OX)\unicode.c" : "$(SRCDIR)\unicode.c"
	1899	+"$(OX)\unicode.h" : "$(OX)\unicode.c"
1641	1900	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1642	1901	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1643	1902
	1903	+"$(OX)\unversioned.c" : "$(SRCDIR)\unversioned.c"
	1904	+"$(OX)\unversioned.h" : "$(OX)\unversioned.c"
1644	1905	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1645	1906	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1646	1907
	1908	+"$(OX)\update.c" : "$(SRCDIR)\update.c"
	1909	+"$(OX)\update.h" : "$(OX)\update.c"
1647	1910	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1648	1911	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1649	1912
	1913	+"$(OX)\url.c" : "$(SRCDIR)\url.c"
	1914	+"$(OX)\url.h" : "$(OX)\url.c"
1650	1915	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1651	1916	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1652	1917
	1918	+"$(OX)\user.c" : "$(SRCDIR)\user.c"
	1919	+"$(OX)\user.h" : "$(OX)\user.c"
1653	1920	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1654	1921	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1655	1922
	1923	+"$(OX)\utf8.c" : "$(SRCDIR)\utf8.c"
	1924	+"$(OX)\utf8.h" : "$(OX)\utf8.c"
1656	1925	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1657	1926	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1658	1927
	1928	+"$(OX)\util.c" : "$(SRCDIR)\util.c"
	1929	+"$(OX)\util.h" : "$(OX)\util.c"
1659	1930	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1660	1931	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1661	1932
	1933	+"$(OX)\verify.c" : "$(SRCDIR)\verify.c"
	1934	+"$(OX)\verify.h" : "$(OX)\verify.c"
1662	1935	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1663	1936	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1664	1937
	1938	+"$(OX)\vfile.c" : "$(SRCDIR)\vfile.c"
	1939	+"$(OX)\vfile.h" : "$(OX)\vfile.c"
1665	1940	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1666	1941	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1667	1942
	1943	+"$(OX)\webmail.c" : "$(SRCDIR)\webmail.c"
	1944	+"$(OX)\webmail.h" : "$(OX)\webmail.c"
1668	1945	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1669	1946	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1670	1947
	1948	+"$(OX)\wiki.c" : "$(SRCDIR)\wiki.c"
	1949	+"$(OX)\wiki.h" : "$(OX)\wiki.c"
1671	1950	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1672	1951	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1673	1952
	1953	+"$(OX)\wikiformat.c" : "$(SRCDIR)\wikiformat.c"
	1954	+"$(OX)\wikiformat.h" : "$(OX)\wikiformat.c"
1674	1955	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1675	1956	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1676	1957
	1958	+"$(OX)\winfile.c" : "$(SRCDIR)\winfile.c"
	1959	+"$(OX)\winfile.h" : "$(OX)\winfile.c"
1677	1960	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1678	1961	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1679	1962
	1963	+"$(OX)\winhttp.c" : "$(SRCDIR)\winhttp.c"
	1964	+"$(OX)\winhttp.h" : "$(OX)\winhttp.c"
1680	1965	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1681	1966	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1682	1967
	1968	+"$(OX)\xfer.c" : "$(SRCDIR)\xfer.c"
	1969	+"$(OX)\xfer.h" : "$(OX)\xfer.c"
1683	1970	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1684	1971	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1685	1972
	1973	+"$(OX)\xfersetup.c" : "$(SRCDIR)\xfersetup.c"
	1974	+"$(OX)\xfersetup.h" : "$(OX)\xfersetup.c"
1686	1975	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1687	1976	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1688	1977
	1978	+"$(OX)\zip.c" : "$(SRCDIR)\zip.c"
	1979	+"$(OX)\zip.h" : "$(OX)\zip.c"
1689	1980	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1690	1981	$(RCC) /fo $@ $**
1691	1982
1692		-"$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1693		- "$(OBJDIR)\makeheaders$E" "$(OX)\add.c":"$(OX)\add.h" \
1694		- "$(OX)\ajax.c":"$(OX)\ajax.h" \
1695		- "$(OX)\alerts.c":"$(OX)\alerts.h" \
1696		- "$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1697		- "$(OX)\attach.c":"$(OX)\attach.h" \
1698		- "$(OX)\backlink.c":"$(OX)\backlink.h" \
1699		- "$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1700		- "$(OX)\bag.c":"$(OX)\bag.h" \
1701		- "$(OX)\bisect.c":"$(OX)\bisect.h" \
1702		- "$(OX)\blob.c":"$(OX)\blob.h" \
1703		- "$(OX)\branch.c":"$(OX)\branch.h" \
1704		- "$(OX)\browse.c":"$(OX)\browse.h" \
1705		- "$(OX)\builtin.c":"$(OX)\builtin.h" \
1706		- "$(OX)\bundle.c":"$(OX)\bundle.h" \
1707		- "$(OX)\cache.c":"$(OX)\cache.h" \
1708		- "$(OX)\capabilities.c":"$(OX)\capabilities.h" \
1709		- "$(OX)\captcha.c":"$(OX)\captcha.h" \
1710		- "$(OX)\cgi.c":"$(OX)\cgi.h" \
1711		- "$(OX)\chat.c":"$(OX)\chat.h" \
1712		- "$(OX)\checkin.c":"$(OX)\checkin.h" \
1713		- "$(OX)\checkout.c":"$(OX)\checkout.h" \
1714		- "$(OX)\clearsign.c":"$(OX)\clearsign.h" \
1715		- "$(OX)\clone.c":"$(OX)\clone.h" \
1716		- "$(OX)\color.c":"$(OX)\color.h" \
1717		- "$(OX)\comformat.c":"$(OX)\comformat.h" \
1718		- "$(OX)\configure.c":"$(OX)\configure.h" \
1719		- "$(OX)\content.c":"$(OX)\content.h" \
1720		- "$(OX)\cookies.c":"$(OX)\cookies.h" \
1721		- "$(OX)\db.c":"$(OX)\db.h" \
1722		- "$(OX)\delta.c":"$(OX)\delta.h" \
1723		- "$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
1724		- "$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
1725		- "$(OX)\descendants.c":"$(OX)\descendants.h" \
1726		- "$(OX)\diff.c":"$(OX)\diff.h" \
1727		- "$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
1728		- "$(OX)\dispatch.c":"$(OX)\dispatch.h" \
1729		- "$(OX)\doc.c":"$(OX)\doc.h" \
1730		- "$(OX)\encode.c":"$(OX)\encode.h" \
1731		- "$(OX)\etag.c":"$(OX)\etag.h" \
1732		- "$(OX)\event.c":"$(OX)\event.h" \
1733		- "$(OX)\export.c":"$(OX)\export.h" \
1734		- "$(OX)\extcgi.c":"$(OX)\extcgi.h" \
1735		- "$(OX)\file.c":"$(OX)\file.h" \
1736		- "$(OX)\fileedit.c":"$(OX)\fileedit.h" \
1737		- "$(OX)\finfo.c":"$(OX)\finfo.h" \
1738		- "$(OX)\foci.c":"$(OX)\foci.h" \
1739		- "$(OX)\forum.c":"$(OX)\forum.h" \
1740		- "$(OX)\fshell.c":"$(OX)\fshell.h" \
1741		- "$(OX)\fusefs.c":"$(OX)\fusefs.h" \
1742		- "$(OX)\fuzz.c":"$(OX)\fuzz.h" \
1743		- "$(OX)\glob.c":"$(OX)\glob.h" \
1744		- "$(OX)\graph.c":"$(OX)\graph.h" \
1745		- "$(OX)\gzip.c":"$(OX)\gzip.h" \
1746		- "$(OX)\hname.c":"$(OX)\hname.h" \
1747		- "$(OX)\hook.c":"$(OX)\hook.h" \
1748		- "$(OX)\http.c":"$(OX)\http.h" \
1749		- "$(OX)\http_socket.c":"$(OX)\http_socket.h" \
1750		- "$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
1751		- "$(OX)\http_transport.c":"$(OX)\http_transport.h" \
1752		- "$(OX)\import.c":"$(OX)\import.h" \
1753		- "$(OX)\info.c":"$(OX)\info.h" \
1754		- "$(OX)\interwiki.c":"$(OX)\interwiki.h" \
1755		- "$(OX)\json.c":"$(OX)\json.h" \
1756		- "$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
1757		- "$(OX)\json_branch.c":"$(OX)\json_branch.h" \
1758		- "$(OX)\json_config.c":"$(OX)\json_config.h" \
1759		- "$(OX)\json_diff.c":"$(OX)\json_diff.h" \
1760		- "$(OX)\json_dir.c":"$(OX)\json_dir.h" \
1761		- "$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
1762		- "$(OX)\json_login.c":"$(OX)\json_login.h" \
1763		- "$(OX)\json_query.c":"$(OX)\json_query.h" \
1764		- "$(OX)\json_report.c":"$(OX)\json_report.h" \
1765		- "$(OX)\json_status.c":"$(OX)\json_status.h" \
1766		- "$(OX)\json_tag.c":"$(OX)\json_tag.h" \
1767		- "$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
1768		- "$(OX)\json_user.c":"$(OX)\json_user.h" \
1769		- "$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
1770		- "$(OX)\leaf.c":"$(OX)\leaf.h" \
1771		- "$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
1772		- "$(OX)\login.c":"$(OX)\login.h" \
1773		- "$(OX)\lookslike.c":"$(OX)\lookslike.h" \
1774		- "$(OX)\main.c":"$(OX)\main.h" \
1775		- "$(OX)\manifest.c":"$(OX)\manifest.h" \
1776		- "$(OX)\markdown.c":"$(OX)\markdown.h" \
1777		- "$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
1778		- "$(OX)\md5.c":"$(OX)\md5.h" \
1779		- "$(OX)\merge.c":"$(OX)\merge.h" \
1780		- "$(OX)\merge3.c":"$(OX)\merge3.h" \
1781		- "$(OX)\moderate.c":"$(OX)\moderate.h" \
1782		- "$(OX)\name.c":"$(OX)\name.h" \
1783		- "$(OX)\path.c":"$(OX)\path.h" \
1784		- "$(OX)\piechart.c":"$(OX)\piechart.h" \
1785		- "$(OX)\pikchr.c":"$(OX)\pikchr.h" \
1786		- "$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
1787		- "$(OX)\pivot.c":"$(OX)\pivot.h" \
1788		- "$(OX)\popen.c":"$(OX)\popen.h" \
1789		- "$(OX)\pqueue.c":"$(OX)\pqueue.h" \
1790		- "$(OX)\printf.c":"$(OX)\printf.h" \
1791		- "$(OX)\publish.c":"$(OX)\publish.h" \
1792		- "$(OX)\purge.c":"$(OX)\purge.h" \
1793		- "$(OX)\rebuild.c":"$(OX)\rebuild.h" \
1794		- "$(OX)\regexp.c":"$(OX)\regexp.h" \
1795		- "$(OX)\repolist.c":"$(OX)\repolist.h" \
1796		- "$(OX)\report.c":"$(OX)\report.h" \
1797		- "$(OX)\rss.c":"$(OX)\rss.h" \
1798		- "$(OX)\schema.c":"$(OX)\schema.h" \
1799		- "$(OX)\search.c":"$(OX)\search.h" \
1800		- "$(OX)\security_audit.c":"$(OX)\security_audit.h" \
1801		- "$(OX)\setup.c":"$(OX)\setup.h" \
1802		- "$(OX)\setupuser.c":"$(OX)\setupuser.h" \
1803		- "$(OX)\sha1.c":"$(OX)\sha1.h" \
1804		- "$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
1805		- "$(OX)\sha3.c":"$(OX)\sha3.h" \
1806		- "$(OX)\shun.c":"$(OX)\shun.h" \
1807		- "$(OX)\sitemap.c":"$(OX)\sitemap.h" \
1808		- "$(OX)\skins.c":"$(OX)\skins.h" \
1809		- "$(OX)\smtp.c":"$(OX)\smtp.h" \
1810		- "$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
1811		- "$(OX)\stash.c":"$(OX)\stash.h" \
1812		- "$(OX)\stat.c":"$(OX)\stat.h" \
1813		- "$(OX)\statrep.c":"$(OX)\statrep.h" \
1814		- "$(OX)\style.c":"$(OX)\style.h" \
1815		- "$(OX)\sync.c":"$(OX)\sync.h" \
1816		- "$(OX)\tag.c":"$(OX)\tag.h" \
1817		- "$(OX)\tar.c":"$(OX)\tar.h" \
1818		- "$(OX)\terminal.c":"$(OX)\terminal.h" \
1819		- "$(OX)\th_main.c":"$(OX)\th_main.h" \
1820		- "$(OX)\timeline.c":"$(OX)\timeline.h" \
1821		- "$(OX)\tkt.c":"$(OX)\tkt.h" \
1822		- "$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
1823		- "$(OX)\undo.c":"$(OX)\undo.h" \
1824		- "$(OX)\unicode.c":"$(OX)\unicode.h" \
1825		- "$(OX)\unversioned.c":"$(OX)\unversioned.h" \
1826		- "$(OX)\update.c":"$(OX)\update.h" \
1827		- "$(OX)\url.c":"$(OX)\url.h" \
1828		- "$(OX)\user.c":"$(OX)\user.h" \
1829		- "$(OX)\utf8.c":"$(OX)\utf8.h" \
1830		- "$(OX)\util.c":"$(OX)\util.h" \
1831		- "$(OX)\verify.c":"$(OX)\verify.h" \
1832		- "$(OX)\vfile.c":"$(OX)\vfile.h" \
1833		- "$(OX)\webmail.c":"$(OX)\webmail.h" \
1834		- "$(OX)\wiki.c":"$(OX)\wiki.h" \
1835		- "$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
1836		- "$(OX)\winfile.c":"$(OX)\winfile.h" \
1837		- "$(OX)\winhttp.c":"$(OX)\winhttp.h" \
1838		- "$(OX)\xfer.c":"$(OX)\xfer.h" \
1839		- "$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
1840		- "$(OX)\zip.c":"$(OX)\zip.h" \
1841		- "$(SRCDIR)\sqlite3.h" \
1842		- "$(SRCDIR)\th.h" \
1843		- "$(OX)\VERSION.h" \
1844		- "$(SRCDIR)\cson_amalgamation.h"
1845		- @copy /Y nul: $@
	1983	+
	1984	+DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
	1985	+GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
	1986	+
	1987	+!if $(DEPHEADERGEN)==0
	1988	+GEN_HEADERS = $(GEN_HEADERS) \
	1989	+ "$(OX)\add.c":"$(OX)\add.h" \
	1990	+ "$(OX)\ajax.c":"$(OX)\ajax.h" \
	1991	+ "$(OX)\alerts.c":"$(OX)\alerts.h" \
	1992	+ "$(OX)\allrepo.c":"$(OX)\allrepo.h" \
	1993	+ "$(OX)\attach.c":"$(OX)\attach.h" \
	1994	+ "$(OX)\backlink.c":"$(OX)\backlink.h" \
	1995	+ "$(OX)\backoffice.c":"$(OX)\backoffice.h" \
	1996	+ "$(OX)\bag.c":"$(OX)\bag.h" \
	1997	+ "$(OX)\bisect.c":"$(OX)\bisect.h" \
	1998	+ "$(OX)\blob.c":"$(OX)\blob.h" \
	1999	+ "$(OX)\branch.c":"$(OX)\branch.h" \
	2000	+ "$(OX)\browse.c":"$(OX)\browse.h" \
	2001	+ "$(OX)\builtin.c":"$(OX)\builtin.h" \
	2002	+ "$(OX)\bundle.c":"$(OX)\bundle.h" \
	2003	+ "$(OX)\cache.c":"$(OX)\cache.h" \
	2004	+ "$(OX)\capabilities.c":"$(OX)\capabilities.h" \
	2005	+ "$(OX)\captcha.c":"$(OX)\captcha.h" \
	2006	+ "$(OX)\cgi.c":"$(OX)\cgi.h" \
	2007	+ "$(OX)\chat.c":"$(OX)\chat.h" \
	2008	+ "$(OX)\checkin.c":"$(OX)\checkin.h" \
	2009	+ "$(OX)\checkout.c":"$(OX)\checkout.h" \
	2010	+ "$(OX)\clearsign.c":"$(OX)\clearsign.h" \
	2011	+ "$(OX)\clone.c":"$(OX)\clone.h" \
	2012	+ "$(OX)\color.c":"$(OX)\color.h" \
	2013	+ "$(OX)\comformat.c":"$(OX)\comformat.h" \
	2014	+ "$(OX)\configure.c":"$(OX)\configure.h" \
	2015	+ "$(OX)\content.c":"$(OX)\content.h" \
	2016	+ "$(OX)\cookies.c":"$(OX)\cookies.h" \
	2017	+ "$(OX)\db.c":"$(OX)\db.h" \
	2018	+ "$(OX)\delta.c":"$(OX)\delta.h" \
	2019	+ "$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
	2020	+ "$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
	2021	+ "$(OX)\descendants.c":"$(OX)\descendants.h" \
	2022	+ "$(OX)\diff.c":"$(OX)\diff.h" \
	2023	+ "$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
	2024	+ "$(OX)\dispatch.c":"$(OX)\dispatch.h" \
	2025	+ "$(OX)\doc.c":"$(OX)\doc.h" \
	2026	+ "$(OX)\encode.c":"$(OX)\encode.h" \
	2027	+ "$(OX)\etag.c":"$(OX)\etag.h" \
	2028	+ "$(OX)\event.c":"$(OX)\event.h" \
	2029	+ "$(OX)\export.c":"$(OX)\export.h" \
	2030	+ "$(OX)\extcgi.c":"$(OX)\extcgi.h" \
	2031	+ "$(OX)\file.c":"$(OX)\file.h" \
	2032	+ "$(OX)\fileedit.c":"$(OX)\fileedit.h" \
	2033	+ "$(OX)\finfo.c":"$(OX)\finfo.h" \
	2034	+ "$(OX)\foci.c":"$(OX)\foci.h" \
	2035	+ "$(OX)\forum.c":"$(OX)\forum.h" \
	2036	+ "$(OX)\fshell.c":"$(OX)\fshell.h" \
	2037	+ "$(OX)\fusefs.c":"$(OX)\fusefs.h" \
	2038	+ "$(OX)\fuzz.c":"$(OX)\fuzz.h" \
	2039	+ "$(OX)\glob.c":"$(OX)\glob.h" \
	2040	+ "$(OX)\graph.c":"$(OX)\graph.h" \
	2041	+ "$(OX)\gzip.c":"$(OX)\gzip.h" \
	2042	+ "$(OX)\hname.c":"$(OX)\hname.h" \
	2043	+ "$(OX)\hook.c":"$(OX)\hook.h" \
	2044	+ "$(OX)\http.c":"$(OX)\http.h" \
	2045	+ "$(OX)\http_socket.c":"$(OX)\http_socket.h" \
	2046	+ "$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
	2047	+ "$(OX)\http_transport.c":"$(OX)\http_transport.h" \
	2048	+ "$(OX)\import.c":"$(OX)\import.h" \
	2049	+ "$(OX)\info.c":"$(OX)\info.h" \
	2050	+ "$(OX)\interwiki.c":"$(OX)\interwiki.h" \
	2051	+ "$(OX)\json.c":"$(OX)\json.h" \
	2052	+ "$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
	2053	+ "$(OX)\json_branch.c":"$(OX)\json_branch.h" \
	2054	+ "$(OX)\json_config.c":"$(OX)\json_config.h" \
	2055	+ "$(OX)\json_diff.c":"$(OX)\json_diff.h" \
	2056	+ "$(OX)\json_dir.c":"$(OX)\json_dir.h" \
	2057	+ "$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
	2058	+ "$(OX)\json_login.c":"$(OX)\json_login.h" \
	2059	+ "$(OX)\json_query.c":"$(OX)\json_query.h" \
	2060	+ "$(OX)\json_report.c":"$(OX)\json_report.h" \
	2061	+ "$(OX)\json_status.c":"$(OX)\json_status.h" \
	2062	+ "$(OX)\json_tag.c":"$(OX)\json_tag.h" \
	2063	+ "$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
	2064	+ "$(OX)\json_user.c":"$(OX)\json_user.h" \
	2065	+ "$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
	2066	+ "$(OX)\leaf.c":"$(OX)\leaf.h" \
	2067	+ "$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
	2068	+ "$(OX)\login.c":"$(OX)\login.h" \
	2069	+ "$(OX)\lookslike.c":"$(OX)\lookslike.h" \
	2070	+ "$(OX)\main.c":"$(OX)\main.h" \
	2071	+ "$(OX)\manifest.c":"$(OX)\manifest.h" \
	2072	+ "$(OX)\markdown.c":"$(OX)\markdown.h" \
	2073	+ "$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
	2074	+ "$(OX)\md5.c":"$(OX)\md5.h" \
	2075	+ "$(OX)\merge.c":"$(OX)\merge.h" \
	2076	+ "$(OX)\merge3.c":"$(OX)\merge3.h" \
	2077	+ "$(OX)\moderate.c":"$(OX)\moderate.h" \
	2078	+ "$(OX)\name.c":"$(OX)\name.h" \
	2079	+ "$(OX)\path.c":"$(OX)\path.h" \
	2080	+ "$(OX)\piechart.c":"$(OX)\piechart.h" \
	2081	+ "$(OX)\pikchr.c":"$(OX)\pikchr.h" \
	2082	+ "$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
	2083	+ "$(OX)\pivot.c":"$(OX)\pivot.h" \
	2084	+ "$(OX)\popen.c":"$(OX)\popen.h" \
	2085	+ "$(OX)\pqueue.c":"$(OX)\pqueue.h" \
	2086	+ "$(OX)\printf.c":"$(OX)\printf.h" \
	2087	+ "$(OX)\publish.c":"$(OX)\publish.h" \
	2088	+ "$(OX)\purge.c":"$(OX)\purge.h" \
	2089	+ "$(OX)\rebuild.c":"$(OX)\rebuild.h" \
	2090	+ "$(OX)\regexp.c":"$(OX)\regexp.h" \
	2091	+ "$(OX)\repolist.c":"$(OX)\repolist.h" \
	2092	+ "$(OX)\report.c":"$(OX)\report.h" \
	2093	+ "$(OX)\rss.c":"$(OX)\rss.h" \
	2094	+ "$(OX)\schema.c":"$(OX)\schema.h" \
	2095	+ "$(OX)\search.c":"$(OX)\search.h" \
	2096	+ "$(OX)\security_audit.c":"$(OX)\security_audit.h" \
	2097	+ "$(OX)\setup.c":"$(OX)\setup.h" \
	2098	+ "$(OX)\setupuser.c":"$(OX)\setupuser.h" \
	2099	+ "$(OX)\sha1.c":"$(OX)\sha1.h" \
	2100	+ "$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
	2101	+ "$(OX)\sha3.c":"$(OX)\sha3.h" \
	2102	+ "$(OX)\shun.c":"$(OX)\shun.h" \
	2103	+ "$(OX)\sitemap.c":"$(OX)\sitemap.h" \
	2104	+ "$(OX)\skins.c":"$(OX)\skins.h" \
	2105	+ "$(OX)\smtp.c":"$(OX)\smtp.h" \
	2106	+ "$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
	2107	+ "$(OX)\stash.c":"$(OX)\stash.h" \
	2108	+ "$(OX)\stat.c":"$(OX)\stat.h" \
	2109	+ "$(OX)\statrep.c":"$(OX)\statrep.h" \
	2110	+ "$(OX)\style.c":"$(OX)\style.h" \
	2111	+ "$(OX)\sync.c":"$(OX)\sync.h" \
	2112	+ "$(OX)\tag.c":"$(OX)\tag.h" \
	2113	+ "$(OX)\tar.c":"$(OX)\tar.h" \
	2114	+ "$(OX)\terminal.c":"$(OX)\terminal.h" \
	2115	+ "$(OX)\th_main.c":"$(OX)\th_main.h" \
	2116	+ "$(OX)\timeline.c":"$(OX)\timeline.h" \
	2117	+ "$(OX)\tkt.c":"$(OX)\tkt.h" \
	2118	+ "$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
	2119	+ "$(OX)\undo.c":"$(OX)\undo.h" \
	2120	+ "$(OX)\unicode.c":"$(OX)\unicode.h" \
	2121	+ "$(OX)\unversioned.c":"$(OX)\unversioned.h" \
	2122	+ "$(OX)\update.c":"$(OX)\update.h" \
	2123	+ "$(OX)\url.c":"$(OX)\url.h" \
	2124	+ "$(OX)\user.c":"$(OX)\user.h" \
	2125	+ "$(OX)\utf8.c":"$(OX)\utf8.h" \
	2126	+ "$(OX)\util.c":"$(OX)\util.h" \
	2127	+ "$(OX)\verify.c":"$(OX)\verify.h" \
	2128	+ "$(OX)\vfile.c":"$(OX)\vfile.h" \
	2129	+ "$(OX)\webmail.c":"$(OX)\webmail.h" \
	2130	+ "$(OX)\wiki.c":"$(OX)\wiki.h" \
	2131	+ "$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
	2132	+ "$(OX)\winfile.c":"$(OX)\winfile.h" \
	2133	+ "$(OX)\winhttp.c":"$(OX)\winhttp.h" \
	2134	+ "$(OX)\xfer.c":"$(OX)\xfer.h" \
	2135	+ "$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
	2136	+ "$(OX)\zip.c":"$(OX)\zip.h"
	2137	+!endif
	2138	+
	2139	+"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
	2140	+ "$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
	2141	+ @copy /Y NUL $@
	2142	+
1846	2143

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,13 +12,17 @@
12	SRCDIR = $(B)\src
13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	BUILDDIR = Build
15	!message Using default build directory, $(BUILDDIR)
16	!endif

17	T = $(BUILDDIR)

18	OBJDIR = $(T)

19	OX = $(OBJDIR)

20	O = .obj
21	E = .exe
22	P = .pdb
23
24	!ifndef INSTALLDIR
	@@ -37,20 +41,32 @@
37	#
38	!if !exist("$(B)\.fossil-settings")
39	!error Please specify path to project base directory: B="path/to/fossil"
40	!endif
41
42	# Create build directory during preprocessing if needed.
43	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]




44	!endif
45
46	# Perl is only necessary if OpenSSL support is enabled and it is built from
47	# source code. The PERLDIR environment variable, if it exists, should point
48	# to the directory containing the main Perl executable specified here (i.e.
49	# "perl.exe").
50	!ifndef PERL





51	PERL = perl.exe



52	!endif
53
54	# Enable debugging symbols?
55	!ifndef DEBUG
56	DEBUG = 0
	@@ -199,30 +215,30 @@
199	!endif
200
201	!if $(FOSSIL_ENABLE_WINXP)!=0
202	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
203	CFLAGS = $(CFLAGS) $(XPCFLAGS)
204	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
205	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
206	!else
207	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
208	!endif
209	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
210	!endif
211
212	!if $(FOSSIL_DYNAMIC_BUILD)!=0
213	!if $(DEBUG)!=0
214	CRTFLAGS = /MDd
215	!else
216	CRTFLAGS = /MD
217	!endif
218	!else
219	!if $(DEBUG)!=0
220	CRTFLAGS = /MTd
221	!else
222	CRTFLAGS = /MT
223	!endif
224	!endif
225
226	!if $(DEBUG)!=0
227	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
228	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -509,115 +525,117 @@
509	"$(OX)\winhttp.c" \
510	"$(OX)\xfer.c" \
511	"$(OX)\xfersetup.c" \
512	"$(OX)\zip.c"
513
514	EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
515	"$(SRCDIR)\..\skins\ardoise\details.txt" \
516	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
517	"$(SRCDIR)\..\skins\ardoise\header.txt" \
518	"$(SRCDIR)\..\skins\black_and_white\css.txt" \
519	"$(SRCDIR)\..\skins\black_and_white\details.txt" \
520	"$(SRCDIR)\..\skins\black_and_white\footer.txt" \
521	"$(SRCDIR)\..\skins\black_and_white\header.txt" \
522	"$(SRCDIR)\..\skins\blitz\css.txt" \
523	"$(SRCDIR)\..\skins\blitz\details.txt" \
524	"$(SRCDIR)\..\skins\blitz\footer.txt" \
525	"$(SRCDIR)\..\skins\blitz\header.txt" \
526	"$(SRCDIR)\..\skins\blitz\ticket.txt" \
527	"$(SRCDIR)\..\skins\bootstrap\css.txt" \
528	"$(SRCDIR)\..\skins\bootstrap\details.txt" \
529	"$(SRCDIR)\..\skins\bootstrap\footer.txt" \
530	"$(SRCDIR)\..\skins\bootstrap\header.txt" \
531	"$(SRCDIR)\..\skins\darkmode\css.txt" \
532	"$(SRCDIR)\..\skins\darkmode\details.txt" \
533	"$(SRCDIR)\..\skins\darkmode\footer.txt" \
534	"$(SRCDIR)\..\skins\darkmode\header.txt" \
535	"$(SRCDIR)\..\skins\default\css.txt" \
536	"$(SRCDIR)\..\skins\default\details.txt" \
537	"$(SRCDIR)\..\skins\default\footer.txt" \
538	"$(SRCDIR)\..\skins\default\header.txt" \
539	"$(SRCDIR)\..\skins\eagle\css.txt" \
540	"$(SRCDIR)\..\skins\eagle\details.txt" \
541	"$(SRCDIR)\..\skins\eagle\footer.txt" \
542	"$(SRCDIR)\..\skins\eagle\header.txt" \
543	"$(SRCDIR)\..\skins\khaki\css.txt" \
544	"$(SRCDIR)\..\skins\khaki\details.txt" \
545	"$(SRCDIR)\..\skins\khaki\footer.txt" \
546	"$(SRCDIR)\..\skins\khaki\header.txt" \
547	"$(SRCDIR)\..\skins\original\css.txt" \
548	"$(SRCDIR)\..\skins\original\details.txt" \
549	"$(SRCDIR)\..\skins\original\footer.txt" \
550	"$(SRCDIR)\..\skins\original\header.txt" \
551	"$(SRCDIR)\..\skins\plain_gray\css.txt" \
552	"$(SRCDIR)\..\skins\plain_gray\details.txt" \
553	"$(SRCDIR)\..\skins\plain_gray\footer.txt" \
554	"$(SRCDIR)\..\skins\plain_gray\header.txt" \
555	"$(SRCDIR)\..\skins\xekri\css.txt" \
556	"$(SRCDIR)\..\skins\xekri\details.txt" \
557	"$(SRCDIR)\..\skins\xekri\footer.txt" \
558	"$(SRCDIR)\..\skins\xekri\header.txt" \
559	"$(SRCDIR)\accordion.js" \
560	"$(SRCDIR)\alerts\bflat2.wav" \
561	"$(SRCDIR)\alerts\bflat3.wav" \
562	"$(SRCDIR)\alerts\bloop.wav" \
563	"$(SRCDIR)\alerts\plunk.wav" \
564	"$(SRCDIR)\chat.js" \
565	"$(SRCDIR)\ci_edit.js" \
566	"$(SRCDIR)\copybtn.js" \
567	"$(SRCDIR)\default.css" \
568	"$(SRCDIR)\diff.tcl" \
569	"$(SRCDIR)\forum.js" \
570	"$(SRCDIR)\fossil.bootstrap.js" \
571	"$(SRCDIR)\fossil.confirmer.js" \
572	"$(SRCDIR)\fossil.copybutton.js" \
573	"$(SRCDIR)\fossil.dom.js" \
574	"$(SRCDIR)\fossil.fetch.js" \
575	"$(SRCDIR)\fossil.numbered-lines.js" \
576	"$(SRCDIR)\fossil.page.fileedit.js" \
577	"$(SRCDIR)\fossil.page.forumpost.js" \
578	"$(SRCDIR)\fossil.page.pikchrshow.js" \
579	"$(SRCDIR)\fossil.page.wikiedit.js" \
580	"$(SRCDIR)\fossil.pikchr.js" \
581	"$(SRCDIR)\fossil.popupwidget.js" \
582	"$(SRCDIR)\fossil.storage.js" \
583	"$(SRCDIR)\fossil.tabs.js" \
584	"$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
585	"$(SRCDIR)\graph.js" \
586	"$(SRCDIR)\hbmenu.js" \
587	"$(SRCDIR)\href.js" \
588	"$(SRCDIR)\login.js" \
589	"$(SRCDIR)\markdown.md" \
590	"$(SRCDIR)\menu.js" \
591	"$(SRCDIR)\sbsdiff.js" \
592	"$(SRCDIR)\scroll.js" \
593	"$(SRCDIR)\skin.js" \
594	"$(SRCDIR)\sorttable.js" \
595	"$(SRCDIR)\sounds\0.wav" \
596	"$(SRCDIR)\sounds\1.wav" \
597	"$(SRCDIR)\sounds\2.wav" \
598	"$(SRCDIR)\sounds\3.wav" \
599	"$(SRCDIR)\sounds\4.wav" \
600	"$(SRCDIR)\sounds\5.wav" \
601	"$(SRCDIR)\sounds\6.wav" \
602	"$(SRCDIR)\sounds\7.wav" \
603	"$(SRCDIR)\sounds\8.wav" \
604	"$(SRCDIR)\sounds\9.wav" \
605	"$(SRCDIR)\sounds\a.wav" \
606	"$(SRCDIR)\sounds\b.wav" \
607	"$(SRCDIR)\sounds\c.wav" \
608	"$(SRCDIR)\sounds\d.wav" \
609	"$(SRCDIR)\sounds\e.wav" \
610	"$(SRCDIR)\sounds\f.wav" \
611	"$(SRCDIR)\style.admin_log.css" \
612	"$(SRCDIR)\style.fileedit.css" \
613	"$(SRCDIR)\style.wikiedit.css" \
614	"$(SRCDIR)\tree.js" \
615	"$(SRCDIR)\useredit.js" \
616	"$(SRCDIR)\wiki.wiki"
617
618	OBJ = "$(OX)\add$O" \


619	"$(OX)\ajax$O" \
620	"$(OX)\alerts$O" \
621	"$(OX)\allrepo$O" \
622	"$(OX)\attach$O" \
623	"$(OX)\backlink$O" \
	@@ -766,15 +784,15 @@
766	"$(OX)\wikiformat$O" \
767	"$(OX)\winfile$O" \
768	"$(OX)\winhttp$O" \
769	"$(OX)\xfer$O" \
770	"$(OX)\xfersetup$O" \
771	"$(OX)\zip$O" \
772	!if $(FOSSIL_ENABLE_MINIZ)!=0
773	"$(OX)\miniz$O" \
774	!endif
775	"$(OX)\fossil.res"
776
777
778	!ifndef BASEAPPNAME
779	BASEAPPNAME = fossil
780	!endif
	@@ -781,11 +799,11 @@
781
782	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
783	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
784	APPTARGETS =
785
786	all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
787
788	$(BASEAPPNAME): "$(APPNAME)"
789
790	$(BASEAPPNAME)$(E): "$(APPNAME)"
791
	@@ -797,55 +815,49 @@
797	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
798	!if $(DEBUG)!=0
799	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
800	!endif
801
802	$(OX):
803	if not exist $@\. mkdir $@
804
805	!if "$(BUILDDIR)"!="$(OX)"
806	$(BUILDDIR):
807	if not exist $@\. mkdir $@
808	!endif
809
810	!if $(FOSSIL_BUILD_ZLIB)
811	zlib $(ZLIB_X):
812	@echo Building zlib from "$(ZLIBDIR)"...
813	!if $(FOSSIL_ENABLE_WINXP)!=0
814	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
815	!else
816	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
817	!endif
818	copy nul $(ZLIB_X)
819
820	clean-zlib:
821	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
822	!endif
823
824	!if $(FOSSIL_ENABLE_SSL)!=0
825	OPENSSL_X = "$(OX)\openssl.opts"
826	openssl $(OPENSSL_X):
827	@echo Building OpenSSL from "$(SSLDIR)"...
828	!ifdef PERLDIR
829	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
830	!else
831	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
832	!endif
833	!if $(FOSSIL_ENABLE_WINXP)!=0
834	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
835	!else
836	@pushd "$(SSLDIR)" && $(MAKE) && popd
837	echo $(SSLCONFIG) > $(OPENSSL_X)
838	!endif

839
840	clean-openssl:
841	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
842	-del $(OPENSSL_X)
843
844	!if $(FOSSIL_BUILD_SSL)!=0
845	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
846	!endif
847
848	!endif
849
850	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
851	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1016,30 +1028,15 @@
1016	echo "$(OX)\miniz.obj" >> $@
1017	!endif
1018	echo $(LIBS) >> $@
1019
1020
1021	# This target gets the project tools built.
1022	toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1023
1024	"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1025	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026
1027	"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1028	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029
1030	"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1031	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032
1033	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1037	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1038
1039	"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1040	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1041
1042	!if $(USE_SEE)!=0
1043	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1044	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1045	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
	@@ -1130,716 +1127,1016 @@
1130	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1131	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1132	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1133
1134	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1135	echo "$(SRCDIR)\../skins/ardoise/css.txt" > $@
1136	echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1137	echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1138	echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1139	echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1140	echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1141	echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1142	echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1143	echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1144	echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1145	echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1146	echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1147	echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1148	echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1149	echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1150	echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1151	echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1152	echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1153	echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1154	echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1155	echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1156	echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1157	echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1158	echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1159	echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1160	echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1161	echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1162	echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1163	echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1164	echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1165	echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1166	echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1167	echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1168	echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1169	echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1170	echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1171	echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1172	echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1173	echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1174	echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1175	echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1176	echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1177	echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1178	echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1179	echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1180	echo "$(SRCDIR)\accordion.js" >> $@
1181	echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1182	echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1183	echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1184	echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1185	echo "$(SRCDIR)\chat.js" >> $@
1186	echo "$(SRCDIR)\ci_edit.js" >> $@
1187	echo "$(SRCDIR)\copybtn.js" >> $@
1188	echo "$(SRCDIR)\default.css" >> $@
1189	echo "$(SRCDIR)\diff.tcl" >> $@
1190	echo "$(SRCDIR)\forum.js" >> $@
1191	echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1192	echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1193	echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1194	echo "$(SRCDIR)\fossil.dom.js" >> $@
1195	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1196	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1197	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1198	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1199	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1200	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1201	echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1202	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1203	echo "$(SRCDIR)\fossil.storage.js" >> $@
1204	echo "$(SRCDIR)\fossil.tabs.js" >> $@
1205	echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1206	echo "$(SRCDIR)\graph.js" >> $@
1207	echo "$(SRCDIR)\hbmenu.js" >> $@
1208	echo "$(SRCDIR)\href.js" >> $@
1209	echo "$(SRCDIR)\login.js" >> $@
1210	echo "$(SRCDIR)\markdown.md" >> $@
1211	echo "$(SRCDIR)\menu.js" >> $@
1212	echo "$(SRCDIR)\sbsdiff.js" >> $@
1213	echo "$(SRCDIR)\scroll.js" >> $@
1214	echo "$(SRCDIR)\skin.js" >> $@
1215	echo "$(SRCDIR)\sorttable.js" >> $@
1216	echo "$(SRCDIR)\sounds/0.wav" >> $@
1217	echo "$(SRCDIR)\sounds/1.wav" >> $@
1218	echo "$(SRCDIR)\sounds/2.wav" >> $@
1219	echo "$(SRCDIR)\sounds/3.wav" >> $@
1220	echo "$(SRCDIR)\sounds/4.wav" >> $@
1221	echo "$(SRCDIR)\sounds/5.wav" >> $@
1222	echo "$(SRCDIR)\sounds/6.wav" >> $@
1223	echo "$(SRCDIR)\sounds/7.wav" >> $@
1224	echo "$(SRCDIR)\sounds/8.wav" >> $@
1225	echo "$(SRCDIR)\sounds/9.wav" >> $@
1226	echo "$(SRCDIR)\sounds/a.wav" >> $@
1227	echo "$(SRCDIR)\sounds/b.wav" >> $@
1228	echo "$(SRCDIR)\sounds/c.wav" >> $@
1229	echo "$(SRCDIR)\sounds/d.wav" >> $@
1230	echo "$(SRCDIR)\sounds/e.wav" >> $@
1231	echo "$(SRCDIR)\sounds/f.wav" >> $@
1232	echo "$(SRCDIR)\style.admin_log.css" >> $@
1233	echo "$(SRCDIR)\style.fileedit.css" >> $@
1234	echo "$(SRCDIR)\style.wikiedit.css" >> $@
1235	echo "$(SRCDIR)\tree.js" >> $@
1236	echo "$(SRCDIR)\useredit.js" >> $@
1237	echo "$(SRCDIR)\wiki.wiki" >> $@
1238


1239	{$(SRCDIR)\}.c{$(OX)\}.c:
1240	"$(OBJDIR)\translate$E" $** > $@
1241
1242	{$(OX)}.c{$(OX)}.h :
1243	"$(OBJDIR)\makeheaders$E" $**:$@
1244
1245	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1247


1248	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1249	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1250


1251	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1252	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1253


1254	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1255	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1256


1257	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1258	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1259


1260	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1262


1263	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1264	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1265


1266	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1267	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1268


1269	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1270	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1271


1272	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1273	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1274


1275	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1277


1278	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1279	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1280


1281	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1282	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1283


1284	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1285	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1286


1287	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1288	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1289


1290	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1292


1293	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1294	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1295


1296	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1297	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1298


1299	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1300	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1301


1302	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1303	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1304


1305	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1307


1308	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1309	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1310


1311	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1312	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1313


1314	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1315	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1316


1317	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1318	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1319


1320	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1322


1323	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1324	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1325


1326	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1327	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1328


1329	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1330	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1331


1332	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1333	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1334


1335	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1337


1338	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1339	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1340


1341	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1342	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1343


1344	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1345	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1346


1347	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1348	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1349


1350	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1352


1353	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1354	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1355


1356	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1357	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1358


1359	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1360	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1361


1362	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1363	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1364


1365	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1367


1368	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1369	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1370


1371	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1372	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1373


1374	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1375	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1376


1377	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1378	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1379


1380	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1382


1383	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1384	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1385


1386	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1387	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1388


1389	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1390	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1391


1392	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1393	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1394


1395	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1397


1398	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1399	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1400


1401	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1402	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1403


1404	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1405	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1406


1407	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1408	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1409


1410	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1412


1413	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1414	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1415


1416	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1417	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1418


1419	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1420	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1421


1422	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1423	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1424


1425	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1427


1428	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1429	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1430


1431	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1432	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1433


1434	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1435	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1436


1437	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1438	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1439


1440	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1442


1443	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1444	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1445


1446	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1447	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1448


1449	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1450	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1451


1452	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1453	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1454


1455	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1457


1458	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1459	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1460


1461	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1462	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1463


1464	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1465	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1466


1467	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1468	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1469


1470	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1472


1473	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1474	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1475


1476	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1477	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1478


1479	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1480	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1481


1482	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1483	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1484


1485	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1487


1488	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1489	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1490


1491	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1492	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1493


1494	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1495	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1496


1497	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1498	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1499


1500	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1502


1503	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1504	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1505


1506	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1507	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1508


1509	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1510	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1511


1512	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1513	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1514


1515	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1517


1518	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1519	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1520


1521	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1522	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1523


1524	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1525	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1526


1527	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1528	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1529


1530	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1532


1533	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1534	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1535


1536	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1537	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1538


1539	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1540	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1541


1542	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1543	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1544


1545	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1547


1548	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1549	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1550


1551	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1552	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1553


1554	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1555	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1556


1557	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1558	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1559


1560	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1562


1563	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1564	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1565


1566	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1567	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1568


1569	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1570	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1571


1572	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1573	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1574


1575	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1577


1578	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1579	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1580


1581	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1582	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1583


1584	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1585	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1586


1587	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1588	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1589


1590	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1592


1593	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1594	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1595


1596	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1597	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1598


1599	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1600	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1601


1602	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1603	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1604


1605	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1607


1608	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1609	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1610


1611	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1612	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1613


1614	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1615	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1616


1617	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1618	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1619


1620	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1622


1623	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1624	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1625


1626	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1627	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1628


1629	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1630	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1631


1632	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1633	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1634


1635	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1637


1638	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1639	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1640


1641	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1642	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1643


1644	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1645	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1646


1647	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1648	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1649


1650	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1652


1653	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1654	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1655


1656	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1657	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1658


1659	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1660	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1661


1662	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1663	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1664


1665	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1667


1668	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1669	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1670


1671	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1672	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1673


1674	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1675	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1676


1677	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1678	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1679


1680	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1682


1683	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1684	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1685


1686	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1687	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1688


1689	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1690	$(RCC) /fo $@ $**
1691
1692	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1693	"$(OBJDIR)\makeheaders$E" "$(OX)\add.c":"$(OX)\add.h" \
1694	"$(OX)\ajax.c":"$(OX)\ajax.h" \
1695	"$(OX)\alerts.c":"$(OX)\alerts.h" \
1696	"$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1697	"$(OX)\attach.c":"$(OX)\attach.h" \
1698	"$(OX)\backlink.c":"$(OX)\backlink.h" \
1699	"$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1700	"$(OX)\bag.c":"$(OX)\bag.h" \
1701	"$(OX)\bisect.c":"$(OX)\bisect.h" \
1702	"$(OX)\blob.c":"$(OX)\blob.h" \
1703	"$(OX)\branch.c":"$(OX)\branch.h" \
1704	"$(OX)\browse.c":"$(OX)\browse.h" \
1705	"$(OX)\builtin.c":"$(OX)\builtin.h" \
1706	"$(OX)\bundle.c":"$(OX)\bundle.h" \
1707	"$(OX)\cache.c":"$(OX)\cache.h" \
1708	"$(OX)\capabilities.c":"$(OX)\capabilities.h" \
1709	"$(OX)\captcha.c":"$(OX)\captcha.h" \
1710	"$(OX)\cgi.c":"$(OX)\cgi.h" \
1711	"$(OX)\chat.c":"$(OX)\chat.h" \
1712	"$(OX)\checkin.c":"$(OX)\checkin.h" \
1713	"$(OX)\checkout.c":"$(OX)\checkout.h" \
1714	"$(OX)\clearsign.c":"$(OX)\clearsign.h" \
1715	"$(OX)\clone.c":"$(OX)\clone.h" \
1716	"$(OX)\color.c":"$(OX)\color.h" \
1717	"$(OX)\comformat.c":"$(OX)\comformat.h" \
1718	"$(OX)\configure.c":"$(OX)\configure.h" \
1719	"$(OX)\content.c":"$(OX)\content.h" \
1720	"$(OX)\cookies.c":"$(OX)\cookies.h" \
1721	"$(OX)\db.c":"$(OX)\db.h" \
1722	"$(OX)\delta.c":"$(OX)\delta.h" \
1723	"$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
1724	"$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
1725	"$(OX)\descendants.c":"$(OX)\descendants.h" \
1726	"$(OX)\diff.c":"$(OX)\diff.h" \
1727	"$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
1728	"$(OX)\dispatch.c":"$(OX)\dispatch.h" \
1729	"$(OX)\doc.c":"$(OX)\doc.h" \
1730	"$(OX)\encode.c":"$(OX)\encode.h" \
1731	"$(OX)\etag.c":"$(OX)\etag.h" \
1732	"$(OX)\event.c":"$(OX)\event.h" \
1733	"$(OX)\export.c":"$(OX)\export.h" \
1734	"$(OX)\extcgi.c":"$(OX)\extcgi.h" \
1735	"$(OX)\file.c":"$(OX)\file.h" \
1736	"$(OX)\fileedit.c":"$(OX)\fileedit.h" \
1737	"$(OX)\finfo.c":"$(OX)\finfo.h" \
1738	"$(OX)\foci.c":"$(OX)\foci.h" \
1739	"$(OX)\forum.c":"$(OX)\forum.h" \
1740	"$(OX)\fshell.c":"$(OX)\fshell.h" \
1741	"$(OX)\fusefs.c":"$(OX)\fusefs.h" \
1742	"$(OX)\fuzz.c":"$(OX)\fuzz.h" \
1743	"$(OX)\glob.c":"$(OX)\glob.h" \
1744	"$(OX)\graph.c":"$(OX)\graph.h" \
1745	"$(OX)\gzip.c":"$(OX)\gzip.h" \
1746	"$(OX)\hname.c":"$(OX)\hname.h" \
1747	"$(OX)\hook.c":"$(OX)\hook.h" \
1748	"$(OX)\http.c":"$(OX)\http.h" \
1749	"$(OX)\http_socket.c":"$(OX)\http_socket.h" \
1750	"$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
1751	"$(OX)\http_transport.c":"$(OX)\http_transport.h" \
1752	"$(OX)\import.c":"$(OX)\import.h" \
1753	"$(OX)\info.c":"$(OX)\info.h" \
1754	"$(OX)\interwiki.c":"$(OX)\interwiki.h" \
1755	"$(OX)\json.c":"$(OX)\json.h" \
1756	"$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
1757	"$(OX)\json_branch.c":"$(OX)\json_branch.h" \
1758	"$(OX)\json_config.c":"$(OX)\json_config.h" \
1759	"$(OX)\json_diff.c":"$(OX)\json_diff.h" \
1760	"$(OX)\json_dir.c":"$(OX)\json_dir.h" \
1761	"$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
1762	"$(OX)\json_login.c":"$(OX)\json_login.h" \
1763	"$(OX)\json_query.c":"$(OX)\json_query.h" \
1764	"$(OX)\json_report.c":"$(OX)\json_report.h" \
1765	"$(OX)\json_status.c":"$(OX)\json_status.h" \
1766	"$(OX)\json_tag.c":"$(OX)\json_tag.h" \
1767	"$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
1768	"$(OX)\json_user.c":"$(OX)\json_user.h" \
1769	"$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
1770	"$(OX)\leaf.c":"$(OX)\leaf.h" \
1771	"$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
1772	"$(OX)\login.c":"$(OX)\login.h" \
1773	"$(OX)\lookslike.c":"$(OX)\lookslike.h" \
1774	"$(OX)\main.c":"$(OX)\main.h" \
1775	"$(OX)\manifest.c":"$(OX)\manifest.h" \
1776	"$(OX)\markdown.c":"$(OX)\markdown.h" \
1777	"$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
1778	"$(OX)\md5.c":"$(OX)\md5.h" \
1779	"$(OX)\merge.c":"$(OX)\merge.h" \
1780	"$(OX)\merge3.c":"$(OX)\merge3.h" \
1781	"$(OX)\moderate.c":"$(OX)\moderate.h" \
1782	"$(OX)\name.c":"$(OX)\name.h" \
1783	"$(OX)\path.c":"$(OX)\path.h" \
1784	"$(OX)\piechart.c":"$(OX)\piechart.h" \
1785	"$(OX)\pikchr.c":"$(OX)\pikchr.h" \
1786	"$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
1787	"$(OX)\pivot.c":"$(OX)\pivot.h" \
1788	"$(OX)\popen.c":"$(OX)\popen.h" \
1789	"$(OX)\pqueue.c":"$(OX)\pqueue.h" \
1790	"$(OX)\printf.c":"$(OX)\printf.h" \
1791	"$(OX)\publish.c":"$(OX)\publish.h" \
1792	"$(OX)\purge.c":"$(OX)\purge.h" \
1793	"$(OX)\rebuild.c":"$(OX)\rebuild.h" \
1794	"$(OX)\regexp.c":"$(OX)\regexp.h" \
1795	"$(OX)\repolist.c":"$(OX)\repolist.h" \
1796	"$(OX)\report.c":"$(OX)\report.h" \
1797	"$(OX)\rss.c":"$(OX)\rss.h" \
1798	"$(OX)\schema.c":"$(OX)\schema.h" \
1799	"$(OX)\search.c":"$(OX)\search.h" \
1800	"$(OX)\security_audit.c":"$(OX)\security_audit.h" \
1801	"$(OX)\setup.c":"$(OX)\setup.h" \
1802	"$(OX)\setupuser.c":"$(OX)\setupuser.h" \
1803	"$(OX)\sha1.c":"$(OX)\sha1.h" \
1804	"$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
1805	"$(OX)\sha3.c":"$(OX)\sha3.h" \
1806	"$(OX)\shun.c":"$(OX)\shun.h" \
1807	"$(OX)\sitemap.c":"$(OX)\sitemap.h" \
1808	"$(OX)\skins.c":"$(OX)\skins.h" \
1809	"$(OX)\smtp.c":"$(OX)\smtp.h" \
1810	"$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
1811	"$(OX)\stash.c":"$(OX)\stash.h" \
1812	"$(OX)\stat.c":"$(OX)\stat.h" \
1813	"$(OX)\statrep.c":"$(OX)\statrep.h" \
1814	"$(OX)\style.c":"$(OX)\style.h" \
1815	"$(OX)\sync.c":"$(OX)\sync.h" \
1816	"$(OX)\tag.c":"$(OX)\tag.h" \
1817	"$(OX)\tar.c":"$(OX)\tar.h" \
1818	"$(OX)\terminal.c":"$(OX)\terminal.h" \
1819	"$(OX)\th_main.c":"$(OX)\th_main.h" \
1820	"$(OX)\timeline.c":"$(OX)\timeline.h" \
1821	"$(OX)\tkt.c":"$(OX)\tkt.h" \
1822	"$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
1823	"$(OX)\undo.c":"$(OX)\undo.h" \
1824	"$(OX)\unicode.c":"$(OX)\unicode.h" \
1825	"$(OX)\unversioned.c":"$(OX)\unversioned.h" \
1826	"$(OX)\update.c":"$(OX)\update.h" \
1827	"$(OX)\url.c":"$(OX)\url.h" \
1828	"$(OX)\user.c":"$(OX)\user.h" \
1829	"$(OX)\utf8.c":"$(OX)\utf8.h" \
1830	"$(OX)\util.c":"$(OX)\util.h" \
1831	"$(OX)\verify.c":"$(OX)\verify.h" \
1832	"$(OX)\vfile.c":"$(OX)\vfile.h" \
1833	"$(OX)\webmail.c":"$(OX)\webmail.h" \
1834	"$(OX)\wiki.c":"$(OX)\wiki.h" \
1835	"$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
1836	"$(OX)\winfile.c":"$(OX)\winfile.h" \
1837	"$(OX)\winhttp.c":"$(OX)\winhttp.h" \
1838	"$(OX)\xfer.c":"$(OX)\xfer.h" \
1839	"$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
1840	"$(OX)\zip.c":"$(OX)\zip.h" \
1841	"$(SRCDIR)\sqlite3.h" \
1842	"$(SRCDIR)\th.h" \
1843	"$(OX)\VERSION.h" \
1844	"$(SRCDIR)\cson_amalgamation.h"
1845	@copy /Y nul: $@






1846

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,13 +12,17 @@
12	SRCDIR = $(B)\src
13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	BUILDDIR = Build
15	!message Using default build directory, $(BUILDDIR)
16	!endif
17	# Top of build/staging/object directory subtree
18	T = $(BUILDDIR)
19	# Where object and other intermediate binary files will go
20	OBJDIR = $(T)
21	# Staging area for translated or generated sources
22	OX = $(OBJDIR)
23	# Extensions for this platform
24	O = .obj
25	E = .exe
26	P = .pdb
27
28	!ifndef INSTALLDIR
	@@ -37,20 +41,32 @@
41	#
42	!if !exist("$(B)\.fossil-settings")
43	!error Please specify path to project base directory: B="path/to/fossil"
44	!endif
45
46	# Create build, object and staging directory during preprocessing if needed.
47	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
48	!endif
49	!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
50	!endif
51	!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
52	!endif
53
54	# Perl is only necessary if OpenSSL support is enabled and it is built from
55	# source code. The PERLDIR environment variable, if it exists, should point
56	# to the directory containing the main Perl executable specified here (i.e.
57	# "perl.exe").
58	!if $(FOSSIL_BUILD_SSL)!=0
59	! if !defined(PERL) && [where PERL.exe > nul 2>&1]
60	PERL = perl.exe
61	!undef PERLDIR
62	! elseif !defined(PERL)
63	! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
64	PERL = perl.exe
65	! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
66	! endif
67	! endif
68	!endif
69
70	# Enable debugging symbols?
71	!ifndef DEBUG
72	DEBUG = 0
	@@ -199,30 +215,30 @@
215	!endif
216
217	!if $(FOSSIL_ENABLE_WINXP)!=0
218	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
219	CFLAGS = $(CFLAGS) $(XPCFLAGS)
220	! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
221	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
222	! else
223	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
224	! endif
225	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
226	!endif
227
228	!if $(FOSSIL_DYNAMIC_BUILD)!=0
229	! if $(DEBUG)!=0
230	CRTFLAGS = /MDd
231	! else
232	CRTFLAGS = /MD
233	! endif
234	!else
235	! if $(DEBUG)!=0
236	CRTFLAGS = /MTd
237	! else
238	CRTFLAGS = /MT
239	! endif
240	!endif
241
242	!if $(DEBUG)!=0
243	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
244	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -509,115 +525,117 @@
525	"$(OX)\winhttp.c" \
526	"$(OX)\xfer.c" \
527	"$(OX)\xfersetup.c" \
528	"$(OX)\zip.c"
529
530	EXTRA_FILES = \
531	"$(SRCDIR)\..\skins\ardoise\css.txt" \
532	"$(SRCDIR)\..\skins\ardoise\details.txt" \
533	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
534	"$(SRCDIR)\..\skins\ardoise\header.txt" \
535	"$(SRCDIR)\..\skins\black_and_white\css.txt" \
536	"$(SRCDIR)\..\skins\black_and_white\details.txt" \
537	"$(SRCDIR)\..\skins\black_and_white\footer.txt" \
538	"$(SRCDIR)\..\skins\black_and_white\header.txt" \
539	"$(SRCDIR)\..\skins\blitz\css.txt" \
540	"$(SRCDIR)\..\skins\blitz\details.txt" \
541	"$(SRCDIR)\..\skins\blitz\footer.txt" \
542	"$(SRCDIR)\..\skins\blitz\header.txt" \
543	"$(SRCDIR)\..\skins\blitz\ticket.txt" \
544	"$(SRCDIR)\..\skins\bootstrap\css.txt" \
545	"$(SRCDIR)\..\skins\bootstrap\details.txt" \
546	"$(SRCDIR)\..\skins\bootstrap\footer.txt" \
547	"$(SRCDIR)\..\skins\bootstrap\header.txt" \
548	"$(SRCDIR)\..\skins\darkmode\css.txt" \
549	"$(SRCDIR)\..\skins\darkmode\details.txt" \
550	"$(SRCDIR)\..\skins\darkmode\footer.txt" \
551	"$(SRCDIR)\..\skins\darkmode\header.txt" \
552	"$(SRCDIR)\..\skins\default\css.txt" \
553	"$(SRCDIR)\..\skins\default\details.txt" \
554	"$(SRCDIR)\..\skins\default\footer.txt" \
555	"$(SRCDIR)\..\skins\default\header.txt" \
556	"$(SRCDIR)\..\skins\eagle\css.txt" \
557	"$(SRCDIR)\..\skins\eagle\details.txt" \
558	"$(SRCDIR)\..\skins\eagle\footer.txt" \
559	"$(SRCDIR)\..\skins\eagle\header.txt" \
560	"$(SRCDIR)\..\skins\khaki\css.txt" \
561	"$(SRCDIR)\..\skins\khaki\details.txt" \
562	"$(SRCDIR)\..\skins\khaki\footer.txt" \
563	"$(SRCDIR)\..\skins\khaki\header.txt" \
564	"$(SRCDIR)\..\skins\original\css.txt" \
565	"$(SRCDIR)\..\skins\original\details.txt" \
566	"$(SRCDIR)\..\skins\original\footer.txt" \
567	"$(SRCDIR)\..\skins\original\header.txt" \
568	"$(SRCDIR)\..\skins\plain_gray\css.txt" \
569	"$(SRCDIR)\..\skins\plain_gray\details.txt" \
570	"$(SRCDIR)\..\skins\plain_gray\footer.txt" \
571	"$(SRCDIR)\..\skins\plain_gray\header.txt" \
572	"$(SRCDIR)\..\skins\xekri\css.txt" \
573	"$(SRCDIR)\..\skins\xekri\details.txt" \
574	"$(SRCDIR)\..\skins\xekri\footer.txt" \
575	"$(SRCDIR)\..\skins\xekri\header.txt" \
576	"$(SRCDIR)\accordion.js" \
577	"$(SRCDIR)\alerts\bflat2.wav" \
578	"$(SRCDIR)\alerts\bflat3.wav" \
579	"$(SRCDIR)\alerts\bloop.wav" \
580	"$(SRCDIR)\alerts\plunk.wav" \
581	"$(SRCDIR)\chat.js" \
582	"$(SRCDIR)\ci_edit.js" \
583	"$(SRCDIR)\copybtn.js" \
584	"$(SRCDIR)\default.css" \
585	"$(SRCDIR)\diff.tcl" \
586	"$(SRCDIR)\forum.js" \
587	"$(SRCDIR)\fossil.bootstrap.js" \
588	"$(SRCDIR)\fossil.confirmer.js" \
589	"$(SRCDIR)\fossil.copybutton.js" \
590	"$(SRCDIR)\fossil.dom.js" \
591	"$(SRCDIR)\fossil.fetch.js" \
592	"$(SRCDIR)\fossil.numbered-lines.js" \
593	"$(SRCDIR)\fossil.page.fileedit.js" \
594	"$(SRCDIR)\fossil.page.forumpost.js" \
595	"$(SRCDIR)\fossil.page.pikchrshow.js" \
596	"$(SRCDIR)\fossil.page.wikiedit.js" \
597	"$(SRCDIR)\fossil.pikchr.js" \
598	"$(SRCDIR)\fossil.popupwidget.js" \
599	"$(SRCDIR)\fossil.storage.js" \
600	"$(SRCDIR)\fossil.tabs.js" \
601	"$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
602	"$(SRCDIR)\graph.js" \
603	"$(SRCDIR)\hbmenu.js" \
604	"$(SRCDIR)\href.js" \
605	"$(SRCDIR)\login.js" \
606	"$(SRCDIR)\markdown.md" \
607	"$(SRCDIR)\menu.js" \
608	"$(SRCDIR)\sbsdiff.js" \
609	"$(SRCDIR)\scroll.js" \
610	"$(SRCDIR)\skin.js" \
611	"$(SRCDIR)\sorttable.js" \
612	"$(SRCDIR)\sounds\0.wav" \
613	"$(SRCDIR)\sounds\1.wav" \
614	"$(SRCDIR)\sounds\2.wav" \
615	"$(SRCDIR)\sounds\3.wav" \
616	"$(SRCDIR)\sounds\4.wav" \
617	"$(SRCDIR)\sounds\5.wav" \
618	"$(SRCDIR)\sounds\6.wav" \
619	"$(SRCDIR)\sounds\7.wav" \
620	"$(SRCDIR)\sounds\8.wav" \
621	"$(SRCDIR)\sounds\9.wav" \
622	"$(SRCDIR)\sounds\a.wav" \
623	"$(SRCDIR)\sounds\b.wav" \
624	"$(SRCDIR)\sounds\c.wav" \
625	"$(SRCDIR)\sounds\d.wav" \
626	"$(SRCDIR)\sounds\e.wav" \
627	"$(SRCDIR)\sounds\f.wav" \
628	"$(SRCDIR)\style.admin_log.css" \
629	"$(SRCDIR)\style.fileedit.css" \
630	"$(SRCDIR)\style.wikiedit.css" \
631	"$(SRCDIR)\tree.js" \
632	"$(SRCDIR)\useredit.js" \
633	"$(SRCDIR)\wiki.wiki"
634
635	OBJ = \
636	"$(OX)\add$O" \
637	"$(OX)\ajax$O" \
638	"$(OX)\alerts$O" \
639	"$(OX)\allrepo$O" \
640	"$(OX)\attach$O" \
641	"$(OX)\backlink$O" \
	@@ -766,15 +784,15 @@
784	"$(OX)\wikiformat$O" \
785	"$(OX)\winfile$O" \
786	"$(OX)\winhttp$O" \
787	"$(OX)\xfer$O" \
788	"$(OX)\xfersetup$O" \
789	"$(OX)\zip$O"
790	!if $(FOSSIL_ENABLE_MINIZ)!=0
791	OBJ = $(OBJ) "$(OX)\miniz$O"
792	!endif
793	OBJ = $(OBJ) "$(OX)\fossil.res"
794
795
796	!ifndef BASEAPPNAME
797	BASEAPPNAME = fossil
798	!endif
	@@ -781,11 +799,11 @@
799
800	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
801	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
802	APPTARGETS =
803
804	all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
805
806	$(BASEAPPNAME): "$(APPNAME)"
807
808	$(BASEAPPNAME)$(E): "$(APPNAME)"
809
	@@ -797,55 +815,49 @@
815	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
816	!if $(DEBUG)!=0
817	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
818	!endif
819
820	ZLIB_X = "$(OX)\zlib_built"







821	!if $(FOSSIL_BUILD_ZLIB)
822	zlib $(ZLIB_X):
823	@echo Building zlib from "$(ZLIBDIR)"...
824	!if $(FOSSIL_ENABLE_WINXP)!=0
825	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
826	!else
827	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
828	!endif
829	cmd /E:ON /c date /T > $(ZLIB_X)
830
831	clean-zlib:
832	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
833	!endif
834
835	!if $(FOSSIL_ENABLE_SSL)!=0
836	OPENSSL_X = "$(OX)\openssl.opts"
837	openssl $(OPENSSL_X):
838	@echo Building OpenSSL from "$(SSLDIR)"...
839	! ifdef PERLDIR
840	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
841	! else
842	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
843	! endif
844	! if $(FOSSIL_ENABLE_WINXP)!=0
845	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
846	! else
847	@pushd "$(SSLDIR)" && $(MAKE) && popd
848	! endif
849	echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
850	cmd /E:ON /c date /T >> $(OPENSSL_X)
851
852	clean-openssl:
853	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
854	-del $(OPENSSL_X)
855
856	! if $(FOSSIL_BUILD_SSL)!=0
857	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
858	! endif
859
860	!endif
861
862	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
863	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1016,30 +1028,15 @@
1028	echo "$(OX)\miniz.obj" >> $@
1029	!endif
1030	echo $(LIBS) >> $@
1031
1032
1033	{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	# This target gets the project tools built.
1037	toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"















1038
1039	!if $(USE_SEE)!=0
1040	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1041	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1042	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
	@@ -1130,716 +1127,1016 @@
1127	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1128	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1129	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1130
1131	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1132	-echo. > $@
1133	@echo "$(SRCDIR)\../skins/ardoise/css.txt" >> $@
1134	@echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1135	@echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1136	@echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1137	@echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1138	@echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1139	@echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1140	@echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1141	@echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1142	@echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1143	@echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1144	@echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1145	@echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1146	@echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1147	@echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1148	@echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1149	@echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1150	@echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1151	@echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1152	@echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1153	@echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1154	@echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1155	@echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1156	@echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1157	@echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1158	@echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1159	@echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1160	@echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1161	@echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1162	@echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1163	@echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1164	@echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1165	@echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1166	@echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1167	@echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1168	@echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1169	@echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1170	@echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1171	@echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1172	@echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1173	@echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1174	@echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1175	@echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1176	@echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1177	@echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1178	@echo "$(SRCDIR)\accordion.js" >> $@
1179	@echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1180	@echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1181	@echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1182	@echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1183	@echo "$(SRCDIR)\chat.js" >> $@
1184	@echo "$(SRCDIR)\ci_edit.js" >> $@
1185	@echo "$(SRCDIR)\copybtn.js" >> $@
1186	@echo "$(SRCDIR)\default.css" >> $@
1187	@echo "$(SRCDIR)\diff.tcl" >> $@
1188	@echo "$(SRCDIR)\forum.js" >> $@
1189	@echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1190	@echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1191	@echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1192	@echo "$(SRCDIR)\fossil.dom.js" >> $@
1193	@echo "$(SRCDIR)\fossil.fetch.js" >> $@
1194	@echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1195	@echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1196	@echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1197	@echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1198	@echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1199	@echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1200	@echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1201	@echo "$(SRCDIR)\fossil.storage.js" >> $@
1202	@echo "$(SRCDIR)\fossil.tabs.js" >> $@
1203	@echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1204	@echo "$(SRCDIR)\graph.js" >> $@
1205	@echo "$(SRCDIR)\hbmenu.js" >> $@
1206	@echo "$(SRCDIR)\href.js" >> $@
1207	@echo "$(SRCDIR)\login.js" >> $@
1208	@echo "$(SRCDIR)\markdown.md" >> $@
1209	@echo "$(SRCDIR)\menu.js" >> $@
1210	@echo "$(SRCDIR)\sbsdiff.js" >> $@
1211	@echo "$(SRCDIR)\scroll.js" >> $@
1212	@echo "$(SRCDIR)\skin.js" >> $@
1213	@echo "$(SRCDIR)\sorttable.js" >> $@
1214	@echo "$(SRCDIR)\sounds/0.wav" >> $@
1215	@echo "$(SRCDIR)\sounds/1.wav" >> $@
1216	@echo "$(SRCDIR)\sounds/2.wav" >> $@
1217	@echo "$(SRCDIR)\sounds/3.wav" >> $@
1218	@echo "$(SRCDIR)\sounds/4.wav" >> $@
1219	@echo "$(SRCDIR)\sounds/5.wav" >> $@
1220	@echo "$(SRCDIR)\sounds/6.wav" >> $@
1221	@echo "$(SRCDIR)\sounds/7.wav" >> $@
1222	@echo "$(SRCDIR)\sounds/8.wav" >> $@
1223	@echo "$(SRCDIR)\sounds/9.wav" >> $@
1224	@echo "$(SRCDIR)\sounds/a.wav" >> $@
1225	@echo "$(SRCDIR)\sounds/b.wav" >> $@
1226	@echo "$(SRCDIR)\sounds/c.wav" >> $@
1227	@echo "$(SRCDIR)\sounds/d.wav" >> $@
1228	@echo "$(SRCDIR)\sounds/e.wav" >> $@
1229	@echo "$(SRCDIR)\sounds/f.wav" >> $@
1230	@echo "$(SRCDIR)\style.admin_log.css" >> $@
1231	@echo "$(SRCDIR)\style.fileedit.css" >> $@
1232	@echo "$(SRCDIR)\style.wikiedit.css" >> $@
1233	@echo "$(SRCDIR)\tree.js" >> $@
1234	@echo "$(SRCDIR)\useredit.js" >> $@
1235	@echo "$(SRCDIR)\wiki.wiki" >> $@
1236	{$(OX)\}.c{$(OX)\}.h:
1237	"$(OBJDIR)\makeheaders$E" $**:$@
1238	{$(SRCDIR)\}.c{$(OX)\}.c:
1239	"$(OBJDIR)\translate$E" $** > $@




1240	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1241	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1242
1243	"$(OX)\add.c" : "$(SRCDIR)\add.c"
1244	"$(OX)\add.h" : "$(OX)\add.c"
1245	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1247
1248	"$(OX)\ajax.c" : "$(SRCDIR)\ajax.c"
1249	"$(OX)\ajax.h" : "$(OX)\ajax.c"
1250	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1251	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1252
1253	"$(OX)\alerts.c" : "$(SRCDIR)\alerts.c"
1254	"$(OX)\alerts.h" : "$(OX)\alerts.c"
1255	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1256	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1257
1258	"$(OX)\allrepo.c" : "$(SRCDIR)\allrepo.c"
1259	"$(OX)\allrepo.h" : "$(OX)\allrepo.c"
1260	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1262
1263	"$(OX)\attach.c" : "$(SRCDIR)\attach.c"
1264	"$(OX)\attach.h" : "$(OX)\attach.c"
1265	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1266	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1267
1268	"$(OX)\backlink.c" : "$(SRCDIR)\backlink.c"
1269	"$(OX)\backlink.h" : "$(OX)\backlink.c"
1270	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1271	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1272
1273	"$(OX)\backoffice.c" : "$(SRCDIR)\backoffice.c"
1274	"$(OX)\backoffice.h" : "$(OX)\backoffice.c"
1275	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1277
1278	"$(OX)\bag.c" : "$(SRCDIR)\bag.c"
1279	"$(OX)\bag.h" : "$(OX)\bag.c"
1280	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1281	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1282
1283	"$(OX)\bisect.c" : "$(SRCDIR)\bisect.c"
1284	"$(OX)\bisect.h" : "$(OX)\bisect.c"
1285	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1286	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1287
1288	"$(OX)\blob.c" : "$(SRCDIR)\blob.c"
1289	"$(OX)\blob.h" : "$(OX)\blob.c"
1290	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1292
1293	"$(OX)\branch.c" : "$(SRCDIR)\branch.c"
1294	"$(OX)\branch.h" : "$(OX)\branch.c"
1295	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1296	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1297
1298	"$(OX)\browse.c" : "$(SRCDIR)\browse.c"
1299	"$(OX)\browse.h" : "$(OX)\browse.c"
1300	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1301	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1302
1303	"$(OX)\builtin.c" : "$(SRCDIR)\builtin.c"
1304	"$(OX)\builtin.h" : "$(OX)\builtin.c"
1305	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1307
1308	"$(OX)\bundle.c" : "$(SRCDIR)\bundle.c"
1309	"$(OX)\bundle.h" : "$(OX)\bundle.c"
1310	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1311	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1312
1313	"$(OX)\cache.c" : "$(SRCDIR)\cache.c"
1314	"$(OX)\cache.h" : "$(OX)\cache.c"
1315	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1316	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1317
1318	"$(OX)\capabilities.c" : "$(SRCDIR)\capabilities.c"
1319	"$(OX)\capabilities.h" : "$(OX)\capabilities.c"
1320	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1322
1323	"$(OX)\captcha.c" : "$(SRCDIR)\captcha.c"
1324	"$(OX)\captcha.h" : "$(OX)\captcha.c"
1325	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1326	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1327
1328	"$(OX)\cgi.c" : "$(SRCDIR)\cgi.c"
1329	"$(OX)\cgi.h" : "$(OX)\cgi.c"
1330	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1331	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1332
1333	"$(OX)\chat.c" : "$(SRCDIR)\chat.c"
1334	"$(OX)\chat.h" : "$(OX)\chat.c"
1335	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1337
1338	"$(OX)\checkin.c" : "$(SRCDIR)\checkin.c"
1339	"$(OX)\checkin.h" : "$(OX)\checkin.c"
1340	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1341	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1342
1343	"$(OX)\checkout.c" : "$(SRCDIR)\checkout.c"
1344	"$(OX)\checkout.h" : "$(OX)\checkout.c"
1345	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1346	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1347
1348	"$(OX)\clearsign.c" : "$(SRCDIR)\clearsign.c"
1349	"$(OX)\clearsign.h" : "$(OX)\clearsign.c"
1350	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1352
1353	"$(OX)\clone.c" : "$(SRCDIR)\clone.c"
1354	"$(OX)\clone.h" : "$(OX)\clone.c"
1355	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1356	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1357
1358	"$(OX)\color.c" : "$(SRCDIR)\color.c"
1359	"$(OX)\color.h" : "$(OX)\color.c"
1360	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1361	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1362
1363	"$(OX)\comformat.c" : "$(SRCDIR)\comformat.c"
1364	"$(OX)\comformat.h" : "$(OX)\comformat.c"
1365	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1367
1368	"$(OX)\configure.c" : "$(SRCDIR)\configure.c"
1369	"$(OX)\configure.h" : "$(OX)\configure.c"
1370	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1371	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1372
1373	"$(OX)\content.c" : "$(SRCDIR)\content.c"
1374	"$(OX)\content.h" : "$(OX)\content.c"
1375	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1376	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1377
1378	"$(OX)\cookies.c" : "$(SRCDIR)\cookies.c"
1379	"$(OX)\cookies.h" : "$(OX)\cookies.c"
1380	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1382
1383	"$(OX)\db.c" : "$(SRCDIR)\db.c"
1384	"$(OX)\db.h" : "$(OX)\db.c"
1385	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1386	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1387
1388	"$(OX)\delta.c" : "$(SRCDIR)\delta.c"
1389	"$(OX)\delta.h" : "$(OX)\delta.c"
1390	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1391	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1392
1393	"$(OX)\deltacmd.c" : "$(SRCDIR)\deltacmd.c"
1394	"$(OX)\deltacmd.h" : "$(OX)\deltacmd.c"
1395	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1397
1398	"$(OX)\deltafunc.c" : "$(SRCDIR)\deltafunc.c"
1399	"$(OX)\deltafunc.h" : "$(OX)\deltafunc.c"
1400	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1401	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1402
1403	"$(OX)\descendants.c" : "$(SRCDIR)\descendants.c"
1404	"$(OX)\descendants.h" : "$(OX)\descendants.c"
1405	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1406	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1407
1408	"$(OX)\diff.c" : "$(SRCDIR)\diff.c"
1409	"$(OX)\diff.h" : "$(OX)\diff.c"
1410	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1412
1413	"$(OX)\diffcmd.c" : "$(SRCDIR)\diffcmd.c"
1414	"$(OX)\diffcmd.h" : "$(OX)\diffcmd.c"
1415	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1416	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1417
1418	"$(OX)\dispatch.c" : "$(SRCDIR)\dispatch.c"
1419	"$(OX)\dispatch.h" : "$(OX)\dispatch.c"
1420	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1421	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1422
1423	"$(OX)\doc.c" : "$(SRCDIR)\doc.c"
1424	"$(OX)\doc.h" : "$(OX)\doc.c"
1425	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1427
1428	"$(OX)\encode.c" : "$(SRCDIR)\encode.c"
1429	"$(OX)\encode.h" : "$(OX)\encode.c"
1430	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1431	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1432
1433	"$(OX)\etag.c" : "$(SRCDIR)\etag.c"
1434	"$(OX)\etag.h" : "$(OX)\etag.c"
1435	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1436	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1437
1438	"$(OX)\event.c" : "$(SRCDIR)\event.c"
1439	"$(OX)\event.h" : "$(OX)\event.c"
1440	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1442
1443	"$(OX)\export.c" : "$(SRCDIR)\export.c"
1444	"$(OX)\export.h" : "$(OX)\export.c"
1445	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1446	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1447
1448	"$(OX)\extcgi.c" : "$(SRCDIR)\extcgi.c"
1449	"$(OX)\extcgi.h" : "$(OX)\extcgi.c"
1450	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1452
1453	"$(OX)\file.c" : "$(SRCDIR)\file.c"
1454	"$(OX)\file.h" : "$(OX)\file.c"
1455	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1457
1458	"$(OX)\fileedit.c" : "$(SRCDIR)\fileedit.c"
1459	"$(OX)\fileedit.h" : "$(OX)\fileedit.c"
1460	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1461	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1462
1463	"$(OX)\finfo.c" : "$(SRCDIR)\finfo.c"
1464	"$(OX)\finfo.h" : "$(OX)\finfo.c"
1465	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1466	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1467
1468	"$(OX)\foci.c" : "$(SRCDIR)\foci.c"
1469	"$(OX)\foci.h" : "$(OX)\foci.c"
1470	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1472
1473	"$(OX)\forum.c" : "$(SRCDIR)\forum.c"
1474	"$(OX)\forum.h" : "$(OX)\forum.c"
1475	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1476	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1477
1478	"$(OX)\fshell.c" : "$(SRCDIR)\fshell.c"
1479	"$(OX)\fshell.h" : "$(OX)\fshell.c"
1480	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1481	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1482
1483	"$(OX)\fusefs.c" : "$(SRCDIR)\fusefs.c"
1484	"$(OX)\fusefs.h" : "$(OX)\fusefs.c"
1485	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1487
1488	"$(OX)\fuzz.c" : "$(SRCDIR)\fuzz.c"
1489	"$(OX)\fuzz.h" : "$(OX)\fuzz.c"
1490	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1491	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1492
1493	"$(OX)\glob.c" : "$(SRCDIR)\glob.c"
1494	"$(OX)\glob.h" : "$(OX)\glob.c"
1495	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1496	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1497
1498	"$(OX)\graph.c" : "$(SRCDIR)\graph.c"
1499	"$(OX)\graph.h" : "$(OX)\graph.c"
1500	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1502
1503	"$(OX)\gzip.c" : "$(SRCDIR)\gzip.c"
1504	"$(OX)\gzip.h" : "$(OX)\gzip.c"
1505	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1506	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1507
1508	"$(OX)\hname.c" : "$(SRCDIR)\hname.c"
1509	"$(OX)\hname.h" : "$(OX)\hname.c"
1510	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1511	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1512
1513	"$(OX)\hook.c" : "$(SRCDIR)\hook.c"
1514	"$(OX)\hook.h" : "$(OX)\hook.c"
1515	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1517
1518	"$(OX)\http.c" : "$(SRCDIR)\http.c"
1519	"$(OX)\http.h" : "$(OX)\http.c"
1520	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1521	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1522
1523	"$(OX)\http_socket.c" : "$(SRCDIR)\http_socket.c"
1524	"$(OX)\http_socket.h" : "$(OX)\http_socket.c"
1525	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1526	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1527
1528	"$(OX)\http_ssl.c" : "$(SRCDIR)\http_ssl.c"
1529	"$(OX)\http_ssl.h" : "$(OX)\http_ssl.c"
1530	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1532
1533	"$(OX)\http_transport.c" : "$(SRCDIR)\http_transport.c"
1534	"$(OX)\http_transport.h" : "$(OX)\http_transport.c"
1535	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1536	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1537
1538	"$(OX)\import.c" : "$(SRCDIR)\import.c"
1539	"$(OX)\import.h" : "$(OX)\import.c"
1540	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1541	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1542
1543	"$(OX)\info.c" : "$(SRCDIR)\info.c"
1544	"$(OX)\info.h" : "$(OX)\info.c"
1545	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1547
1548	"$(OX)\interwiki.c" : "$(SRCDIR)\interwiki.c"
1549	"$(OX)\interwiki.h" : "$(OX)\interwiki.c"
1550	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1551	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1552
1553	"$(OX)\json.c" : "$(SRCDIR)\json.c"
1554	"$(OX)\json.h" : "$(OX)\json.c"
1555	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1556	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1557
1558	"$(OX)\json_artifact.c" : "$(SRCDIR)\json_artifact.c"
1559	"$(OX)\json_artifact.h" : "$(OX)\json_artifact.c"
1560	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1562
1563	"$(OX)\json_branch.c" : "$(SRCDIR)\json_branch.c"
1564	"$(OX)\json_branch.h" : "$(OX)\json_branch.c"
1565	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1566	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1567
1568	"$(OX)\json_config.c" : "$(SRCDIR)\json_config.c"
1569	"$(OX)\json_config.h" : "$(OX)\json_config.c"
1570	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1571	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1572
1573	"$(OX)\json_diff.c" : "$(SRCDIR)\json_diff.c"
1574	"$(OX)\json_diff.h" : "$(OX)\json_diff.c"
1575	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1577
1578	"$(OX)\json_dir.c" : "$(SRCDIR)\json_dir.c"
1579	"$(OX)\json_dir.h" : "$(OX)\json_dir.c"
1580	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1581	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1582
1583	"$(OX)\json_finfo.c" : "$(SRCDIR)\json_finfo.c"
1584	"$(OX)\json_finfo.h" : "$(OX)\json_finfo.c"
1585	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1586	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1587
1588	"$(OX)\json_login.c" : "$(SRCDIR)\json_login.c"
1589	"$(OX)\json_login.h" : "$(OX)\json_login.c"
1590	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1592
1593	"$(OX)\json_query.c" : "$(SRCDIR)\json_query.c"
1594	"$(OX)\json_query.h" : "$(OX)\json_query.c"
1595	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1596	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1597
1598	"$(OX)\json_report.c" : "$(SRCDIR)\json_report.c"
1599	"$(OX)\json_report.h" : "$(OX)\json_report.c"
1600	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1601	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1602
1603	"$(OX)\json_status.c" : "$(SRCDIR)\json_status.c"
1604	"$(OX)\json_status.h" : "$(OX)\json_status.c"
1605	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1607
1608	"$(OX)\json_tag.c" : "$(SRCDIR)\json_tag.c"
1609	"$(OX)\json_tag.h" : "$(OX)\json_tag.c"
1610	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1611	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1612
1613	"$(OX)\json_timeline.c" : "$(SRCDIR)\json_timeline.c"
1614	"$(OX)\json_timeline.h" : "$(OX)\json_timeline.c"
1615	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1616	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1617
1618	"$(OX)\json_user.c" : "$(SRCDIR)\json_user.c"
1619	"$(OX)\json_user.h" : "$(OX)\json_user.c"
1620	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1622
1623	"$(OX)\json_wiki.c" : "$(SRCDIR)\json_wiki.c"
1624	"$(OX)\json_wiki.h" : "$(OX)\json_wiki.c"
1625	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1626	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1627
1628	"$(OX)\leaf.c" : "$(SRCDIR)\leaf.c"
1629	"$(OX)\leaf.h" : "$(OX)\leaf.c"
1630	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1631	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1632
1633	"$(OX)\loadctrl.c" : "$(SRCDIR)\loadctrl.c"
1634	"$(OX)\loadctrl.h" : "$(OX)\loadctrl.c"
1635	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1637
1638	"$(OX)\login.c" : "$(SRCDIR)\login.c"
1639	"$(OX)\login.h" : "$(OX)\login.c"
1640	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1641	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1642
1643	"$(OX)\lookslike.c" : "$(SRCDIR)\lookslike.c"
1644	"$(OX)\lookslike.h" : "$(OX)\lookslike.c"
1645	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1646	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1647
1648	"$(OX)\main.c" : "$(SRCDIR)\main.c"
1649	"$(OX)\main.h" : "$(OX)\main.c"
1650	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1652
1653	"$(OX)\manifest.c" : "$(SRCDIR)\manifest.c"
1654	"$(OX)\manifest.h" : "$(OX)\manifest.c"
1655	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1656	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1657
1658	"$(OX)\markdown.c" : "$(SRCDIR)\markdown.c"
1659	"$(OX)\markdown.h" : "$(OX)\markdown.c"
1660	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1661	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1662
1663	"$(OX)\markdown_html.c" : "$(SRCDIR)\markdown_html.c"
1664	"$(OX)\markdown_html.h" : "$(OX)\markdown_html.c"
1665	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1667
1668	"$(OX)\md5.c" : "$(SRCDIR)\md5.c"
1669	"$(OX)\md5.h" : "$(OX)\md5.c"
1670	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1671	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1672
1673	"$(OX)\merge.c" : "$(SRCDIR)\merge.c"
1674	"$(OX)\merge.h" : "$(OX)\merge.c"
1675	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1676	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1677
1678	"$(OX)\merge3.c" : "$(SRCDIR)\merge3.c"
1679	"$(OX)\merge3.h" : "$(OX)\merge3.c"
1680	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1682
1683	"$(OX)\moderate.c" : "$(SRCDIR)\moderate.c"
1684	"$(OX)\moderate.h" : "$(OX)\moderate.c"
1685	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1686	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1687
1688	"$(OX)\name.c" : "$(SRCDIR)\name.c"
1689	"$(OX)\name.h" : "$(OX)\name.c"
1690	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1691	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1692
1693	"$(OX)\path.c" : "$(SRCDIR)\path.c"
1694	"$(OX)\path.h" : "$(OX)\path.c"
1695	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1696	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1697
1698	"$(OX)\piechart.c" : "$(SRCDIR)\piechart.c"
1699	"$(OX)\piechart.h" : "$(OX)\piechart.c"
1700	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1701	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1702
1703	"$(OX)\pikchr.c" : "$(SRCDIR)\pikchr.c"
1704	"$(OX)\pikchr.h" : "$(OX)\pikchr.c"
1705	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1706	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1707
1708	"$(OX)\pikchrshow.c" : "$(SRCDIR)\pikchrshow.c"
1709	"$(OX)\pikchrshow.h" : "$(OX)\pikchrshow.c"
1710	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1711	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1712
1713	"$(OX)\pivot.c" : "$(SRCDIR)\pivot.c"
1714	"$(OX)\pivot.h" : "$(OX)\pivot.c"
1715	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1716	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1717
1718	"$(OX)\popen.c" : "$(SRCDIR)\popen.c"
1719	"$(OX)\popen.h" : "$(OX)\popen.c"
1720	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1721	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1722
1723	"$(OX)\pqueue.c" : "$(SRCDIR)\pqueue.c"
1724	"$(OX)\pqueue.h" : "$(OX)\pqueue.c"
1725	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1726	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1727
1728	"$(OX)\printf.c" : "$(SRCDIR)\printf.c"
1729	"$(OX)\printf.h" : "$(OX)\printf.c"
1730	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1731	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1732
1733	"$(OX)\publish.c" : "$(SRCDIR)\publish.c"
1734	"$(OX)\publish.h" : "$(OX)\publish.c"
1735	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1736	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1737
1738	"$(OX)\purge.c" : "$(SRCDIR)\purge.c"
1739	"$(OX)\purge.h" : "$(OX)\purge.c"
1740	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1741	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1742
1743	"$(OX)\rebuild.c" : "$(SRCDIR)\rebuild.c"
1744	"$(OX)\rebuild.h" : "$(OX)\rebuild.c"
1745	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1746	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1747
1748	"$(OX)\regexp.c" : "$(SRCDIR)\regexp.c"
1749	"$(OX)\regexp.h" : "$(OX)\regexp.c"
1750	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1751	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1752
1753	"$(OX)\repolist.c" : "$(SRCDIR)\repolist.c"
1754	"$(OX)\repolist.h" : "$(OX)\repolist.c"
1755	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1756	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1757
1758	"$(OX)\report.c" : "$(SRCDIR)\report.c"
1759	"$(OX)\report.h" : "$(OX)\report.c"
1760	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1761	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1762
1763	"$(OX)\rss.c" : "$(SRCDIR)\rss.c"
1764	"$(OX)\rss.h" : "$(OX)\rss.c"
1765	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1767
1768	"$(OX)\schema.c" : "$(SRCDIR)\schema.c"
1769	"$(OX)\schema.h" : "$(OX)\schema.c"
1770	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1771	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1772
1773	"$(OX)\search.c" : "$(SRCDIR)\search.c"
1774	"$(OX)\search.h" : "$(OX)\search.c"
1775	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1776	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1777
1778	"$(OX)\security_audit.c" : "$(SRCDIR)\security_audit.c"
1779	"$(OX)\security_audit.h" : "$(OX)\security_audit.c"
1780	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1781	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1782
1783	"$(OX)\setup.c" : "$(SRCDIR)\setup.c"
1784	"$(OX)\setup.h" : "$(OX)\setup.c"
1785	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1786	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1787
1788	"$(OX)\setupuser.c" : "$(SRCDIR)\setupuser.c"
1789	"$(OX)\setupuser.h" : "$(OX)\setupuser.c"
1790	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1791	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1792
1793	"$(OX)\sha1.c" : "$(SRCDIR)\sha1.c"
1794	"$(OX)\sha1.h" : "$(OX)\sha1.c"
1795	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1796	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1797
1798	"$(OX)\sha1hard.c" : "$(SRCDIR)\sha1hard.c"
1799	"$(OX)\sha1hard.h" : "$(OX)\sha1hard.c"
1800	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1801	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1802
1803	"$(OX)\sha3.c" : "$(SRCDIR)\sha3.c"
1804	"$(OX)\sha3.h" : "$(OX)\sha3.c"
1805	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1806	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1807
1808	"$(OX)\shun.c" : "$(SRCDIR)\shun.c"
1809	"$(OX)\shun.h" : "$(OX)\shun.c"
1810	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1811	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1812
1813	"$(OX)\sitemap.c" : "$(SRCDIR)\sitemap.c"
1814	"$(OX)\sitemap.h" : "$(OX)\sitemap.c"
1815	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1816	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1817
1818	"$(OX)\skins.c" : "$(SRCDIR)\skins.c"
1819	"$(OX)\skins.h" : "$(OX)\skins.c"
1820	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1821	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1822
1823	"$(OX)\smtp.c" : "$(SRCDIR)\smtp.c"
1824	"$(OX)\smtp.h" : "$(OX)\smtp.c"
1825	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1826	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1827
1828	"$(OX)\sqlcmd.c" : "$(SRCDIR)\sqlcmd.c"
1829	"$(OX)\sqlcmd.h" : "$(OX)\sqlcmd.c"
1830	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1831	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1832
1833	"$(OX)\stash.c" : "$(SRCDIR)\stash.c"
1834	"$(OX)\stash.h" : "$(OX)\stash.c"
1835	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1836	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1837
1838	"$(OX)\stat.c" : "$(SRCDIR)\stat.c"
1839	"$(OX)\stat.h" : "$(OX)\stat.c"
1840	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1841	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1842
1843	"$(OX)\statrep.c" : "$(SRCDIR)\statrep.c"
1844	"$(OX)\statrep.h" : "$(OX)\statrep.c"
1845	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1846	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1847
1848	"$(OX)\style.c" : "$(SRCDIR)\style.c"
1849	"$(OX)\style.h" : "$(OX)\style.c"
1850	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1851	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1852
1853	"$(OX)\sync.c" : "$(SRCDIR)\sync.c"
1854	"$(OX)\sync.h" : "$(OX)\sync.c"
1855	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1856	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1857
1858	"$(OX)\tag.c" : "$(SRCDIR)\tag.c"
1859	"$(OX)\tag.h" : "$(OX)\tag.c"
1860	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1861	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1862
1863	"$(OX)\tar.c" : "$(SRCDIR)\tar.c"
1864	"$(OX)\tar.h" : "$(OX)\tar.c"
1865	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1866	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1867
1868	"$(OX)\terminal.c" : "$(SRCDIR)\terminal.c"
1869	"$(OX)\terminal.h" : "$(OX)\terminal.c"
1870	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1871	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1872
1873	"$(OX)\th_main.c" : "$(SRCDIR)\th_main.c"
1874	"$(OX)\th_main.h" : "$(OX)\th_main.c"
1875	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1876	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1877
1878	"$(OX)\timeline.c" : "$(SRCDIR)\timeline.c"
1879	"$(OX)\timeline.h" : "$(OX)\timeline.c"
1880	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1881	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1882
1883	"$(OX)\tkt.c" : "$(SRCDIR)\tkt.c"
1884	"$(OX)\tkt.h" : "$(OX)\tkt.c"
1885	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1886	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1887
1888	"$(OX)\tktsetup.c" : "$(SRCDIR)\tktsetup.c"
1889	"$(OX)\tktsetup.h" : "$(OX)\tktsetup.c"
1890	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1891	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1892
1893	"$(OX)\undo.c" : "$(SRCDIR)\undo.c"
1894	"$(OX)\undo.h" : "$(OX)\undo.c"
1895	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1896	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1897
1898	"$(OX)\unicode.c" : "$(SRCDIR)\unicode.c"
1899	"$(OX)\unicode.h" : "$(OX)\unicode.c"
1900	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1901	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1902
1903	"$(OX)\unversioned.c" : "$(SRCDIR)\unversioned.c"
1904	"$(OX)\unversioned.h" : "$(OX)\unversioned.c"
1905	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1906	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1907
1908	"$(OX)\update.c" : "$(SRCDIR)\update.c"
1909	"$(OX)\update.h" : "$(OX)\update.c"
1910	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1911	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1912
1913	"$(OX)\url.c" : "$(SRCDIR)\url.c"
1914	"$(OX)\url.h" : "$(OX)\url.c"
1915	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1916	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1917
1918	"$(OX)\user.c" : "$(SRCDIR)\user.c"
1919	"$(OX)\user.h" : "$(OX)\user.c"
1920	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1921	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1922
1923	"$(OX)\utf8.c" : "$(SRCDIR)\utf8.c"
1924	"$(OX)\utf8.h" : "$(OX)\utf8.c"
1925	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1926	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1927
1928	"$(OX)\util.c" : "$(SRCDIR)\util.c"
1929	"$(OX)\util.h" : "$(OX)\util.c"
1930	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1931	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1932
1933	"$(OX)\verify.c" : "$(SRCDIR)\verify.c"
1934	"$(OX)\verify.h" : "$(OX)\verify.c"
1935	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1936	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1937
1938	"$(OX)\vfile.c" : "$(SRCDIR)\vfile.c"
1939	"$(OX)\vfile.h" : "$(OX)\vfile.c"
1940	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1941	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1942
1943	"$(OX)\webmail.c" : "$(SRCDIR)\webmail.c"
1944	"$(OX)\webmail.h" : "$(OX)\webmail.c"
1945	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1946	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1947
1948	"$(OX)\wiki.c" : "$(SRCDIR)\wiki.c"
1949	"$(OX)\wiki.h" : "$(OX)\wiki.c"
1950	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1951	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1952
1953	"$(OX)\wikiformat.c" : "$(SRCDIR)\wikiformat.c"
1954	"$(OX)\wikiformat.h" : "$(OX)\wikiformat.c"
1955	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1956	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1957
1958	"$(OX)\winfile.c" : "$(SRCDIR)\winfile.c"
1959	"$(OX)\winfile.h" : "$(OX)\winfile.c"
1960	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1961	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1962
1963	"$(OX)\winhttp.c" : "$(SRCDIR)\winhttp.c"
1964	"$(OX)\winhttp.h" : "$(OX)\winhttp.c"
1965	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1966	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1967
1968	"$(OX)\xfer.c" : "$(SRCDIR)\xfer.c"
1969	"$(OX)\xfer.h" : "$(OX)\xfer.c"
1970	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1971	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1972
1973	"$(OX)\xfersetup.c" : "$(SRCDIR)\xfersetup.c"
1974	"$(OX)\xfersetup.h" : "$(OX)\xfersetup.c"
1975	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1976	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1977
1978	"$(OX)\zip.c" : "$(SRCDIR)\zip.c"
1979	"$(OX)\zip.h" : "$(OX)\zip.c"
1980	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1981	$(RCC) /fo $@ $**
1982
1983
1984	DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1985	GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
1986
1987	!if $(DEPHEADERGEN)==0
1988	GEN_HEADERS = $(GEN_HEADERS) \
1989	"$(OX)\add.c":"$(OX)\add.h" \
1990	"$(OX)\ajax.c":"$(OX)\ajax.h" \
1991	"$(OX)\alerts.c":"$(OX)\alerts.h" \
1992	"$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1993	"$(OX)\attach.c":"$(OX)\attach.h" \
1994	"$(OX)\backlink.c":"$(OX)\backlink.h" \
1995	"$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1996	"$(OX)\bag.c":"$(OX)\bag.h" \
1997	"$(OX)\bisect.c":"$(OX)\bisect.h" \
1998	"$(OX)\blob.c":"$(OX)\blob.h" \
1999	"$(OX)\branch.c":"$(OX)\branch.h" \
2000	"$(OX)\browse.c":"$(OX)\browse.h" \
2001	"$(OX)\builtin.c":"$(OX)\builtin.h" \
2002	"$(OX)\bundle.c":"$(OX)\bundle.h" \
2003	"$(OX)\cache.c":"$(OX)\cache.h" \
2004	"$(OX)\capabilities.c":"$(OX)\capabilities.h" \
2005	"$(OX)\captcha.c":"$(OX)\captcha.h" \
2006	"$(OX)\cgi.c":"$(OX)\cgi.h" \
2007	"$(OX)\chat.c":"$(OX)\chat.h" \
2008	"$(OX)\checkin.c":"$(OX)\checkin.h" \
2009	"$(OX)\checkout.c":"$(OX)\checkout.h" \
2010	"$(OX)\clearsign.c":"$(OX)\clearsign.h" \
2011	"$(OX)\clone.c":"$(OX)\clone.h" \
2012	"$(OX)\color.c":"$(OX)\color.h" \
2013	"$(OX)\comformat.c":"$(OX)\comformat.h" \
2014	"$(OX)\configure.c":"$(OX)\configure.h" \
2015	"$(OX)\content.c":"$(OX)\content.h" \
2016	"$(OX)\cookies.c":"$(OX)\cookies.h" \
2017	"$(OX)\db.c":"$(OX)\db.h" \
2018	"$(OX)\delta.c":"$(OX)\delta.h" \
2019	"$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
2020	"$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
2021	"$(OX)\descendants.c":"$(OX)\descendants.h" \
2022	"$(OX)\diff.c":"$(OX)\diff.h" \
2023	"$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
2024	"$(OX)\dispatch.c":"$(OX)\dispatch.h" \
2025	"$(OX)\doc.c":"$(OX)\doc.h" \
2026	"$(OX)\encode.c":"$(OX)\encode.h" \
2027	"$(OX)\etag.c":"$(OX)\etag.h" \
2028	"$(OX)\event.c":"$(OX)\event.h" \
2029	"$(OX)\export.c":"$(OX)\export.h" \
2030	"$(OX)\extcgi.c":"$(OX)\extcgi.h" \
2031	"$(OX)\file.c":"$(OX)\file.h" \
2032	"$(OX)\fileedit.c":"$(OX)\fileedit.h" \
2033	"$(OX)\finfo.c":"$(OX)\finfo.h" \
2034	"$(OX)\foci.c":"$(OX)\foci.h" \
2035	"$(OX)\forum.c":"$(OX)\forum.h" \
2036	"$(OX)\fshell.c":"$(OX)\fshell.h" \
2037	"$(OX)\fusefs.c":"$(OX)\fusefs.h" \
2038	"$(OX)\fuzz.c":"$(OX)\fuzz.h" \
2039	"$(OX)\glob.c":"$(OX)\glob.h" \
2040	"$(OX)\graph.c":"$(OX)\graph.h" \
2041	"$(OX)\gzip.c":"$(OX)\gzip.h" \
2042	"$(OX)\hname.c":"$(OX)\hname.h" \
2043	"$(OX)\hook.c":"$(OX)\hook.h" \
2044	"$(OX)\http.c":"$(OX)\http.h" \
2045	"$(OX)\http_socket.c":"$(OX)\http_socket.h" \
2046	"$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
2047	"$(OX)\http_transport.c":"$(OX)\http_transport.h" \
2048	"$(OX)\import.c":"$(OX)\import.h" \
2049	"$(OX)\info.c":"$(OX)\info.h" \
2050	"$(OX)\interwiki.c":"$(OX)\interwiki.h" \
2051	"$(OX)\json.c":"$(OX)\json.h" \
2052	"$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
2053	"$(OX)\json_branch.c":"$(OX)\json_branch.h" \
2054	"$(OX)\json_config.c":"$(OX)\json_config.h" \
2055	"$(OX)\json_diff.c":"$(OX)\json_diff.h" \
2056	"$(OX)\json_dir.c":"$(OX)\json_dir.h" \
2057	"$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
2058	"$(OX)\json_login.c":"$(OX)\json_login.h" \
2059	"$(OX)\json_query.c":"$(OX)\json_query.h" \
2060	"$(OX)\json_report.c":"$(OX)\json_report.h" \
2061	"$(OX)\json_status.c":"$(OX)\json_status.h" \
2062	"$(OX)\json_tag.c":"$(OX)\json_tag.h" \
2063	"$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
2064	"$(OX)\json_user.c":"$(OX)\json_user.h" \
2065	"$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
2066	"$(OX)\leaf.c":"$(OX)\leaf.h" \
2067	"$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
2068	"$(OX)\login.c":"$(OX)\login.h" \
2069	"$(OX)\lookslike.c":"$(OX)\lookslike.h" \
2070	"$(OX)\main.c":"$(OX)\main.h" \
2071	"$(OX)\manifest.c":"$(OX)\manifest.h" \
2072	"$(OX)\markdown.c":"$(OX)\markdown.h" \
2073	"$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
2074	"$(OX)\md5.c":"$(OX)\md5.h" \
2075	"$(OX)\merge.c":"$(OX)\merge.h" \
2076	"$(OX)\merge3.c":"$(OX)\merge3.h" \
2077	"$(OX)\moderate.c":"$(OX)\moderate.h" \
2078	"$(OX)\name.c":"$(OX)\name.h" \
2079	"$(OX)\path.c":"$(OX)\path.h" \
2080	"$(OX)\piechart.c":"$(OX)\piechart.h" \
2081	"$(OX)\pikchr.c":"$(OX)\pikchr.h" \
2082	"$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
2083	"$(OX)\pivot.c":"$(OX)\pivot.h" \
2084	"$(OX)\popen.c":"$(OX)\popen.h" \
2085	"$(OX)\pqueue.c":"$(OX)\pqueue.h" \
2086	"$(OX)\printf.c":"$(OX)\printf.h" \
2087	"$(OX)\publish.c":"$(OX)\publish.h" \
2088	"$(OX)\purge.c":"$(OX)\purge.h" \
2089	"$(OX)\rebuild.c":"$(OX)\rebuild.h" \
2090	"$(OX)\regexp.c":"$(OX)\regexp.h" \
2091	"$(OX)\repolist.c":"$(OX)\repolist.h" \
2092	"$(OX)\report.c":"$(OX)\report.h" \
2093	"$(OX)\rss.c":"$(OX)\rss.h" \
2094	"$(OX)\schema.c":"$(OX)\schema.h" \
2095	"$(OX)\search.c":"$(OX)\search.h" \
2096	"$(OX)\security_audit.c":"$(OX)\security_audit.h" \
2097	"$(OX)\setup.c":"$(OX)\setup.h" \
2098	"$(OX)\setupuser.c":"$(OX)\setupuser.h" \
2099	"$(OX)\sha1.c":"$(OX)\sha1.h" \
2100	"$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
2101	"$(OX)\sha3.c":"$(OX)\sha3.h" \
2102	"$(OX)\shun.c":"$(OX)\shun.h" \
2103	"$(OX)\sitemap.c":"$(OX)\sitemap.h" \
2104	"$(OX)\skins.c":"$(OX)\skins.h" \
2105	"$(OX)\smtp.c":"$(OX)\smtp.h" \
2106	"$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
2107	"$(OX)\stash.c":"$(OX)\stash.h" \
2108	"$(OX)\stat.c":"$(OX)\stat.h" \
2109	"$(OX)\statrep.c":"$(OX)\statrep.h" \
2110	"$(OX)\style.c":"$(OX)\style.h" \
2111	"$(OX)\sync.c":"$(OX)\sync.h" \
2112	"$(OX)\tag.c":"$(OX)\tag.h" \
2113	"$(OX)\tar.c":"$(OX)\tar.h" \
2114	"$(OX)\terminal.c":"$(OX)\terminal.h" \
2115	"$(OX)\th_main.c":"$(OX)\th_main.h" \
2116	"$(OX)\timeline.c":"$(OX)\timeline.h" \
2117	"$(OX)\tkt.c":"$(OX)\tkt.h" \
2118	"$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
2119	"$(OX)\undo.c":"$(OX)\undo.h" \
2120	"$(OX)\unicode.c":"$(OX)\unicode.h" \
2121	"$(OX)\unversioned.c":"$(OX)\unversioned.h" \
2122	"$(OX)\update.c":"$(OX)\update.h" \
2123	"$(OX)\url.c":"$(OX)\url.h" \
2124	"$(OX)\user.c":"$(OX)\user.h" \
2125	"$(OX)\utf8.c":"$(OX)\utf8.h" \
2126	"$(OX)\util.c":"$(OX)\util.h" \
2127	"$(OX)\verify.c":"$(OX)\verify.h" \
2128	"$(OX)\vfile.c":"$(OX)\vfile.h" \
2129	"$(OX)\webmail.c":"$(OX)\webmail.h" \
2130	"$(OX)\wiki.c":"$(OX)\wiki.h" \
2131	"$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
2132	"$(OX)\winfile.c":"$(OX)\winfile.h" \
2133	"$(OX)\winhttp.c":"$(OX)\winhttp.h" \
2134	"$(OX)\xfer.c":"$(OX)\xfer.h" \
2135	"$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
2136	"$(OX)\zip.c":"$(OX)\zip.h"
2137	!endif
2138
2139	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
2140	"$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
2141	@copy /Y NUL $@
2142
2143

M win/Makefile.msc

+722 -425

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -12,13 +12,17 @@
12	12	SRCDIR = $(B)\src
13	13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	14	BUILDDIR = Build
15	15	!message Using default build directory, $(BUILDDIR)
16	16	!endif
	17	+# Top of build/staging/object directory subtree
17	18	T = $(BUILDDIR)
	19	+# Where object and other intermediate binary files will go
18	20	OBJDIR = $(T)
	21	+# Staging area for translated or generated sources
19	22	OX = $(OBJDIR)
	23	+# Extensions for this platform
20	24	O = .obj
21	25	E = .exe
22	26	P = .pdb
23	27
24	28	!ifndef INSTALLDIR
		@@ -37,20 +41,32 @@
37	41	#
38	42	!if !exist("$(B)\.fossil-settings")
39	43	!error Please specify path to project base directory: B="path/to/fossil"
40	44	!endif
41	45
42		-# Create build directory during preprocessing if needed.
	46	+# Create build, object and staging directory during preprocessing if needed.
43	47	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
	48	+!endif
	49	+!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
	50	+!endif
	51	+!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
44	52	!endif
45	53
46	54	# Perl is only necessary if OpenSSL support is enabled and it is built from
47	55	# source code. The PERLDIR environment variable, if it exists, should point
48	56	# to the directory containing the main Perl executable specified here (i.e.
49	57	# "perl.exe").
50		-!ifndef PERL
	58	+!if $(FOSSIL_BUILD_SSL)!=0
	59	+! if !defined(PERL) && [where PERL.exe > nul 2>&1]
	60	+PERL = perl.exe
	61	+!undef PERLDIR
	62	+! elseif !defined(PERL)
	63	+! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
51	64	PERL = perl.exe
	65	+! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
	66	+! endif
	67	+! endif
52	68	!endif
53	69
54	70	# Enable debugging symbols?
55	71	!ifndef DEBUG
56	72	DEBUG = 0
		@@ -199,30 +215,30 @@
199	215	!endif
200	216
201	217	!if $(FOSSIL_ENABLE_WINXP)!=0
202	218	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
203	219	CFLAGS = $(CFLAGS) $(XPCFLAGS)
204		-!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	220	+! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
205	221	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
206		-!else
	222	+! else
207	223	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
208		-!endif
	224	+! endif
209	225	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
210	226	!endif
211	227
212	228	!if $(FOSSIL_DYNAMIC_BUILD)!=0
213		-!if $(DEBUG)!=0
214		-CRTFLAGS = /MDd
215		-!else
216		-CRTFLAGS = /MD
217		-!endif
218		-!else
219		-!if $(DEBUG)!=0
220		-CRTFLAGS = /MTd
221		-!else
222		-CRTFLAGS = /MT
223		-!endif
	229	+! if $(DEBUG)!=0
	230	+CRTFLAGS = /MDd
	231	+! else
	232	+CRTFLAGS = /MD
	233	+! endif
	234	+!else
	235	+! if $(DEBUG)!=0
	236	+CRTFLAGS = /MTd
	237	+! else
	238	+CRTFLAGS = /MT
	239	+! endif
224	240	!endif
225	241
226	242	!if $(DEBUG)!=0
227	243	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
228	244	LDFLAGS = $(LDFLAGS) /DEBUG
		@@ -509,115 +525,117 @@
509	525	"$(OX)\winhttp.c" \
510	526	"$(OX)\xfer.c" \
511	527	"$(OX)\xfersetup.c" \
512	528	"$(OX)\zip.c"
513	529
514		-EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
515		- "$(SRCDIR)\..\skins\ardoise\details.txt" \
516		- "$(SRCDIR)\..\skins\ardoise\footer.txt" \
517		- "$(SRCDIR)\..\skins\ardoise\header.txt" \
518		- "$(SRCDIR)\..\skins\black_and_white\css.txt" \
519		- "$(SRCDIR)\..\skins\black_and_white\details.txt" \
520		- "$(SRCDIR)\..\skins\black_and_white\footer.txt" \
521		- "$(SRCDIR)\..\skins\black_and_white\header.txt" \
522		- "$(SRCDIR)\..\skins\blitz\css.txt" \
523		- "$(SRCDIR)\..\skins\blitz\details.txt" \
524		- "$(SRCDIR)\..\skins\blitz\footer.txt" \
525		- "$(SRCDIR)\..\skins\blitz\header.txt" \
526		- "$(SRCDIR)\..\skins\blitz\ticket.txt" \
527		- "$(SRCDIR)\..\skins\bootstrap\css.txt" \
528		- "$(SRCDIR)\..\skins\bootstrap\details.txt" \
529		- "$(SRCDIR)\..\skins\bootstrap\footer.txt" \
530		- "$(SRCDIR)\..\skins\bootstrap\header.txt" \
531		- "$(SRCDIR)\..\skins\darkmode\css.txt" \
532		- "$(SRCDIR)\..\skins\darkmode\details.txt" \
533		- "$(SRCDIR)\..\skins\darkmode\footer.txt" \
534		- "$(SRCDIR)\..\skins\darkmode\header.txt" \
535		- "$(SRCDIR)\..\skins\default\css.txt" \
536		- "$(SRCDIR)\..\skins\default\details.txt" \
537		- "$(SRCDIR)\..\skins\default\footer.txt" \
538		- "$(SRCDIR)\..\skins\default\header.txt" \
539		- "$(SRCDIR)\..\skins\eagle\css.txt" \
540		- "$(SRCDIR)\..\skins\eagle\details.txt" \
541		- "$(SRCDIR)\..\skins\eagle\footer.txt" \
542		- "$(SRCDIR)\..\skins\eagle\header.txt" \
543		- "$(SRCDIR)\..\skins\khaki\css.txt" \
544		- "$(SRCDIR)\..\skins\khaki\details.txt" \
545		- "$(SRCDIR)\..\skins\khaki\footer.txt" \
546		- "$(SRCDIR)\..\skins\khaki\header.txt" \
547		- "$(SRCDIR)\..\skins\original\css.txt" \
548		- "$(SRCDIR)\..\skins\original\details.txt" \
549		- "$(SRCDIR)\..\skins\original\footer.txt" \
550		- "$(SRCDIR)\..\skins\original\header.txt" \
551		- "$(SRCDIR)\..\skins\plain_gray\css.txt" \
552		- "$(SRCDIR)\..\skins\plain_gray\details.txt" \
553		- "$(SRCDIR)\..\skins\plain_gray\footer.txt" \
554		- "$(SRCDIR)\..\skins\plain_gray\header.txt" \
555		- "$(SRCDIR)\..\skins\xekri\css.txt" \
556		- "$(SRCDIR)\..\skins\xekri\details.txt" \
557		- "$(SRCDIR)\..\skins\xekri\footer.txt" \
558		- "$(SRCDIR)\..\skins\xekri\header.txt" \
559		- "$(SRCDIR)\accordion.js" \
560		- "$(SRCDIR)\alerts\bflat2.wav" \
561		- "$(SRCDIR)\alerts\bflat3.wav" \
562		- "$(SRCDIR)\alerts\bloop.wav" \
563		- "$(SRCDIR)\alerts\plunk.wav" \
564		- "$(SRCDIR)\chat.js" \
565		- "$(SRCDIR)\ci_edit.js" \
566		- "$(SRCDIR)\copybtn.js" \
567		- "$(SRCDIR)\default.css" \
568		- "$(SRCDIR)\diff.tcl" \
569		- "$(SRCDIR)\forum.js" \
570		- "$(SRCDIR)\fossil.bootstrap.js" \
571		- "$(SRCDIR)\fossil.confirmer.js" \
572		- "$(SRCDIR)\fossil.copybutton.js" \
573		- "$(SRCDIR)\fossil.dom.js" \
574		- "$(SRCDIR)\fossil.fetch.js" \
575		- "$(SRCDIR)\fossil.numbered-lines.js" \
576		- "$(SRCDIR)\fossil.page.fileedit.js" \
577		- "$(SRCDIR)\fossil.page.forumpost.js" \
578		- "$(SRCDIR)\fossil.page.pikchrshow.js" \
579		- "$(SRCDIR)\fossil.page.wikiedit.js" \
580		- "$(SRCDIR)\fossil.pikchr.js" \
581		- "$(SRCDIR)\fossil.popupwidget.js" \
582		- "$(SRCDIR)\fossil.storage.js" \
583		- "$(SRCDIR)\fossil.tabs.js" \
584		- "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
585		- "$(SRCDIR)\graph.js" \
586		- "$(SRCDIR)\hbmenu.js" \
587		- "$(SRCDIR)\href.js" \
588		- "$(SRCDIR)\login.js" \
589		- "$(SRCDIR)\markdown.md" \
590		- "$(SRCDIR)\menu.js" \
591		- "$(SRCDIR)\sbsdiff.js" \
592		- "$(SRCDIR)\scroll.js" \
593		- "$(SRCDIR)\skin.js" \
594		- "$(SRCDIR)\sorttable.js" \
595		- "$(SRCDIR)\sounds\0.wav" \
596		- "$(SRCDIR)\sounds\1.wav" \
597		- "$(SRCDIR)\sounds\2.wav" \
598		- "$(SRCDIR)\sounds\3.wav" \
599		- "$(SRCDIR)\sounds\4.wav" \
600		- "$(SRCDIR)\sounds\5.wav" \
601		- "$(SRCDIR)\sounds\6.wav" \
602		- "$(SRCDIR)\sounds\7.wav" \
603		- "$(SRCDIR)\sounds\8.wav" \
604		- "$(SRCDIR)\sounds\9.wav" \
605		- "$(SRCDIR)\sounds\a.wav" \
606		- "$(SRCDIR)\sounds\b.wav" \
607		- "$(SRCDIR)\sounds\c.wav" \
608		- "$(SRCDIR)\sounds\d.wav" \
609		- "$(SRCDIR)\sounds\e.wav" \
610		- "$(SRCDIR)\sounds\f.wav" \
611		- "$(SRCDIR)\style.admin_log.css" \
612		- "$(SRCDIR)\style.fileedit.css" \
613		- "$(SRCDIR)\style.wikiedit.css" \
614		- "$(SRCDIR)\tree.js" \
615		- "$(SRCDIR)\useredit.js" \
616		- "$(SRCDIR)\wiki.wiki"
617		-
618		-OBJ = "$(OX)\add$O" \
	530	+EXTRA_FILES = \
	531	+ "$(SRCDIR)\..\skins\ardoise\css.txt" \
	532	+ "$(SRCDIR)\..\skins\ardoise\details.txt" \
	533	+ "$(SRCDIR)\..\skins\ardoise\footer.txt" \
	534	+ "$(SRCDIR)\..\skins\ardoise\header.txt" \
	535	+ "$(SRCDIR)\..\skins\black_and_white\css.txt" \
	536	+ "$(SRCDIR)\..\skins\black_and_white\details.txt" \
	537	+ "$(SRCDIR)\..\skins\black_and_white\footer.txt" \
	538	+ "$(SRCDIR)\..\skins\black_and_white\header.txt" \
	539	+ "$(SRCDIR)\..\skins\blitz\css.txt" \
	540	+ "$(SRCDIR)\..\skins\blitz\details.txt" \
	541	+ "$(SRCDIR)\..\skins\blitz\footer.txt" \
	542	+ "$(SRCDIR)\..\skins\blitz\header.txt" \
	543	+ "$(SRCDIR)\..\skins\blitz\ticket.txt" \
	544	+ "$(SRCDIR)\..\skins\bootstrap\css.txt" \
	545	+ "$(SRCDIR)\..\skins\bootstrap\details.txt" \
	546	+ "$(SRCDIR)\..\skins\bootstrap\footer.txt" \
	547	+ "$(SRCDIR)\..\skins\bootstrap\header.txt" \
	548	+ "$(SRCDIR)\..\skins\darkmode\css.txt" \
	549	+ "$(SRCDIR)\..\skins\darkmode\details.txt" \
	550	+ "$(SRCDIR)\..\skins\darkmode\footer.txt" \
	551	+ "$(SRCDIR)\..\skins\darkmode\header.txt" \
	552	+ "$(SRCDIR)\..\skins\default\css.txt" \
	553	+ "$(SRCDIR)\..\skins\default\details.txt" \
	554	+ "$(SRCDIR)\..\skins\default\footer.txt" \
	555	+ "$(SRCDIR)\..\skins\default\header.txt" \
	556	+ "$(SRCDIR)\..\skins\eagle\css.txt" \
	557	+ "$(SRCDIR)\..\skins\eagle\details.txt" \
	558	+ "$(SRCDIR)\..\skins\eagle\footer.txt" \
	559	+ "$(SRCDIR)\..\skins\eagle\header.txt" \
	560	+ "$(SRCDIR)\..\skins\khaki\css.txt" \
	561	+ "$(SRCDIR)\..\skins\khaki\details.txt" \
	562	+ "$(SRCDIR)\..\skins\khaki\footer.txt" \
	563	+ "$(SRCDIR)\..\skins\khaki\header.txt" \
	564	+ "$(SRCDIR)\..\skins\original\css.txt" \
	565	+ "$(SRCDIR)\..\skins\original\details.txt" \
	566	+ "$(SRCDIR)\..\skins\original\footer.txt" \
	567	+ "$(SRCDIR)\..\skins\original\header.txt" \
	568	+ "$(SRCDIR)\..\skins\plain_gray\css.txt" \
	569	+ "$(SRCDIR)\..\skins\plain_gray\details.txt" \
	570	+ "$(SRCDIR)\..\skins\plain_gray\footer.txt" \
	571	+ "$(SRCDIR)\..\skins\plain_gray\header.txt" \
	572	+ "$(SRCDIR)\..\skins\xekri\css.txt" \
	573	+ "$(SRCDIR)\..\skins\xekri\details.txt" \
	574	+ "$(SRCDIR)\..\skins\xekri\footer.txt" \
	575	+ "$(SRCDIR)\..\skins\xekri\header.txt" \
	576	+ "$(SRCDIR)\accordion.js" \
	577	+ "$(SRCDIR)\alerts\bflat2.wav" \
	578	+ "$(SRCDIR)\alerts\bflat3.wav" \
	579	+ "$(SRCDIR)\alerts\bloop.wav" \
	580	+ "$(SRCDIR)\alerts\plunk.wav" \
	581	+ "$(SRCDIR)\chat.js" \
	582	+ "$(SRCDIR)\ci_edit.js" \
	583	+ "$(SRCDIR)\copybtn.js" \
	584	+ "$(SRCDIR)\default.css" \
	585	+ "$(SRCDIR)\diff.tcl" \
	586	+ "$(SRCDIR)\forum.js" \
	587	+ "$(SRCDIR)\fossil.bootstrap.js" \
	588	+ "$(SRCDIR)\fossil.confirmer.js" \
	589	+ "$(SRCDIR)\fossil.copybutton.js" \
	590	+ "$(SRCDIR)\fossil.dom.js" \
	591	+ "$(SRCDIR)\fossil.fetch.js" \
	592	+ "$(SRCDIR)\fossil.numbered-lines.js" \
	593	+ "$(SRCDIR)\fossil.page.fileedit.js" \
	594	+ "$(SRCDIR)\fossil.page.forumpost.js" \
	595	+ "$(SRCDIR)\fossil.page.pikchrshow.js" \
	596	+ "$(SRCDIR)\fossil.page.wikiedit.js" \
	597	+ "$(SRCDIR)\fossil.pikchr.js" \
	598	+ "$(SRCDIR)\fossil.popupwidget.js" \
	599	+ "$(SRCDIR)\fossil.storage.js" \
	600	+ "$(SRCDIR)\fossil.tabs.js" \
	601	+ "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
	602	+ "$(SRCDIR)\graph.js" \
	603	+ "$(SRCDIR)\hbmenu.js" \
	604	+ "$(SRCDIR)\href.js" \
	605	+ "$(SRCDIR)\login.js" \
	606	+ "$(SRCDIR)\markdown.md" \
	607	+ "$(SRCDIR)\menu.js" \
	608	+ "$(SRCDIR)\sbsdiff.js" \
	609	+ "$(SRCDIR)\scroll.js" \
	610	+ "$(SRCDIR)\skin.js" \
	611	+ "$(SRCDIR)\sorttable.js" \
	612	+ "$(SRCDIR)\sounds\0.wav" \
	613	+ "$(SRCDIR)\sounds\1.wav" \
	614	+ "$(SRCDIR)\sounds\2.wav" \
	615	+ "$(SRCDIR)\sounds\3.wav" \
	616	+ "$(SRCDIR)\sounds\4.wav" \
	617	+ "$(SRCDIR)\sounds\5.wav" \
	618	+ "$(SRCDIR)\sounds\6.wav" \
	619	+ "$(SRCDIR)\sounds\7.wav" \
	620	+ "$(SRCDIR)\sounds\8.wav" \
	621	+ "$(SRCDIR)\sounds\9.wav" \
	622	+ "$(SRCDIR)\sounds\a.wav" \
	623	+ "$(SRCDIR)\sounds\b.wav" \
	624	+ "$(SRCDIR)\sounds\c.wav" \
	625	+ "$(SRCDIR)\sounds\d.wav" \
	626	+ "$(SRCDIR)\sounds\e.wav" \
	627	+ "$(SRCDIR)\sounds\f.wav" \
	628	+ "$(SRCDIR)\style.admin_log.css" \
	629	+ "$(SRCDIR)\style.fileedit.css" \
	630	+ "$(SRCDIR)\style.wikiedit.css" \
	631	+ "$(SRCDIR)\tree.js" \
	632	+ "$(SRCDIR)\useredit.js" \
	633	+ "$(SRCDIR)\wiki.wiki"
	634	+
	635	+OBJ = \
	636	+ "$(OX)\add$O" \
619	637	"$(OX)\ajax$O" \
620	638	"$(OX)\alerts$O" \
621	639	"$(OX)\allrepo$O" \
622	640	"$(OX)\attach$O" \
623	641	"$(OX)\backlink$O" \
		@@ -766,15 +784,15 @@
766	784	"$(OX)\wikiformat$O" \
767	785	"$(OX)\winfile$O" \
768	786	"$(OX)\winhttp$O" \
769	787	"$(OX)\xfer$O" \
770	788	"$(OX)\xfersetup$O" \
771		- "$(OX)\zip$O" \
	789	+ "$(OX)\zip$O"
772	790	!if $(FOSSIL_ENABLE_MINIZ)!=0
773		- "$(OX)\miniz$O" \
	791	+OBJ = $(OBJ) "$(OX)\miniz$O"
774	792	!endif
775		- "$(OX)\fossil.res"
	793	+OBJ = $(OBJ) "$(OX)\fossil.res"
776	794
777	795
778	796	!ifndef BASEAPPNAME
779	797	BASEAPPNAME = fossil
780	798	!endif
		@@ -781,11 +799,11 @@
781	799
782	800	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
783	801	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
784	802	APPTARGETS =
785	803
786		-all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
	804	+all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
787	805
788	806	$(BASEAPPNAME): "$(APPNAME)"
789	807
790	808	$(BASEAPPNAME)$(E): "$(APPNAME)"
791	809
		@@ -797,55 +815,49 @@
797	815	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
798	816	!if $(DEBUG)!=0
799	817	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
800	818	!endif
801	819
802		-$(OX):
803		- if not exist $@\. mkdir $@
804		-
805		-!if "$(BUILDDIR)"!="$(OX)"
806		-$(BUILDDIR):
807		- if not exist $@\. mkdir $@
808		-!endif
809		-
	820	+ZLIB_X = "$(OX)\zlib_built"
810	821	!if $(FOSSIL_BUILD_ZLIB)
811	822	zlib $(ZLIB_X):
812	823	@echo Building zlib from "$(ZLIBDIR)"...
813	824	!if $(FOSSIL_ENABLE_WINXP)!=0
814	825	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
815	826	!else
816	827	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
817	828	!endif
818		- copy nul $(ZLIB_X)
	829	+ cmd /E:ON /c date /T > $(ZLIB_X)
819	830
820	831	clean-zlib:
821	832	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
822	833	!endif
823	834
824	835	!if $(FOSSIL_ENABLE_SSL)!=0
825	836	OPENSSL_X = "$(OX)\openssl.opts"
826	837	openssl $(OPENSSL_X):
827	838	@echo Building OpenSSL from "$(SSLDIR)"...
828		-!ifdef PERLDIR
	839	+! ifdef PERLDIR
829	840	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
830		-!else
	841	+! else
831	842	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
832		-!endif
833		-!if $(FOSSIL_ENABLE_WINXP)!=0
	843	+! endif
	844	+! if $(FOSSIL_ENABLE_WINXP)!=0
834	845	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
835		-!else
	846	+! else
836	847	@pushd "$(SSLDIR)" && $(MAKE) && popd
837		- echo $(SSLCONFIG) > $(OPENSSL_X)
838		-!endif
	848	+! endif
	849	+ echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
	850	+ cmd /E:ON /c date /T >> $(OPENSSL_X)
839	851
840	852	clean-openssl:
841	853	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
842	854	-del $(OPENSSL_X)
843	855
844		-!if $(FOSSIL_BUILD_SSL)!=0
	856	+! if $(FOSSIL_BUILD_SSL)!=0
845	857	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
846		-!endif
	858	+! endif
847	859
848	860	!endif
849	861
850	862	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
851	863	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
		@@ -1016,30 +1028,15 @@
1016	1028	echo "$(OX)\miniz.obj" >> $@
1017	1029	!endif
1018	1030	echo $(LIBS) >> $@
1019	1031
1020	1032
1021		-# This target gets the project tools built.
1022		-toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1023		-
1024		-"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1025		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026		-
1027		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1028		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029		-
1030		-"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1031		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032		-
1033		-"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1034		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035		-
1036		-"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1037		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1038		-
1039		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1040		- $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1033	+{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
	1034	+ $(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
	1035	+
	1036	+# This target gets the project tools built.
	1037	+toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1041	1038
1042	1039	!if $(USE_SEE)!=0
1043	1040	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1044	1041	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1045	1042	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
		@@ -1130,716 +1127,1016 @@
1130	1127	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1131	1128	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1132	1129	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1133	1130
1134	1131	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1135		- echo "$(SRCDIR)\../skins/ardoise/css.txt" > $@
1136		- echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1137		- echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1138		- echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1139		- echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1140		- echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1141		- echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1142		- echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1143		- echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1144		- echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1145		- echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1146		- echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1147		- echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1148		- echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1149		- echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1150		- echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1151		- echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1152		- echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1153		- echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1154		- echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1155		- echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1156		- echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1157		- echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1158		- echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1159		- echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1160		- echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1161		- echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1162		- echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1163		- echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1164		- echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1165		- echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1166		- echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1167		- echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1168		- echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1169		- echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1170		- echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1171		- echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1172		- echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1173		- echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1174		- echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1175		- echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1176		- echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1177		- echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1178		- echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1179		- echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1180		- echo "$(SRCDIR)\accordion.js" >> $@
1181		- echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1182		- echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1183		- echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1184		- echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1185		- echo "$(SRCDIR)\chat.js" >> $@
1186		- echo "$(SRCDIR)\ci_edit.js" >> $@
1187		- echo "$(SRCDIR)\copybtn.js" >> $@
1188		- echo "$(SRCDIR)\default.css" >> $@
1189		- echo "$(SRCDIR)\diff.tcl" >> $@
1190		- echo "$(SRCDIR)\forum.js" >> $@
1191		- echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1192		- echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1193		- echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1194		- echo "$(SRCDIR)\fossil.dom.js" >> $@
1195		- echo "$(SRCDIR)\fossil.fetch.js" >> $@
1196		- echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1197		- echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1198		- echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1199		- echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1200		- echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1201		- echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1202		- echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1203		- echo "$(SRCDIR)\fossil.storage.js" >> $@
1204		- echo "$(SRCDIR)\fossil.tabs.js" >> $@
1205		- echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1206		- echo "$(SRCDIR)\graph.js" >> $@
1207		- echo "$(SRCDIR)\hbmenu.js" >> $@
1208		- echo "$(SRCDIR)\href.js" >> $@
1209		- echo "$(SRCDIR)\login.js" >> $@
1210		- echo "$(SRCDIR)\markdown.md" >> $@
1211		- echo "$(SRCDIR)\menu.js" >> $@
1212		- echo "$(SRCDIR)\sbsdiff.js" >> $@
1213		- echo "$(SRCDIR)\scroll.js" >> $@
1214		- echo "$(SRCDIR)\skin.js" >> $@
1215		- echo "$(SRCDIR)\sorttable.js" >> $@
1216		- echo "$(SRCDIR)\sounds/0.wav" >> $@
1217		- echo "$(SRCDIR)\sounds/1.wav" >> $@
1218		- echo "$(SRCDIR)\sounds/2.wav" >> $@
1219		- echo "$(SRCDIR)\sounds/3.wav" >> $@
1220		- echo "$(SRCDIR)\sounds/4.wav" >> $@
1221		- echo "$(SRCDIR)\sounds/5.wav" >> $@
1222		- echo "$(SRCDIR)\sounds/6.wav" >> $@
1223		- echo "$(SRCDIR)\sounds/7.wav" >> $@
1224		- echo "$(SRCDIR)\sounds/8.wav" >> $@
1225		- echo "$(SRCDIR)\sounds/9.wav" >> $@
1226		- echo "$(SRCDIR)\sounds/a.wav" >> $@
1227		- echo "$(SRCDIR)\sounds/b.wav" >> $@
1228		- echo "$(SRCDIR)\sounds/c.wav" >> $@
1229		- echo "$(SRCDIR)\sounds/d.wav" >> $@
1230		- echo "$(SRCDIR)\sounds/e.wav" >> $@
1231		- echo "$(SRCDIR)\sounds/f.wav" >> $@
1232		- echo "$(SRCDIR)\style.admin_log.css" >> $@
1233		- echo "$(SRCDIR)\style.fileedit.css" >> $@
1234		- echo "$(SRCDIR)\style.wikiedit.css" >> $@
1235		- echo "$(SRCDIR)\tree.js" >> $@
1236		- echo "$(SRCDIR)\useredit.js" >> $@
1237		- echo "$(SRCDIR)\wiki.wiki" >> $@
1238		-
	1132	+ -echo. > $@
	1133	+ @echo "$(SRCDIR)\../skins/ardoise/css.txt" >> $@
	1134	+ @echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
	1135	+ @echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
	1136	+ @echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
	1137	+ @echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
	1138	+ @echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
	1139	+ @echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
	1140	+ @echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
	1141	+ @echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
	1142	+ @echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
	1143	+ @echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
	1144	+ @echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
	1145	+ @echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
	1146	+ @echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
	1147	+ @echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
	1148	+ @echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
	1149	+ @echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
	1150	+ @echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
	1151	+ @echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
	1152	+ @echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
	1153	+ @echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
	1154	+ @echo "$(SRCDIR)\../skins/default/css.txt" >> $@
	1155	+ @echo "$(SRCDIR)\../skins/default/details.txt" >> $@
	1156	+ @echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
	1157	+ @echo "$(SRCDIR)\../skins/default/header.txt" >> $@
	1158	+ @echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
	1159	+ @echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
	1160	+ @echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
	1161	+ @echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
	1162	+ @echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
	1163	+ @echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
	1164	+ @echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
	1165	+ @echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
	1166	+ @echo "$(SRCDIR)\../skins/original/css.txt" >> $@
	1167	+ @echo "$(SRCDIR)\../skins/original/details.txt" >> $@
	1168	+ @echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
	1169	+ @echo "$(SRCDIR)\../skins/original/header.txt" >> $@
	1170	+ @echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
	1171	+ @echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
	1172	+ @echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
	1173	+ @echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
	1174	+ @echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
	1175	+ @echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
	1176	+ @echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
	1177	+ @echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
	1178	+ @echo "$(SRCDIR)\accordion.js" >> $@
	1179	+ @echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
	1180	+ @echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
	1181	+ @echo "$(SRCDIR)\alerts/bloop.wav" >> $@
	1182	+ @echo "$(SRCDIR)\alerts/plunk.wav" >> $@
	1183	+ @echo "$(SRCDIR)\chat.js" >> $@
	1184	+ @echo "$(SRCDIR)\ci_edit.js" >> $@
	1185	+ @echo "$(SRCDIR)\copybtn.js" >> $@
	1186	+ @echo "$(SRCDIR)\default.css" >> $@
	1187	+ @echo "$(SRCDIR)\diff.tcl" >> $@
	1188	+ @echo "$(SRCDIR)\forum.js" >> $@
	1189	+ @echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
	1190	+ @echo "$(SRCDIR)\fossil.confirmer.js" >> $@
	1191	+ @echo "$(SRCDIR)\fossil.copybutton.js" >> $@
	1192	+ @echo "$(SRCDIR)\fossil.dom.js" >> $@
	1193	+ @echo "$(SRCDIR)\fossil.fetch.js" >> $@
	1194	+ @echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
	1195	+ @echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
	1196	+ @echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
	1197	+ @echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
	1198	+ @echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
	1199	+ @echo "$(SRCDIR)\fossil.pikchr.js" >> $@
	1200	+ @echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
	1201	+ @echo "$(SRCDIR)\fossil.storage.js" >> $@
	1202	+ @echo "$(SRCDIR)\fossil.tabs.js" >> $@
	1203	+ @echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
	1204	+ @echo "$(SRCDIR)\graph.js" >> $@
	1205	+ @echo "$(SRCDIR)\hbmenu.js" >> $@
	1206	+ @echo "$(SRCDIR)\href.js" >> $@
	1207	+ @echo "$(SRCDIR)\login.js" >> $@
	1208	+ @echo "$(SRCDIR)\markdown.md" >> $@
	1209	+ @echo "$(SRCDIR)\menu.js" >> $@
	1210	+ @echo "$(SRCDIR)\sbsdiff.js" >> $@
	1211	+ @echo "$(SRCDIR)\scroll.js" >> $@
	1212	+ @echo "$(SRCDIR)\skin.js" >> $@
	1213	+ @echo "$(SRCDIR)\sorttable.js" >> $@
	1214	+ @echo "$(SRCDIR)\sounds/0.wav" >> $@
	1215	+ @echo "$(SRCDIR)\sounds/1.wav" >> $@
	1216	+ @echo "$(SRCDIR)\sounds/2.wav" >> $@
	1217	+ @echo "$(SRCDIR)\sounds/3.wav" >> $@
	1218	+ @echo "$(SRCDIR)\sounds/4.wav" >> $@
	1219	+ @echo "$(SRCDIR)\sounds/5.wav" >> $@
	1220	+ @echo "$(SRCDIR)\sounds/6.wav" >> $@
	1221	+ @echo "$(SRCDIR)\sounds/7.wav" >> $@
	1222	+ @echo "$(SRCDIR)\sounds/8.wav" >> $@
	1223	+ @echo "$(SRCDIR)\sounds/9.wav" >> $@
	1224	+ @echo "$(SRCDIR)\sounds/a.wav" >> $@
	1225	+ @echo "$(SRCDIR)\sounds/b.wav" >> $@
	1226	+ @echo "$(SRCDIR)\sounds/c.wav" >> $@
	1227	+ @echo "$(SRCDIR)\sounds/d.wav" >> $@
	1228	+ @echo "$(SRCDIR)\sounds/e.wav" >> $@
	1229	+ @echo "$(SRCDIR)\sounds/f.wav" >> $@
	1230	+ @echo "$(SRCDIR)\style.admin_log.css" >> $@
	1231	+ @echo "$(SRCDIR)\style.fileedit.css" >> $@
	1232	+ @echo "$(SRCDIR)\style.wikiedit.css" >> $@
	1233	+ @echo "$(SRCDIR)\tree.js" >> $@
	1234	+ @echo "$(SRCDIR)\useredit.js" >> $@
	1235	+ @echo "$(SRCDIR)\wiki.wiki" >> $@
	1236	+{$(OX)\}.c{$(OX)\}.h:
	1237	+ "$(OBJDIR)\makeheaders$E" $**:$@
1239	1238	{$(SRCDIR)\}.c{$(OX)\}.c:
1240	1239	"$(OBJDIR)\translate$E" $** > $@
1241		-
1242		-{$(OX)}.c{$(OX)}.h :
1243		- "$(OBJDIR)\makeheaders$E" $**:$@
1244		-
1245	1240	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1246	1241	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1247	1242
	1243	+"$(OX)\add.c" : "$(SRCDIR)\add.c"
	1244	+"$(OX)\add.h" : "$(OX)\add.c"
1248	1245	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1249	1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1250	1247
	1248	+"$(OX)\ajax.c" : "$(SRCDIR)\ajax.c"
	1249	+"$(OX)\ajax.h" : "$(OX)\ajax.c"
1251	1250	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1252	1251	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1253	1252
	1253	+"$(OX)\alerts.c" : "$(SRCDIR)\alerts.c"
	1254	+"$(OX)\alerts.h" : "$(OX)\alerts.c"
1254	1255	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1255	1256	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1256	1257
	1258	+"$(OX)\allrepo.c" : "$(SRCDIR)\allrepo.c"
	1259	+"$(OX)\allrepo.h" : "$(OX)\allrepo.c"
1257	1260	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1258	1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1259	1262
	1263	+"$(OX)\attach.c" : "$(SRCDIR)\attach.c"
	1264	+"$(OX)\attach.h" : "$(OX)\attach.c"
1260	1265	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1261	1266	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1262	1267
	1268	+"$(OX)\backlink.c" : "$(SRCDIR)\backlink.c"
	1269	+"$(OX)\backlink.h" : "$(OX)\backlink.c"
1263	1270	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1264	1271	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1265	1272
	1273	+"$(OX)\backoffice.c" : "$(SRCDIR)\backoffice.c"
	1274	+"$(OX)\backoffice.h" : "$(OX)\backoffice.c"
1266	1275	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1267	1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1268	1277
	1278	+"$(OX)\bag.c" : "$(SRCDIR)\bag.c"
	1279	+"$(OX)\bag.h" : "$(OX)\bag.c"
1269	1280	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1270	1281	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1271	1282
	1283	+"$(OX)\bisect.c" : "$(SRCDIR)\bisect.c"
	1284	+"$(OX)\bisect.h" : "$(OX)\bisect.c"
1272	1285	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1273	1286	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1274	1287
	1288	+"$(OX)\blob.c" : "$(SRCDIR)\blob.c"
	1289	+"$(OX)\blob.h" : "$(OX)\blob.c"
1275	1290	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1276	1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1277	1292
	1293	+"$(OX)\branch.c" : "$(SRCDIR)\branch.c"
	1294	+"$(OX)\branch.h" : "$(OX)\branch.c"
1278	1295	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1279	1296	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1280	1297
	1298	+"$(OX)\browse.c" : "$(SRCDIR)\browse.c"
	1299	+"$(OX)\browse.h" : "$(OX)\browse.c"
1281	1300	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1282	1301	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1283	1302
	1303	+"$(OX)\builtin.c" : "$(SRCDIR)\builtin.c"
	1304	+"$(OX)\builtin.h" : "$(OX)\builtin.c"
1284	1305	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1285	1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1286	1307
	1308	+"$(OX)\bundle.c" : "$(SRCDIR)\bundle.c"
	1309	+"$(OX)\bundle.h" : "$(OX)\bundle.c"
1287	1310	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1288	1311	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1289	1312
	1313	+"$(OX)\cache.c" : "$(SRCDIR)\cache.c"
	1314	+"$(OX)\cache.h" : "$(OX)\cache.c"
1290	1315	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1291	1316	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1292	1317
	1318	+"$(OX)\capabilities.c" : "$(SRCDIR)\capabilities.c"
	1319	+"$(OX)\capabilities.h" : "$(OX)\capabilities.c"
1293	1320	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1294	1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1295	1322
	1323	+"$(OX)\captcha.c" : "$(SRCDIR)\captcha.c"
	1324	+"$(OX)\captcha.h" : "$(OX)\captcha.c"
1296	1325	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1297	1326	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1298	1327
	1328	+"$(OX)\cgi.c" : "$(SRCDIR)\cgi.c"
	1329	+"$(OX)\cgi.h" : "$(OX)\cgi.c"
1299	1330	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1300	1331	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1301	1332
	1333	+"$(OX)\chat.c" : "$(SRCDIR)\chat.c"
	1334	+"$(OX)\chat.h" : "$(OX)\chat.c"
1302	1335	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1303	1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1304	1337
	1338	+"$(OX)\checkin.c" : "$(SRCDIR)\checkin.c"
	1339	+"$(OX)\checkin.h" : "$(OX)\checkin.c"
1305	1340	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1306	1341	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1307	1342
	1343	+"$(OX)\checkout.c" : "$(SRCDIR)\checkout.c"
	1344	+"$(OX)\checkout.h" : "$(OX)\checkout.c"
1308	1345	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1309	1346	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1310	1347
	1348	+"$(OX)\clearsign.c" : "$(SRCDIR)\clearsign.c"
	1349	+"$(OX)\clearsign.h" : "$(OX)\clearsign.c"
1311	1350	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1312	1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1313	1352
	1353	+"$(OX)\clone.c" : "$(SRCDIR)\clone.c"
	1354	+"$(OX)\clone.h" : "$(OX)\clone.c"
1314	1355	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1315	1356	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1316	1357
	1358	+"$(OX)\color.c" : "$(SRCDIR)\color.c"
	1359	+"$(OX)\color.h" : "$(OX)\color.c"
1317	1360	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1318	1361	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1319	1362
	1363	+"$(OX)\comformat.c" : "$(SRCDIR)\comformat.c"
	1364	+"$(OX)\comformat.h" : "$(OX)\comformat.c"
1320	1365	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1321	1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1322	1367
	1368	+"$(OX)\configure.c" : "$(SRCDIR)\configure.c"
	1369	+"$(OX)\configure.h" : "$(OX)\configure.c"
1323	1370	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1324	1371	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1325	1372
	1373	+"$(OX)\content.c" : "$(SRCDIR)\content.c"
	1374	+"$(OX)\content.h" : "$(OX)\content.c"
1326	1375	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1327	1376	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1328	1377
	1378	+"$(OX)\cookies.c" : "$(SRCDIR)\cookies.c"
	1379	+"$(OX)\cookies.h" : "$(OX)\cookies.c"
1329	1380	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1330	1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1331	1382
	1383	+"$(OX)\db.c" : "$(SRCDIR)\db.c"
	1384	+"$(OX)\db.h" : "$(OX)\db.c"
1332	1385	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1333	1386	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1334	1387
	1388	+"$(OX)\delta.c" : "$(SRCDIR)\delta.c"
	1389	+"$(OX)\delta.h" : "$(OX)\delta.c"
1335	1390	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1336	1391	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1337	1392
	1393	+"$(OX)\deltacmd.c" : "$(SRCDIR)\deltacmd.c"
	1394	+"$(OX)\deltacmd.h" : "$(OX)\deltacmd.c"
1338	1395	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1339	1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1340	1397
	1398	+"$(OX)\deltafunc.c" : "$(SRCDIR)\deltafunc.c"
	1399	+"$(OX)\deltafunc.h" : "$(OX)\deltafunc.c"
1341	1400	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1342	1401	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1343	1402
	1403	+"$(OX)\descendants.c" : "$(SRCDIR)\descendants.c"
	1404	+"$(OX)\descendants.h" : "$(OX)\descendants.c"
1344	1405	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1345	1406	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1346	1407
	1408	+"$(OX)\diff.c" : "$(SRCDIR)\diff.c"
	1409	+"$(OX)\diff.h" : "$(OX)\diff.c"
1347	1410	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1348	1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1349	1412
	1413	+"$(OX)\diffcmd.c" : "$(SRCDIR)\diffcmd.c"
	1414	+"$(OX)\diffcmd.h" : "$(OX)\diffcmd.c"
1350	1415	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1351	1416	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1352	1417
	1418	+"$(OX)\dispatch.c" : "$(SRCDIR)\dispatch.c"
	1419	+"$(OX)\dispatch.h" : "$(OX)\dispatch.c"
1353	1420	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1354	1421	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1355	1422
	1423	+"$(OX)\doc.c" : "$(SRCDIR)\doc.c"
	1424	+"$(OX)\doc.h" : "$(OX)\doc.c"
1356	1425	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1357	1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1358	1427
	1428	+"$(OX)\encode.c" : "$(SRCDIR)\encode.c"
	1429	+"$(OX)\encode.h" : "$(OX)\encode.c"
1359	1430	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1360	1431	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1361	1432
	1433	+"$(OX)\etag.c" : "$(SRCDIR)\etag.c"
	1434	+"$(OX)\etag.h" : "$(OX)\etag.c"
1362	1435	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1363	1436	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1364	1437
	1438	+"$(OX)\event.c" : "$(SRCDIR)\event.c"
	1439	+"$(OX)\event.h" : "$(OX)\event.c"
1365	1440	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1366	1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1367	1442
	1443	+"$(OX)\export.c" : "$(SRCDIR)\export.c"
	1444	+"$(OX)\export.h" : "$(OX)\export.c"
1368	1445	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1369	1446	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1370	1447
	1448	+"$(OX)\extcgi.c" : "$(SRCDIR)\extcgi.c"
	1449	+"$(OX)\extcgi.h" : "$(OX)\extcgi.c"
1371	1450	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1372	1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1373	1452
	1453	+"$(OX)\file.c" : "$(SRCDIR)\file.c"
	1454	+"$(OX)\file.h" : "$(OX)\file.c"
1374	1455	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1375	1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1376	1457
	1458	+"$(OX)\fileedit.c" : "$(SRCDIR)\fileedit.c"
	1459	+"$(OX)\fileedit.h" : "$(OX)\fileedit.c"
1377	1460	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1378	1461	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1379	1462
	1463	+"$(OX)\finfo.c" : "$(SRCDIR)\finfo.c"
	1464	+"$(OX)\finfo.h" : "$(OX)\finfo.c"
1380	1465	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1381	1466	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1382	1467
	1468	+"$(OX)\foci.c" : "$(SRCDIR)\foci.c"
	1469	+"$(OX)\foci.h" : "$(OX)\foci.c"
1383	1470	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1384	1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1385	1472
	1473	+"$(OX)\forum.c" : "$(SRCDIR)\forum.c"
	1474	+"$(OX)\forum.h" : "$(OX)\forum.c"
1386	1475	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1387	1476	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1388	1477
	1478	+"$(OX)\fshell.c" : "$(SRCDIR)\fshell.c"
	1479	+"$(OX)\fshell.h" : "$(OX)\fshell.c"
1389	1480	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1390	1481	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1391	1482
	1483	+"$(OX)\fusefs.c" : "$(SRCDIR)\fusefs.c"
	1484	+"$(OX)\fusefs.h" : "$(OX)\fusefs.c"
1392	1485	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1393	1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1394	1487
	1488	+"$(OX)\fuzz.c" : "$(SRCDIR)\fuzz.c"
	1489	+"$(OX)\fuzz.h" : "$(OX)\fuzz.c"
1395	1490	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1396	1491	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1397	1492
	1493	+"$(OX)\glob.c" : "$(SRCDIR)\glob.c"
	1494	+"$(OX)\glob.h" : "$(OX)\glob.c"
1398	1495	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1399	1496	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1400	1497
	1498	+"$(OX)\graph.c" : "$(SRCDIR)\graph.c"
	1499	+"$(OX)\graph.h" : "$(OX)\graph.c"
1401	1500	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1402	1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1403	1502
	1503	+"$(OX)\gzip.c" : "$(SRCDIR)\gzip.c"
	1504	+"$(OX)\gzip.h" : "$(OX)\gzip.c"
1404	1505	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1405	1506	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1406	1507
	1508	+"$(OX)\hname.c" : "$(SRCDIR)\hname.c"
	1509	+"$(OX)\hname.h" : "$(OX)\hname.c"
1407	1510	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1408	1511	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1409	1512
	1513	+"$(OX)\hook.c" : "$(SRCDIR)\hook.c"
	1514	+"$(OX)\hook.h" : "$(OX)\hook.c"
1410	1515	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1411	1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1412	1517
	1518	+"$(OX)\http.c" : "$(SRCDIR)\http.c"
	1519	+"$(OX)\http.h" : "$(OX)\http.c"
1413	1520	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1414	1521	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1415	1522
	1523	+"$(OX)\http_socket.c" : "$(SRCDIR)\http_socket.c"
	1524	+"$(OX)\http_socket.h" : "$(OX)\http_socket.c"
1416	1525	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1417	1526	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1418	1527
	1528	+"$(OX)\http_ssl.c" : "$(SRCDIR)\http_ssl.c"
	1529	+"$(OX)\http_ssl.h" : "$(OX)\http_ssl.c"
1419	1530	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1420	1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1421	1532
	1533	+"$(OX)\http_transport.c" : "$(SRCDIR)\http_transport.c"
	1534	+"$(OX)\http_transport.h" : "$(OX)\http_transport.c"
1422	1535	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1423	1536	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1424	1537
	1538	+"$(OX)\import.c" : "$(SRCDIR)\import.c"
	1539	+"$(OX)\import.h" : "$(OX)\import.c"
1425	1540	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1426	1541	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1427	1542
	1543	+"$(OX)\info.c" : "$(SRCDIR)\info.c"
	1544	+"$(OX)\info.h" : "$(OX)\info.c"
1428	1545	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1429	1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1430	1547
	1548	+"$(OX)\interwiki.c" : "$(SRCDIR)\interwiki.c"
	1549	+"$(OX)\interwiki.h" : "$(OX)\interwiki.c"
1431	1550	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1432	1551	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1433	1552
	1553	+"$(OX)\json.c" : "$(SRCDIR)\json.c"
	1554	+"$(OX)\json.h" : "$(OX)\json.c"
1434	1555	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1435	1556	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1436	1557
	1558	+"$(OX)\json_artifact.c" : "$(SRCDIR)\json_artifact.c"
	1559	+"$(OX)\json_artifact.h" : "$(OX)\json_artifact.c"
1437	1560	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1438	1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1439	1562
	1563	+"$(OX)\json_branch.c" : "$(SRCDIR)\json_branch.c"
	1564	+"$(OX)\json_branch.h" : "$(OX)\json_branch.c"
1440	1565	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1441	1566	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1442	1567
	1568	+"$(OX)\json_config.c" : "$(SRCDIR)\json_config.c"
	1569	+"$(OX)\json_config.h" : "$(OX)\json_config.c"
1443	1570	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1444	1571	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1445	1572
	1573	+"$(OX)\json_diff.c" : "$(SRCDIR)\json_diff.c"
	1574	+"$(OX)\json_diff.h" : "$(OX)\json_diff.c"
1446	1575	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1447	1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1448	1577
	1578	+"$(OX)\json_dir.c" : "$(SRCDIR)\json_dir.c"
	1579	+"$(OX)\json_dir.h" : "$(OX)\json_dir.c"
1449	1580	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1450	1581	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1451	1582
	1583	+"$(OX)\json_finfo.c" : "$(SRCDIR)\json_finfo.c"
	1584	+"$(OX)\json_finfo.h" : "$(OX)\json_finfo.c"
1452	1585	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1453	1586	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1454	1587
	1588	+"$(OX)\json_login.c" : "$(SRCDIR)\json_login.c"
	1589	+"$(OX)\json_login.h" : "$(OX)\json_login.c"
1455	1590	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1456	1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1457	1592
	1593	+"$(OX)\json_query.c" : "$(SRCDIR)\json_query.c"
	1594	+"$(OX)\json_query.h" : "$(OX)\json_query.c"
1458	1595	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1459	1596	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1460	1597
	1598	+"$(OX)\json_report.c" : "$(SRCDIR)\json_report.c"
	1599	+"$(OX)\json_report.h" : "$(OX)\json_report.c"
1461	1600	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1462	1601	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1463	1602
	1603	+"$(OX)\json_status.c" : "$(SRCDIR)\json_status.c"
	1604	+"$(OX)\json_status.h" : "$(OX)\json_status.c"
1464	1605	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1465	1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1466	1607
	1608	+"$(OX)\json_tag.c" : "$(SRCDIR)\json_tag.c"
	1609	+"$(OX)\json_tag.h" : "$(OX)\json_tag.c"
1467	1610	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1468	1611	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1469	1612
	1613	+"$(OX)\json_timeline.c" : "$(SRCDIR)\json_timeline.c"
	1614	+"$(OX)\json_timeline.h" : "$(OX)\json_timeline.c"
1470	1615	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1471	1616	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1472	1617
	1618	+"$(OX)\json_user.c" : "$(SRCDIR)\json_user.c"
	1619	+"$(OX)\json_user.h" : "$(OX)\json_user.c"
1473	1620	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1474	1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1475	1622
	1623	+"$(OX)\json_wiki.c" : "$(SRCDIR)\json_wiki.c"
	1624	+"$(OX)\json_wiki.h" : "$(OX)\json_wiki.c"
1476	1625	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1477	1626	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1478	1627
	1628	+"$(OX)\leaf.c" : "$(SRCDIR)\leaf.c"
	1629	+"$(OX)\leaf.h" : "$(OX)\leaf.c"
1479	1630	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1480	1631	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1481	1632
	1633	+"$(OX)\loadctrl.c" : "$(SRCDIR)\loadctrl.c"
	1634	+"$(OX)\loadctrl.h" : "$(OX)\loadctrl.c"
1482	1635	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1483	1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1484	1637
	1638	+"$(OX)\login.c" : "$(SRCDIR)\login.c"
	1639	+"$(OX)\login.h" : "$(OX)\login.c"
1485	1640	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1486	1641	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1487	1642
	1643	+"$(OX)\lookslike.c" : "$(SRCDIR)\lookslike.c"
	1644	+"$(OX)\lookslike.h" : "$(OX)\lookslike.c"
1488	1645	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1489	1646	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1490	1647
	1648	+"$(OX)\main.c" : "$(SRCDIR)\main.c"
	1649	+"$(OX)\main.h" : "$(OX)\main.c"
1491	1650	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1492	1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1493	1652
	1653	+"$(OX)\manifest.c" : "$(SRCDIR)\manifest.c"
	1654	+"$(OX)\manifest.h" : "$(OX)\manifest.c"
1494	1655	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1495	1656	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1496	1657
	1658	+"$(OX)\markdown.c" : "$(SRCDIR)\markdown.c"
	1659	+"$(OX)\markdown.h" : "$(OX)\markdown.c"
1497	1660	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1498	1661	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1499	1662
	1663	+"$(OX)\markdown_html.c" : "$(SRCDIR)\markdown_html.c"
	1664	+"$(OX)\markdown_html.h" : "$(OX)\markdown_html.c"
1500	1665	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1501	1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1502	1667
	1668	+"$(OX)\md5.c" : "$(SRCDIR)\md5.c"
	1669	+"$(OX)\md5.h" : "$(OX)\md5.c"
1503	1670	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1504	1671	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1505	1672
	1673	+"$(OX)\merge.c" : "$(SRCDIR)\merge.c"
	1674	+"$(OX)\merge.h" : "$(OX)\merge.c"
1506	1675	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1507	1676	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1508	1677
	1678	+"$(OX)\merge3.c" : "$(SRCDIR)\merge3.c"
	1679	+"$(OX)\merge3.h" : "$(OX)\merge3.c"
1509	1680	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1510	1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1511	1682
	1683	+"$(OX)\moderate.c" : "$(SRCDIR)\moderate.c"
	1684	+"$(OX)\moderate.h" : "$(OX)\moderate.c"
1512	1685	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1513	1686	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1514	1687
	1688	+"$(OX)\name.c" : "$(SRCDIR)\name.c"
	1689	+"$(OX)\name.h" : "$(OX)\name.c"
1515	1690	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1516	1691	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1517	1692
	1693	+"$(OX)\path.c" : "$(SRCDIR)\path.c"
	1694	+"$(OX)\path.h" : "$(OX)\path.c"
1518	1695	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1519	1696	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1520	1697
	1698	+"$(OX)\piechart.c" : "$(SRCDIR)\piechart.c"
	1699	+"$(OX)\piechart.h" : "$(OX)\piechart.c"
1521	1700	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1522	1701	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1523	1702
	1703	+"$(OX)\pikchr.c" : "$(SRCDIR)\pikchr.c"
	1704	+"$(OX)\pikchr.h" : "$(OX)\pikchr.c"
1524	1705	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1525	1706	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1526	1707
	1708	+"$(OX)\pikchrshow.c" : "$(SRCDIR)\pikchrshow.c"
	1709	+"$(OX)\pikchrshow.h" : "$(OX)\pikchrshow.c"
1527	1710	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1528	1711	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1529	1712
	1713	+"$(OX)\pivot.c" : "$(SRCDIR)\pivot.c"
	1714	+"$(OX)\pivot.h" : "$(OX)\pivot.c"
1530	1715	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1531	1716	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1532	1717
	1718	+"$(OX)\popen.c" : "$(SRCDIR)\popen.c"
	1719	+"$(OX)\popen.h" : "$(OX)\popen.c"
1533	1720	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1534	1721	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1535	1722
	1723	+"$(OX)\pqueue.c" : "$(SRCDIR)\pqueue.c"
	1724	+"$(OX)\pqueue.h" : "$(OX)\pqueue.c"
1536	1725	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1537	1726	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1538	1727
	1728	+"$(OX)\printf.c" : "$(SRCDIR)\printf.c"
	1729	+"$(OX)\printf.h" : "$(OX)\printf.c"
1539	1730	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1540	1731	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1541	1732
	1733	+"$(OX)\publish.c" : "$(SRCDIR)\publish.c"
	1734	+"$(OX)\publish.h" : "$(OX)\publish.c"
1542	1735	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1543	1736	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1544	1737
	1738	+"$(OX)\purge.c" : "$(SRCDIR)\purge.c"
	1739	+"$(OX)\purge.h" : "$(OX)\purge.c"
1545	1740	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1546	1741	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1547	1742
	1743	+"$(OX)\rebuild.c" : "$(SRCDIR)\rebuild.c"
	1744	+"$(OX)\rebuild.h" : "$(OX)\rebuild.c"
1548	1745	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1549	1746	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1550	1747
	1748	+"$(OX)\regexp.c" : "$(SRCDIR)\regexp.c"
	1749	+"$(OX)\regexp.h" : "$(OX)\regexp.c"
1551	1750	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1552	1751	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1553	1752
	1753	+"$(OX)\repolist.c" : "$(SRCDIR)\repolist.c"
	1754	+"$(OX)\repolist.h" : "$(OX)\repolist.c"
1554	1755	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1555	1756	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1556	1757
	1758	+"$(OX)\report.c" : "$(SRCDIR)\report.c"
	1759	+"$(OX)\report.h" : "$(OX)\report.c"
1557	1760	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1558	1761	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1559	1762
	1763	+"$(OX)\rss.c" : "$(SRCDIR)\rss.c"
	1764	+"$(OX)\rss.h" : "$(OX)\rss.c"
1560	1765	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1561	1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1562	1767
	1768	+"$(OX)\schema.c" : "$(SRCDIR)\schema.c"
	1769	+"$(OX)\schema.h" : "$(OX)\schema.c"
1563	1770	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1564	1771	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1565	1772
	1773	+"$(OX)\search.c" : "$(SRCDIR)\search.c"
	1774	+"$(OX)\search.h" : "$(OX)\search.c"
1566	1775	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1567	1776	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1568	1777
	1778	+"$(OX)\security_audit.c" : "$(SRCDIR)\security_audit.c"
	1779	+"$(OX)\security_audit.h" : "$(OX)\security_audit.c"
1569	1780	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1570	1781	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1571	1782
	1783	+"$(OX)\setup.c" : "$(SRCDIR)\setup.c"
	1784	+"$(OX)\setup.h" : "$(OX)\setup.c"
1572	1785	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1573	1786	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1574	1787
	1788	+"$(OX)\setupuser.c" : "$(SRCDIR)\setupuser.c"
	1789	+"$(OX)\setupuser.h" : "$(OX)\setupuser.c"
1575	1790	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1576	1791	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1577	1792
	1793	+"$(OX)\sha1.c" : "$(SRCDIR)\sha1.c"
	1794	+"$(OX)\sha1.h" : "$(OX)\sha1.c"
1578	1795	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1579	1796	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1580	1797
	1798	+"$(OX)\sha1hard.c" : "$(SRCDIR)\sha1hard.c"
	1799	+"$(OX)\sha1hard.h" : "$(OX)\sha1hard.c"
1581	1800	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1582	1801	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1583	1802
	1803	+"$(OX)\sha3.c" : "$(SRCDIR)\sha3.c"
	1804	+"$(OX)\sha3.h" : "$(OX)\sha3.c"
1584	1805	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1585	1806	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1586	1807
	1808	+"$(OX)\shun.c" : "$(SRCDIR)\shun.c"
	1809	+"$(OX)\shun.h" : "$(OX)\shun.c"
1587	1810	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1588	1811	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1589	1812
	1813	+"$(OX)\sitemap.c" : "$(SRCDIR)\sitemap.c"
	1814	+"$(OX)\sitemap.h" : "$(OX)\sitemap.c"
1590	1815	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1591	1816	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1592	1817
	1818	+"$(OX)\skins.c" : "$(SRCDIR)\skins.c"
	1819	+"$(OX)\skins.h" : "$(OX)\skins.c"
1593	1820	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1594	1821	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1595	1822
	1823	+"$(OX)\smtp.c" : "$(SRCDIR)\smtp.c"
	1824	+"$(OX)\smtp.h" : "$(OX)\smtp.c"
1596	1825	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1597	1826	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1598	1827
	1828	+"$(OX)\sqlcmd.c" : "$(SRCDIR)\sqlcmd.c"
	1829	+"$(OX)\sqlcmd.h" : "$(OX)\sqlcmd.c"
1599	1830	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1600	1831	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1601	1832
	1833	+"$(OX)\stash.c" : "$(SRCDIR)\stash.c"
	1834	+"$(OX)\stash.h" : "$(OX)\stash.c"
1602	1835	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1603	1836	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1604	1837
	1838	+"$(OX)\stat.c" : "$(SRCDIR)\stat.c"
	1839	+"$(OX)\stat.h" : "$(OX)\stat.c"
1605	1840	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1606	1841	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1607	1842
	1843	+"$(OX)\statrep.c" : "$(SRCDIR)\statrep.c"
	1844	+"$(OX)\statrep.h" : "$(OX)\statrep.c"
1608	1845	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1609	1846	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1610	1847
	1848	+"$(OX)\style.c" : "$(SRCDIR)\style.c"
	1849	+"$(OX)\style.h" : "$(OX)\style.c"
1611	1850	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1612	1851	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1613	1852
	1853	+"$(OX)\sync.c" : "$(SRCDIR)\sync.c"
	1854	+"$(OX)\sync.h" : "$(OX)\sync.c"
1614	1855	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1615	1856	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1616	1857
	1858	+"$(OX)\tag.c" : "$(SRCDIR)\tag.c"
	1859	+"$(OX)\tag.h" : "$(OX)\tag.c"
1617	1860	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1618	1861	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1619	1862
	1863	+"$(OX)\tar.c" : "$(SRCDIR)\tar.c"
	1864	+"$(OX)\tar.h" : "$(OX)\tar.c"
1620	1865	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1621	1866	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1622	1867
	1868	+"$(OX)\terminal.c" : "$(SRCDIR)\terminal.c"
	1869	+"$(OX)\terminal.h" : "$(OX)\terminal.c"
1623	1870	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1624	1871	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1625	1872
	1873	+"$(OX)\th_main.c" : "$(SRCDIR)\th_main.c"
	1874	+"$(OX)\th_main.h" : "$(OX)\th_main.c"
1626	1875	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1627	1876	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1628	1877
	1878	+"$(OX)\timeline.c" : "$(SRCDIR)\timeline.c"
	1879	+"$(OX)\timeline.h" : "$(OX)\timeline.c"
1629	1880	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1630	1881	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1631	1882
	1883	+"$(OX)\tkt.c" : "$(SRCDIR)\tkt.c"
	1884	+"$(OX)\tkt.h" : "$(OX)\tkt.c"
1632	1885	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1633	1886	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1634	1887
	1888	+"$(OX)\tktsetup.c" : "$(SRCDIR)\tktsetup.c"
	1889	+"$(OX)\tktsetup.h" : "$(OX)\tktsetup.c"
1635	1890	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1636	1891	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1637	1892
	1893	+"$(OX)\undo.c" : "$(SRCDIR)\undo.c"
	1894	+"$(OX)\undo.h" : "$(OX)\undo.c"
1638	1895	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1639	1896	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1640	1897
	1898	+"$(OX)\unicode.c" : "$(SRCDIR)\unicode.c"
	1899	+"$(OX)\unicode.h" : "$(OX)\unicode.c"
1641	1900	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1642	1901	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1643	1902
	1903	+"$(OX)\unversioned.c" : "$(SRCDIR)\unversioned.c"
	1904	+"$(OX)\unversioned.h" : "$(OX)\unversioned.c"
1644	1905	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1645	1906	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1646	1907
	1908	+"$(OX)\update.c" : "$(SRCDIR)\update.c"
	1909	+"$(OX)\update.h" : "$(OX)\update.c"
1647	1910	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1648	1911	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1649	1912
	1913	+"$(OX)\url.c" : "$(SRCDIR)\url.c"
	1914	+"$(OX)\url.h" : "$(OX)\url.c"
1650	1915	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1651	1916	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1652	1917
	1918	+"$(OX)\user.c" : "$(SRCDIR)\user.c"
	1919	+"$(OX)\user.h" : "$(OX)\user.c"
1653	1920	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1654	1921	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1655	1922
	1923	+"$(OX)\utf8.c" : "$(SRCDIR)\utf8.c"
	1924	+"$(OX)\utf8.h" : "$(OX)\utf8.c"
1656	1925	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1657	1926	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1658	1927
	1928	+"$(OX)\util.c" : "$(SRCDIR)\util.c"
	1929	+"$(OX)\util.h" : "$(OX)\util.c"
1659	1930	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1660	1931	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1661	1932
	1933	+"$(OX)\verify.c" : "$(SRCDIR)\verify.c"
	1934	+"$(OX)\verify.h" : "$(OX)\verify.c"
1662	1935	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1663	1936	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1664	1937
	1938	+"$(OX)\vfile.c" : "$(SRCDIR)\vfile.c"
	1939	+"$(OX)\vfile.h" : "$(OX)\vfile.c"
1665	1940	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1666	1941	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1667	1942
	1943	+"$(OX)\webmail.c" : "$(SRCDIR)\webmail.c"
	1944	+"$(OX)\webmail.h" : "$(OX)\webmail.c"
1668	1945	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1669	1946	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1670	1947
	1948	+"$(OX)\wiki.c" : "$(SRCDIR)\wiki.c"
	1949	+"$(OX)\wiki.h" : "$(OX)\wiki.c"
1671	1950	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1672	1951	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1673	1952
	1953	+"$(OX)\wikiformat.c" : "$(SRCDIR)\wikiformat.c"
	1954	+"$(OX)\wikiformat.h" : "$(OX)\wikiformat.c"
1674	1955	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1675	1956	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1676	1957
	1958	+"$(OX)\winfile.c" : "$(SRCDIR)\winfile.c"
	1959	+"$(OX)\winfile.h" : "$(OX)\winfile.c"
1677	1960	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1678	1961	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1679	1962
	1963	+"$(OX)\winhttp.c" : "$(SRCDIR)\winhttp.c"
	1964	+"$(OX)\winhttp.h" : "$(OX)\winhttp.c"
1680	1965	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1681	1966	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1682	1967
	1968	+"$(OX)\xfer.c" : "$(SRCDIR)\xfer.c"
	1969	+"$(OX)\xfer.h" : "$(OX)\xfer.c"
1683	1970	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1684	1971	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1685	1972
	1973	+"$(OX)\xfersetup.c" : "$(SRCDIR)\xfersetup.c"
	1974	+"$(OX)\xfersetup.h" : "$(OX)\xfersetup.c"
1686	1975	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1687	1976	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1688	1977
	1978	+"$(OX)\zip.c" : "$(SRCDIR)\zip.c"
	1979	+"$(OX)\zip.h" : "$(OX)\zip.c"
1689	1980	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1690	1981	$(RCC) /fo $@ $**
1691	1982
1692		-"$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1693		- "$(OBJDIR)\makeheaders$E" "$(OX)\add.c":"$(OX)\add.h" \
1694		- "$(OX)\ajax.c":"$(OX)\ajax.h" \
1695		- "$(OX)\alerts.c":"$(OX)\alerts.h" \
1696		- "$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1697		- "$(OX)\attach.c":"$(OX)\attach.h" \
1698		- "$(OX)\backlink.c":"$(OX)\backlink.h" \
1699		- "$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1700		- "$(OX)\bag.c":"$(OX)\bag.h" \
1701		- "$(OX)\bisect.c":"$(OX)\bisect.h" \
1702		- "$(OX)\blob.c":"$(OX)\blob.h" \
1703		- "$(OX)\branch.c":"$(OX)\branch.h" \
1704		- "$(OX)\browse.c":"$(OX)\browse.h" \
1705		- "$(OX)\builtin.c":"$(OX)\builtin.h" \
1706		- "$(OX)\bundle.c":"$(OX)\bundle.h" \
1707		- "$(OX)\cache.c":"$(OX)\cache.h" \
1708		- "$(OX)\capabilities.c":"$(OX)\capabilities.h" \
1709		- "$(OX)\captcha.c":"$(OX)\captcha.h" \
1710		- "$(OX)\cgi.c":"$(OX)\cgi.h" \
1711		- "$(OX)\chat.c":"$(OX)\chat.h" \
1712		- "$(OX)\checkin.c":"$(OX)\checkin.h" \
1713		- "$(OX)\checkout.c":"$(OX)\checkout.h" \
1714		- "$(OX)\clearsign.c":"$(OX)\clearsign.h" \
1715		- "$(OX)\clone.c":"$(OX)\clone.h" \
1716		- "$(OX)\color.c":"$(OX)\color.h" \
1717		- "$(OX)\comformat.c":"$(OX)\comformat.h" \
1718		- "$(OX)\configure.c":"$(OX)\configure.h" \
1719		- "$(OX)\content.c":"$(OX)\content.h" \
1720		- "$(OX)\cookies.c":"$(OX)\cookies.h" \
1721		- "$(OX)\db.c":"$(OX)\db.h" \
1722		- "$(OX)\delta.c":"$(OX)\delta.h" \
1723		- "$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
1724		- "$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
1725		- "$(OX)\descendants.c":"$(OX)\descendants.h" \
1726		- "$(OX)\diff.c":"$(OX)\diff.h" \
1727		- "$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
1728		- "$(OX)\dispatch.c":"$(OX)\dispatch.h" \
1729		- "$(OX)\doc.c":"$(OX)\doc.h" \
1730		- "$(OX)\encode.c":"$(OX)\encode.h" \
1731		- "$(OX)\etag.c":"$(OX)\etag.h" \
1732		- "$(OX)\event.c":"$(OX)\event.h" \
1733		- "$(OX)\export.c":"$(OX)\export.h" \
1734		- "$(OX)\extcgi.c":"$(OX)\extcgi.h" \
1735		- "$(OX)\file.c":"$(OX)\file.h" \
1736		- "$(OX)\fileedit.c":"$(OX)\fileedit.h" \
1737		- "$(OX)\finfo.c":"$(OX)\finfo.h" \
1738		- "$(OX)\foci.c":"$(OX)\foci.h" \
1739		- "$(OX)\forum.c":"$(OX)\forum.h" \
1740		- "$(OX)\fshell.c":"$(OX)\fshell.h" \
1741		- "$(OX)\fusefs.c":"$(OX)\fusefs.h" \
1742		- "$(OX)\fuzz.c":"$(OX)\fuzz.h" \
1743		- "$(OX)\glob.c":"$(OX)\glob.h" \
1744		- "$(OX)\graph.c":"$(OX)\graph.h" \
1745		- "$(OX)\gzip.c":"$(OX)\gzip.h" \
1746		- "$(OX)\hname.c":"$(OX)\hname.h" \
1747		- "$(OX)\hook.c":"$(OX)\hook.h" \
1748		- "$(OX)\http.c":"$(OX)\http.h" \
1749		- "$(OX)\http_socket.c":"$(OX)\http_socket.h" \
1750		- "$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
1751		- "$(OX)\http_transport.c":"$(OX)\http_transport.h" \
1752		- "$(OX)\import.c":"$(OX)\import.h" \
1753		- "$(OX)\info.c":"$(OX)\info.h" \
1754		- "$(OX)\interwiki.c":"$(OX)\interwiki.h" \
1755		- "$(OX)\json.c":"$(OX)\json.h" \
1756		- "$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
1757		- "$(OX)\json_branch.c":"$(OX)\json_branch.h" \
1758		- "$(OX)\json_config.c":"$(OX)\json_config.h" \
1759		- "$(OX)\json_diff.c":"$(OX)\json_diff.h" \
1760		- "$(OX)\json_dir.c":"$(OX)\json_dir.h" \
1761		- "$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
1762		- "$(OX)\json_login.c":"$(OX)\json_login.h" \
1763		- "$(OX)\json_query.c":"$(OX)\json_query.h" \
1764		- "$(OX)\json_report.c":"$(OX)\json_report.h" \
1765		- "$(OX)\json_status.c":"$(OX)\json_status.h" \
1766		- "$(OX)\json_tag.c":"$(OX)\json_tag.h" \
1767		- "$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
1768		- "$(OX)\json_user.c":"$(OX)\json_user.h" \
1769		- "$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
1770		- "$(OX)\leaf.c":"$(OX)\leaf.h" \
1771		- "$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
1772		- "$(OX)\login.c":"$(OX)\login.h" \
1773		- "$(OX)\lookslike.c":"$(OX)\lookslike.h" \
1774		- "$(OX)\main.c":"$(OX)\main.h" \
1775		- "$(OX)\manifest.c":"$(OX)\manifest.h" \
1776		- "$(OX)\markdown.c":"$(OX)\markdown.h" \
1777		- "$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
1778		- "$(OX)\md5.c":"$(OX)\md5.h" \
1779		- "$(OX)\merge.c":"$(OX)\merge.h" \
1780		- "$(OX)\merge3.c":"$(OX)\merge3.h" \
1781		- "$(OX)\moderate.c":"$(OX)\moderate.h" \
1782		- "$(OX)\name.c":"$(OX)\name.h" \
1783		- "$(OX)\path.c":"$(OX)\path.h" \
1784		- "$(OX)\piechart.c":"$(OX)\piechart.h" \
1785		- "$(OX)\pikchr.c":"$(OX)\pikchr.h" \
1786		- "$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
1787		- "$(OX)\pivot.c":"$(OX)\pivot.h" \
1788		- "$(OX)\popen.c":"$(OX)\popen.h" \
1789		- "$(OX)\pqueue.c":"$(OX)\pqueue.h" \
1790		- "$(OX)\printf.c":"$(OX)\printf.h" \
1791		- "$(OX)\publish.c":"$(OX)\publish.h" \
1792		- "$(OX)\purge.c":"$(OX)\purge.h" \
1793		- "$(OX)\rebuild.c":"$(OX)\rebuild.h" \
1794		- "$(OX)\regexp.c":"$(OX)\regexp.h" \
1795		- "$(OX)\repolist.c":"$(OX)\repolist.h" \
1796		- "$(OX)\report.c":"$(OX)\report.h" \
1797		- "$(OX)\rss.c":"$(OX)\rss.h" \
1798		- "$(OX)\schema.c":"$(OX)\schema.h" \
1799		- "$(OX)\search.c":"$(OX)\search.h" \
1800		- "$(OX)\security_audit.c":"$(OX)\security_audit.h" \
1801		- "$(OX)\setup.c":"$(OX)\setup.h" \
1802		- "$(OX)\setupuser.c":"$(OX)\setupuser.h" \
1803		- "$(OX)\sha1.c":"$(OX)\sha1.h" \
1804		- "$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
1805		- "$(OX)\sha3.c":"$(OX)\sha3.h" \
1806		- "$(OX)\shun.c":"$(OX)\shun.h" \
1807		- "$(OX)\sitemap.c":"$(OX)\sitemap.h" \
1808		- "$(OX)\skins.c":"$(OX)\skins.h" \
1809		- "$(OX)\smtp.c":"$(OX)\smtp.h" \
1810		- "$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
1811		- "$(OX)\stash.c":"$(OX)\stash.h" \
1812		- "$(OX)\stat.c":"$(OX)\stat.h" \
1813		- "$(OX)\statrep.c":"$(OX)\statrep.h" \
1814		- "$(OX)\style.c":"$(OX)\style.h" \
1815		- "$(OX)\sync.c":"$(OX)\sync.h" \
1816		- "$(OX)\tag.c":"$(OX)\tag.h" \
1817		- "$(OX)\tar.c":"$(OX)\tar.h" \
1818		- "$(OX)\terminal.c":"$(OX)\terminal.h" \
1819		- "$(OX)\th_main.c":"$(OX)\th_main.h" \
1820		- "$(OX)\timeline.c":"$(OX)\timeline.h" \
1821		- "$(OX)\tkt.c":"$(OX)\tkt.h" \
1822		- "$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
1823		- "$(OX)\undo.c":"$(OX)\undo.h" \
1824		- "$(OX)\unicode.c":"$(OX)\unicode.h" \
1825		- "$(OX)\unversioned.c":"$(OX)\unversioned.h" \
1826		- "$(OX)\update.c":"$(OX)\update.h" \
1827		- "$(OX)\url.c":"$(OX)\url.h" \
1828		- "$(OX)\user.c":"$(OX)\user.h" \
1829		- "$(OX)\utf8.c":"$(OX)\utf8.h" \
1830		- "$(OX)\util.c":"$(OX)\util.h" \
1831		- "$(OX)\verify.c":"$(OX)\verify.h" \
1832		- "$(OX)\vfile.c":"$(OX)\vfile.h" \
1833		- "$(OX)\webmail.c":"$(OX)\webmail.h" \
1834		- "$(OX)\wiki.c":"$(OX)\wiki.h" \
1835		- "$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
1836		- "$(OX)\winfile.c":"$(OX)\winfile.h" \
1837		- "$(OX)\winhttp.c":"$(OX)\winhttp.h" \
1838		- "$(OX)\xfer.c":"$(OX)\xfer.h" \
1839		- "$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
1840		- "$(OX)\zip.c":"$(OX)\zip.h" \
1841		- "$(SRCDIR)\sqlite3.h" \
1842		- "$(SRCDIR)\th.h" \
1843		- "$(OX)\VERSION.h" \
1844		- "$(SRCDIR)\cson_amalgamation.h"
1845		- @copy /Y nul: $@
	1983	+
	1984	+DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
	1985	+GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
	1986	+
	1987	+!if $(DEPHEADERGEN)==0
	1988	+GEN_HEADERS = $(GEN_HEADERS) \
	1989	+ "$(OX)\add.c":"$(OX)\add.h" \
	1990	+ "$(OX)\ajax.c":"$(OX)\ajax.h" \
	1991	+ "$(OX)\alerts.c":"$(OX)\alerts.h" \
	1992	+ "$(OX)\allrepo.c":"$(OX)\allrepo.h" \
	1993	+ "$(OX)\attach.c":"$(OX)\attach.h" \
	1994	+ "$(OX)\backlink.c":"$(OX)\backlink.h" \
	1995	+ "$(OX)\backoffice.c":"$(OX)\backoffice.h" \
	1996	+ "$(OX)\bag.c":"$(OX)\bag.h" \
	1997	+ "$(OX)\bisect.c":"$(OX)\bisect.h" \
	1998	+ "$(OX)\blob.c":"$(OX)\blob.h" \
	1999	+ "$(OX)\branch.c":"$(OX)\branch.h" \
	2000	+ "$(OX)\browse.c":"$(OX)\browse.h" \
	2001	+ "$(OX)\builtin.c":"$(OX)\builtin.h" \
	2002	+ "$(OX)\bundle.c":"$(OX)\bundle.h" \
	2003	+ "$(OX)\cache.c":"$(OX)\cache.h" \
	2004	+ "$(OX)\capabilities.c":"$(OX)\capabilities.h" \
	2005	+ "$(OX)\captcha.c":"$(OX)\captcha.h" \
	2006	+ "$(OX)\cgi.c":"$(OX)\cgi.h" \
	2007	+ "$(OX)\chat.c":"$(OX)\chat.h" \
	2008	+ "$(OX)\checkin.c":"$(OX)\checkin.h" \
	2009	+ "$(OX)\checkout.c":"$(OX)\checkout.h" \
	2010	+ "$(OX)\clearsign.c":"$(OX)\clearsign.h" \
	2011	+ "$(OX)\clone.c":"$(OX)\clone.h" \
	2012	+ "$(OX)\color.c":"$(OX)\color.h" \
	2013	+ "$(OX)\comformat.c":"$(OX)\comformat.h" \
	2014	+ "$(OX)\configure.c":"$(OX)\configure.h" \
	2015	+ "$(OX)\content.c":"$(OX)\content.h" \
	2016	+ "$(OX)\cookies.c":"$(OX)\cookies.h" \
	2017	+ "$(OX)\db.c":"$(OX)\db.h" \
	2018	+ "$(OX)\delta.c":"$(OX)\delta.h" \
	2019	+ "$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
	2020	+ "$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
	2021	+ "$(OX)\descendants.c":"$(OX)\descendants.h" \
	2022	+ "$(OX)\diff.c":"$(OX)\diff.h" \
	2023	+ "$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
	2024	+ "$(OX)\dispatch.c":"$(OX)\dispatch.h" \
	2025	+ "$(OX)\doc.c":"$(OX)\doc.h" \
	2026	+ "$(OX)\encode.c":"$(OX)\encode.h" \
	2027	+ "$(OX)\etag.c":"$(OX)\etag.h" \
	2028	+ "$(OX)\event.c":"$(OX)\event.h" \
	2029	+ "$(OX)\export.c":"$(OX)\export.h" \
	2030	+ "$(OX)\extcgi.c":"$(OX)\extcgi.h" \
	2031	+ "$(OX)\file.c":"$(OX)\file.h" \
	2032	+ "$(OX)\fileedit.c":"$(OX)\fileedit.h" \
	2033	+ "$(OX)\finfo.c":"$(OX)\finfo.h" \
	2034	+ "$(OX)\foci.c":"$(OX)\foci.h" \
	2035	+ "$(OX)\forum.c":"$(OX)\forum.h" \
	2036	+ "$(OX)\fshell.c":"$(OX)\fshell.h" \
	2037	+ "$(OX)\fusefs.c":"$(OX)\fusefs.h" \
	2038	+ "$(OX)\fuzz.c":"$(OX)\fuzz.h" \
	2039	+ "$(OX)\glob.c":"$(OX)\glob.h" \
	2040	+ "$(OX)\graph.c":"$(OX)\graph.h" \
	2041	+ "$(OX)\gzip.c":"$(OX)\gzip.h" \
	2042	+ "$(OX)\hname.c":"$(OX)\hname.h" \
	2043	+ "$(OX)\hook.c":"$(OX)\hook.h" \
	2044	+ "$(OX)\http.c":"$(OX)\http.h" \
	2045	+ "$(OX)\http_socket.c":"$(OX)\http_socket.h" \
	2046	+ "$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
	2047	+ "$(OX)\http_transport.c":"$(OX)\http_transport.h" \
	2048	+ "$(OX)\import.c":"$(OX)\import.h" \
	2049	+ "$(OX)\info.c":"$(OX)\info.h" \
	2050	+ "$(OX)\interwiki.c":"$(OX)\interwiki.h" \
	2051	+ "$(OX)\json.c":"$(OX)\json.h" \
	2052	+ "$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
	2053	+ "$(OX)\json_branch.c":"$(OX)\json_branch.h" \
	2054	+ "$(OX)\json_config.c":"$(OX)\json_config.h" \
	2055	+ "$(OX)\json_diff.c":"$(OX)\json_diff.h" \
	2056	+ "$(OX)\json_dir.c":"$(OX)\json_dir.h" \
	2057	+ "$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
	2058	+ "$(OX)\json_login.c":"$(OX)\json_login.h" \
	2059	+ "$(OX)\json_query.c":"$(OX)\json_query.h" \
	2060	+ "$(OX)\json_report.c":"$(OX)\json_report.h" \
	2061	+ "$(OX)\json_status.c":"$(OX)\json_status.h" \
	2062	+ "$(OX)\json_tag.c":"$(OX)\json_tag.h" \
	2063	+ "$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
	2064	+ "$(OX)\json_user.c":"$(OX)\json_user.h" \
	2065	+ "$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
	2066	+ "$(OX)\leaf.c":"$(OX)\leaf.h" \
	2067	+ "$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
	2068	+ "$(OX)\login.c":"$(OX)\login.h" \
	2069	+ "$(OX)\lookslike.c":"$(OX)\lookslike.h" \
	2070	+ "$(OX)\main.c":"$(OX)\main.h" \
	2071	+ "$(OX)\manifest.c":"$(OX)\manifest.h" \
	2072	+ "$(OX)\markdown.c":"$(OX)\markdown.h" \
	2073	+ "$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
	2074	+ "$(OX)\md5.c":"$(OX)\md5.h" \
	2075	+ "$(OX)\merge.c":"$(OX)\merge.h" \
	2076	+ "$(OX)\merge3.c":"$(OX)\merge3.h" \
	2077	+ "$(OX)\moderate.c":"$(OX)\moderate.h" \
	2078	+ "$(OX)\name.c":"$(OX)\name.h" \
	2079	+ "$(OX)\path.c":"$(OX)\path.h" \
	2080	+ "$(OX)\piechart.c":"$(OX)\piechart.h" \
	2081	+ "$(OX)\pikchr.c":"$(OX)\pikchr.h" \
	2082	+ "$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
	2083	+ "$(OX)\pivot.c":"$(OX)\pivot.h" \
	2084	+ "$(OX)\popen.c":"$(OX)\popen.h" \
	2085	+ "$(OX)\pqueue.c":"$(OX)\pqueue.h" \
	2086	+ "$(OX)\printf.c":"$(OX)\printf.h" \
	2087	+ "$(OX)\publish.c":"$(OX)\publish.h" \
	2088	+ "$(OX)\purge.c":"$(OX)\purge.h" \
	2089	+ "$(OX)\rebuild.c":"$(OX)\rebuild.h" \
	2090	+ "$(OX)\regexp.c":"$(OX)\regexp.h" \
	2091	+ "$(OX)\repolist.c":"$(OX)\repolist.h" \
	2092	+ "$(OX)\report.c":"$(OX)\report.h" \
	2093	+ "$(OX)\rss.c":"$(OX)\rss.h" \
	2094	+ "$(OX)\schema.c":"$(OX)\schema.h" \
	2095	+ "$(OX)\search.c":"$(OX)\search.h" \
	2096	+ "$(OX)\security_audit.c":"$(OX)\security_audit.h" \
	2097	+ "$(OX)\setup.c":"$(OX)\setup.h" \
	2098	+ "$(OX)\setupuser.c":"$(OX)\setupuser.h" \
	2099	+ "$(OX)\sha1.c":"$(OX)\sha1.h" \
	2100	+ "$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
	2101	+ "$(OX)\sha3.c":"$(OX)\sha3.h" \
	2102	+ "$(OX)\shun.c":"$(OX)\shun.h" \
	2103	+ "$(OX)\sitemap.c":"$(OX)\sitemap.h" \
	2104	+ "$(OX)\skins.c":"$(OX)\skins.h" \
	2105	+ "$(OX)\smtp.c":"$(OX)\smtp.h" \
	2106	+ "$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
	2107	+ "$(OX)\stash.c":"$(OX)\stash.h" \
	2108	+ "$(OX)\stat.c":"$(OX)\stat.h" \
	2109	+ "$(OX)\statrep.c":"$(OX)\statrep.h" \
	2110	+ "$(OX)\style.c":"$(OX)\style.h" \
	2111	+ "$(OX)\sync.c":"$(OX)\sync.h" \
	2112	+ "$(OX)\tag.c":"$(OX)\tag.h" \
	2113	+ "$(OX)\tar.c":"$(OX)\tar.h" \
	2114	+ "$(OX)\terminal.c":"$(OX)\terminal.h" \
	2115	+ "$(OX)\th_main.c":"$(OX)\th_main.h" \
	2116	+ "$(OX)\timeline.c":"$(OX)\timeline.h" \
	2117	+ "$(OX)\tkt.c":"$(OX)\tkt.h" \
	2118	+ "$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
	2119	+ "$(OX)\undo.c":"$(OX)\undo.h" \
	2120	+ "$(OX)\unicode.c":"$(OX)\unicode.h" \
	2121	+ "$(OX)\unversioned.c":"$(OX)\unversioned.h" \
	2122	+ "$(OX)\update.c":"$(OX)\update.h" \
	2123	+ "$(OX)\url.c":"$(OX)\url.h" \
	2124	+ "$(OX)\user.c":"$(OX)\user.h" \
	2125	+ "$(OX)\utf8.c":"$(OX)\utf8.h" \
	2126	+ "$(OX)\util.c":"$(OX)\util.h" \
	2127	+ "$(OX)\verify.c":"$(OX)\verify.h" \
	2128	+ "$(OX)\vfile.c":"$(OX)\vfile.h" \
	2129	+ "$(OX)\webmail.c":"$(OX)\webmail.h" \
	2130	+ "$(OX)\wiki.c":"$(OX)\wiki.h" \
	2131	+ "$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
	2132	+ "$(OX)\winfile.c":"$(OX)\winfile.h" \
	2133	+ "$(OX)\winhttp.c":"$(OX)\winhttp.h" \
	2134	+ "$(OX)\xfer.c":"$(OX)\xfer.h" \
	2135	+ "$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
	2136	+ "$(OX)\zip.c":"$(OX)\zip.h"
	2137	+!endif
	2138	+
	2139	+"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
	2140	+ "$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
	2141	+ @copy /Y NUL $@
	2142	+
1846	2143

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,13 +12,17 @@
12	SRCDIR = $(B)\src
13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	BUILDDIR = Build
15	!message Using default build directory, $(BUILDDIR)
16	!endif

17	T = $(BUILDDIR)

18	OBJDIR = $(T)

19	OX = $(OBJDIR)

20	O = .obj
21	E = .exe
22	P = .pdb
23
24	!ifndef INSTALLDIR
	@@ -37,20 +41,32 @@
37	#
38	!if !exist("$(B)\.fossil-settings")
39	!error Please specify path to project base directory: B="path/to/fossil"
40	!endif
41
42	# Create build directory during preprocessing if needed.
43	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]




44	!endif
45
46	# Perl is only necessary if OpenSSL support is enabled and it is built from
47	# source code. The PERLDIR environment variable, if it exists, should point
48	# to the directory containing the main Perl executable specified here (i.e.
49	# "perl.exe").
50	!ifndef PERL





51	PERL = perl.exe



52	!endif
53
54	# Enable debugging symbols?
55	!ifndef DEBUG
56	DEBUG = 0
	@@ -199,30 +215,30 @@
199	!endif
200
201	!if $(FOSSIL_ENABLE_WINXP)!=0
202	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
203	CFLAGS = $(CFLAGS) $(XPCFLAGS)
204	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
205	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
206	!else
207	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
208	!endif
209	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
210	!endif
211
212	!if $(FOSSIL_DYNAMIC_BUILD)!=0
213	!if $(DEBUG)!=0
214	CRTFLAGS = /MDd
215	!else
216	CRTFLAGS = /MD
217	!endif
218	!else
219	!if $(DEBUG)!=0
220	CRTFLAGS = /MTd
221	!else
222	CRTFLAGS = /MT
223	!endif
224	!endif
225
226	!if $(DEBUG)!=0
227	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
228	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -509,115 +525,117 @@
509	"$(OX)\winhttp.c" \
510	"$(OX)\xfer.c" \
511	"$(OX)\xfersetup.c" \
512	"$(OX)\zip.c"
513
514	EXTRA_FILES = "$(SRCDIR)\..\skins\ardoise\css.txt" \
515	"$(SRCDIR)\..\skins\ardoise\details.txt" \
516	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
517	"$(SRCDIR)\..\skins\ardoise\header.txt" \
518	"$(SRCDIR)\..\skins\black_and_white\css.txt" \
519	"$(SRCDIR)\..\skins\black_and_white\details.txt" \
520	"$(SRCDIR)\..\skins\black_and_white\footer.txt" \
521	"$(SRCDIR)\..\skins\black_and_white\header.txt" \
522	"$(SRCDIR)\..\skins\blitz\css.txt" \
523	"$(SRCDIR)\..\skins\blitz\details.txt" \
524	"$(SRCDIR)\..\skins\blitz\footer.txt" \
525	"$(SRCDIR)\..\skins\blitz\header.txt" \
526	"$(SRCDIR)\..\skins\blitz\ticket.txt" \
527	"$(SRCDIR)\..\skins\bootstrap\css.txt" \
528	"$(SRCDIR)\..\skins\bootstrap\details.txt" \
529	"$(SRCDIR)\..\skins\bootstrap\footer.txt" \
530	"$(SRCDIR)\..\skins\bootstrap\header.txt" \
531	"$(SRCDIR)\..\skins\darkmode\css.txt" \
532	"$(SRCDIR)\..\skins\darkmode\details.txt" \
533	"$(SRCDIR)\..\skins\darkmode\footer.txt" \
534	"$(SRCDIR)\..\skins\darkmode\header.txt" \
535	"$(SRCDIR)\..\skins\default\css.txt" \
536	"$(SRCDIR)\..\skins\default\details.txt" \
537	"$(SRCDIR)\..\skins\default\footer.txt" \
538	"$(SRCDIR)\..\skins\default\header.txt" \
539	"$(SRCDIR)\..\skins\eagle\css.txt" \
540	"$(SRCDIR)\..\skins\eagle\details.txt" \
541	"$(SRCDIR)\..\skins\eagle\footer.txt" \
542	"$(SRCDIR)\..\skins\eagle\header.txt" \
543	"$(SRCDIR)\..\skins\khaki\css.txt" \
544	"$(SRCDIR)\..\skins\khaki\details.txt" \
545	"$(SRCDIR)\..\skins\khaki\footer.txt" \
546	"$(SRCDIR)\..\skins\khaki\header.txt" \
547	"$(SRCDIR)\..\skins\original\css.txt" \
548	"$(SRCDIR)\..\skins\original\details.txt" \
549	"$(SRCDIR)\..\skins\original\footer.txt" \
550	"$(SRCDIR)\..\skins\original\header.txt" \
551	"$(SRCDIR)\..\skins\plain_gray\css.txt" \
552	"$(SRCDIR)\..\skins\plain_gray\details.txt" \
553	"$(SRCDIR)\..\skins\plain_gray\footer.txt" \
554	"$(SRCDIR)\..\skins\plain_gray\header.txt" \
555	"$(SRCDIR)\..\skins\xekri\css.txt" \
556	"$(SRCDIR)\..\skins\xekri\details.txt" \
557	"$(SRCDIR)\..\skins\xekri\footer.txt" \
558	"$(SRCDIR)\..\skins\xekri\header.txt" \
559	"$(SRCDIR)\accordion.js" \
560	"$(SRCDIR)\alerts\bflat2.wav" \
561	"$(SRCDIR)\alerts\bflat3.wav" \
562	"$(SRCDIR)\alerts\bloop.wav" \
563	"$(SRCDIR)\alerts\plunk.wav" \
564	"$(SRCDIR)\chat.js" \
565	"$(SRCDIR)\ci_edit.js" \
566	"$(SRCDIR)\copybtn.js" \
567	"$(SRCDIR)\default.css" \
568	"$(SRCDIR)\diff.tcl" \
569	"$(SRCDIR)\forum.js" \
570	"$(SRCDIR)\fossil.bootstrap.js" \
571	"$(SRCDIR)\fossil.confirmer.js" \
572	"$(SRCDIR)\fossil.copybutton.js" \
573	"$(SRCDIR)\fossil.dom.js" \
574	"$(SRCDIR)\fossil.fetch.js" \
575	"$(SRCDIR)\fossil.numbered-lines.js" \
576	"$(SRCDIR)\fossil.page.fileedit.js" \
577	"$(SRCDIR)\fossil.page.forumpost.js" \
578	"$(SRCDIR)\fossil.page.pikchrshow.js" \
579	"$(SRCDIR)\fossil.page.wikiedit.js" \
580	"$(SRCDIR)\fossil.pikchr.js" \
581	"$(SRCDIR)\fossil.popupwidget.js" \
582	"$(SRCDIR)\fossil.storage.js" \
583	"$(SRCDIR)\fossil.tabs.js" \
584	"$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
585	"$(SRCDIR)\graph.js" \
586	"$(SRCDIR)\hbmenu.js" \
587	"$(SRCDIR)\href.js" \
588	"$(SRCDIR)\login.js" \
589	"$(SRCDIR)\markdown.md" \
590	"$(SRCDIR)\menu.js" \
591	"$(SRCDIR)\sbsdiff.js" \
592	"$(SRCDIR)\scroll.js" \
593	"$(SRCDIR)\skin.js" \
594	"$(SRCDIR)\sorttable.js" \
595	"$(SRCDIR)\sounds\0.wav" \
596	"$(SRCDIR)\sounds\1.wav" \
597	"$(SRCDIR)\sounds\2.wav" \
598	"$(SRCDIR)\sounds\3.wav" \
599	"$(SRCDIR)\sounds\4.wav" \
600	"$(SRCDIR)\sounds\5.wav" \
601	"$(SRCDIR)\sounds\6.wav" \
602	"$(SRCDIR)\sounds\7.wav" \
603	"$(SRCDIR)\sounds\8.wav" \
604	"$(SRCDIR)\sounds\9.wav" \
605	"$(SRCDIR)\sounds\a.wav" \
606	"$(SRCDIR)\sounds\b.wav" \
607	"$(SRCDIR)\sounds\c.wav" \
608	"$(SRCDIR)\sounds\d.wav" \
609	"$(SRCDIR)\sounds\e.wav" \
610	"$(SRCDIR)\sounds\f.wav" \
611	"$(SRCDIR)\style.admin_log.css" \
612	"$(SRCDIR)\style.fileedit.css" \
613	"$(SRCDIR)\style.wikiedit.css" \
614	"$(SRCDIR)\tree.js" \
615	"$(SRCDIR)\useredit.js" \
616	"$(SRCDIR)\wiki.wiki"
617
618	OBJ = "$(OX)\add$O" \


619	"$(OX)\ajax$O" \
620	"$(OX)\alerts$O" \
621	"$(OX)\allrepo$O" \
622	"$(OX)\attach$O" \
623	"$(OX)\backlink$O" \
	@@ -766,15 +784,15 @@
766	"$(OX)\wikiformat$O" \
767	"$(OX)\winfile$O" \
768	"$(OX)\winhttp$O" \
769	"$(OX)\xfer$O" \
770	"$(OX)\xfersetup$O" \
771	"$(OX)\zip$O" \
772	!if $(FOSSIL_ENABLE_MINIZ)!=0
773	"$(OX)\miniz$O" \
774	!endif
775	"$(OX)\fossil.res"
776
777
778	!ifndef BASEAPPNAME
779	BASEAPPNAME = fossil
780	!endif
	@@ -781,11 +799,11 @@
781
782	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
783	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
784	APPTARGETS =
785
786	all: "$(OX)" "$(APPNAME)" $(BUILDDIR)
787
788	$(BASEAPPNAME): "$(APPNAME)"
789
790	$(BASEAPPNAME)$(E): "$(APPNAME)"
791
	@@ -797,55 +815,49 @@
797	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
798	!if $(DEBUG)!=0
799	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
800	!endif
801
802	$(OX):
803	if not exist $@\. mkdir $@
804
805	!if "$(BUILDDIR)"!="$(OX)"
806	$(BUILDDIR):
807	if not exist $@\. mkdir $@
808	!endif
809
810	!if $(FOSSIL_BUILD_ZLIB)
811	zlib $(ZLIB_X):
812	@echo Building zlib from "$(ZLIBDIR)"...
813	!if $(FOSSIL_ENABLE_WINXP)!=0
814	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
815	!else
816	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
817	!endif
818	copy nul $(ZLIB_X)
819
820	clean-zlib:
821	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
822	!endif
823
824	!if $(FOSSIL_ENABLE_SSL)!=0
825	OPENSSL_X = "$(OX)\openssl.opts"
826	openssl $(OPENSSL_X):
827	@echo Building OpenSSL from "$(SSLDIR)"...
828	!ifdef PERLDIR
829	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
830	!else
831	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
832	!endif
833	!if $(FOSSIL_ENABLE_WINXP)!=0
834	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
835	!else
836	@pushd "$(SSLDIR)" && $(MAKE) && popd
837	echo $(SSLCONFIG) > $(OPENSSL_X)
838	!endif

839
840	clean-openssl:
841	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
842	-del $(OPENSSL_X)
843
844	!if $(FOSSIL_BUILD_SSL)!=0
845	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
846	!endif
847
848	!endif
849
850	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
851	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1016,30 +1028,15 @@
1016	echo "$(OX)\miniz.obj" >> $@
1017	!endif
1018	echo $(LIBS) >> $@
1019
1020
1021	# This target gets the project tools built.
1022	toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"
1023
1024	"$(OBJDIR)\translate$E": "$(SRCDIR)\translate.c"
1025	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026
1027	"$(OBJDIR)\makeheaders$E": "$(SRCDIR)\makeheaders.c"
1028	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029
1030	"$(OBJDIR)\mkindex$E": "$(SRCDIR)\mkindex.c"
1031	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032
1033	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	"$(OBJDIR)\mkversion$E": "$(SRCDIR)\mkversion.c"
1037	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1038
1039	"$(OBJDIR)\codecheck1$E": "$(SRCDIR)\codecheck1.c"
1040	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1041
1042	!if $(USE_SEE)!=0
1043	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1044	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1045	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
	@@ -1130,716 +1127,1016 @@
1130	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1131	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1132	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1133
1134	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1135	echo "$(SRCDIR)\../skins/ardoise/css.txt" > $@
1136	echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1137	echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1138	echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1139	echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1140	echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1141	echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1142	echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1143	echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1144	echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1145	echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1146	echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1147	echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1148	echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1149	echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1150	echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1151	echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1152	echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1153	echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1154	echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1155	echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1156	echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1157	echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1158	echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1159	echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1160	echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1161	echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1162	echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1163	echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1164	echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1165	echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1166	echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1167	echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1168	echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1169	echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1170	echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1171	echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1172	echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1173	echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1174	echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1175	echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1176	echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1177	echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1178	echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1179	echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1180	echo "$(SRCDIR)\accordion.js" >> $@
1181	echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1182	echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1183	echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1184	echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1185	echo "$(SRCDIR)\chat.js" >> $@
1186	echo "$(SRCDIR)\ci_edit.js" >> $@
1187	echo "$(SRCDIR)\copybtn.js" >> $@
1188	echo "$(SRCDIR)\default.css" >> $@
1189	echo "$(SRCDIR)\diff.tcl" >> $@
1190	echo "$(SRCDIR)\forum.js" >> $@
1191	echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1192	echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1193	echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1194	echo "$(SRCDIR)\fossil.dom.js" >> $@
1195	echo "$(SRCDIR)\fossil.fetch.js" >> $@
1196	echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1197	echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1198	echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1199	echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1200	echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1201	echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1202	echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1203	echo "$(SRCDIR)\fossil.storage.js" >> $@
1204	echo "$(SRCDIR)\fossil.tabs.js" >> $@
1205	echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1206	echo "$(SRCDIR)\graph.js" >> $@
1207	echo "$(SRCDIR)\hbmenu.js" >> $@
1208	echo "$(SRCDIR)\href.js" >> $@
1209	echo "$(SRCDIR)\login.js" >> $@
1210	echo "$(SRCDIR)\markdown.md" >> $@
1211	echo "$(SRCDIR)\menu.js" >> $@
1212	echo "$(SRCDIR)\sbsdiff.js" >> $@
1213	echo "$(SRCDIR)\scroll.js" >> $@
1214	echo "$(SRCDIR)\skin.js" >> $@
1215	echo "$(SRCDIR)\sorttable.js" >> $@
1216	echo "$(SRCDIR)\sounds/0.wav" >> $@
1217	echo "$(SRCDIR)\sounds/1.wav" >> $@
1218	echo "$(SRCDIR)\sounds/2.wav" >> $@
1219	echo "$(SRCDIR)\sounds/3.wav" >> $@
1220	echo "$(SRCDIR)\sounds/4.wav" >> $@
1221	echo "$(SRCDIR)\sounds/5.wav" >> $@
1222	echo "$(SRCDIR)\sounds/6.wav" >> $@
1223	echo "$(SRCDIR)\sounds/7.wav" >> $@
1224	echo "$(SRCDIR)\sounds/8.wav" >> $@
1225	echo "$(SRCDIR)\sounds/9.wav" >> $@
1226	echo "$(SRCDIR)\sounds/a.wav" >> $@
1227	echo "$(SRCDIR)\sounds/b.wav" >> $@
1228	echo "$(SRCDIR)\sounds/c.wav" >> $@
1229	echo "$(SRCDIR)\sounds/d.wav" >> $@
1230	echo "$(SRCDIR)\sounds/e.wav" >> $@
1231	echo "$(SRCDIR)\sounds/f.wav" >> $@
1232	echo "$(SRCDIR)\style.admin_log.css" >> $@
1233	echo "$(SRCDIR)\style.fileedit.css" >> $@
1234	echo "$(SRCDIR)\style.wikiedit.css" >> $@
1235	echo "$(SRCDIR)\tree.js" >> $@
1236	echo "$(SRCDIR)\useredit.js" >> $@
1237	echo "$(SRCDIR)\wiki.wiki" >> $@
1238


1239	{$(SRCDIR)\}.c{$(OX)\}.c:
1240	"$(OBJDIR)\translate$E" $** > $@
1241
1242	{$(OX)}.c{$(OX)}.h :
1243	"$(OBJDIR)\makeheaders$E" $**:$@
1244
1245	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1247


1248	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1249	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1250


1251	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1252	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1253


1254	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1255	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1256


1257	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1258	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1259


1260	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1262


1263	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1264	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1265


1266	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1267	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1268


1269	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1270	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1271


1272	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1273	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1274


1275	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1277


1278	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1279	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1280


1281	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1282	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1283


1284	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1285	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1286


1287	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1288	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1289


1290	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1292


1293	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1294	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1295


1296	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1297	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1298


1299	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1300	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1301


1302	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1303	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1304


1305	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1307


1308	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1309	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1310


1311	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1312	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1313


1314	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1315	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1316


1317	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1318	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1319


1320	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1322


1323	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1324	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1325


1326	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1327	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1328


1329	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1330	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1331


1332	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1333	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1334


1335	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1337


1338	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1339	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1340


1341	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1342	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1343


1344	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1345	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1346


1347	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1348	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1349


1350	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1352


1353	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1354	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1355


1356	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1357	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1358


1359	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1360	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1361


1362	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1363	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1364


1365	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1367


1368	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1369	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1370


1371	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1372	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1373


1374	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1375	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1376


1377	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1378	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1379


1380	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1382


1383	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1384	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1385


1386	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1387	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1388


1389	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1390	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1391


1392	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1393	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1394


1395	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1397


1398	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1399	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1400


1401	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1402	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1403


1404	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1405	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1406


1407	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1408	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1409


1410	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1412


1413	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1414	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1415


1416	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1417	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1418


1419	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1420	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1421


1422	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1423	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1424


1425	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1427


1428	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1429	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1430


1431	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1432	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1433


1434	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1435	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1436


1437	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1438	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1439


1440	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1442


1443	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1444	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1445


1446	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1447	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1448


1449	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1450	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1451


1452	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1453	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1454


1455	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1457


1458	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1459	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1460


1461	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1462	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1463


1464	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1465	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1466


1467	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1468	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1469


1470	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1472


1473	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1474	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1475


1476	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1477	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1478


1479	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1480	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1481


1482	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1483	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1484


1485	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1487


1488	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1489	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1490


1491	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1492	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1493


1494	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1495	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1496


1497	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1498	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1499


1500	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1502


1503	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1504	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1505


1506	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1507	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1508


1509	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1510	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1511


1512	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1513	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1514


1515	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1517


1518	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1519	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1520


1521	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1522	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1523


1524	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1525	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1526


1527	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1528	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1529


1530	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1532


1533	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1534	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1535


1536	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1537	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1538


1539	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1540	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1541


1542	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1543	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1544


1545	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1547


1548	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1549	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1550


1551	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1552	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1553


1554	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1555	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1556


1557	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1558	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1559


1560	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1562


1563	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1564	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1565


1566	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1567	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1568


1569	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1570	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1571


1572	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1573	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1574


1575	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1577


1578	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1579	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1580


1581	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1582	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1583


1584	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1585	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1586


1587	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1588	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1589


1590	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1592


1593	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1594	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1595


1596	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1597	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1598


1599	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1600	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1601


1602	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1603	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1604


1605	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1607


1608	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1609	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1610


1611	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1612	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1613


1614	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1615	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1616


1617	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1618	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1619


1620	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1622


1623	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1624	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1625


1626	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1627	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1628


1629	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1630	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1631


1632	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1633	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1634


1635	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1637


1638	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1639	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1640


1641	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1642	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1643


1644	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1645	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1646


1647	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1648	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1649


1650	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1652


1653	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1654	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1655


1656	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1657	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1658


1659	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1660	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1661


1662	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1663	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1664


1665	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1667


1668	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1669	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1670


1671	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1672	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1673


1674	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1675	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1676


1677	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1678	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1679


1680	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1682


1683	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1684	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1685


1686	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1687	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1688


1689	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1690	$(RCC) /fo $@ $**
1691
1692	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1693	"$(OBJDIR)\makeheaders$E" "$(OX)\add.c":"$(OX)\add.h" \
1694	"$(OX)\ajax.c":"$(OX)\ajax.h" \
1695	"$(OX)\alerts.c":"$(OX)\alerts.h" \
1696	"$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1697	"$(OX)\attach.c":"$(OX)\attach.h" \
1698	"$(OX)\backlink.c":"$(OX)\backlink.h" \
1699	"$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1700	"$(OX)\bag.c":"$(OX)\bag.h" \
1701	"$(OX)\bisect.c":"$(OX)\bisect.h" \
1702	"$(OX)\blob.c":"$(OX)\blob.h" \
1703	"$(OX)\branch.c":"$(OX)\branch.h" \
1704	"$(OX)\browse.c":"$(OX)\browse.h" \
1705	"$(OX)\builtin.c":"$(OX)\builtin.h" \
1706	"$(OX)\bundle.c":"$(OX)\bundle.h" \
1707	"$(OX)\cache.c":"$(OX)\cache.h" \
1708	"$(OX)\capabilities.c":"$(OX)\capabilities.h" \
1709	"$(OX)\captcha.c":"$(OX)\captcha.h" \
1710	"$(OX)\cgi.c":"$(OX)\cgi.h" \
1711	"$(OX)\chat.c":"$(OX)\chat.h" \
1712	"$(OX)\checkin.c":"$(OX)\checkin.h" \
1713	"$(OX)\checkout.c":"$(OX)\checkout.h" \
1714	"$(OX)\clearsign.c":"$(OX)\clearsign.h" \
1715	"$(OX)\clone.c":"$(OX)\clone.h" \
1716	"$(OX)\color.c":"$(OX)\color.h" \
1717	"$(OX)\comformat.c":"$(OX)\comformat.h" \
1718	"$(OX)\configure.c":"$(OX)\configure.h" \
1719	"$(OX)\content.c":"$(OX)\content.h" \
1720	"$(OX)\cookies.c":"$(OX)\cookies.h" \
1721	"$(OX)\db.c":"$(OX)\db.h" \
1722	"$(OX)\delta.c":"$(OX)\delta.h" \
1723	"$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
1724	"$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
1725	"$(OX)\descendants.c":"$(OX)\descendants.h" \
1726	"$(OX)\diff.c":"$(OX)\diff.h" \
1727	"$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
1728	"$(OX)\dispatch.c":"$(OX)\dispatch.h" \
1729	"$(OX)\doc.c":"$(OX)\doc.h" \
1730	"$(OX)\encode.c":"$(OX)\encode.h" \
1731	"$(OX)\etag.c":"$(OX)\etag.h" \
1732	"$(OX)\event.c":"$(OX)\event.h" \
1733	"$(OX)\export.c":"$(OX)\export.h" \
1734	"$(OX)\extcgi.c":"$(OX)\extcgi.h" \
1735	"$(OX)\file.c":"$(OX)\file.h" \
1736	"$(OX)\fileedit.c":"$(OX)\fileedit.h" \
1737	"$(OX)\finfo.c":"$(OX)\finfo.h" \
1738	"$(OX)\foci.c":"$(OX)\foci.h" \
1739	"$(OX)\forum.c":"$(OX)\forum.h" \
1740	"$(OX)\fshell.c":"$(OX)\fshell.h" \
1741	"$(OX)\fusefs.c":"$(OX)\fusefs.h" \
1742	"$(OX)\fuzz.c":"$(OX)\fuzz.h" \
1743	"$(OX)\glob.c":"$(OX)\glob.h" \
1744	"$(OX)\graph.c":"$(OX)\graph.h" \
1745	"$(OX)\gzip.c":"$(OX)\gzip.h" \
1746	"$(OX)\hname.c":"$(OX)\hname.h" \
1747	"$(OX)\hook.c":"$(OX)\hook.h" \
1748	"$(OX)\http.c":"$(OX)\http.h" \
1749	"$(OX)\http_socket.c":"$(OX)\http_socket.h" \
1750	"$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
1751	"$(OX)\http_transport.c":"$(OX)\http_transport.h" \
1752	"$(OX)\import.c":"$(OX)\import.h" \
1753	"$(OX)\info.c":"$(OX)\info.h" \
1754	"$(OX)\interwiki.c":"$(OX)\interwiki.h" \
1755	"$(OX)\json.c":"$(OX)\json.h" \
1756	"$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
1757	"$(OX)\json_branch.c":"$(OX)\json_branch.h" \
1758	"$(OX)\json_config.c":"$(OX)\json_config.h" \
1759	"$(OX)\json_diff.c":"$(OX)\json_diff.h" \
1760	"$(OX)\json_dir.c":"$(OX)\json_dir.h" \
1761	"$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
1762	"$(OX)\json_login.c":"$(OX)\json_login.h" \
1763	"$(OX)\json_query.c":"$(OX)\json_query.h" \
1764	"$(OX)\json_report.c":"$(OX)\json_report.h" \
1765	"$(OX)\json_status.c":"$(OX)\json_status.h" \
1766	"$(OX)\json_tag.c":"$(OX)\json_tag.h" \
1767	"$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
1768	"$(OX)\json_user.c":"$(OX)\json_user.h" \
1769	"$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
1770	"$(OX)\leaf.c":"$(OX)\leaf.h" \
1771	"$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
1772	"$(OX)\login.c":"$(OX)\login.h" \
1773	"$(OX)\lookslike.c":"$(OX)\lookslike.h" \
1774	"$(OX)\main.c":"$(OX)\main.h" \
1775	"$(OX)\manifest.c":"$(OX)\manifest.h" \
1776	"$(OX)\markdown.c":"$(OX)\markdown.h" \
1777	"$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
1778	"$(OX)\md5.c":"$(OX)\md5.h" \
1779	"$(OX)\merge.c":"$(OX)\merge.h" \
1780	"$(OX)\merge3.c":"$(OX)\merge3.h" \
1781	"$(OX)\moderate.c":"$(OX)\moderate.h" \
1782	"$(OX)\name.c":"$(OX)\name.h" \
1783	"$(OX)\path.c":"$(OX)\path.h" \
1784	"$(OX)\piechart.c":"$(OX)\piechart.h" \
1785	"$(OX)\pikchr.c":"$(OX)\pikchr.h" \
1786	"$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
1787	"$(OX)\pivot.c":"$(OX)\pivot.h" \
1788	"$(OX)\popen.c":"$(OX)\popen.h" \
1789	"$(OX)\pqueue.c":"$(OX)\pqueue.h" \
1790	"$(OX)\printf.c":"$(OX)\printf.h" \
1791	"$(OX)\publish.c":"$(OX)\publish.h" \
1792	"$(OX)\purge.c":"$(OX)\purge.h" \
1793	"$(OX)\rebuild.c":"$(OX)\rebuild.h" \
1794	"$(OX)\regexp.c":"$(OX)\regexp.h" \
1795	"$(OX)\repolist.c":"$(OX)\repolist.h" \
1796	"$(OX)\report.c":"$(OX)\report.h" \
1797	"$(OX)\rss.c":"$(OX)\rss.h" \
1798	"$(OX)\schema.c":"$(OX)\schema.h" \
1799	"$(OX)\search.c":"$(OX)\search.h" \
1800	"$(OX)\security_audit.c":"$(OX)\security_audit.h" \
1801	"$(OX)\setup.c":"$(OX)\setup.h" \
1802	"$(OX)\setupuser.c":"$(OX)\setupuser.h" \
1803	"$(OX)\sha1.c":"$(OX)\sha1.h" \
1804	"$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
1805	"$(OX)\sha3.c":"$(OX)\sha3.h" \
1806	"$(OX)\shun.c":"$(OX)\shun.h" \
1807	"$(OX)\sitemap.c":"$(OX)\sitemap.h" \
1808	"$(OX)\skins.c":"$(OX)\skins.h" \
1809	"$(OX)\smtp.c":"$(OX)\smtp.h" \
1810	"$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
1811	"$(OX)\stash.c":"$(OX)\stash.h" \
1812	"$(OX)\stat.c":"$(OX)\stat.h" \
1813	"$(OX)\statrep.c":"$(OX)\statrep.h" \
1814	"$(OX)\style.c":"$(OX)\style.h" \
1815	"$(OX)\sync.c":"$(OX)\sync.h" \
1816	"$(OX)\tag.c":"$(OX)\tag.h" \
1817	"$(OX)\tar.c":"$(OX)\tar.h" \
1818	"$(OX)\terminal.c":"$(OX)\terminal.h" \
1819	"$(OX)\th_main.c":"$(OX)\th_main.h" \
1820	"$(OX)\timeline.c":"$(OX)\timeline.h" \
1821	"$(OX)\tkt.c":"$(OX)\tkt.h" \
1822	"$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
1823	"$(OX)\undo.c":"$(OX)\undo.h" \
1824	"$(OX)\unicode.c":"$(OX)\unicode.h" \
1825	"$(OX)\unversioned.c":"$(OX)\unversioned.h" \
1826	"$(OX)\update.c":"$(OX)\update.h" \
1827	"$(OX)\url.c":"$(OX)\url.h" \
1828	"$(OX)\user.c":"$(OX)\user.h" \
1829	"$(OX)\utf8.c":"$(OX)\utf8.h" \
1830	"$(OX)\util.c":"$(OX)\util.h" \
1831	"$(OX)\verify.c":"$(OX)\verify.h" \
1832	"$(OX)\vfile.c":"$(OX)\vfile.h" \
1833	"$(OX)\webmail.c":"$(OX)\webmail.h" \
1834	"$(OX)\wiki.c":"$(OX)\wiki.h" \
1835	"$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
1836	"$(OX)\winfile.c":"$(OX)\winfile.h" \
1837	"$(OX)\winhttp.c":"$(OX)\winhttp.h" \
1838	"$(OX)\xfer.c":"$(OX)\xfer.h" \
1839	"$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
1840	"$(OX)\zip.c":"$(OX)\zip.h" \
1841	"$(SRCDIR)\sqlite3.h" \
1842	"$(SRCDIR)\th.h" \
1843	"$(OX)\VERSION.h" \
1844	"$(SRCDIR)\cson_amalgamation.h"
1845	@copy /Y nul: $@






1846

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -12,13 +12,17 @@
12	SRCDIR = $(B)\src
13	!if !defined(BUILDDIR) \|\| "$(BUILDDIR)"==""
14	BUILDDIR = Build
15	!message Using default build directory, $(BUILDDIR)
16	!endif
17	# Top of build/staging/object directory subtree
18	T = $(BUILDDIR)
19	# Where object and other intermediate binary files will go
20	OBJDIR = $(T)
21	# Staging area for translated or generated sources
22	OX = $(OBJDIR)
23	# Extensions for this platform
24	O = .obj
25	E = .exe
26	P = .pdb
27
28	!ifndef INSTALLDIR
	@@ -37,20 +41,32 @@
41	#
42	!if !exist("$(B)\.fossil-settings")
43	!error Please specify path to project base directory: B="path/to/fossil"
44	!endif
45
46	# Create build, object and staging directory during preprocessing if needed.
47	!if [if not exist $(BUILDDIR)\. ( echo Creating $(BUILDDIR) && mkdir $(BUILDDIR) )]
48	!endif
49	!if [if not exist $(OBJDIR)\. ( echo Creating $(OBJDIR) && mkdir $(OBJDIR) )]
50	!endif
51	!if [if not exist $(OX)\. ( echo Creating $(OX) && mkdir $(OX) )]
52	!endif
53
54	# Perl is only necessary if OpenSSL support is enabled and it is built from
55	# source code. The PERLDIR environment variable, if it exists, should point
56	# to the directory containing the main Perl executable specified here (i.e.
57	# "perl.exe").
58	!if $(FOSSIL_BUILD_SSL)!=0
59	! if !defined(PERL) && [where PERL.exe > nul 2>&1]
60	PERL = perl.exe
61	!undef PERLDIR
62	! elseif !defined(PERL)
63	! if defined(PERLDIR) && [where $(PERLDIR)\PERL.exe > nul 2>&1]
64	PERL = perl.exe
65	! error To build OpenSSL, "PERL" must be defined to reference a Perl executable.
66	! endif
67	! endif
68	!endif
69
70	# Enable debugging symbols?
71	!ifndef DEBUG
72	DEBUG = 0
	@@ -199,30 +215,30 @@
215	!endif
216
217	!if $(FOSSIL_ENABLE_WINXP)!=0
218	XPCFLAGS = $(XPCFLAGS) /D_WIN32_WINNT=0x0501 /D_USING_V110_SDK71_=1
219	CFLAGS = $(CFLAGS) $(XPCFLAGS)
220	! if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
221	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.02
222	! else
223	XPLDFLAGS = $(XPLDFLAGS) /SUBSYSTEM:CONSOLE,5.01
224	! endif
225	LDFLAGS = $(LDFLAGS) $(XPLDFLAGS)
226	!endif
227
228	!if $(FOSSIL_DYNAMIC_BUILD)!=0
229	! if $(DEBUG)!=0
230	CRTFLAGS = /MDd
231	! else
232	CRTFLAGS = /MD
233	! endif
234	!else
235	! if $(DEBUG)!=0
236	CRTFLAGS = /MTd
237	! else
238	CRTFLAGS = /MT
239	! endif
240	!endif
241
242	!if $(DEBUG)!=0
243	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
244	LDFLAGS = $(LDFLAGS) /DEBUG
	@@ -509,115 +525,117 @@
525	"$(OX)\winhttp.c" \
526	"$(OX)\xfer.c" \
527	"$(OX)\xfersetup.c" \
528	"$(OX)\zip.c"
529
530	EXTRA_FILES = \
531	"$(SRCDIR)\..\skins\ardoise\css.txt" \
532	"$(SRCDIR)\..\skins\ardoise\details.txt" \
533	"$(SRCDIR)\..\skins\ardoise\footer.txt" \
534	"$(SRCDIR)\..\skins\ardoise\header.txt" \
535	"$(SRCDIR)\..\skins\black_and_white\css.txt" \
536	"$(SRCDIR)\..\skins\black_and_white\details.txt" \
537	"$(SRCDIR)\..\skins\black_and_white\footer.txt" \
538	"$(SRCDIR)\..\skins\black_and_white\header.txt" \
539	"$(SRCDIR)\..\skins\blitz\css.txt" \
540	"$(SRCDIR)\..\skins\blitz\details.txt" \
541	"$(SRCDIR)\..\skins\blitz\footer.txt" \
542	"$(SRCDIR)\..\skins\blitz\header.txt" \
543	"$(SRCDIR)\..\skins\blitz\ticket.txt" \
544	"$(SRCDIR)\..\skins\bootstrap\css.txt" \
545	"$(SRCDIR)\..\skins\bootstrap\details.txt" \
546	"$(SRCDIR)\..\skins\bootstrap\footer.txt" \
547	"$(SRCDIR)\..\skins\bootstrap\header.txt" \
548	"$(SRCDIR)\..\skins\darkmode\css.txt" \
549	"$(SRCDIR)\..\skins\darkmode\details.txt" \
550	"$(SRCDIR)\..\skins\darkmode\footer.txt" \
551	"$(SRCDIR)\..\skins\darkmode\header.txt" \
552	"$(SRCDIR)\..\skins\default\css.txt" \
553	"$(SRCDIR)\..\skins\default\details.txt" \
554	"$(SRCDIR)\..\skins\default\footer.txt" \
555	"$(SRCDIR)\..\skins\default\header.txt" \
556	"$(SRCDIR)\..\skins\eagle\css.txt" \
557	"$(SRCDIR)\..\skins\eagle\details.txt" \
558	"$(SRCDIR)\..\skins\eagle\footer.txt" \
559	"$(SRCDIR)\..\skins\eagle\header.txt" \
560	"$(SRCDIR)\..\skins\khaki\css.txt" \
561	"$(SRCDIR)\..\skins\khaki\details.txt" \
562	"$(SRCDIR)\..\skins\khaki\footer.txt" \
563	"$(SRCDIR)\..\skins\khaki\header.txt" \
564	"$(SRCDIR)\..\skins\original\css.txt" \
565	"$(SRCDIR)\..\skins\original\details.txt" \
566	"$(SRCDIR)\..\skins\original\footer.txt" \
567	"$(SRCDIR)\..\skins\original\header.txt" \
568	"$(SRCDIR)\..\skins\plain_gray\css.txt" \
569	"$(SRCDIR)\..\skins\plain_gray\details.txt" \
570	"$(SRCDIR)\..\skins\plain_gray\footer.txt" \
571	"$(SRCDIR)\..\skins\plain_gray\header.txt" \
572	"$(SRCDIR)\..\skins\xekri\css.txt" \
573	"$(SRCDIR)\..\skins\xekri\details.txt" \
574	"$(SRCDIR)\..\skins\xekri\footer.txt" \
575	"$(SRCDIR)\..\skins\xekri\header.txt" \
576	"$(SRCDIR)\accordion.js" \
577	"$(SRCDIR)\alerts\bflat2.wav" \
578	"$(SRCDIR)\alerts\bflat3.wav" \
579	"$(SRCDIR)\alerts\bloop.wav" \
580	"$(SRCDIR)\alerts\plunk.wav" \
581	"$(SRCDIR)\chat.js" \
582	"$(SRCDIR)\ci_edit.js" \
583	"$(SRCDIR)\copybtn.js" \
584	"$(SRCDIR)\default.css" \
585	"$(SRCDIR)\diff.tcl" \
586	"$(SRCDIR)\forum.js" \
587	"$(SRCDIR)\fossil.bootstrap.js" \
588	"$(SRCDIR)\fossil.confirmer.js" \
589	"$(SRCDIR)\fossil.copybutton.js" \
590	"$(SRCDIR)\fossil.dom.js" \
591	"$(SRCDIR)\fossil.fetch.js" \
592	"$(SRCDIR)\fossil.numbered-lines.js" \
593	"$(SRCDIR)\fossil.page.fileedit.js" \
594	"$(SRCDIR)\fossil.page.forumpost.js" \
595	"$(SRCDIR)\fossil.page.pikchrshow.js" \
596	"$(SRCDIR)\fossil.page.wikiedit.js" \
597	"$(SRCDIR)\fossil.pikchr.js" \
598	"$(SRCDIR)\fossil.popupwidget.js" \
599	"$(SRCDIR)\fossil.storage.js" \
600	"$(SRCDIR)\fossil.tabs.js" \
601	"$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \
602	"$(SRCDIR)\graph.js" \
603	"$(SRCDIR)\hbmenu.js" \
604	"$(SRCDIR)\href.js" \
605	"$(SRCDIR)\login.js" \
606	"$(SRCDIR)\markdown.md" \
607	"$(SRCDIR)\menu.js" \
608	"$(SRCDIR)\sbsdiff.js" \
609	"$(SRCDIR)\scroll.js" \
610	"$(SRCDIR)\skin.js" \
611	"$(SRCDIR)\sorttable.js" \
612	"$(SRCDIR)\sounds\0.wav" \
613	"$(SRCDIR)\sounds\1.wav" \
614	"$(SRCDIR)\sounds\2.wav" \
615	"$(SRCDIR)\sounds\3.wav" \
616	"$(SRCDIR)\sounds\4.wav" \
617	"$(SRCDIR)\sounds\5.wav" \
618	"$(SRCDIR)\sounds\6.wav" \
619	"$(SRCDIR)\sounds\7.wav" \
620	"$(SRCDIR)\sounds\8.wav" \
621	"$(SRCDIR)\sounds\9.wav" \
622	"$(SRCDIR)\sounds\a.wav" \
623	"$(SRCDIR)\sounds\b.wav" \
624	"$(SRCDIR)\sounds\c.wav" \
625	"$(SRCDIR)\sounds\d.wav" \
626	"$(SRCDIR)\sounds\e.wav" \
627	"$(SRCDIR)\sounds\f.wav" \
628	"$(SRCDIR)\style.admin_log.css" \
629	"$(SRCDIR)\style.fileedit.css" \
630	"$(SRCDIR)\style.wikiedit.css" \
631	"$(SRCDIR)\tree.js" \
632	"$(SRCDIR)\useredit.js" \
633	"$(SRCDIR)\wiki.wiki"
634
635	OBJ = \
636	"$(OX)\add$O" \
637	"$(OX)\ajax$O" \
638	"$(OX)\alerts$O" \
639	"$(OX)\allrepo$O" \
640	"$(OX)\attach$O" \
641	"$(OX)\backlink$O" \
	@@ -766,15 +784,15 @@
784	"$(OX)\wikiformat$O" \
785	"$(OX)\winfile$O" \
786	"$(OX)\winhttp$O" \
787	"$(OX)\xfer$O" \
788	"$(OX)\xfersetup$O" \
789	"$(OX)\zip$O"
790	!if $(FOSSIL_ENABLE_MINIZ)!=0
791	OBJ = $(OBJ) "$(OX)\miniz$O"
792	!endif
793	OBJ = $(OBJ) "$(OX)\fossil.res"
794
795
796	!ifndef BASEAPPNAME
797	BASEAPPNAME = fossil
798	!endif
	@@ -781,11 +799,11 @@
799
800	APPNAME = $(OX)\$(BASEAPPNAME)$(E)
801	PDBNAME = $(OX)\$(BASEAPPNAME)$(P)
802	APPTARGETS =
803
804	all: "$(OX)" "$(BUILDDIR)" "$(APPNAME)"
805
806	$(BASEAPPNAME): "$(APPNAME)"
807
808	$(BASEAPPNAME)$(E): "$(APPNAME)"
809
	@@ -797,55 +815,49 @@
815	echo F \| xcopy /Y "$(APPNAME)" "$(INSTALLDIR)"
816	!if $(DEBUG)!=0
817	echo F \| xcopy /Y "$(PDBNAME)" "$(INSTALLDIR)"
818	!endif
819
820	ZLIB_X = "$(OX)\zlib_built"







821	!if $(FOSSIL_BUILD_ZLIB)
822	zlib $(ZLIB_X):
823	@echo Building zlib from "$(ZLIBDIR)"...
824	!if $(FOSSIL_ENABLE_WINXP)!=0
825	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) "CC=cl $(XPCFLAGS)" "LD=link $(XPLDFLAGS)" && popd
826	!else
827	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
828	!endif
829	cmd /E:ON /c date /T > $(ZLIB_X)
830
831	clean-zlib:
832	@pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc clean && popd
833	!endif
834
835	!if $(FOSSIL_ENABLE_SSL)!=0
836	OPENSSL_X = "$(OX)\openssl.opts"
837	openssl $(OPENSSL_X):
838	@echo Building OpenSSL from "$(SSLDIR)"...
839	! ifdef PERLDIR
840	@pushd "$(SSLDIR)" && "$(PERLDIR)\$(PERL)" Configure $(SSLCONFIG) && popd
841	! else
842	@pushd "$(SSLDIR)" && "$(PERL)" Configure $(SSLCONFIG) && popd
843	! endif
844	! if $(FOSSIL_ENABLE_WINXP)!=0
845	@pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
846	! else
847	@pushd "$(SSLDIR)" && $(MAKE) && popd
848	! endif
849	echo Config used: $(SSLCONFIG) > $(OPENSSL_X)
850	cmd /E:ON /c date /T >> $(OPENSSL_X)
851
852	clean-openssl:
853	@pushd "$(SSLDIR)" && $(MAKE) clean && popd
854	-del $(OPENSSL_X)
855
856	! if $(FOSSIL_BUILD_SSL)!=0
857	APPTARGETS = $(APPTARGETS) $(OPENSSL_X)
858	! endif
859
860	!endif
861
862	!if $(FOSSIL_ENABLE_MINIZ)==0 && $(FOSSIL_BUILD_ZLIB)!=0
863	APPTARGETS = $(APPTARGETS) $(ZLIB_X)
	@@ -1016,30 +1028,15 @@
1028	echo "$(OX)\miniz.obj" >> $@
1029	!endif
1030	echo $(LIBS) >> $@
1031
1032
1033	{$(SRCDIR)/}.c{$(OBJDIR)/}$E:
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	# This target gets the project tools built.
1037	toolset: "$(OBJDIR)\translate$E" "$(OBJDIR)\makeheaders$E" "$(OBJDIR)\mkindex$E" "$(OBJDIR)\mkbuiltin$E" "$(OBJDIR)\mkversion$E" "$(OBJDIR)\codecheck1$E"















1038
1039	!if $(USE_SEE)!=0
1040	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1041	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1042	SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
	@@ -1130,716 +1127,1016 @@
1127	"$(OBJDIR)\json_timeline$O" : "$(SRCDIR)\json_detail.h"
1128	"$(OBJDIR)\json_user$O" : "$(SRCDIR)\json_detail.h"
1129	"$(OBJDIR)\json_wiki$O" : "$(SRCDIR)\json_detail.h"
1130
1131	"$(OX)\builtin_data.reslist": $(EXTRA_FILES) "$(B)\win\Makefile.msc"
1132	-echo. > $@
1133	@echo "$(SRCDIR)\../skins/ardoise/css.txt" >> $@
1134	@echo "$(SRCDIR)\../skins/ardoise/details.txt" >> $@
1135	@echo "$(SRCDIR)\../skins/ardoise/footer.txt" >> $@
1136	@echo "$(SRCDIR)\../skins/ardoise/header.txt" >> $@
1137	@echo "$(SRCDIR)\../skins/black_and_white/css.txt" >> $@
1138	@echo "$(SRCDIR)\../skins/black_and_white/details.txt" >> $@
1139	@echo "$(SRCDIR)\../skins/black_and_white/footer.txt" >> $@
1140	@echo "$(SRCDIR)\../skins/black_and_white/header.txt" >> $@
1141	@echo "$(SRCDIR)\../skins/blitz/css.txt" >> $@
1142	@echo "$(SRCDIR)\../skins/blitz/details.txt" >> $@
1143	@echo "$(SRCDIR)\../skins/blitz/footer.txt" >> $@
1144	@echo "$(SRCDIR)\../skins/blitz/header.txt" >> $@
1145	@echo "$(SRCDIR)\../skins/blitz/ticket.txt" >> $@
1146	@echo "$(SRCDIR)\../skins/bootstrap/css.txt" >> $@
1147	@echo "$(SRCDIR)\../skins/bootstrap/details.txt" >> $@
1148	@echo "$(SRCDIR)\../skins/bootstrap/footer.txt" >> $@
1149	@echo "$(SRCDIR)\../skins/bootstrap/header.txt" >> $@
1150	@echo "$(SRCDIR)\../skins/darkmode/css.txt" >> $@
1151	@echo "$(SRCDIR)\../skins/darkmode/details.txt" >> $@
1152	@echo "$(SRCDIR)\../skins/darkmode/footer.txt" >> $@
1153	@echo "$(SRCDIR)\../skins/darkmode/header.txt" >> $@
1154	@echo "$(SRCDIR)\../skins/default/css.txt" >> $@
1155	@echo "$(SRCDIR)\../skins/default/details.txt" >> $@
1156	@echo "$(SRCDIR)\../skins/default/footer.txt" >> $@
1157	@echo "$(SRCDIR)\../skins/default/header.txt" >> $@
1158	@echo "$(SRCDIR)\../skins/eagle/css.txt" >> $@
1159	@echo "$(SRCDIR)\../skins/eagle/details.txt" >> $@
1160	@echo "$(SRCDIR)\../skins/eagle/footer.txt" >> $@
1161	@echo "$(SRCDIR)\../skins/eagle/header.txt" >> $@
1162	@echo "$(SRCDIR)\../skins/khaki/css.txt" >> $@
1163	@echo "$(SRCDIR)\../skins/khaki/details.txt" >> $@
1164	@echo "$(SRCDIR)\../skins/khaki/footer.txt" >> $@
1165	@echo "$(SRCDIR)\../skins/khaki/header.txt" >> $@
1166	@echo "$(SRCDIR)\../skins/original/css.txt" >> $@
1167	@echo "$(SRCDIR)\../skins/original/details.txt" >> $@
1168	@echo "$(SRCDIR)\../skins/original/footer.txt" >> $@
1169	@echo "$(SRCDIR)\../skins/original/header.txt" >> $@
1170	@echo "$(SRCDIR)\../skins/plain_gray/css.txt" >> $@
1171	@echo "$(SRCDIR)\../skins/plain_gray/details.txt" >> $@
1172	@echo "$(SRCDIR)\../skins/plain_gray/footer.txt" >> $@
1173	@echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@
1174	@echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@
1175	@echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@
1176	@echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@
1177	@echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@
1178	@echo "$(SRCDIR)\accordion.js" >> $@
1179	@echo "$(SRCDIR)\alerts/bflat2.wav" >> $@
1180	@echo "$(SRCDIR)\alerts/bflat3.wav" >> $@
1181	@echo "$(SRCDIR)\alerts/bloop.wav" >> $@
1182	@echo "$(SRCDIR)\alerts/plunk.wav" >> $@
1183	@echo "$(SRCDIR)\chat.js" >> $@
1184	@echo "$(SRCDIR)\ci_edit.js" >> $@
1185	@echo "$(SRCDIR)\copybtn.js" >> $@
1186	@echo "$(SRCDIR)\default.css" >> $@
1187	@echo "$(SRCDIR)\diff.tcl" >> $@
1188	@echo "$(SRCDIR)\forum.js" >> $@
1189	@echo "$(SRCDIR)\fossil.bootstrap.js" >> $@
1190	@echo "$(SRCDIR)\fossil.confirmer.js" >> $@
1191	@echo "$(SRCDIR)\fossil.copybutton.js" >> $@
1192	@echo "$(SRCDIR)\fossil.dom.js" >> $@
1193	@echo "$(SRCDIR)\fossil.fetch.js" >> $@
1194	@echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@
1195	@echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@
1196	@echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@
1197	@echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@
1198	@echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@
1199	@echo "$(SRCDIR)\fossil.pikchr.js" >> $@
1200	@echo "$(SRCDIR)\fossil.popupwidget.js" >> $@
1201	@echo "$(SRCDIR)\fossil.storage.js" >> $@
1202	@echo "$(SRCDIR)\fossil.tabs.js" >> $@
1203	@echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@
1204	@echo "$(SRCDIR)\graph.js" >> $@
1205	@echo "$(SRCDIR)\hbmenu.js" >> $@
1206	@echo "$(SRCDIR)\href.js" >> $@
1207	@echo "$(SRCDIR)\login.js" >> $@
1208	@echo "$(SRCDIR)\markdown.md" >> $@
1209	@echo "$(SRCDIR)\menu.js" >> $@
1210	@echo "$(SRCDIR)\sbsdiff.js" >> $@
1211	@echo "$(SRCDIR)\scroll.js" >> $@
1212	@echo "$(SRCDIR)\skin.js" >> $@
1213	@echo "$(SRCDIR)\sorttable.js" >> $@
1214	@echo "$(SRCDIR)\sounds/0.wav" >> $@
1215	@echo "$(SRCDIR)\sounds/1.wav" >> $@
1216	@echo "$(SRCDIR)\sounds/2.wav" >> $@
1217	@echo "$(SRCDIR)\sounds/3.wav" >> $@
1218	@echo "$(SRCDIR)\sounds/4.wav" >> $@
1219	@echo "$(SRCDIR)\sounds/5.wav" >> $@
1220	@echo "$(SRCDIR)\sounds/6.wav" >> $@
1221	@echo "$(SRCDIR)\sounds/7.wav" >> $@
1222	@echo "$(SRCDIR)\sounds/8.wav" >> $@
1223	@echo "$(SRCDIR)\sounds/9.wav" >> $@
1224	@echo "$(SRCDIR)\sounds/a.wav" >> $@
1225	@echo "$(SRCDIR)\sounds/b.wav" >> $@
1226	@echo "$(SRCDIR)\sounds/c.wav" >> $@
1227	@echo "$(SRCDIR)\sounds/d.wav" >> $@
1228	@echo "$(SRCDIR)\sounds/e.wav" >> $@
1229	@echo "$(SRCDIR)\sounds/f.wav" >> $@
1230	@echo "$(SRCDIR)\style.admin_log.css" >> $@
1231	@echo "$(SRCDIR)\style.fileedit.css" >> $@
1232	@echo "$(SRCDIR)\style.wikiedit.css" >> $@
1233	@echo "$(SRCDIR)\tree.js" >> $@
1234	@echo "$(SRCDIR)\useredit.js" >> $@
1235	@echo "$(SRCDIR)\wiki.wiki" >> $@
1236	{$(OX)\}.c{$(OX)\}.h:
1237	"$(OBJDIR)\makeheaders$E" $**:$@
1238	{$(SRCDIR)\}.c{$(OX)\}.c:
1239	"$(OBJDIR)\translate$E" $** > $@




1240	"$(OX)\add$O" : "$(OX)\add.c" "$(OX)\add.h"
1241	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add.c"
1242
1243	"$(OX)\add.c" : "$(SRCDIR)\add.c"
1244	"$(OX)\add.h" : "$(OX)\add.c"
1245	"$(OX)\ajax$O" : "$(OX)\ajax.c" "$(OX)\ajax.h"
1246	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\ajax.c"
1247
1248	"$(OX)\ajax.c" : "$(SRCDIR)\ajax.c"
1249	"$(OX)\ajax.h" : "$(OX)\ajax.c"
1250	"$(OX)\alerts$O" : "$(OX)\alerts.c" "$(OX)\alerts.h"
1251	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\alerts.c"
1252
1253	"$(OX)\alerts.c" : "$(SRCDIR)\alerts.c"
1254	"$(OX)\alerts.h" : "$(OX)\alerts.c"
1255	"$(OX)\allrepo$O" : "$(OX)\allrepo.c" "$(OX)\allrepo.h"
1256	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\allrepo.c"
1257
1258	"$(OX)\allrepo.c" : "$(SRCDIR)\allrepo.c"
1259	"$(OX)\allrepo.h" : "$(OX)\allrepo.c"
1260	"$(OX)\attach$O" : "$(OX)\attach.c" "$(OX)\attach.h"
1261	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\attach.c"
1262
1263	"$(OX)\attach.c" : "$(SRCDIR)\attach.c"
1264	"$(OX)\attach.h" : "$(OX)\attach.c"
1265	"$(OX)\backlink$O" : "$(OX)\backlink.c" "$(OX)\backlink.h"
1266	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backlink.c"
1267
1268	"$(OX)\backlink.c" : "$(SRCDIR)\backlink.c"
1269	"$(OX)\backlink.h" : "$(OX)\backlink.c"
1270	"$(OX)\backoffice$O" : "$(OX)\backoffice.c" "$(OX)\backoffice.h"
1271	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\backoffice.c"
1272
1273	"$(OX)\backoffice.c" : "$(SRCDIR)\backoffice.c"
1274	"$(OX)\backoffice.h" : "$(OX)\backoffice.c"
1275	"$(OX)\bag$O" : "$(OX)\bag.c" "$(OX)\bag.h"
1276	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bag.c"
1277
1278	"$(OX)\bag.c" : "$(SRCDIR)\bag.c"
1279	"$(OX)\bag.h" : "$(OX)\bag.c"
1280	"$(OX)\bisect$O" : "$(OX)\bisect.c" "$(OX)\bisect.h"
1281	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bisect.c"
1282
1283	"$(OX)\bisect.c" : "$(SRCDIR)\bisect.c"
1284	"$(OX)\bisect.h" : "$(OX)\bisect.c"
1285	"$(OX)\blob$O" : "$(OX)\blob.c" "$(OX)\blob.h"
1286	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\blob.c"
1287
1288	"$(OX)\blob.c" : "$(SRCDIR)\blob.c"
1289	"$(OX)\blob.h" : "$(OX)\blob.c"
1290	"$(OX)\branch$O" : "$(OX)\branch.c" "$(OX)\branch.h"
1291	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\branch.c"
1292
1293	"$(OX)\branch.c" : "$(SRCDIR)\branch.c"
1294	"$(OX)\branch.h" : "$(OX)\branch.c"
1295	"$(OX)\browse$O" : "$(OX)\browse.c" "$(OX)\browse.h"
1296	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\browse.c"
1297
1298	"$(OX)\browse.c" : "$(SRCDIR)\browse.c"
1299	"$(OX)\browse.h" : "$(OX)\browse.c"
1300	"$(OX)\builtin$O" : "$(OX)\builtin.c" "$(OX)\builtin.h"
1301	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\builtin.c"
1302
1303	"$(OX)\builtin.c" : "$(SRCDIR)\builtin.c"
1304	"$(OX)\builtin.h" : "$(OX)\builtin.c"
1305	"$(OX)\bundle$O" : "$(OX)\bundle.c" "$(OX)\bundle.h"
1306	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\bundle.c"
1307
1308	"$(OX)\bundle.c" : "$(SRCDIR)\bundle.c"
1309	"$(OX)\bundle.h" : "$(OX)\bundle.c"
1310	"$(OX)\cache$O" : "$(OX)\cache.c" "$(OX)\cache.h"
1311	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cache.c"
1312
1313	"$(OX)\cache.c" : "$(SRCDIR)\cache.c"
1314	"$(OX)\cache.h" : "$(OX)\cache.c"
1315	"$(OX)\capabilities$O" : "$(OX)\capabilities.c" "$(OX)\capabilities.h"
1316	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\capabilities.c"
1317
1318	"$(OX)\capabilities.c" : "$(SRCDIR)\capabilities.c"
1319	"$(OX)\capabilities.h" : "$(OX)\capabilities.c"
1320	"$(OX)\captcha$O" : "$(OX)\captcha.c" "$(OX)\captcha.h"
1321	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\captcha.c"
1322
1323	"$(OX)\captcha.c" : "$(SRCDIR)\captcha.c"
1324	"$(OX)\captcha.h" : "$(OX)\captcha.c"
1325	"$(OX)\cgi$O" : "$(OX)\cgi.c" "$(OX)\cgi.h"
1326	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cgi.c"
1327
1328	"$(OX)\cgi.c" : "$(SRCDIR)\cgi.c"
1329	"$(OX)\cgi.h" : "$(OX)\cgi.c"
1330	"$(OX)\chat$O" : "$(OX)\chat.c" "$(OX)\chat.h"
1331	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\chat.c"
1332
1333	"$(OX)\chat.c" : "$(SRCDIR)\chat.c"
1334	"$(OX)\chat.h" : "$(OX)\chat.c"
1335	"$(OX)\checkin$O" : "$(OX)\checkin.c" "$(OX)\checkin.h"
1336	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkin.c"
1337
1338	"$(OX)\checkin.c" : "$(SRCDIR)\checkin.c"
1339	"$(OX)\checkin.h" : "$(OX)\checkin.c"
1340	"$(OX)\checkout$O" : "$(OX)\checkout.c" "$(OX)\checkout.h"
1341	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\checkout.c"
1342
1343	"$(OX)\checkout.c" : "$(SRCDIR)\checkout.c"
1344	"$(OX)\checkout.h" : "$(OX)\checkout.c"
1345	"$(OX)\clearsign$O" : "$(OX)\clearsign.c" "$(OX)\clearsign.h"
1346	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clearsign.c"
1347
1348	"$(OX)\clearsign.c" : "$(SRCDIR)\clearsign.c"
1349	"$(OX)\clearsign.h" : "$(OX)\clearsign.c"
1350	"$(OX)\clone$O" : "$(OX)\clone.c" "$(OX)\clone.h"
1351	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\clone.c"
1352
1353	"$(OX)\clone.c" : "$(SRCDIR)\clone.c"
1354	"$(OX)\clone.h" : "$(OX)\clone.c"
1355	"$(OX)\color$O" : "$(OX)\color.c" "$(OX)\color.h"
1356	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\color.c"
1357
1358	"$(OX)\color.c" : "$(SRCDIR)\color.c"
1359	"$(OX)\color.h" : "$(OX)\color.c"
1360	"$(OX)\comformat$O" : "$(OX)\comformat.c" "$(OX)\comformat.h"
1361	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\comformat.c"
1362
1363	"$(OX)\comformat.c" : "$(SRCDIR)\comformat.c"
1364	"$(OX)\comformat.h" : "$(OX)\comformat.c"
1365	"$(OX)\configure$O" : "$(OX)\configure.c" "$(OX)\configure.h"
1366	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\configure.c"
1367
1368	"$(OX)\configure.c" : "$(SRCDIR)\configure.c"
1369	"$(OX)\configure.h" : "$(OX)\configure.c"
1370	"$(OX)\content$O" : "$(OX)\content.c" "$(OX)\content.h"
1371	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\content.c"
1372
1373	"$(OX)\content.c" : "$(SRCDIR)\content.c"
1374	"$(OX)\content.h" : "$(OX)\content.c"
1375	"$(OX)\cookies$O" : "$(OX)\cookies.c" "$(OX)\cookies.h"
1376	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\cookies.c"
1377
1378	"$(OX)\cookies.c" : "$(SRCDIR)\cookies.c"
1379	"$(OX)\cookies.h" : "$(OX)\cookies.c"
1380	"$(OX)\db$O" : "$(OX)\db.c" "$(OX)\db.h"
1381	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\db.c"
1382
1383	"$(OX)\db.c" : "$(SRCDIR)\db.c"
1384	"$(OX)\db.h" : "$(OX)\db.c"
1385	"$(OX)\delta$O" : "$(OX)\delta.c" "$(OX)\delta.h"
1386	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\delta.c"
1387
1388	"$(OX)\delta.c" : "$(SRCDIR)\delta.c"
1389	"$(OX)\delta.h" : "$(OX)\delta.c"
1390	"$(OX)\deltacmd$O" : "$(OX)\deltacmd.c" "$(OX)\deltacmd.h"
1391	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltacmd.c"
1392
1393	"$(OX)\deltacmd.c" : "$(SRCDIR)\deltacmd.c"
1394	"$(OX)\deltacmd.h" : "$(OX)\deltacmd.c"
1395	"$(OX)\deltafunc$O" : "$(OX)\deltafunc.c" "$(OX)\deltafunc.h"
1396	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\deltafunc.c"
1397
1398	"$(OX)\deltafunc.c" : "$(SRCDIR)\deltafunc.c"
1399	"$(OX)\deltafunc.h" : "$(OX)\deltafunc.c"
1400	"$(OX)\descendants$O" : "$(OX)\descendants.c" "$(OX)\descendants.h"
1401	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\descendants.c"
1402
1403	"$(OX)\descendants.c" : "$(SRCDIR)\descendants.c"
1404	"$(OX)\descendants.h" : "$(OX)\descendants.c"
1405	"$(OX)\diff$O" : "$(OX)\diff.c" "$(OX)\diff.h"
1406	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diff.c"
1407
1408	"$(OX)\diff.c" : "$(SRCDIR)\diff.c"
1409	"$(OX)\diff.h" : "$(OX)\diff.c"
1410	"$(OX)\diffcmd$O" : "$(OX)\diffcmd.c" "$(OX)\diffcmd.h"
1411	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\diffcmd.c"
1412
1413	"$(OX)\diffcmd.c" : "$(SRCDIR)\diffcmd.c"
1414	"$(OX)\diffcmd.h" : "$(OX)\diffcmd.c"
1415	"$(OX)\dispatch$O" : "$(OX)\dispatch.c" "$(OX)\dispatch.h"
1416	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\dispatch.c"
1417
1418	"$(OX)\dispatch.c" : "$(SRCDIR)\dispatch.c"
1419	"$(OX)\dispatch.h" : "$(OX)\dispatch.c"
1420	"$(OX)\doc$O" : "$(OX)\doc.c" "$(OX)\doc.h"
1421	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\doc.c"
1422
1423	"$(OX)\doc.c" : "$(SRCDIR)\doc.c"
1424	"$(OX)\doc.h" : "$(OX)\doc.c"
1425	"$(OX)\encode$O" : "$(OX)\encode.c" "$(OX)\encode.h"
1426	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\encode.c"
1427
1428	"$(OX)\encode.c" : "$(SRCDIR)\encode.c"
1429	"$(OX)\encode.h" : "$(OX)\encode.c"
1430	"$(OX)\etag$O" : "$(OX)\etag.c" "$(OX)\etag.h"
1431	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\etag.c"
1432
1433	"$(OX)\etag.c" : "$(SRCDIR)\etag.c"
1434	"$(OX)\etag.h" : "$(OX)\etag.c"
1435	"$(OX)\event$O" : "$(OX)\event.c" "$(OX)\event.h"
1436	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\event.c"
1437
1438	"$(OX)\event.c" : "$(SRCDIR)\event.c"
1439	"$(OX)\event.h" : "$(OX)\event.c"
1440	"$(OX)\export$O" : "$(OX)\export.c" "$(OX)\export.h"
1441	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\export.c"
1442
1443	"$(OX)\export.c" : "$(SRCDIR)\export.c"
1444	"$(OX)\export.h" : "$(OX)\export.c"
1445	"$(OX)\extcgi$O" : "$(OX)\extcgi.c" "$(OX)\extcgi.h"
1446	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\extcgi.c"
1447
1448	"$(OX)\extcgi.c" : "$(SRCDIR)\extcgi.c"
1449	"$(OX)\extcgi.h" : "$(OX)\extcgi.c"
1450	"$(OX)\file$O" : "$(OX)\file.c" "$(OX)\file.h"
1451	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\file.c"
1452
1453	"$(OX)\file.c" : "$(SRCDIR)\file.c"
1454	"$(OX)\file.h" : "$(OX)\file.c"
1455	"$(OX)\fileedit$O" : "$(OX)\fileedit.c" "$(OX)\fileedit.h"
1456	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fileedit.c"
1457
1458	"$(OX)\fileedit.c" : "$(SRCDIR)\fileedit.c"
1459	"$(OX)\fileedit.h" : "$(OX)\fileedit.c"
1460	"$(OX)\finfo$O" : "$(OX)\finfo.c" "$(OX)\finfo.h"
1461	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\finfo.c"
1462
1463	"$(OX)\finfo.c" : "$(SRCDIR)\finfo.c"
1464	"$(OX)\finfo.h" : "$(OX)\finfo.c"
1465	"$(OX)\foci$O" : "$(OX)\foci.c" "$(OX)\foci.h"
1466	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\foci.c"
1467
1468	"$(OX)\foci.c" : "$(SRCDIR)\foci.c"
1469	"$(OX)\foci.h" : "$(OX)\foci.c"
1470	"$(OX)\forum$O" : "$(OX)\forum.c" "$(OX)\forum.h"
1471	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\forum.c"
1472
1473	"$(OX)\forum.c" : "$(SRCDIR)\forum.c"
1474	"$(OX)\forum.h" : "$(OX)\forum.c"
1475	"$(OX)\fshell$O" : "$(OX)\fshell.c" "$(OX)\fshell.h"
1476	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fshell.c"
1477
1478	"$(OX)\fshell.c" : "$(SRCDIR)\fshell.c"
1479	"$(OX)\fshell.h" : "$(OX)\fshell.c"
1480	"$(OX)\fusefs$O" : "$(OX)\fusefs.c" "$(OX)\fusefs.h"
1481	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fusefs.c"
1482
1483	"$(OX)\fusefs.c" : "$(SRCDIR)\fusefs.c"
1484	"$(OX)\fusefs.h" : "$(OX)\fusefs.c"
1485	"$(OX)\fuzz$O" : "$(OX)\fuzz.c" "$(OX)\fuzz.h"
1486	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\fuzz.c"
1487
1488	"$(OX)\fuzz.c" : "$(SRCDIR)\fuzz.c"
1489	"$(OX)\fuzz.h" : "$(OX)\fuzz.c"
1490	"$(OX)\glob$O" : "$(OX)\glob.c" "$(OX)\glob.h"
1491	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\glob.c"
1492
1493	"$(OX)\glob.c" : "$(SRCDIR)\glob.c"
1494	"$(OX)\glob.h" : "$(OX)\glob.c"
1495	"$(OX)\graph$O" : "$(OX)\graph.c" "$(OX)\graph.h"
1496	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\graph.c"
1497
1498	"$(OX)\graph.c" : "$(SRCDIR)\graph.c"
1499	"$(OX)\graph.h" : "$(OX)\graph.c"
1500	"$(OX)\gzip$O" : "$(OX)\gzip.c" "$(OX)\gzip.h"
1501	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\gzip.c"
1502
1503	"$(OX)\gzip.c" : "$(SRCDIR)\gzip.c"
1504	"$(OX)\gzip.h" : "$(OX)\gzip.c"
1505	"$(OX)\hname$O" : "$(OX)\hname.c" "$(OX)\hname.h"
1506	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hname.c"
1507
1508	"$(OX)\hname.c" : "$(SRCDIR)\hname.c"
1509	"$(OX)\hname.h" : "$(OX)\hname.c"
1510	"$(OX)\hook$O" : "$(OX)\hook.c" "$(OX)\hook.h"
1511	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\hook.c"
1512
1513	"$(OX)\hook.c" : "$(SRCDIR)\hook.c"
1514	"$(OX)\hook.h" : "$(OX)\hook.c"
1515	"$(OX)\http$O" : "$(OX)\http.c" "$(OX)\http.h"
1516	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http.c"
1517
1518	"$(OX)\http.c" : "$(SRCDIR)\http.c"
1519	"$(OX)\http.h" : "$(OX)\http.c"
1520	"$(OX)\http_socket$O" : "$(OX)\http_socket.c" "$(OX)\http_socket.h"
1521	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_socket.c"
1522
1523	"$(OX)\http_socket.c" : "$(SRCDIR)\http_socket.c"
1524	"$(OX)\http_socket.h" : "$(OX)\http_socket.c"
1525	"$(OX)\http_ssl$O" : "$(OX)\http_ssl.c" "$(OX)\http_ssl.h"
1526	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_ssl.c"
1527
1528	"$(OX)\http_ssl.c" : "$(SRCDIR)\http_ssl.c"
1529	"$(OX)\http_ssl.h" : "$(OX)\http_ssl.c"
1530	"$(OX)\http_transport$O" : "$(OX)\http_transport.c" "$(OX)\http_transport.h"
1531	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\http_transport.c"
1532
1533	"$(OX)\http_transport.c" : "$(SRCDIR)\http_transport.c"
1534	"$(OX)\http_transport.h" : "$(OX)\http_transport.c"
1535	"$(OX)\import$O" : "$(OX)\import.c" "$(OX)\import.h"
1536	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\import.c"
1537
1538	"$(OX)\import.c" : "$(SRCDIR)\import.c"
1539	"$(OX)\import.h" : "$(OX)\import.c"
1540	"$(OX)\info$O" : "$(OX)\info.c" "$(OX)\info.h"
1541	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\info.c"
1542
1543	"$(OX)\info.c" : "$(SRCDIR)\info.c"
1544	"$(OX)\info.h" : "$(OX)\info.c"
1545	"$(OX)\interwiki$O" : "$(OX)\interwiki.c" "$(OX)\interwiki.h"
1546	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\interwiki.c"
1547
1548	"$(OX)\interwiki.c" : "$(SRCDIR)\interwiki.c"
1549	"$(OX)\interwiki.h" : "$(OX)\interwiki.c"
1550	"$(OX)\json$O" : "$(OX)\json.c" "$(OX)\json.h"
1551	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json.c"
1552
1553	"$(OX)\json.c" : "$(SRCDIR)\json.c"
1554	"$(OX)\json.h" : "$(OX)\json.c"
1555	"$(OX)\json_artifact$O" : "$(OX)\json_artifact.c" "$(OX)\json_artifact.h"
1556	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_artifact.c"
1557
1558	"$(OX)\json_artifact.c" : "$(SRCDIR)\json_artifact.c"
1559	"$(OX)\json_artifact.h" : "$(OX)\json_artifact.c"
1560	"$(OX)\json_branch$O" : "$(OX)\json_branch.c" "$(OX)\json_branch.h"
1561	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_branch.c"
1562
1563	"$(OX)\json_branch.c" : "$(SRCDIR)\json_branch.c"
1564	"$(OX)\json_branch.h" : "$(OX)\json_branch.c"
1565	"$(OX)\json_config$O" : "$(OX)\json_config.c" "$(OX)\json_config.h"
1566	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_config.c"
1567
1568	"$(OX)\json_config.c" : "$(SRCDIR)\json_config.c"
1569	"$(OX)\json_config.h" : "$(OX)\json_config.c"
1570	"$(OX)\json_diff$O" : "$(OX)\json_diff.c" "$(OX)\json_diff.h"
1571	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_diff.c"
1572
1573	"$(OX)\json_diff.c" : "$(SRCDIR)\json_diff.c"
1574	"$(OX)\json_diff.h" : "$(OX)\json_diff.c"
1575	"$(OX)\json_dir$O" : "$(OX)\json_dir.c" "$(OX)\json_dir.h"
1576	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_dir.c"
1577
1578	"$(OX)\json_dir.c" : "$(SRCDIR)\json_dir.c"
1579	"$(OX)\json_dir.h" : "$(OX)\json_dir.c"
1580	"$(OX)\json_finfo$O" : "$(OX)\json_finfo.c" "$(OX)\json_finfo.h"
1581	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_finfo.c"
1582
1583	"$(OX)\json_finfo.c" : "$(SRCDIR)\json_finfo.c"
1584	"$(OX)\json_finfo.h" : "$(OX)\json_finfo.c"
1585	"$(OX)\json_login$O" : "$(OX)\json_login.c" "$(OX)\json_login.h"
1586	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_login.c"
1587
1588	"$(OX)\json_login.c" : "$(SRCDIR)\json_login.c"
1589	"$(OX)\json_login.h" : "$(OX)\json_login.c"
1590	"$(OX)\json_query$O" : "$(OX)\json_query.c" "$(OX)\json_query.h"
1591	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_query.c"
1592
1593	"$(OX)\json_query.c" : "$(SRCDIR)\json_query.c"
1594	"$(OX)\json_query.h" : "$(OX)\json_query.c"
1595	"$(OX)\json_report$O" : "$(OX)\json_report.c" "$(OX)\json_report.h"
1596	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_report.c"
1597
1598	"$(OX)\json_report.c" : "$(SRCDIR)\json_report.c"
1599	"$(OX)\json_report.h" : "$(OX)\json_report.c"
1600	"$(OX)\json_status$O" : "$(OX)\json_status.c" "$(OX)\json_status.h"
1601	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_status.c"
1602
1603	"$(OX)\json_status.c" : "$(SRCDIR)\json_status.c"
1604	"$(OX)\json_status.h" : "$(OX)\json_status.c"
1605	"$(OX)\json_tag$O" : "$(OX)\json_tag.c" "$(OX)\json_tag.h"
1606	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_tag.c"
1607
1608	"$(OX)\json_tag.c" : "$(SRCDIR)\json_tag.c"
1609	"$(OX)\json_tag.h" : "$(OX)\json_tag.c"
1610	"$(OX)\json_timeline$O" : "$(OX)\json_timeline.c" "$(OX)\json_timeline.h"
1611	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_timeline.c"
1612
1613	"$(OX)\json_timeline.c" : "$(SRCDIR)\json_timeline.c"
1614	"$(OX)\json_timeline.h" : "$(OX)\json_timeline.c"
1615	"$(OX)\json_user$O" : "$(OX)\json_user.c" "$(OX)\json_user.h"
1616	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_user.c"
1617
1618	"$(OX)\json_user.c" : "$(SRCDIR)\json_user.c"
1619	"$(OX)\json_user.h" : "$(OX)\json_user.c"
1620	"$(OX)\json_wiki$O" : "$(OX)\json_wiki.c" "$(OX)\json_wiki.h"
1621	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\json_wiki.c"
1622
1623	"$(OX)\json_wiki.c" : "$(SRCDIR)\json_wiki.c"
1624	"$(OX)\json_wiki.h" : "$(OX)\json_wiki.c"
1625	"$(OX)\leaf$O" : "$(OX)\leaf.c" "$(OX)\leaf.h"
1626	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\leaf.c"
1627
1628	"$(OX)\leaf.c" : "$(SRCDIR)\leaf.c"
1629	"$(OX)\leaf.h" : "$(OX)\leaf.c"
1630	"$(OX)\loadctrl$O" : "$(OX)\loadctrl.c" "$(OX)\loadctrl.h"
1631	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\loadctrl.c"
1632
1633	"$(OX)\loadctrl.c" : "$(SRCDIR)\loadctrl.c"
1634	"$(OX)\loadctrl.h" : "$(OX)\loadctrl.c"
1635	"$(OX)\login$O" : "$(OX)\login.c" "$(OX)\login.h"
1636	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\login.c"
1637
1638	"$(OX)\login.c" : "$(SRCDIR)\login.c"
1639	"$(OX)\login.h" : "$(OX)\login.c"
1640	"$(OX)\lookslike$O" : "$(OX)\lookslike.c" "$(OX)\lookslike.h"
1641	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\lookslike.c"
1642
1643	"$(OX)\lookslike.c" : "$(SRCDIR)\lookslike.c"
1644	"$(OX)\lookslike.h" : "$(OX)\lookslike.c"
1645	"$(OX)\main$O" : "$(OX)\main.c" "$(OX)\main.h"
1646	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\main.c"
1647
1648	"$(OX)\main.c" : "$(SRCDIR)\main.c"
1649	"$(OX)\main.h" : "$(OX)\main.c"
1650	"$(OX)\manifest$O" : "$(OX)\manifest.c" "$(OX)\manifest.h"
1651	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\manifest.c"
1652
1653	"$(OX)\manifest.c" : "$(SRCDIR)\manifest.c"
1654	"$(OX)\manifest.h" : "$(OX)\manifest.c"
1655	"$(OX)\markdown$O" : "$(OX)\markdown.c" "$(OX)\markdown.h"
1656	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown.c"
1657
1658	"$(OX)\markdown.c" : "$(SRCDIR)\markdown.c"
1659	"$(OX)\markdown.h" : "$(OX)\markdown.c"
1660	"$(OX)\markdown_html$O" : "$(OX)\markdown_html.c" "$(OX)\markdown_html.h"
1661	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\markdown_html.c"
1662
1663	"$(OX)\markdown_html.c" : "$(SRCDIR)\markdown_html.c"
1664	"$(OX)\markdown_html.h" : "$(OX)\markdown_html.c"
1665	"$(OX)\md5$O" : "$(OX)\md5.c" "$(OX)\md5.h"
1666	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\md5.c"
1667
1668	"$(OX)\md5.c" : "$(SRCDIR)\md5.c"
1669	"$(OX)\md5.h" : "$(OX)\md5.c"
1670	"$(OX)\merge$O" : "$(OX)\merge.c" "$(OX)\merge.h"
1671	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge.c"
1672
1673	"$(OX)\merge.c" : "$(SRCDIR)\merge.c"
1674	"$(OX)\merge.h" : "$(OX)\merge.c"
1675	"$(OX)\merge3$O" : "$(OX)\merge3.c" "$(OX)\merge3.h"
1676	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\merge3.c"
1677
1678	"$(OX)\merge3.c" : "$(SRCDIR)\merge3.c"
1679	"$(OX)\merge3.h" : "$(OX)\merge3.c"
1680	"$(OX)\moderate$O" : "$(OX)\moderate.c" "$(OX)\moderate.h"
1681	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\moderate.c"
1682
1683	"$(OX)\moderate.c" : "$(SRCDIR)\moderate.c"
1684	"$(OX)\moderate.h" : "$(OX)\moderate.c"
1685	"$(OX)\name$O" : "$(OX)\name.c" "$(OX)\name.h"
1686	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\name.c"
1687
1688	"$(OX)\name.c" : "$(SRCDIR)\name.c"
1689	"$(OX)\name.h" : "$(OX)\name.c"
1690	"$(OX)\path$O" : "$(OX)\path.c" "$(OX)\path.h"
1691	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\path.c"
1692
1693	"$(OX)\path.c" : "$(SRCDIR)\path.c"
1694	"$(OX)\path.h" : "$(OX)\path.c"
1695	"$(OX)\piechart$O" : "$(OX)\piechart.c" "$(OX)\piechart.h"
1696	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\piechart.c"
1697
1698	"$(OX)\piechart.c" : "$(SRCDIR)\piechart.c"
1699	"$(OX)\piechart.h" : "$(OX)\piechart.c"
1700	"$(OX)\pikchr$O" : "$(OX)\pikchr.c" "$(OX)\pikchr.h"
1701	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchr.c"
1702
1703	"$(OX)\pikchr.c" : "$(SRCDIR)\pikchr.c"
1704	"$(OX)\pikchr.h" : "$(OX)\pikchr.c"
1705	"$(OX)\pikchrshow$O" : "$(OX)\pikchrshow.c" "$(OX)\pikchrshow.h"
1706	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pikchrshow.c"
1707
1708	"$(OX)\pikchrshow.c" : "$(SRCDIR)\pikchrshow.c"
1709	"$(OX)\pikchrshow.h" : "$(OX)\pikchrshow.c"
1710	"$(OX)\pivot$O" : "$(OX)\pivot.c" "$(OX)\pivot.h"
1711	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pivot.c"
1712
1713	"$(OX)\pivot.c" : "$(SRCDIR)\pivot.c"
1714	"$(OX)\pivot.h" : "$(OX)\pivot.c"
1715	"$(OX)\popen$O" : "$(OX)\popen.c" "$(OX)\popen.h"
1716	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\popen.c"
1717
1718	"$(OX)\popen.c" : "$(SRCDIR)\popen.c"
1719	"$(OX)\popen.h" : "$(OX)\popen.c"
1720	"$(OX)\pqueue$O" : "$(OX)\pqueue.c" "$(OX)\pqueue.h"
1721	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\pqueue.c"
1722
1723	"$(OX)\pqueue.c" : "$(SRCDIR)\pqueue.c"
1724	"$(OX)\pqueue.h" : "$(OX)\pqueue.c"
1725	"$(OX)\printf$O" : "$(OX)\printf.c" "$(OX)\printf.h"
1726	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\printf.c"
1727
1728	"$(OX)\printf.c" : "$(SRCDIR)\printf.c"
1729	"$(OX)\printf.h" : "$(OX)\printf.c"
1730	"$(OX)\publish$O" : "$(OX)\publish.c" "$(OX)\publish.h"
1731	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\publish.c"
1732
1733	"$(OX)\publish.c" : "$(SRCDIR)\publish.c"
1734	"$(OX)\publish.h" : "$(OX)\publish.c"
1735	"$(OX)\purge$O" : "$(OX)\purge.c" "$(OX)\purge.h"
1736	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\purge.c"
1737
1738	"$(OX)\purge.c" : "$(SRCDIR)\purge.c"
1739	"$(OX)\purge.h" : "$(OX)\purge.c"
1740	"$(OX)\rebuild$O" : "$(OX)\rebuild.c" "$(OX)\rebuild.h"
1741	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rebuild.c"
1742
1743	"$(OX)\rebuild.c" : "$(SRCDIR)\rebuild.c"
1744	"$(OX)\rebuild.h" : "$(OX)\rebuild.c"
1745	"$(OX)\regexp$O" : "$(OX)\regexp.c" "$(OX)\regexp.h"
1746	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\regexp.c"
1747
1748	"$(OX)\regexp.c" : "$(SRCDIR)\regexp.c"
1749	"$(OX)\regexp.h" : "$(OX)\regexp.c"
1750	"$(OX)\repolist$O" : "$(OX)\repolist.c" "$(OX)\repolist.h"
1751	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\repolist.c"
1752
1753	"$(OX)\repolist.c" : "$(SRCDIR)\repolist.c"
1754	"$(OX)\repolist.h" : "$(OX)\repolist.c"
1755	"$(OX)\report$O" : "$(OX)\report.c" "$(OX)\report.h"
1756	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\report.c"
1757
1758	"$(OX)\report.c" : "$(SRCDIR)\report.c"
1759	"$(OX)\report.h" : "$(OX)\report.c"
1760	"$(OX)\rss$O" : "$(OX)\rss.c" "$(OX)\rss.h"
1761	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\rss.c"
1762
1763	"$(OX)\rss.c" : "$(SRCDIR)\rss.c"
1764	"$(OX)\rss.h" : "$(OX)\rss.c"
1765	"$(OX)\schema$O" : "$(OX)\schema.c" "$(OX)\schema.h"
1766	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\schema.c"
1767
1768	"$(OX)\schema.c" : "$(SRCDIR)\schema.c"
1769	"$(OX)\schema.h" : "$(OX)\schema.c"
1770	"$(OX)\search$O" : "$(OX)\search.c" "$(OX)\search.h"
1771	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\search.c"
1772
1773	"$(OX)\search.c" : "$(SRCDIR)\search.c"
1774	"$(OX)\search.h" : "$(OX)\search.c"
1775	"$(OX)\security_audit$O" : "$(OX)\security_audit.c" "$(OX)\security_audit.h"
1776	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\security_audit.c"
1777
1778	"$(OX)\security_audit.c" : "$(SRCDIR)\security_audit.c"
1779	"$(OX)\security_audit.h" : "$(OX)\security_audit.c"
1780	"$(OX)\setup$O" : "$(OX)\setup.c" "$(OX)\setup.h"
1781	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setup.c"
1782
1783	"$(OX)\setup.c" : "$(SRCDIR)\setup.c"
1784	"$(OX)\setup.h" : "$(OX)\setup.c"
1785	"$(OX)\setupuser$O" : "$(OX)\setupuser.c" "$(OX)\setupuser.h"
1786	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\setupuser.c"
1787
1788	"$(OX)\setupuser.c" : "$(SRCDIR)\setupuser.c"
1789	"$(OX)\setupuser.h" : "$(OX)\setupuser.c"
1790	"$(OX)\sha1$O" : "$(OX)\sha1.c" "$(OX)\sha1.h"
1791	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1.c"
1792
1793	"$(OX)\sha1.c" : "$(SRCDIR)\sha1.c"
1794	"$(OX)\sha1.h" : "$(OX)\sha1.c"
1795	"$(OX)\sha1hard$O" : "$(OX)\sha1hard.c" "$(OX)\sha1hard.h"
1796	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha1hard.c"
1797
1798	"$(OX)\sha1hard.c" : "$(SRCDIR)\sha1hard.c"
1799	"$(OX)\sha1hard.h" : "$(OX)\sha1hard.c"
1800	"$(OX)\sha3$O" : "$(OX)\sha3.c" "$(OX)\sha3.h"
1801	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sha3.c"
1802
1803	"$(OX)\sha3.c" : "$(SRCDIR)\sha3.c"
1804	"$(OX)\sha3.h" : "$(OX)\sha3.c"
1805	"$(OX)\shun$O" : "$(OX)\shun.c" "$(OX)\shun.h"
1806	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\shun.c"
1807
1808	"$(OX)\shun.c" : "$(SRCDIR)\shun.c"
1809	"$(OX)\shun.h" : "$(OX)\shun.c"
1810	"$(OX)\sitemap$O" : "$(OX)\sitemap.c" "$(OX)\sitemap.h"
1811	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sitemap.c"
1812
1813	"$(OX)\sitemap.c" : "$(SRCDIR)\sitemap.c"
1814	"$(OX)\sitemap.h" : "$(OX)\sitemap.c"
1815	"$(OX)\skins$O" : "$(OX)\skins.c" "$(OX)\skins.h"
1816	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\skins.c"
1817
1818	"$(OX)\skins.c" : "$(SRCDIR)\skins.c"
1819	"$(OX)\skins.h" : "$(OX)\skins.c"
1820	"$(OX)\smtp$O" : "$(OX)\smtp.c" "$(OX)\smtp.h"
1821	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\smtp.c"
1822
1823	"$(OX)\smtp.c" : "$(SRCDIR)\smtp.c"
1824	"$(OX)\smtp.h" : "$(OX)\smtp.c"
1825	"$(OX)\sqlcmd$O" : "$(OX)\sqlcmd.c" "$(OX)\sqlcmd.h"
1826	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sqlcmd.c"
1827
1828	"$(OX)\sqlcmd.c" : "$(SRCDIR)\sqlcmd.c"
1829	"$(OX)\sqlcmd.h" : "$(OX)\sqlcmd.c"
1830	"$(OX)\stash$O" : "$(OX)\stash.c" "$(OX)\stash.h"
1831	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stash.c"
1832
1833	"$(OX)\stash.c" : "$(SRCDIR)\stash.c"
1834	"$(OX)\stash.h" : "$(OX)\stash.c"
1835	"$(OX)\stat$O" : "$(OX)\stat.c" "$(OX)\stat.h"
1836	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\stat.c"
1837
1838	"$(OX)\stat.c" : "$(SRCDIR)\stat.c"
1839	"$(OX)\stat.h" : "$(OX)\stat.c"
1840	"$(OX)\statrep$O" : "$(OX)\statrep.c" "$(OX)\statrep.h"
1841	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\statrep.c"
1842
1843	"$(OX)\statrep.c" : "$(SRCDIR)\statrep.c"
1844	"$(OX)\statrep.h" : "$(OX)\statrep.c"
1845	"$(OX)\style$O" : "$(OX)\style.c" "$(OX)\style.h"
1846	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\style.c"
1847
1848	"$(OX)\style.c" : "$(SRCDIR)\style.c"
1849	"$(OX)\style.h" : "$(OX)\style.c"
1850	"$(OX)\sync$O" : "$(OX)\sync.c" "$(OX)\sync.h"
1851	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\sync.c"
1852
1853	"$(OX)\sync.c" : "$(SRCDIR)\sync.c"
1854	"$(OX)\sync.h" : "$(OX)\sync.c"
1855	"$(OX)\tag$O" : "$(OX)\tag.c" "$(OX)\tag.h"
1856	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tag.c"
1857
1858	"$(OX)\tag.c" : "$(SRCDIR)\tag.c"
1859	"$(OX)\tag.h" : "$(OX)\tag.c"
1860	"$(OX)\tar$O" : "$(OX)\tar.c" "$(OX)\tar.h"
1861	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tar.c"
1862
1863	"$(OX)\tar.c" : "$(SRCDIR)\tar.c"
1864	"$(OX)\tar.h" : "$(OX)\tar.c"
1865	"$(OX)\terminal$O" : "$(OX)\terminal.c" "$(OX)\terminal.h"
1866	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\terminal.c"
1867
1868	"$(OX)\terminal.c" : "$(SRCDIR)\terminal.c"
1869	"$(OX)\terminal.h" : "$(OX)\terminal.c"
1870	"$(OX)\th_main$O" : "$(OX)\th_main.c" "$(OX)\th_main.h"
1871	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\th_main.c"
1872
1873	"$(OX)\th_main.c" : "$(SRCDIR)\th_main.c"
1874	"$(OX)\th_main.h" : "$(OX)\th_main.c"
1875	"$(OX)\timeline$O" : "$(OX)\timeline.c" "$(OX)\timeline.h"
1876	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\timeline.c"
1877
1878	"$(OX)\timeline.c" : "$(SRCDIR)\timeline.c"
1879	"$(OX)\timeline.h" : "$(OX)\timeline.c"
1880	"$(OX)\tkt$O" : "$(OX)\tkt.c" "$(OX)\tkt.h"
1881	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tkt.c"
1882
1883	"$(OX)\tkt.c" : "$(SRCDIR)\tkt.c"
1884	"$(OX)\tkt.h" : "$(OX)\tkt.c"
1885	"$(OX)\tktsetup$O" : "$(OX)\tktsetup.c" "$(OX)\tktsetup.h"
1886	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\tktsetup.c"
1887
1888	"$(OX)\tktsetup.c" : "$(SRCDIR)\tktsetup.c"
1889	"$(OX)\tktsetup.h" : "$(OX)\tktsetup.c"
1890	"$(OX)\undo$O" : "$(OX)\undo.c" "$(OX)\undo.h"
1891	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\undo.c"
1892
1893	"$(OX)\undo.c" : "$(SRCDIR)\undo.c"
1894	"$(OX)\undo.h" : "$(OX)\undo.c"
1895	"$(OX)\unicode$O" : "$(OX)\unicode.c" "$(OX)\unicode.h"
1896	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unicode.c"
1897
1898	"$(OX)\unicode.c" : "$(SRCDIR)\unicode.c"
1899	"$(OX)\unicode.h" : "$(OX)\unicode.c"
1900	"$(OX)\unversioned$O" : "$(OX)\unversioned.c" "$(OX)\unversioned.h"
1901	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\unversioned.c"
1902
1903	"$(OX)\unversioned.c" : "$(SRCDIR)\unversioned.c"
1904	"$(OX)\unversioned.h" : "$(OX)\unversioned.c"
1905	"$(OX)\update$O" : "$(OX)\update.c" "$(OX)\update.h"
1906	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\update.c"
1907
1908	"$(OX)\update.c" : "$(SRCDIR)\update.c"
1909	"$(OX)\update.h" : "$(OX)\update.c"
1910	"$(OX)\url$O" : "$(OX)\url.c" "$(OX)\url.h"
1911	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\url.c"
1912
1913	"$(OX)\url.c" : "$(SRCDIR)\url.c"
1914	"$(OX)\url.h" : "$(OX)\url.c"
1915	"$(OX)\user$O" : "$(OX)\user.c" "$(OX)\user.h"
1916	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\user.c"
1917
1918	"$(OX)\user.c" : "$(SRCDIR)\user.c"
1919	"$(OX)\user.h" : "$(OX)\user.c"
1920	"$(OX)\utf8$O" : "$(OX)\utf8.c" "$(OX)\utf8.h"
1921	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\utf8.c"
1922
1923	"$(OX)\utf8.c" : "$(SRCDIR)\utf8.c"
1924	"$(OX)\utf8.h" : "$(OX)\utf8.c"
1925	"$(OX)\util$O" : "$(OX)\util.c" "$(OX)\util.h"
1926	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\util.c"
1927
1928	"$(OX)\util.c" : "$(SRCDIR)\util.c"
1929	"$(OX)\util.h" : "$(OX)\util.c"
1930	"$(OX)\verify$O" : "$(OX)\verify.c" "$(OX)\verify.h"
1931	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\verify.c"
1932
1933	"$(OX)\verify.c" : "$(SRCDIR)\verify.c"
1934	"$(OX)\verify.h" : "$(OX)\verify.c"
1935	"$(OX)\vfile$O" : "$(OX)\vfile.c" "$(OX)\vfile.h"
1936	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\vfile.c"
1937
1938	"$(OX)\vfile.c" : "$(SRCDIR)\vfile.c"
1939	"$(OX)\vfile.h" : "$(OX)\vfile.c"
1940	"$(OX)\webmail$O" : "$(OX)\webmail.c" "$(OX)\webmail.h"
1941	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\webmail.c"
1942
1943	"$(OX)\webmail.c" : "$(SRCDIR)\webmail.c"
1944	"$(OX)\webmail.h" : "$(OX)\webmail.c"
1945	"$(OX)\wiki$O" : "$(OX)\wiki.c" "$(OX)\wiki.h"
1946	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wiki.c"
1947
1948	"$(OX)\wiki.c" : "$(SRCDIR)\wiki.c"
1949	"$(OX)\wiki.h" : "$(OX)\wiki.c"
1950	"$(OX)\wikiformat$O" : "$(OX)\wikiformat.c" "$(OX)\wikiformat.h"
1951	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\wikiformat.c"
1952
1953	"$(OX)\wikiformat.c" : "$(SRCDIR)\wikiformat.c"
1954	"$(OX)\wikiformat.h" : "$(OX)\wikiformat.c"
1955	"$(OX)\winfile$O" : "$(OX)\winfile.c" "$(OX)\winfile.h"
1956	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winfile.c"
1957
1958	"$(OX)\winfile.c" : "$(SRCDIR)\winfile.c"
1959	"$(OX)\winfile.h" : "$(OX)\winfile.c"
1960	"$(OX)\winhttp$O" : "$(OX)\winhttp.c" "$(OX)\winhttp.h"
1961	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\winhttp.c"
1962
1963	"$(OX)\winhttp.c" : "$(SRCDIR)\winhttp.c"
1964	"$(OX)\winhttp.h" : "$(OX)\winhttp.c"
1965	"$(OX)\xfer$O" : "$(OX)\xfer.c" "$(OX)\xfer.h"
1966	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfer.c"
1967
1968	"$(OX)\xfer.c" : "$(SRCDIR)\xfer.c"
1969	"$(OX)\xfer.h" : "$(OX)\xfer.c"
1970	"$(OX)\xfersetup$O" : "$(OX)\xfersetup.c" "$(OX)\xfersetup.h"
1971	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\xfersetup.c"
1972
1973	"$(OX)\xfersetup.c" : "$(SRCDIR)\xfersetup.c"
1974	"$(OX)\xfersetup.h" : "$(OX)\xfersetup.c"
1975	"$(OX)\zip$O" : "$(OX)\zip.c" "$(OX)\zip.h"
1976	$(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\zip.c"
1977
1978	"$(OX)\zip.c" : "$(SRCDIR)\zip.c"
1979	"$(OX)\zip.h" : "$(OX)\zip.c"
1980	"$(OX)\fossil.res" : "$(B)\win\fossil.rc"
1981	$(RCC) /fo $@ $**
1982
1983
1984	DEP_HEADERS = "$(OX)\page_index.h" "$(OX)\builtin_data.h" "$(OX)\VERSION.h"
1985	GEN_HEADERS = "$(SRCDIR)\sqlite3.h":"$(OX)\sqlite3.h" "$(SRCDIR)\th.h":"$(OX)\th.h" "$(SRCDIR)\cson_amalgamation.h":"$(OX)\cson_amalgamation.h" "$(OX)\VERSION.h"
1986
1987	!if $(DEPHEADERGEN)==0
1988	GEN_HEADERS = $(GEN_HEADERS) \
1989	"$(OX)\add.c":"$(OX)\add.h" \
1990	"$(OX)\ajax.c":"$(OX)\ajax.h" \
1991	"$(OX)\alerts.c":"$(OX)\alerts.h" \
1992	"$(OX)\allrepo.c":"$(OX)\allrepo.h" \
1993	"$(OX)\attach.c":"$(OX)\attach.h" \
1994	"$(OX)\backlink.c":"$(OX)\backlink.h" \
1995	"$(OX)\backoffice.c":"$(OX)\backoffice.h" \
1996	"$(OX)\bag.c":"$(OX)\bag.h" \
1997	"$(OX)\bisect.c":"$(OX)\bisect.h" \
1998	"$(OX)\blob.c":"$(OX)\blob.h" \
1999	"$(OX)\branch.c":"$(OX)\branch.h" \
2000	"$(OX)\browse.c":"$(OX)\browse.h" \
2001	"$(OX)\builtin.c":"$(OX)\builtin.h" \
2002	"$(OX)\bundle.c":"$(OX)\bundle.h" \
2003	"$(OX)\cache.c":"$(OX)\cache.h" \
2004	"$(OX)\capabilities.c":"$(OX)\capabilities.h" \
2005	"$(OX)\captcha.c":"$(OX)\captcha.h" \
2006	"$(OX)\cgi.c":"$(OX)\cgi.h" \
2007	"$(OX)\chat.c":"$(OX)\chat.h" \
2008	"$(OX)\checkin.c":"$(OX)\checkin.h" \
2009	"$(OX)\checkout.c":"$(OX)\checkout.h" \
2010	"$(OX)\clearsign.c":"$(OX)\clearsign.h" \
2011	"$(OX)\clone.c":"$(OX)\clone.h" \
2012	"$(OX)\color.c":"$(OX)\color.h" \
2013	"$(OX)\comformat.c":"$(OX)\comformat.h" \
2014	"$(OX)\configure.c":"$(OX)\configure.h" \
2015	"$(OX)\content.c":"$(OX)\content.h" \
2016	"$(OX)\cookies.c":"$(OX)\cookies.h" \
2017	"$(OX)\db.c":"$(OX)\db.h" \
2018	"$(OX)\delta.c":"$(OX)\delta.h" \
2019	"$(OX)\deltacmd.c":"$(OX)\deltacmd.h" \
2020	"$(OX)\deltafunc.c":"$(OX)\deltafunc.h" \
2021	"$(OX)\descendants.c":"$(OX)\descendants.h" \
2022	"$(OX)\diff.c":"$(OX)\diff.h" \
2023	"$(OX)\diffcmd.c":"$(OX)\diffcmd.h" \
2024	"$(OX)\dispatch.c":"$(OX)\dispatch.h" \
2025	"$(OX)\doc.c":"$(OX)\doc.h" \
2026	"$(OX)\encode.c":"$(OX)\encode.h" \
2027	"$(OX)\etag.c":"$(OX)\etag.h" \
2028	"$(OX)\event.c":"$(OX)\event.h" \
2029	"$(OX)\export.c":"$(OX)\export.h" \
2030	"$(OX)\extcgi.c":"$(OX)\extcgi.h" \
2031	"$(OX)\file.c":"$(OX)\file.h" \
2032	"$(OX)\fileedit.c":"$(OX)\fileedit.h" \
2033	"$(OX)\finfo.c":"$(OX)\finfo.h" \
2034	"$(OX)\foci.c":"$(OX)\foci.h" \
2035	"$(OX)\forum.c":"$(OX)\forum.h" \
2036	"$(OX)\fshell.c":"$(OX)\fshell.h" \
2037	"$(OX)\fusefs.c":"$(OX)\fusefs.h" \
2038	"$(OX)\fuzz.c":"$(OX)\fuzz.h" \
2039	"$(OX)\glob.c":"$(OX)\glob.h" \
2040	"$(OX)\graph.c":"$(OX)\graph.h" \
2041	"$(OX)\gzip.c":"$(OX)\gzip.h" \
2042	"$(OX)\hname.c":"$(OX)\hname.h" \
2043	"$(OX)\hook.c":"$(OX)\hook.h" \
2044	"$(OX)\http.c":"$(OX)\http.h" \
2045	"$(OX)\http_socket.c":"$(OX)\http_socket.h" \
2046	"$(OX)\http_ssl.c":"$(OX)\http_ssl.h" \
2047	"$(OX)\http_transport.c":"$(OX)\http_transport.h" \
2048	"$(OX)\import.c":"$(OX)\import.h" \
2049	"$(OX)\info.c":"$(OX)\info.h" \
2050	"$(OX)\interwiki.c":"$(OX)\interwiki.h" \
2051	"$(OX)\json.c":"$(OX)\json.h" \
2052	"$(OX)\json_artifact.c":"$(OX)\json_artifact.h" \
2053	"$(OX)\json_branch.c":"$(OX)\json_branch.h" \
2054	"$(OX)\json_config.c":"$(OX)\json_config.h" \
2055	"$(OX)\json_diff.c":"$(OX)\json_diff.h" \
2056	"$(OX)\json_dir.c":"$(OX)\json_dir.h" \
2057	"$(OX)\json_finfo.c":"$(OX)\json_finfo.h" \
2058	"$(OX)\json_login.c":"$(OX)\json_login.h" \
2059	"$(OX)\json_query.c":"$(OX)\json_query.h" \
2060	"$(OX)\json_report.c":"$(OX)\json_report.h" \
2061	"$(OX)\json_status.c":"$(OX)\json_status.h" \
2062	"$(OX)\json_tag.c":"$(OX)\json_tag.h" \
2063	"$(OX)\json_timeline.c":"$(OX)\json_timeline.h" \
2064	"$(OX)\json_user.c":"$(OX)\json_user.h" \
2065	"$(OX)\json_wiki.c":"$(OX)\json_wiki.h" \
2066	"$(OX)\leaf.c":"$(OX)\leaf.h" \
2067	"$(OX)\loadctrl.c":"$(OX)\loadctrl.h" \
2068	"$(OX)\login.c":"$(OX)\login.h" \
2069	"$(OX)\lookslike.c":"$(OX)\lookslike.h" \
2070	"$(OX)\main.c":"$(OX)\main.h" \
2071	"$(OX)\manifest.c":"$(OX)\manifest.h" \
2072	"$(OX)\markdown.c":"$(OX)\markdown.h" \
2073	"$(OX)\markdown_html.c":"$(OX)\markdown_html.h" \
2074	"$(OX)\md5.c":"$(OX)\md5.h" \
2075	"$(OX)\merge.c":"$(OX)\merge.h" \
2076	"$(OX)\merge3.c":"$(OX)\merge3.h" \
2077	"$(OX)\moderate.c":"$(OX)\moderate.h" \
2078	"$(OX)\name.c":"$(OX)\name.h" \
2079	"$(OX)\path.c":"$(OX)\path.h" \
2080	"$(OX)\piechart.c":"$(OX)\piechart.h" \
2081	"$(OX)\pikchr.c":"$(OX)\pikchr.h" \
2082	"$(OX)\pikchrshow.c":"$(OX)\pikchrshow.h" \
2083	"$(OX)\pivot.c":"$(OX)\pivot.h" \
2084	"$(OX)\popen.c":"$(OX)\popen.h" \
2085	"$(OX)\pqueue.c":"$(OX)\pqueue.h" \
2086	"$(OX)\printf.c":"$(OX)\printf.h" \
2087	"$(OX)\publish.c":"$(OX)\publish.h" \
2088	"$(OX)\purge.c":"$(OX)\purge.h" \
2089	"$(OX)\rebuild.c":"$(OX)\rebuild.h" \
2090	"$(OX)\regexp.c":"$(OX)\regexp.h" \
2091	"$(OX)\repolist.c":"$(OX)\repolist.h" \
2092	"$(OX)\report.c":"$(OX)\report.h" \
2093	"$(OX)\rss.c":"$(OX)\rss.h" \
2094	"$(OX)\schema.c":"$(OX)\schema.h" \
2095	"$(OX)\search.c":"$(OX)\search.h" \
2096	"$(OX)\security_audit.c":"$(OX)\security_audit.h" \
2097	"$(OX)\setup.c":"$(OX)\setup.h" \
2098	"$(OX)\setupuser.c":"$(OX)\setupuser.h" \
2099	"$(OX)\sha1.c":"$(OX)\sha1.h" \
2100	"$(OX)\sha1hard.c":"$(OX)\sha1hard.h" \
2101	"$(OX)\sha3.c":"$(OX)\sha3.h" \
2102	"$(OX)\shun.c":"$(OX)\shun.h" \
2103	"$(OX)\sitemap.c":"$(OX)\sitemap.h" \
2104	"$(OX)\skins.c":"$(OX)\skins.h" \
2105	"$(OX)\smtp.c":"$(OX)\smtp.h" \
2106	"$(OX)\sqlcmd.c":"$(OX)\sqlcmd.h" \
2107	"$(OX)\stash.c":"$(OX)\stash.h" \
2108	"$(OX)\stat.c":"$(OX)\stat.h" \
2109	"$(OX)\statrep.c":"$(OX)\statrep.h" \
2110	"$(OX)\style.c":"$(OX)\style.h" \
2111	"$(OX)\sync.c":"$(OX)\sync.h" \
2112	"$(OX)\tag.c":"$(OX)\tag.h" \
2113	"$(OX)\tar.c":"$(OX)\tar.h" \
2114	"$(OX)\terminal.c":"$(OX)\terminal.h" \
2115	"$(OX)\th_main.c":"$(OX)\th_main.h" \
2116	"$(OX)\timeline.c":"$(OX)\timeline.h" \
2117	"$(OX)\tkt.c":"$(OX)\tkt.h" \
2118	"$(OX)\tktsetup.c":"$(OX)\tktsetup.h" \
2119	"$(OX)\undo.c":"$(OX)\undo.h" \
2120	"$(OX)\unicode.c":"$(OX)\unicode.h" \
2121	"$(OX)\unversioned.c":"$(OX)\unversioned.h" \
2122	"$(OX)\update.c":"$(OX)\update.h" \
2123	"$(OX)\url.c":"$(OX)\url.h" \
2124	"$(OX)\user.c":"$(OX)\user.h" \
2125	"$(OX)\utf8.c":"$(OX)\utf8.h" \
2126	"$(OX)\util.c":"$(OX)\util.h" \
2127	"$(OX)\verify.c":"$(OX)\verify.h" \
2128	"$(OX)\vfile.c":"$(OX)\vfile.h" \
2129	"$(OX)\webmail.c":"$(OX)\webmail.h" \
2130	"$(OX)\wiki.c":"$(OX)\wiki.h" \
2131	"$(OX)\wikiformat.c":"$(OX)\wikiformat.h" \
2132	"$(OX)\winfile.c":"$(OX)\winfile.h" \
2133	"$(OX)\winhttp.c":"$(OX)\winhttp.h" \
2134	"$(OX)\xfer.c":"$(OX)\xfer.h" \
2135	"$(OX)\xfersetup.c":"$(OX)\xfersetup.h" \
2136	"$(OX)\zip.c":"$(OX)\zip.h"
2137	!endif
2138
2139	"$(OX)\headers": "$(OBJDIR)\makeheaders$E" $(DEP_HEADERS)
2140	"$(OBJDIR)\makeheaders$E" $(GEN_HEADERS)
2141	@copy /Y NUL $@
2142
2143

Fossil SCM

Keyboard Shortcuts