[Orca-checkins] r381 - in trunk/orca: . packages/rrdtool-1.0.46 packages/rrdtool-1.0.49 packages/rrdtool-1.0.49/cgilib-0.4 packages/rrdtool-1.0.49/config packages/rrdtool-1.0.49/contrib packages/rrdtool-1.0.49/contrib/add_ds packages/rrdtool-1.0.49/contrib/php3 packages/rrdtool-1.0.49/contrib/php3/CVS packages/rrdtool-1.0.49/contrib/php4 packages/rrdtool-1.0.49/contrib/rrdexplorer packages/rrdtool-1.0.49/contrib/rrdfetchnames packages/rrdtool-1.0.49/contrib/rrdlastds packages/rrdtool-1.0.49/doc packages/rrdtool-1.0.49/examples packages/rrdtool-1.0.49/gd1.3 packages/rrdtool-1.0.49/libpng-1.0.9 packages/rrdtool-1.0.49/perl-piped packages/rrdtool-1.0.49/perl-shared packages/rrdtool-1.0.49/src packages/rrdtool-1.0.49/tcl packages/rrdtool-1.0.49/zlib-1.1.4
Blair Zajac
blair at orcaware.com
Sat Aug 21 12:05:15 PDT 2004
Author: blair
Date: Sat Aug 21 11:59:00 2004
New Revision: 381
Added:
trunk/orca/packages/rrdtool-1.0.49/
- copied from r379, trunk/orca/packages/rrdtool-1.0.46/
trunk/orca/packages/rrdtool-1.0.49/CHANGES
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/CHANGES
trunk/orca/packages/rrdtool-1.0.49/CONTRIBUTORS
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/CONTRIBUTORS
trunk/orca/packages/rrdtool-1.0.49/COPYING
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/COPYING
trunk/orca/packages/rrdtool-1.0.49/COPYRIGHT
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/COPYRIGHT
trunk/orca/packages/rrdtool-1.0.49/Makefile.am
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.am
trunk/orca/packages/rrdtool-1.0.49/Makefile.in
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.in
trunk/orca/packages/rrdtool-1.0.49/NT-BUILD-TIPS.txt
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/NT-BUILD-TIPS.txt
trunk/orca/packages/rrdtool-1.0.49/README
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/README
trunk/orca/packages/rrdtool-1.0.49/TODO
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/TODO
trunk/orca/packages/rrdtool-1.0.49/aclocal.m4
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/aclocal.m4
trunk/orca/packages/rrdtool-1.0.49/cgilib-0.4/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/cgilib-0.4/
trunk/orca/packages/rrdtool-1.0.49/config/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/config/
trunk/orca/packages/rrdtool-1.0.49/config.h.in
- copied unchanged from r380, trunk/orca/packages/rrdtool-1.0.46/config.h.in
trunk/orca/packages/rrdtool-1.0.49/configure
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/configure
trunk/orca/packages/rrdtool-1.0.49/configure.ac
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/configure.ac
trunk/orca/packages/rrdtool-1.0.49/contrib/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/contrib/
trunk/orca/packages/rrdtool-1.0.49/contrib/php3/Makefile
trunk/orca/packages/rrdtool-1.0.49/contrib/php4/Makefile.in
trunk/orca/packages/rrdtool-1.0.49/doc/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/doc/
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-dump.dtd
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-xport.dtd
trunk/orca/packages/rrdtool-1.0.49/examples/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/examples/
trunk/orca/packages/rrdtool-1.0.49/gd1.3/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/gd1.3/
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/
trunk/orca/packages/rrdtool-1.0.49/perl-piped/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/perl-piped/
trunk/orca/packages/rrdtool-1.0.49/perl-shared/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/perl-shared/
trunk/orca/packages/rrdtool-1.0.49/rrdtool.spec
- copied, changed from r380, trunk/orca/packages/rrdtool-1.0.46/rrdtool.spec
trunk/orca/packages/rrdtool-1.0.49/src/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/src/
trunk/orca/packages/rrdtool-1.0.49/tcl/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/tcl/
trunk/orca/packages/rrdtool-1.0.49/zlib-1.1.4/
- copied from r380, trunk/orca/packages/rrdtool-1.0.46/zlib-1.1.4/
Removed:
trunk/orca/packages/rrdtool-1.0.46/
Modified:
trunk/orca/INSTALL
trunk/orca/configure.in
trunk/orca/packages/rrdtool-1.0.49/contrib/add_ds/batch.pl
trunk/orca/packages/rrdtool-1.0.49/contrib/php3/CVS/Entries
trunk/orca/packages/rrdtool-1.0.49/contrib/rrdexplorer/png.cgi
trunk/orca/packages/rrdtool-1.0.49/contrib/rrdfetchnames/rrdfetchnames.pl
trunk/orca/packages/rrdtool-1.0.49/contrib/rrdlastds/rrdlastds.pl
trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.am
trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.in
trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.html
trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.txt
trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.html
trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.txt
trunk/orca/packages/rrdtool-1.0.49/doc/bin_dec_hex.txt
trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.html
trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.pod
trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rpntutorial.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.txt
trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.html
trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.pod
trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.txt
trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.c
trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.h
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/png.h
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngconf.h
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngerror.c
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngpread.c
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngread.c
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrtran.c
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrutil.c
trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngset.c
trunk/orca/packages/rrdtool-1.0.49/perl-piped/RRDp.pm
trunk/orca/packages/rrdtool-1.0.49/perl-shared/Makefile.PL.in
trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.pm
trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.xs
trunk/orca/packages/rrdtool-1.0.49/src/Makefile.am
trunk/orca/packages/rrdtool-1.0.49/src/Makefile.in
trunk/orca/packages/rrdtool-1.0.49/src/gdpng.c
trunk/orca/packages/rrdtool-1.0.49/src/gifsize.c
trunk/orca/packages/rrdtool-1.0.49/src/parsetime.c
trunk/orca/packages/rrdtool-1.0.49/src/pngsize.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd.h
trunk/orca/packages/rrdtool-1.0.49/src/rrd_cgi.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_create.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_diff.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_dump.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_error.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_fetch.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.h
trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.h
trunk/orca/packages/rrdtool-1.0.49/src/rrd_info.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_last.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_open.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_resize.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_restore.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.h
trunk/orca/packages/rrdtool-1.0.49/src/rrd_tune.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_update.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.c
trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.h
trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.am
trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.in
Log:
Update rrdtool from 1.0.46 to 1.0.49.
* configure.in:
Bump the required RRDs Perl VERSION number from 1.000461 to 1.000491
and update the directory to find rrdtool in from rrdtool-1.0.46 to
rrdtool-1.0.49.
* INSTALL (Determine which Perl modules need compiling and installing):
Bump the required RRDs Perl VERSION number from 1.000461 to 1.000491
and update the RRDs package version from 1.0.46 to 1.0.49.
* packages/rrdtool-1.0.49:
Renamed from packages/rrdtool-1.0.46. Directory contents updated
from rrdtool-1.0.49.tar.gz.
Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL (original)
+++ trunk/orca/INSTALL Sat Aug 21 11:59:00 2004
@@ -175,7 +175,7 @@
Devel::DProf Not required by Orca 19990108
Digest::MD5 >= 2.33 >= 2.33 2.33
Math::IntervalSearch >= 1.05 >= 1.05 1.05
- RRDs >= 1.000461 >= 1.0.46 1.0.46
+ RRDs >= 1.000491 >= 1.0.49 1.0.49
Storable >= 2.13 >= 2.13 2.13
Time::HiRes Not required by Orca 1.59
version >= 0.41 >= 0.41 0.41
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Sat Aug 21 11:59:00 2004
@@ -37,8 +37,8 @@
DIGEST_MD5_VER=2.33
MATH_INTERVALSEARCH_DIR=Math-Interpolate-1.05
MATH_INTERVALSEARCH_VER=1.05
-RRDTOOL_DIR=rrdtool-1.0.46
-RRDTOOL_VER=1.000461
+RRDTOOL_DIR=rrdtool-1.0.49
+RRDTOOL_VER=1.000491
STORABLE_DIR=Storable-2.13
STORABLE_VER=2.13
TIME_HIRES_DIR=Time-HiRes-1.59
Copied: trunk/orca/packages/rrdtool-1.0.49/CHANGES (from r380, trunk/orca/packages/rrdtool-1.0.46/CHANGES)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/CHANGES (original)
+++ trunk/orca/packages/rrdtool-1.0.49/CHANGES Sat Aug 21 11:59:00 2004
@@ -2,6 +2,93 @@
---------------------------
- bugfix, + enhancement, * contrib, = RELEASE
---------------------------------------------
+= 1.0.49 2004/08/08 -- Tobi
+
+- 2004/08/08 -- Tobi
+ * applied all outstanding patches to libpng 1.0.9
+
+- 2004/07/23 -- Blair Zajac <blair at orcaware.com>
+ * make it compile without perl
+
+- 2004/07/16 -- Krzysztof Kotlenga <pocek at polbrokers.dyndns.org>
+ * fix lucida compiled in font to be realy bold
+
+- 2004/07/14 -- Arend-Jan Wijtzes <ajwytzes at wise-guys.nl>
+ * fixed rrdcgi issues with evaluation tags inside arguments
+
++ 2004/05/25 -- Wolfgang Schrimm <wolfgang{dot}schrimm{at}urz{dot}uni-heidelberg{dot}de>
+ * dtd files for dump and xport xml files
+
++ 2004/05/25 -- Mike Schilli <b2b at perlmeister.com>
+ * added dump and restore support to persbindings
+
++ 2004/05/25 -- Tobi
+ * added example to rrdtool dump from debian patch ...
+
+- 2004/05/09 -- Lars Thegler <lars at thegler.dk> (and Blair Zajac)
+ * make RRD.xs compile with old perls
+
+- 2004/05/08 -- Tobi
+ * missed : in getopt for -X causing segfault
+
+- 2004/04/24 -- Milan Obuch <milan.obuch at bluegrass.sk>
+ * better layout when printing data from rrdtool
+
+
+
+= 1.0.48 2004/04/06 -- Tobi
+
+- 2004/04/05 -- Thomas M. Payerle <payerle at benfranklin.physics.umd.edu>
+ * tcl makefile was broken again ... (tobi does not use tcl)
+
+- 2004/04/05 -- Tobi
+ * allow icon size up to 64pixels
+
+- 2004/04/05 -- Gustavo Badauy <gustavo.badauy at unear.net>
+ improve compilability on windows
+
+= 1.0.47 2004/04/04 -- Tobi
+
++ 2004/04/04 -- Gabor Gombas <gombasg at sztaki.hu>
+ added stdout flushing to rrdexplorer.cgi
+
++ 2004/04/04 -- Piotr Kodzis <Piotr.Kodzis at inteligo.pl>
+ --only-graph option for rrdtool graph
+
++ 2004/04/04 -- Antoine Delvaux <antoine(dot)delvaux(at)belnet(dot)be>
+ --force-rules-legend option to force drawing of [HV]RULE legends
+
+- 2004/03/23 -- "Girod, Laurent" <Laurent.Girod at pmintl.com>
+ open file in binary for writing in restore ... (unbreak things on windows)
+
+- 2004/03/11 -- Milan Obuch <milan.obuch at bluegrass.sk>
+ fixes to perl-shared to find config.h propperly
+
+- 2004/03/09 -- Michael Boman <mboman at gentoo.org>
+ fixed tcl building even more
+
+- 2004/02/18 -- Dominik Loniewski <D.Loniewski at itl.waw.pl>
+ fixed tcl building some more
+
+- 2003/01/19 -- David L. Barker <dave at ncomtech.com>
+ Fixed xport crash when processing different size variable sets
+ Ensured that xport output variables are in the row with the correct timestamp
+ Removed unused allocated array srcptr_list[]
+
+- 2004/01/17 - Gerhard Strangar <g.s at arcor.de>
+ fixed pod files to allow indexing with solaris windexer
+
++ 2003/11/02 - Christophe Kalt <kalt at taranis.org>
+ addition of RRDs::times()
+
+- 2004/01/12 -- paul_murphy at non.agilent.com
+ fix for tcl makefile
+
+- 2004/01/11 -- Milan Obuch <milan.obuch at bluegrass.sk>
+ improved mrtg alt scale
+ improved ascii output spacing in rrdtool cli (port from FreeBSD)
+ fixed error in month parsing in parsetime (port from FreeBSD)
+
= 1.0.46 2004/01/04 -- Tobi
+ 2004/01/01 -- Tobi
@@ -223,7 +310,7 @@
- 2002/04/29 -- Alex
* fix for PRINT template parser in rrd_graph ...
-- 2002/04/16 -- Milan Obuch <milan.obuch at in.nextra.sk>
+- 2002/04/16 -- Milan Obuch <milan.obuch at bluegrass.sk>
* fix for --alt-mrtg
+ 2002/05/01 Wolfgang Schrimm <Wolfgang.Schrimm at urz.uni-heidelberg.de>
@@ -236,7 +323,7 @@
= 1.0.36 2002/04/13 -- Tobi
-+ 2002/04/13 -- Milan Obuch <milan.obuch at in.nextra.sk>
++ 2002/04/13 -- Milan Obuch <milan.obuch at bluegrass.sk>
* added new options to rrdgraph. Check the manpage for
--overlay, --background, --unit, GD (graph output format)
Copied: trunk/orca/packages/rrdtool-1.0.49/CONTRIBUTORS (from r380, trunk/orca/packages/rrdtool-1.0.46/CONTRIBUTORS)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/CONTRIBUTORS (original)
+++ trunk/orca/packages/rrdtool-1.0.49/CONTRIBUTORS Sat Aug 21 11:59:00 2004
@@ -54,10 +54,11 @@
Bruce Campbell <bruce.campbell at apnic.net>
Sean Summers <sean at Fenstermaker.com> (RPM .spec)
Christophe Van Ginneken <Christophe.VanGinneken at ubizen.com> (--no-legend)
- Milan Obuch <milan.obuch at in.nextra.sk> background unit GD overlay --y-alt-mrtg
+ Milan Obuch <milan.obuch at bluegrass.sk> background unit GD overlay --y-alt-mrtg
Wolfgang Schrimm <wschrimm at uni-hd.de> xport function
Travis Brown <tebrown at csh.rit.edu>
Lee Thompson <bm55b at yahoo.com> --enable-local-libpng, --enable-local-zlib
+ David L. Barker <dave at ncomtech.com> xport function bug fixes
Documentation
Copied: trunk/orca/packages/rrdtool-1.0.49/Makefile.am (from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.am)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.49/Makefile.am Sat Aug 21 11:59:00 2004
@@ -34,12 +34,20 @@
# the special call to install-sh is because the -d switch is not portable
# mac os X has its perl module in bundles so it seems
install-data-local:
- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+ @if test "x$(PERL)" != "xno"; then \
+ echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+ $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+ echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+ $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+ echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+ $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+ echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+ $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+ echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+ test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+ echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+ test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+ fi
# use relaxed rules when building dists
@@ -123,8 +131,7 @@
to-scp: to-dist
cp CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/
- (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps $(PACKAGE)-$(VERSION).tar.gz.md5)
-
+ (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps $(PACKAGE)-$(VERSION).tar.gz.md5; chmod 644 $(PACKAGE)-$(VERSION).tar.gz* )
# $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
site-perl-inst: site-perl-install
Copied: trunk/orca/packages/rrdtool-1.0.49/Makefile.in (from r380, trunk/orca/packages/rrdtool-1.0.46/Makefile.in)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.49/Makefile.in Sat Aug 21 11:59:00 2004
@@ -634,12 +634,20 @@
# the special call to install-sh is because the -d switch is not portable
# mac os X has its perl module in bundles so it seems
install-data-local:
- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+ @if test "x$(PERL)" != "xno"; then \
+ echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+ $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+ echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \
+ $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \
+ echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \
+ $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \
+ echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \
+ $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \
+ echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \
+ test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs. at SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \
+ echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \
+ test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \
+ fi
# rules for building the perl module
@@ -713,8 +721,7 @@
to-scp: to-dist
cp CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/
- (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps $(PACKAGE)-$(VERSION).tar.gz.md5)
-
+ (cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz;gmd5sum $(PACKAGE)-$(VERSION).tar.gz >$(PACKAGE)-$(VERSION).tar.gz.md5; pgps $(PACKAGE)-$(VERSION).tar.gz.md5; chmod 644 $(PACKAGE)-$(VERSION).tar.gz* )
# $(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
site-perl-inst: site-perl-install
Copied: trunk/orca/packages/rrdtool-1.0.49/configure (from r380, trunk/orca/packages/rrdtool-1.0.46/configure)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/configure (original)
+++ trunk/orca/packages/rrdtool-1.0.49/configure Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.58.
+# Generated by GNU Autoconf 2.58 for rrdtool 1.0.49.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -419,14 +419,14 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='rrdtool'
+PACKAGE_TARNAME='rrdtool'
+PACKAGE_VERSION='1.0.49'
+PACKAGE_STRING='rrdtool 1.0.49'
+PACKAGE_BUGREPORT=''
ac_unique_file="src/rrd_tool.c"
-ac_default_prefix=/usr/local/rrdtool-1.0.46
+ac_default_prefix=/usr/local/rrdtool-1.0.49
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -953,7 +953,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures rrdtool 1.0.49 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1019,7 +1019,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of rrdtool 1.0.49:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -1159,6 +1161,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+rrdtool configure 1.0.49
+generated by GNU Autoconf 2.58
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1171,7 +1175,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by rrdtool $as_me 1.0.49, which was
generated by GNU Autoconf 2.58. Invocation command line was
$ $0 $@
@@ -1501,6 +1505,14 @@
+
+
+
+
+
+
+
+
ac_aux_dir=
for ac_dir in config $srcdir/config; do
if test -f $ac_dir/install-sh; then
@@ -1859,8 +1871,8 @@
# Define the identity of the package.
- PACKAGE=rrdtool
- VERSION=1.0.46
+ PACKAGE='rrdtool'
+ VERSION='1.0.49'
cat >>confdefs.h <<_ACEOF
@@ -1989,7 +2001,6 @@
-
ac_config_headers="$ac_config_headers config.h"
@@ -3665,7 +3676,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3668 "configure"' > conftest.$ac_ext
+ echo '#line 3679 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4422,9 +4433,9 @@
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to the rrdtool lists. ##
+## ---------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -5230,7 +5241,7 @@
# Provide some information about the compiler.
-echo "$as_me:5233:" \
+echo "$as_me:5244:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6257,11 +6268,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6260: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6271: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6264: \$? = $ac_status" >&5
+ echo "$as_me:6275: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6489,11 +6500,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6492: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6503: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6496: \$? = $ac_status" >&5
+ echo "$as_me:6507: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6556,11 +6567,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6559: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6570: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6563: \$? = $ac_status" >&5
+ echo "$as_me:6574: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8674,7 +8685,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8677 "configure"
+#line 8688 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8772,7 +8783,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8775 "configure"
+#line 8786 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10924,11 +10935,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10927: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10938: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10931: \$? = $ac_status" >&5
+ echo "$as_me:10942: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10991,11 +11002,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10994: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11005: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10998: \$? = $ac_status" >&5
+ echo "$as_me:11009: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12320,7 +12331,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12323 "configure"
+#line 12334 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12418,7 +12429,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12421 "configure"
+#line 12432 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13240,11 +13251,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13243: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13254: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13247: \$? = $ac_status" >&5
+ echo "$as_me:13258: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13307,11 +13318,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13310: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13321: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13314: \$? = $ac_status" >&5
+ echo "$as_me:13325: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15269,11 +15280,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15272: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15276: \$? = $ac_status" >&5
+ echo "$as_me:15287: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15501,11 +15512,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15504: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15515: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15508: \$? = $ac_status" >&5
+ echo "$as_me:15519: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15568,11 +15579,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15571: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15582: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15575: \$? = $ac_status" >&5
+ echo "$as_me:15586: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17686,7 +17697,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17689 "configure"
+#line 17700 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17784,7 +17795,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17787 "configure"
+#line 17798 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20371,9 +20382,9 @@
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ---------------------------------- ##
+## Report this to the rrdtool lists. ##
+## ---------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -23692,7 +23703,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by rrdtool $as_me 1.0.49, which was
generated by GNU Autoconf 2.58. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23755,7 +23766,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+rrdtool config.status 1.0.49
configured by $0, generated by GNU Autoconf 2.58,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copied: trunk/orca/packages/rrdtool-1.0.49/configure.ac (from r380, trunk/orca/packages/rrdtool-1.0.46/configure.ac)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/configure.ac (original)
+++ trunk/orca/packages/rrdtool-1.0.49/configure.ac Sat Aug 21 11:59:00 2004
@@ -13,7 +13,7 @@
unset CDPATH
dnl make sure we are being executed in the right place
-AC_INIT
+AC_INIT(rrdtool, 1.0.49)
AC_CONFIG_SRCDIR([src/rrd_tool.c])
dnl all our local stuff like install scripts and include files
@@ -24,11 +24,10 @@
AC_CANONICAL_TARGET([])
dnl tell automake the this script is for rrdtool
-AM_INIT_AUTOMAKE(rrdtool, 1.0.46)
-AC_SUBST(VERSION)
+AM_INIT_AUTOMAKE
dnl where we install our stuff ...
-AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.46 )
+AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.49 )
dnl tell automake which file to use as config header
AC_CONFIG_HEADERS([config.h])
Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/add_ds/batch.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/add_ds/batch.pl (original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/add_ds/batch.pl Sat Aug 21 11:59:00 2004
@@ -43,7 +43,7 @@
########### USER CONFIGURABLE SECTION #######################
my $newdir = "xml";
-my $rrdtool = "/usr/local/rrdtool-1.0.46/bin/rrdtool";
+my $rrdtool = "/scratch/oetiker/rrd/bin/rrdtool";
my $add_ds = "./add_ds.pl"; # path to add_ds.pl script
########### END CONFIGURE SECTION ###########################
Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/php3/CVS/Entries
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/php3/CVS/Entries (original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/php3/CVS/Entries Sat Aug 21 11:59:00 2004
@@ -1,8 +1,8 @@
/INSTALL/1.1.1.1/Tue Feb 26 10:21:19 2002//
-/Makefile/1.1.1.1/Tue Feb 26 10:21:19 2002//
/README/1.1.1.1/Tue Feb 26 10:21:19 2002//
/USAGE/1.1.1.1/Tue Feb 26 10:21:19 2002//
/VERSION/1.1.1.1/Tue Feb 26 10:21:19 2002//
/php3_rrdtool.c/1.1.1.1/Tue Feb 26 10:21:19 2002//
/php3_rrdtool.h/1.1.1.1/Tue Feb 26 10:21:19 2002//
D/examples////
+/Makefile/1.1.1.1/Fri Jan 23 23:28:32 2004//
Added: trunk/orca/packages/rrdtool-1.0.49/contrib/php3/Makefile
==============================================================================
--- (empty file)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/php3/Makefile Sat Aug 21 11:59:00 2004
@@ -0,0 +1,72 @@
+# code by Joey Miller <joeym at inficad.com>
+#
+#
+# BEFORE COMPILING YOU MUST SET THE VARIABLES BELOW
+# TO INDICATE THE CORRECT DIRECTORIES!!!!!!!!!!!!!!!!!!!!!
+#
+#
+# USE AT YOUR OWN RISK!
+#
+
+## begin configurable vars
+
+## PHPINCLUDE -- the directory where php is untarred
+##
+PHPINCLUDE = -I/usr/home/joeym/apache_build/php-3.0.14
+
+## PHPLIBS -- the directory where you can find some of the PHP objects
+## and compiled libs (the directory where php is untarred, and
+## has already been compiled!
+##
+PHPLIBS = /usr/home/joeym/apache_build/php-3.0.14
+
+## RRDINCLUDE, GDINCLUDE -- where to find some of the header
+## files needed by rrdtool and it's libs
+##
+RRDINCLUDE = -I/usr/home/joeym/newshit/rrdtool-1.0.10/src
+GDINCLUDE = -I/usr/home/joeym/newshit/rrdtool-1.0.10/gd1.3
+
+## RRDLIB -- where to find librrd.a (usually /usr/local/rrdtool-1.0.10/lib)
+RRDLIB = /usr/local/rrdtool-1.0.10/lib
+
+#
+# if php is compiled as an apache module
+#
+APACHEINC = -I/var/www/include
+
+
+
+###### end primary config vars .. change the vars below only
+###### if you need to
+######
+
+
+
+
+CFLAGS = -O -fpic
+CC = gcc
+
+CXX = g++
+CXXFLAGS= $(CFLAGS)
+
+LD = cc
+LDFLAGS = -shared
+
+RM = /bin/rm
+
+OBJS = php3_rrdtool.o
+CFLAGS := $(CFLAGS) -I../lib $(PHPINCLUDE) $(APACHEINC) $(RRDINCLUDE) $(GDINCLUDE)
+CXXFLAGS:= $(CXXFLAGS) -I../lib $(PHPINCLUDE) $(APACHEINC) $(RRDINCLUDE) $(GDINCLUDE)
+LIBS := -L$(RRDLIB) -L$(PHPLIBS) -lrrd
+
+all: php3_rrdtool.so
+
+php3_rrdtool.so: $(OBJS)
+ $(LD) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
+
+clean:
+ $(RM) *.o
+ $(RM) *.so
+
+veryclean: clean
+ $(RM) *~
Added: trunk/orca/packages/rrdtool-1.0.49/contrib/php4/Makefile.in
==============================================================================
--- (empty file)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/php4/Makefile.in Sat Aug 21 11:59:00 2004
@@ -0,0 +1,6 @@
+LTLIBRARY_NAME = librrdtool.la
+LTLIBRARY_SOURCES = rrdtool.c
+LTLIBRARY_SHARED_NAME = rrdtool.la
+LTLIBRARY_SHARED_LIBADD = $(RRDTOOL_SHARED_LIBADD)
+
+include $(top_srcdir)/build/dynlib.mk
Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/rrdexplorer/png.cgi
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/rrdexplorer/png.cgi (original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/rrdexplorer/png.cgi Sat Aug 21 11:59:00 2004
@@ -30,6 +30,7 @@
print "Content-type: image/png\n"; # Use html
print "Cache-Control: no-cache\n"; # Ensure no cashing of page
print "Expires: $expiredate\n\n"; # Expire now
+$| = 1;
$root = $ENV{"DOCUMENT_ROOT"};
# see rrdfetchnames
Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/rrdfetchnames/rrdfetchnames.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/rrdfetchnames/rrdfetchnames.pl (original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/rrdfetchnames/rrdfetchnames.pl Sat Aug 21 11:59:00 2004
@@ -6,7 +6,7 @@
use lib qw( ../../perl-shared/blib/lib ../../perl-shared/blib/arch );
#makes programm work AFTER install
-use lib qw( /usr/local/rrdtool-1.0.46/lib/perl ../lib/perl );
+use lib qw( /scratch/oetiker/rrd/lib/perl ../lib/perl );
use vars qw(@ISA $loaded);
Modified: trunk/orca/packages/rrdtool-1.0.49/contrib/rrdlastds/rrdlastds.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/contrib/rrdlastds/rrdlastds.pl (original)
+++ trunk/orca/packages/rrdtool-1.0.49/contrib/rrdlastds/rrdlastds.pl Sat Aug 21 11:59:00 2004
@@ -13,7 +13,7 @@
#makes things work when run without install
use lib qw( ../../perl-shared/blib/lib ../../perl-shared/blib/arch );
# this is for after install
-use lib qw( /usr/local/rrdtool-1.0.46/lib/perl ../lib/perl );
+use lib qw( /scratch/oetiker/rrd/lib/perl ../lib/perl );
use RRDs;
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.am Sat Aug 21 11:59:00 2004
@@ -22,20 +22,20 @@
PDF = $(MAN:.1=.pdf)
# what should go into the distribution
-EXTRA_DIST= $(POD) $(HTML) $(TXT)
+EXTRA_DIST= $(POD) $(HTML) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd
# some install rules
idocdir = $(prefix)/doc
idoc_DATA = $(POD) $(TXT)
ihtmldir = $(prefix)/html
ihtml_DATA = $(HTML)
-imandir = $(prefix)/man/man1
+imandir = $(mandir)/man1
iman_DATA = $(MAN)
all-local: link txt man html
.pod.1 .pm.1 .pl.1:
- pod2man --release=$(VERSION) --center=rrdtool $< > $@
+ pod2man --release=$(VERSION) --center=RRDtool $< > $@
.1.txt:
@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/Makefile.in Sat Aug 21 11:59:00 2004
@@ -184,14 +184,14 @@
PDF = $(MAN:.1=.pdf)
# what should go into the distribution
-EXTRA_DIST = $(POD) $(HTML) $(TXT)
+EXTRA_DIST = $(POD) $(HTML) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd
# some install rules
idocdir = $(prefix)/doc
idoc_DATA = $(POD) $(TXT)
ihtmldir = $(prefix)/html
ihtml_DATA = $(HTML)
-imandir = $(prefix)/man/man1
+imandir = $(mandir)/man1
iman_DATA = $(MAN)
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -404,7 +404,7 @@
all-local: link txt man html
.pod.1 .pm.1 .pl.1:
- pod2man --release=$(VERSION) --center=rrdtool $< > $@
+ pod2man --release=$(VERSION) --center=RRDtool $< > $@
.1.txt:
@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDp.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.html Sat Aug 21 11:59:00 2004
@@ -55,20 +55,20 @@
Load the RRDp::pipe module.
</dd>
<p></p>
-<dt><strong><a name="item_rrdp%3a%3astart_path_to_rrdtool_executable"><strong>RRDp::start</strong> <em>path to rrdtool executable</em></a></strong><br />
+<dt><strong><a name="item_rrdp_3a_3astart_path_to_rrdtool_executable"><strong>RRDp::start</strong> <em>path to rrdtool executable</em></a></strong><br />
</dt>
<dd>
start rrdtool. The argument must be the path to the rrdtool executable
</dd>
<p></p>
-<dt><strong><a name="item_rrdp%3a%3acmd_rrdtool_commandline"><strong>RRDp::cmd</strong> <em>rrdtool commandline</em></a></strong><br />
+<dt><strong><a name="item_rrdp_3a_3acmd_rrdtool_commandline"><strong>RRDp::cmd</strong> <em>rrdtool commandline</em></a></strong><br />
</dt>
<dd>
pass commands on to rrdtool. check the rrdtool documentation for
more info on the rrdtool commands.
</dd>
<p></p>
-<dt><strong><a name="item_%24answer_%3d_rrdp%3a%3aread">$answer = <strong>RRDp::read</strong></a></strong><br />
+<dt><strong><a name="item__24answer__3d_rrdp_3a_3aread">$answer = <strong>RRDp::read</strong></a></strong><br />
</dt>
<dd>
read rrdtools response to your command. Note that the $answer variable will
@@ -79,13 +79,13 @@
the variable.
</dd>
<p></p>
-<dt><strong><a name="item_%24status_%3d_rrdp%3a%3aend">$status = <strong>RRDp::end</strong></a></strong><br />
+<dt><strong><a name="item__24status__3d_rrdp_3a_3aend">$status = <strong>RRDp::end</strong></a></strong><br />
</dt>
<dd>
terminates rrdtool and returns rrdtools status ...
</dd>
<p></p>
-<dt><strong><a name="item_%24rrdp%3a%3auser%2c_%24rrdp%3a%3asys%2c_%24rrdp%3"><strong>$RRDp::user</strong>, <strong>$RRDp::sys</strong>, <strong>$RRDp::real</strong></a></strong><br />
+<dt><strong><a name="item__24rrdp_3a_3auser_2c__24rrdp_3a_3asys_2c__24rrdp_3"><strong>$RRDp::user</strong>, <strong>$RRDp::sys</strong>, <strong>$RRDp::real</strong></a></strong><br />
</dt>
<dd>
these variables will contain totals of the user time, system time and
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDp.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDp.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDp(3) rrdtool RRDp(3)
+RRDp(3) RRDtool RRDp(3)
@@ -89,4 +89,4 @@
-1.0.46 2004-01-04 RRDp(3)
+1.0.49 2004-08-08 RRDp(3)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDs.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.html Sat Aug 21 11:59:00 2004
@@ -46,7 +46,8 @@
RRDs::update ...
RRDs::graph ...
RRDs::fetch ...
- RRDs::tune ...</pre>
+ RRDs::tune ...
+ RRDs::times(start, end)</pre>
<p>
</p>
<hr />
@@ -66,6 +67,10 @@
<pre>
--template=in:out</pre>
<p>is also valid.</p>
+<p>The RRDs::times function takes two parameters: a ``start'' and ``end'' time.
+These should be specified in the <strong>AT-STYLE TIME SPECIFICATION</strong> format
+used by rrdtool. See the <strong>rrdfetch</strong> documentation for a detailed
+explanation on how to specify time.</p>
<p>
</p>
<h2><a name="error_handling">Error Handling</a></h2>
@@ -82,8 +87,8 @@
<p>
</p>
<h2><a name="return_values">Return Values</a></h2>
-<p>The functions RRDs::last, RRDs::graph, RRDs::info and RRDs::fetch return their
-findings.</p>
+<p>The functions RRDs::last, RRDs::graph, RRDs::info, RRDs::fetch and RRDs::times
+return their findings.</p>
<p><strong>RRDs::last</strong> returns a single INTEGER representing the last update time.</p>
<pre>
$lastupdate = RRDs::last ...</pre>
@@ -119,6 +124,8 @@
}
print "\n";
}</pre>
+<p><strong>RRDs::times</strong> returns two integers which are the number of seconds since
+epoch (1970-01-01) for the supplied ``start'' and ``end'' arguments, respectively.</p>
<p>See the examples directory for more ways to use this extension.</p>
<p>
</p>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/RRDs.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/RRDs.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDs(3) rrdtool RRDs(3)
+RRDs(3) RRDtool RRDs(3)
@@ -15,6 +15,7 @@
RRDs::graph ...
RRDs::fetch ...
RRDs::tune ...
+ RRDs::times(start, end)
DDEESSCCRRIIPPTTIIOONN
CCaalllliinngg SSeeqquueennccee
@@ -36,6 +37,12 @@
is also valid.
+ The RRDs::times function takes two parameters: a "start"
+ and "end" time. These should be specified in the AATT--SSTTYYLLEE
+ TTIIMMEE SSPPEECCIIFFIICCAATTIIOONN format used by rrdtool. See the rrrrdd--
+ ffeettcchh documentation for a detailed explanation on how to
+ specify time.
+
EErrrroorr HHaannddlliinngg
The RRD functions will not abort your program even when
@@ -53,8 +60,8 @@
RReettuurrnn VVaalluueess
- The functions RRDs::last, RRDs::graph, RRDs::info and
- RRDs::fetch return their findings.
+ The functions RRDs::last, RRDs::graph, RRDs::info,
+ RRDs::fetch and RRDs::times return their findings.
RRRRDDss::::llaasstt returns a single INTEGER representing the last
update time.
@@ -97,6 +104,10 @@
print "\n";
}
+ RRRRDDss::::ttiimmeess returns two integers which are the number of
+ seconds since epoch (1970-01-01) for the supplied "start"
+ and "end" arguments, respectively.
+
See the examples directory for more ways to use this
extension.
@@ -115,4 +126,4 @@
-1.0.46 2004-01-04 RRDs(3)
+1.0.49 2004-08-08 RRDs(3)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/bin_dec_hex.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/bin_dec_hex.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/bin_dec_hex.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-BIN_DEC_HEX(1) rrdtool BIN_DEC_HEX(1)
+BIN_DEC_HEX(1) RRDtool BIN_DEC_HEX(1)
@@ -411,4 +411,4 @@
-1.0.46 2002-02-26 BIN_DEC_HEX(1)
+1.0.49 2004-01-17 BIN_DEC_HEX(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/cdeftutorial.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.html Sat Aug 21 11:59:00 2004
@@ -37,20 +37,21 @@
<li><a href="#some_examples">Some examples</a></li>
<ul>
- <li><a href="#example:_using_a_recently_created_rrd">Example: using a recently created RRD</a></li>
- <li><a href="#example:_better_handling_of_unknown_data,_by_using_time">Example: better handling of unknown data, by using time</a></li>
- <li><a href="#example:_pretending_weird_data_isn't_there">Example: Pretending weird data isn't there</a></li>
- <li><a href="#example:_working_on_a_certain_time_span">Example: working on a certain time span</a></li>
- <li><a href="#example:_you_suspect_to_have_problems_and_want_to_see_unknown_data.">Example: You suspect to have problems and want to see unknown data.</a></li>
- <li><a href="#same_example_useful_with_stacked_data:">Same example useful with STACKed data:</a></li>
+ <li><a href="#example__using_a_recently_created_rrd">Example: using a recently created RRD</a></li>
+ <li><a href="#example__better_handling_of_unknown_data__by_using_time">Example: better handling of unknown data, by using time</a></li>
+ <li><a href="#example__pretending_weird_data_isn_t_there">Example: Pretending weird data isn't there</a></li>
+ <li><a href="#example__working_on_a_certain_time_span">Example: working on a certain time span</a></li>
+ <li><a href="#example__you_suspect_to_have_problems_and_want_to_see_unknown_data_">Example: You suspect to have problems and want to see unknown data.</a></li>
+ <li><a href="#same_example_useful_with_stacked_data_">Same example useful with STACKed data:</a></li>
</ul>
<li><a href="#the_examples_from_the_rrd_graph_manual_page">The examples from the RRD graph manual page</a></li>
<ul>
- <li><a href="#degrees_celsius_vs._degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></li>
+ <li><a href="#degrees_celsius_vs__degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></li>
<li><a href="#changing_unknown_into_zero">Changing unknown into zero</a></li>
<li><a href="#infinity_demo">Infinity demo</a></li>
+ <li><a href="#data_filtering_example">Data Filtering Example</a></li>
</ul>
<li><a href="#out_of_ideas_for_now">Out of ideas for now</a></li>
@@ -380,7 +381,7 @@
<h1><a name="some_examples">Some examples</a></h1>
<p>
</p>
-<h2><a name="example:_using_a_recently_created_rrd">Example: using a recently created RRD</a></h2>
+<h2><a name="example__using_a_recently_created_rrd">Example: using a recently created RRD</a></h2>
<p>You are keeping statistics on your router for over a year now. Recently
you installed an extra router and you would like to show the combined
throughput for these two devices.</p>
@@ -439,7 +440,7 @@
to remove this rule so that unknown data is properly displayed.</p>
<p>
</p>
-<h2><a name="example:_better_handling_of_unknown_data,_by_using_time">Example: better handling of unknown data, by using time</a></h2>
+<h2><a name="example__better_handling_of_unknown_data__by_using_time">Example: better handling of unknown data, by using time</a></h2>
<p>Above example has one drawback. If you do log unknown data in
your database after installing your new equipment, it will also be
translated into zero and therefore you won't see that there was a
@@ -514,7 +515,7 @@
come up with.</p>
<p>
</p>
-<h2><a name="example:_pretending_weird_data_isn't_there">Example: Pretending weird data isn't there</a></h2>
+<h2><a name="example__pretending_weird_data_isn_t_there">Example: Pretending weird data isn't there</a></h2>
<p>Suppose you have a problem that shows up as huge spikes in your graph.
You know this happens and why so you decide to work around the problem.
Perhaps you're using your network to do a backup at night and by doing
@@ -548,7 +549,7 @@
CDEF:result=number,100000,GT,100000,number,IF</pre>
<p>
</p>
-<h2><a name="example:_working_on_a_certain_time_span">Example: working on a certain time span</a></h2>
+<h2><a name="example__working_on_a_certain_time_span">Example: working on a certain time span</a></h2>
<p>If you want a graph that spans a few weeks, but would only want to
see some routers data for one week, you need to ``hide'' the rest of
the time frame. Don't ask me when this would be useful, it's just
@@ -571,17 +572,17 @@
numbers (or zero) only.</p>
<p>Let's compile the complete CDEF:</p>
<pre>
- DEF:ds0=router1.rrd:AVERAGE
- CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,UNKN,ds0,IF</pre>
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,ds0,UNKN,IF</pre>
<p>This will return the value of ds0 if both comparisons return true. You
could also do it the other way around:</p>
<pre>
- DEF:ds0=router1.rrd:AVERAGE
- CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF</pre>
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF</pre>
<p>This will return an UNKNOWN if either comparison returns true.</p>
<p>
</p>
-<h2><a name="example:_you_suspect_to_have_problems_and_want_to_see_unknown_data.">Example: You suspect to have problems and want to see unknown data.</a></h2>
+<h2><a name="example__you_suspect_to_have_problems_and_want_to_see_unknown_data_">Example: You suspect to have problems and want to see unknown data.</a></h2>
<p>Suppose you add up the number of active users on several terminal servers.
If one of them doesn't give an answer (or an incorrect one) you get ``NaN''
in the database (``Not a Number'') and NaN is evaluated as Unknown.</p>
@@ -615,7 +616,7 @@
AREA:wrongdata#FF0000:unknown data</pre>
<p>
</p>
-<h2><a name="same_example_useful_with_stacked_data:">Same example useful with STACKed data:</a></h2>
+<h2><a name="same_example_useful_with_stacked_data_">Same example useful with STACKed data:</a></h2>
<p>If you use stack in the previous example (as I would do) then you don't
add up the values. Therefore, there is no relationship between the
four values and you don't get a single value to test.
@@ -664,7 +665,7 @@
<h1><a name="the_examples_from_the_rrd_graph_manual_page">The examples from the RRD graph manual page</a></h1>
<p>
</p>
-<h2><a name="degrees_celsius_vs._degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></h2>
+<h2><a name="degrees_celsius_vs__degrees_fahrenheit">Degrees Celsius vs. Degrees Fahrenheit</a></h2>
<pre>
rrdtool graph demo.gif --title="Demo Graph" \
DEF:cel=demo.rrd:exhaust:AVERAGE \
@@ -767,14 +768,13 @@
<p>If your data can also have negative values you also need to overwrite
the other half of your graph. This can be done in a relatively simple
way: what you need is the ``wipeout'' variable and place a negative
-sign before it: ``CDEF:wipeout2=wipeout,-1,*''
+sign before it: ``CDEF:wipeout2=wipeout,-1,*''</p>
+<p>
</p>
-<pre>
-
-=head2 Filtering data</pre>
+<h2><a name="data_filtering_example">Data Filtering Example</a></h2>
+<p>by Gonzalo Augusto Arana Tagle <<a href="mailto:garana at uolsinectis.com.ar">garana at uolsinectis.com.ar</a>></p>
<p>You may do some complex data filtering:</p>
-<pre>
- MEDIAN FILTER: filters shot noise</pre>
+<p>MEDIAN FILTER: filters shot noise</p>
<pre>
DEF:var=database.rrd:traffic:AVERAGE
CDEF:prev1=PREV(var)
@@ -783,12 +783,11 @@
CDEF:median=prev1,prev2,prev3,+,+,3,/
LINE3:median#000077:filtered
LINE1:prev2#007700:'raw data'</pre>
-<pre>
- DERIVATE:</pre>
+<p>DERIVATE:</p>
<pre>
DEF:var=database.rrd:traffic:AVERAGE
CDEF:prev1=PREV(var)
- CDEF:time=TIME
+ CDEF:time=var,POP,TIME
CDEF:prevtime=PREV(time)
CDEF:derivate=var,prev1,-,time,prevtime,-,/
LINE3:derivate#000077:derivate
@@ -811,9 +810,7 @@
</p>
<hr />
<h1><a name="author">AUTHOR</a></h1>
-<p>Alex van den Bogaerdt
-<<a href="mailto:alex at ergens.op.het.net">alex at ergens.op.het.net</a>>
-</p>
+<p>Alex van den Bogaerdt <<a href="mailto:alex at ergens.op.het.net">alex at ergens.op.het.net</a>></p>
</body>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/cdeftutorial.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.pod Sat Aug 21 11:59:00 2004
@@ -615,14 +615,14 @@
Let's compile the complete CDEF:
- DEF:ds0=router1.rrd:AVERAGE
- CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,UNKN,ds0,IF
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,ds0,UNKN,IF
This will return the value of ds0 if both comparisons return true. You
could also do it the other way around:
- DEF:ds0=router1.rrd:AVERAGE
- CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
This will return an UNKNOWN if either comparison returns true.
@@ -837,12 +837,14 @@
the other half of your graph. This can be done in a relatively simple
way: what you need is the "wipeout" variable and place a negative
sign before it: "CDEF:wipeout2=wipeout,-1,*"
-
-=head2 Filtering data
+
+=head2 Data Filtering Example
+
+by Gonzalo Augusto Arana Tagle E<lt>garana at uolsinectis.com.arE<gt>
You may do some complex data filtering:
- MEDIAN FILTER: filters shot noise
+MEDIAN FILTER: filters shot noise
DEF:var=database.rrd:traffic:AVERAGE
CDEF:prev1=PREV(var)
@@ -853,11 +855,11 @@
LINE1:prev2#007700:'raw data'
- DERIVATE:
+DERIVATE:
DEF:var=database.rrd:traffic:AVERAGE
CDEF:prev1=PREV(var)
- CDEF:time=TIME
+ CDEF:time=var,POP,TIME
CDEF:prevtime=PREV(time)
CDEF:derivate=var,prev1,-,time,prevtime,-,/
LINE3:derivate#000077:derivate
@@ -879,5 +881,4 @@
=head1 AUTHOR
-Alex van den Bogaerdt
-E<lt>alex at ergens.op.het.netE<gt>
+Alex van den Bogaerdt E<lt>alex at ergens.op.het.netE<gt>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/cdeftutorial.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/cdeftutorial.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-CDEFTUTORIAL(1) rrdtool CDEFTUTORIAL(1)
+CDEFTUTORIAL(1) RRDtool CDEFTUTORIAL(1)
@@ -595,14 +595,14 @@
Let's compile the complete CDEF:
- DEF:ds0=router1.rrd:AVERAGE
- CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,UNKN,ds0,IF
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,GE,TIME,endtime,LE,*,ds0,UNKN,IF
This will return the value of ds0 if both comparisons
return true. You could also do it the other way around:
- DEF:ds0=router1.rrd:AVERAGE
- CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
+ DEF:ds0=router1.rrd:AVERAGE
+ CDEF:ds0modified=TIME,begintime,LT,TIME,endtime,GT,+,UNKN,ds0,IF
This will return an UNKNOWN if either comparison returns
true.
@@ -836,11 +836,13 @@
"wipeout" variable and place a negative sign before it:
"CDEF:wipeout2=wipeout,-1,*"
- FFiilltteerriinngg ddaattaa
+ DDaattaa FFiilltteerriinngg EExxaammppllee
+
+ by Gonzalo Augusto Arana Tagle <garana at uolsinectis.com.ar>
You may do some complex data filtering:
- MEDIAN FILTER: filters shot noise
+ MEDIAN FILTER: filters shot noise
DEF:var=database.rrd:traffic:AVERAGE
CDEF:prev1=PREV(var)
@@ -850,15 +852,13 @@
LINE3:median#000077:filtered
LINE1:prev2#007700:'raw data'
- DERIVATE:
-
-
+ DERIVATE:
DEF:var=database.rrd:traffic:AVERAGE
CDEF:prev1=PREV(var)
- CDEF:time=TIME
+ CDEF:time=var,POP,TIME
CDEF:prevtime=PREV(time)
CDEF:derivate=var,prev1,-,time,prevtime,-,/
LINE3:derivate#000077:derivate
@@ -881,4 +881,4 @@
-1.0.46 2003-09-14 CDEFTUTORIAL(1)
+1.0.49 2004-07-14 CDEFTUTORIAL(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rpntutorial.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rpntutorial.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rpntutorial.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RPNTUTORIAL(1) rrdtool RPNTUTORIAL(1)
+RPNTUTORIAL(1) RRDtool RPNTUTORIAL(1)
@@ -202,4 +202,4 @@
-1.0.46 2003-09-14 RPNTUTORIAL(1)
+1.0.49 2004-01-17 RPNTUTORIAL(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrd-beginners.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.html Sat Aug 21 11:59:00 2004
@@ -20,11 +20,11 @@
<li><a href="#what_makes_rrdtool_so_special">What makes RRDTool so special?</a></li>
<li><a href="#graphical_magic">Graphical Magic</a></li>
- <li><a href="#wrapping_rrdtool_within_shell/perl_script">Wrapping RRDTool within Shell/Perl script</a></li>
+ <li><a href="#wrapping_rrdtool_within_shell_perl_script">Wrapping RRDTool within Shell/Perl script</a></li>
<ul>
- <li><a href="#shell_script_(collects_data,_updates_database)">Shell script (collects data, updates database)</a></li>
- <li><a href="#perl_script_(retrieves_data_from_database_and_generates_graphs_and_statistics)">Perl script (retrieves data from database and generates graphs and statistics)</a></li>
+ <li><a href="#shell_script__collects_data__updates_database_">Shell script (collects data, updates database)</a></li>
+ <li><a href="#perl_script__retrieves_data_from_database_and_generates_graphs_and_statistics_">Perl script (retrieves data from database and generates graphs and statistics)</a></li>
</ul>
</ul>
@@ -232,7 +232,7 @@
Detailed instructions be found under graph manual.</p>
<p>
</p>
-<h2><a name="wrapping_rrdtool_within_shell/perl_script">Wrapping RRDTool within Shell/Perl script</a></h2>
+<h2><a name="wrapping_rrdtool_within_shell_perl_script">Wrapping RRDTool within Shell/Perl script</a></h2>
<p>After understanding RRDTool, it is now a time to actually use RRDTool in
scripts. Tasks involved in network management are data collection, data
storage, and data retrieval. In the following example,
@@ -242,7 +242,7 @@
scripts are as shown below:</p>
<p>
</p>
-<h3><a name="shell_script_(collects_data,_updates_database)">Shell script (collects data, updates database)</a></h3>
+<h3><a name="shell_script__collects_data__updates_database_">Shell script (collects data, updates database)</a></h3>
<pre>
#!/bin/sh
a=0
@@ -260,7 +260,7 @@
done # end of while loop</pre>
<p>
</p>
-<h3><a name="perl_script_(retrieves_data_from_database_and_generates_graphs_and_statistics)">Perl script (retrieves data from database and generates graphs and statistics)</a></h3>
+<h3><a name="perl_script__retrieves_data_from_database_and_generates_graphs_and_statistics_">Perl script (retrieves data from database and generates graphs and statistics)</a></h3>
<pre>
#!/usr/bin/perl -w
#This script fetch data from target.rrd, creates graph of memory consumption
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrd-beginners.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrd-beginners.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRD-BEGINNERS(1) rrdtool RRD-BEGINNERS(1)
+RRD-BEGINNERS(1) RRDtool RRD-BEGINNERS(1)
@@ -392,4 +392,4 @@
-1.0.46 2003-09-14 RRD-BEGINNERS(1)
+1.0.49 2004-01-17 RRD-BEGINNERS(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcgi.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.html Sat Aug 21 11:59:00 2004
@@ -51,7 +51,7 @@
only for a subset of tags. This allows to nest tags.</p>
<p>The argument parser uses the same semantics as you are used from your c shell.</p>
<dl>
-<dt><strong><a name="item_%2d%2dfilter"><strong>--filter</strong></a></strong><br />
+<dt><strong><a name="item__2d_2dfilter"><strong>--filter</strong></a></strong><br />
</dt>
<dd>
Assume that rrdcgi is being run as a filter and not as a cgi.
@@ -61,13 +61,13 @@
</p>
<h2><a name="keywords">Keywords</a></h2>
<dl>
-<dt><strong><a name="item_rrd%3a%3acv_name">RRD::CV <em>name</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3acv_name">RRD::CV <em>name</em></a></strong><br />
</dt>
<dd>
Inserts the CGI variable of the given name.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3acv%3a%3aquote_name">RRD::CV::QUOTE <em>name</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3acv_3a_3aquote_name">RRD::CV::QUOTE <em>name</em></a></strong><br />
</dt>
<dd>
Inserts the CGI variable of the given name but quotes it, ready for
@@ -75,7 +75,7 @@
value of the CGI variable it will still be considered as one argument.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3acv%3a%3apath_name">RRD::CV::PATH <em>name</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3acv_3a_3apath_name">RRD::CV::PATH <em>name</em></a></strong><br />
</dt>
<dd>
Inserts the CGI variable of the given name, quotes it and makes sure
@@ -84,7 +84,7 @@
CGI interface.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3agetenv_variable">RRD::GETENV <em>variable</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agetenv_variable">RRD::GETENV <em>variable</em></a></strong><br />
</dt>
<dd>
Get the value of an environment variable.
@@ -98,7 +98,7 @@
some sort of access control on the directory</p>
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3agoodfor_seconds">RRD::GOODFOR <em>seconds</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agoodfor_seconds">RRD::GOODFOR <em>seconds</em></a></strong><br />
</dt>
<dd>
Specify the number of seconds this page should remain valid. This will prompt
@@ -106,13 +106,13 @@
seconds is <em>negative</em> a Refresh headers.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3ainclude_filename">RRD::INCLUDE <em>filename</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3ainclude_filename">RRD::INCLUDE <em>filename</em></a></strong><br />
</dt>
<dd>
Include the contents of the given file into the page returned from the cgi
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3asetenv_variable_value">RRD::SETENV <em>variable</em> <em>value</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3asetenv_variable_value">RRD::SETENV <em>variable</em> <em>value</em></a></strong><br />
</dt>
<dd>
If you want to present your graphs in another time zone than your own, you
@@ -127,33 +127,33 @@
values permitted to TZ depend on your OS.</p>
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3asetvar_variable_value">RRD::SETVAR <em>variable</em> <em>value</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3asetvar_variable_value">RRD::SETVAR <em>variable</em> <em>value</em></a></strong><br />
</dt>
<dd>
Analog to SETENV but for local variables
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3agetvar_variable">RRD::GETVAR <em>variable</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agetvar_variable">RRD::GETVAR <em>variable</em></a></strong><br />
</dt>
<dd>
Analog to GETENV but for local variables
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3atime%3a%3alast_rrd%2dfile_strftime%2dform">RRD::TIME::LAST <em>rrd-file</em> <em>strftime-format</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3atime_3a_3alast_rrd_2dfile_strftime_2dform">RRD::TIME::LAST <em>rrd-file</em> <em>strftime-format</em></a></strong><br />
</dt>
<dd>
This gets replaced by the last modification time of the selected RRD. The
time is <em>strftime</em>-formated with the string specified in the second argument.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3atime%3a%3anow_strftime%2dformat">RRD::TIME::NOW <em>strftime-format</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3atime_3a_3anow_strftime_2dformat">RRD::TIME::NOW <em>strftime-format</em></a></strong><br />
</dt>
<dd>
This gets replaced by the current time of day. The
time is <em>strftime</em>-formated with the string specified in the argument.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3atime%3a%3astrftime_start%7cend_start%2dsp">RRD::TIME::STRFTIME <em>START|END</em> <em>start-spec</em> <em>end-spec</em> <em>strftime-format</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3atime_3a_3astrftime_start_7cend_start_2dsp">RRD::TIME::STRFTIME <em>START|END</em> <em>start-spec</em> <em>end-spec</em> <em>strftime-format</em></a></strong><br />
</dt>
<dd>
This gets replaced by a strftime-formatted time using the format
@@ -164,7 +164,7 @@
folks to figure out than ``-2weeks''.
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3agraph_rrdgraph_arguments">RRD::GRAPH <em>rrdgraph arguments</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3agraph_rrdgraph_arguments">RRD::GRAPH <em>rrdgraph arguments</em></a></strong><br />
</dt>
<dd>
This tag creates the RRD graph defined in its argument and then gets
@@ -191,7 +191,7 @@
directories given in the PNG file argument will get dropped.</p>
</dd>
<p></p>
-<dt><strong><a name="item_rrd%3a%3aprint_number">RRD::PRINT <em>number</em></a></strong><br />
+<dt><strong><a name="item_rrd_3a_3aprint_number">RRD::PRINT <em>number</em></a></strong><br />
</dt>
<dd>
If the preceding <strong>RRD::GRAPH</strong> tag contained and <strong>PRINT</strong> arguments,
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcgi.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcgi.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDCGI(1) rrdtool RRDCGI(1)
+RRDCGI(1) RRDtool RRDCGI(1)
@@ -207,4 +207,4 @@
-1.0.46 2003-11-23 RRDCGI(1)
+1.0.49 2004-01-17 RRDCGI(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcreate.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.html Sat Aug 21 11:59:00 2004
@@ -27,7 +27,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool create - Set up a new Round Robin Database</p>
+<p>rrdcreate - Set up a new Round Robin Database</p>
<div align="right"><a href="rrdcreate.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -73,7 +73,7 @@
into the <strong>RRD</strong>.
</dd>
<p></p>
-<dt><strong><a name="item_ds%3ads%2dname%3adst%3aheartbeat%3amin%3amax"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>heartbeat</em><strong>:</strong><em>min</em><strong>:</strong><em>max</em></a></strong><br />
+<dt><strong><a name="item_ds_3ads_2dname_3adst_3aheartbeat_3amin_3amax"><strong>DS:</strong><em>ds-name</em><strong>:</strong><em>DST</em><strong>:</strong><em>heartbeat</em><strong>:</strong><em>min</em><strong>:</strong><em>max</em></a></strong><br />
</dt>
<dd>
A single <strong>RRD</strong> can accept input from several data sources (<strong>DS</strong>).
@@ -143,7 +143,7 @@
<p><em>If information on minimal/maximal expected values is available,
always set the min and/or max properties. This will help RRDTool in
doing a simple sanity check on the data supplied when running update.</em></p>
-<dt><strong><a name="item_rra%3acf%3axff%3asteps%3arows"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>xff</em><strong>:</strong><em>steps</em><strong>:</strong><em>rows</em></a></strong><br />
+<dt><strong><a name="item_rra_3acf_3axff_3asteps_3arows"><strong>RRA:</strong><em>CF</em><strong>:</strong><em>xff</em><strong>:</strong><em>steps</em><strong>:</strong><em>rows</em></a></strong><br />
</dt>
<dd>
The purpose of an <strong>RRD</strong> is to store data in the round robin archives
@@ -239,7 +239,7 @@
precision should be acceptable.
</dd>
<p></p>
-<dt><strong><a name="item_it%27s_always_a_rate">It's always a Rate</a></strong><br />
+<dt><strong><a name="item_it_27s_always_a_rate">It's always a Rate</a></strong><br />
</dt>
<dd>
RRDTool stores rates in amount/second for COUNTER, DERIVE and ABSOLUTE data.
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcreate.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool create - Set up a new Round Robin Database
+rrdcreate - Set up a new Round Robin Database
=for html <div align="right"><a href="rrdcreate.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdcreate.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdcreate.txt Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDCREATE(1) rrdtool RRDCREATE(1)
+RRDCREATE(1) RRDtool RRDCREATE(1)
NNAAMMEE
- rrdtool create - Set up a new Round Robin Database
+ rrdcreate - Set up a new Round Robin Database
SSYYNNOOPPSSIISS
rrrrddttooooll ccrreeaattee _f_i_l_e_n_a_m_e [----ssttaarrtt|--bb _s_t_a_r_t _t_i_m_e]
@@ -248,4 +248,4 @@
-1.0.46 2003-09-14 RRDCREATE(1)
+1.0.49 2004-01-17 RRDCREATE(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrddump.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.html Sat Aug 21 11:59:00 2004
@@ -16,6 +16,7 @@
<li><a href="#name">NAME</a></li>
<li><a href="#synopsis">SYNOPSIS</a></li>
<li><a href="#description">DESCRIPTION</a></li>
+ <li><a href="#examples">EXAMPLES</a></li>
<li><a href="#author">AUTHOR</a></li>
</ul>
-->
@@ -24,7 +25,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool dump - dump the contents of an <strong>RRD</strong> to XML format</p>
+<p>rrddump - dump the contents of an <strong>RRD</strong> to XML format</p>
<div align="right"><a href="rrddump.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -40,7 +41,7 @@
to another as well as manipulating the contents of an <strong>RRD</strong> file in a
somewhat more convenient manner.</p>
<dl>
-<dt><strong><a name="item_filename%2errd"><em>filename.rrd</em></a></strong><br />
+<dt><strong><a name="item_filename_2errd"><em>filename.rrd</em></a></strong><br />
</dt>
<dd>
The name of the <strong>RRD</strong> you want to dump.
@@ -49,8 +50,28 @@
<p>
</p>
<hr />
+<h1><a name="examples">EXAMPLES</a></h1>
+<p>To transfer an RRD between architectures, follow these steps:</p>
+<pre>
+
+=item 1.</pre>
+<p>On the same system where the RRD was created, use <strong>rrdtool</strong> <strong>dump</strong>
+to export the data to XML format.</p>
+<ol>
+<li></li>
+Transfer the XML dump to the target system
+<p></p>
+<li></li>
+Run <strong>rrdtool</strong> <strong>restore</strong> to create a new RRD from the XML dump. See
+<strong>rrdrestore</strong> for details.
+<p></p></ol>
+<p>
+</p>
+<hr />
<h1><a name="author">AUTHOR</a></h1>
-<p>Tobias Oetiker <<a href="mailto:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</a>></p>
+<p>Tobias Oetiker <<a href="mailto:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</a>>
+
+</p>
</body>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrddump.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool dump - dump the contents of an B<RRD> to XML format
+rrddump - dump the contents of an B<RRD> to XML format
=for html <div align="right"><a href="rrddump.pdf">PDF</a> version.</div>
@@ -16,9 +16,7 @@
to another as well as manipulating the contents of an B<RRD> file in a
somewhat more convenient manner.
-
-
-=over 8
+=over
=item I<filename.rrd>
@@ -26,6 +24,28 @@
=back
+=head1 EXAMPLES
+
+To transfer an RRD between architectures, follow these steps:
+
+=over 4
+
+=item 1.
+
+On the same system where the RRD was created, use B<rrdtool> B<dump>
+to export the data to XML format.
+
+=item 2.
+
+Transfer the XML dump to the target system
+
+=item 3.
+
+Run B<rrdtool> B<restore> to create a new RRD from the XML dump. See
+B<rrdrestore> for details.
+
+=back
+
=head1 AUTHOR
Tobias Oetiker E<lt>oetiker at ee.ethz.chE<gt>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrddump.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrddump.txt Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDDUMP(1) rrdtool RRDDUMP(1)
+RRDDUMP(1) RRDtool RRDDUMP(1)
NNAAMMEE
- rrdtool dump - dump the contents of an RRRRDD to XML format
+ rrddump - dump the contents of an RRRRDD to XML format
SSYYNNOOPPSSIISS
rrrrddttooooll dduummpp _f_i_l_e_n_a_m_e_._r_r_d > _f_i_l_e_n_a_m_e_._x_m_l
@@ -17,11 +17,23 @@
venient manner.
_f_i_l_e_n_a_m_e_._r_r_d
- The name of the RRRRDD you want to dump.
+ The name of the RRRRDD you want to dump.
+
+EEXXAAMMPPLLEESS
+ To transfer an RRD between architectures, follow these
+ steps:
+
+ 1. On the same system where the RRD was created, use rrrrdd--
+ ttooooll dduummpp to export the data to XML format.
+
+ 2. Transfer the XML dump to the target system
+
+ 3. Run rrrrddttooooll rreessttoorree to create a new RRD from the XML
+ dump. See rrrrddrreessttoorree for details.
AAUUTTHHOORR
Tobias Oetiker <oetiker at ee.ethz.ch>
-1.0.46 2002-02-26 RRDDUMP(1)
+1.0.49 2004-05-25 RRDDUMP(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdfetch.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.html Sat Aug 21 11:59:00 2004
@@ -33,7 +33,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool fetch - fetch data from an RRD.</p>
+<p>rrdfetch - fetch data from an RRD.</p>
<div align="right"><a href="rrdfetch.pdf">PDF</a> version.</div><p>
</p>
<hr />
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdfetch.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool fetch - fetch data from an RRD.
+rrdfetch - fetch data from an RRD.
=for html <div align="right"><a href="rrdfetch.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdfetch.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdfetch.txt Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDFETCH(1) rrdtool RRDFETCH(1)
+RRDFETCH(1) RRDtool RRDFETCH(1)
NNAAMMEE
- rrdtool fetch - fetch data from an RRD.
+ rrdfetch - fetch data from an RRD.
SSYYNNOOPPSSIISS
rrrrddttooooll ffeettcchh _f_i_l_e_n_a_m_e _C_F [----rreessoolluuttiioonn|--rr _r_e_s_o_l_u_t_i_o_n]
@@ -249,4 +249,4 @@
-1.0.46 2003-09-14 RRDFETCH(1)
+1.0.49 2004-01-17 RRDFETCH(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdgraph.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.html Sat Aug 21 11:59:00 2004
@@ -36,7 +36,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool graph - Create a graph based on data from one or several RRD</p>
+<p>rrdgraph - Create a graph based on data from one or several RRD</p>
<div align="right"><a href="rrdgraph.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -67,6 +67,8 @@
[<strong>-u</strong>|<strong>--upper-limit</strong> <em>value</em>]
[<strong>-l</strong>|<strong>--lower-limit</strong> <em>value</em>]
[<strong>-g</strong>|<strong>--no-legend</strong>]
+[<strong>-j</strong>|<strong>--only-graph</strong>]
+[<strong>-F</strong>|<strong>--force-rules-legend</strong>]
[<strong>-r</strong>|<strong>--rigid</strong>]
[<strong>-S</strong>|<strong>--step</strong> <em>value</em>]
[<strong>-b</strong>|<strong>--base</strong> <em>value</em>]
@@ -188,7 +190,7 @@
<p>If you want no y-grid at all set specify the magic word <strong>none</strong>.</p>
</dd>
<p></p>
-<dt><strong><a name="item_%2dy%7c%2d%2dalt%2dy%2dgrid"><strong>-Y</strong>|<strong>--alt-y-grid</strong></a></strong><br />
+<dt><strong><a name="item__2dy_7c_2d_2dalt_2dy_2dgrid"><strong>-Y</strong>|<strong>--alt-y-grid</strong></a></strong><br />
</dt>
<dd>
Place Y grid dynamically based on graph Y range. Algorithm ensures
@@ -197,7 +199,7 @@
every 1, 2, 5 or 10 units. (contributed by Sasha Mikheev)
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2dno%2dminor"><strong>--no-minor</strong></a></strong><br />
+<dt><strong><a name="item__2d_2dno_2dminor"><strong>--no-minor</strong></a></strong><br />
</dt>
<dd>
Turn off the minor grid lines. This is particularly useful for small
@@ -205,14 +207,14 @@
by Travis Brown)
</dd>
<p></p>
-<dt><strong><a name="item_%2dr%7c%2d%2dalt%2dy%2dmrtg"><strong>-R</strong>|<strong>--alt-y-mrtg</strong></a></strong><br />
+<dt><strong><a name="item__2dr_7c_2d_2dalt_2dy_2dmrtg"><strong>-R</strong>|<strong>--alt-y-mrtg</strong></a></strong><br />
</dt>
<dd>
Y grid placed on graph Y range mimics MRTG's (rateup-generated) graphs.
Currently axis is split into 4 parts, just as rateup does.
</dd>
<p></p>
-<dt><strong><a name="item_%2da%7c%2d%2dalt%2dautoscale"><strong>-A</strong>|<strong>--alt-autoscale</strong></a></strong><br />
+<dt><strong><a name="item__2da_7c_2d_2dalt_2dautoscale"><strong>-A</strong>|<strong>--alt-autoscale</strong></a></strong><br />
</dt>
<dd>
Compute Y range based on function absolute minimum and
@@ -225,7 +227,7 @@
and periodic behavior will be seen. (contributed by Sasha Mikheev)
</dd>
<p></p>
-<dt><strong><a name="item_%2dm%7c%2d%2dalt%2dautoscale%2dmax"><strong>-M</strong>|<strong>--alt-autoscale-max</strong></a></strong><br />
+<dt><strong><a name="item__2dm_7c_2d_2dalt_2dautoscale_2dmax"><strong>-M</strong>|<strong>--alt-autoscale-max</strong></a></strong><br />
</dt>
<dd>
Where --alt-autoscale will modify both the absolute maximum AND minimum
@@ -256,7 +258,7 @@
values.
</dd>
<p></p>
-<dt><strong><a name="item_%2dv%7c%2d%2dvertical%2dlabel_text"><strong>-v</strong>|<strong>--vertical-label</strong> <em>text</em></a></strong><br />
+<dt><strong><a name="item__2dv_7c_2d_2dvertical_2dlabel_text"><strong>-v</strong>|<strong>--vertical-label</strong> <em>text</em></a></strong><br />
</dt>
<dd>
vertical label on the left side of the graph. This is normally used to
@@ -266,15 +268,13 @@
<dt><strong><a name="item_pixels"><strong>-w</strong>|<strong>--width</strong> <em>pixels</em> (default 400 pixel)</a></strong><br />
</dt>
<dd>
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Width of the drawing area within the graph. This affects the size of the gif.
</dd>
<p></p>
<dt><strong><strong>-h</strong>|<strong>--height</strong> <em>pixels</em> (default 100 pixel)</strong><br />
</dt>
<dd>
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Height of the drawing area within the graph. This affects the size of the gif.
</dd>
<p></p>
<dt><strong><a name="item_interlaced"><strong>-i</strong>|<strong>--interlaced</strong> (default: false)</a></strong><br />
@@ -288,7 +288,7 @@
of the graph.
</dd>
<p></p>
-<dt><strong><a name="item_%2df%7c%2d%2dimginfo_formatstring"><strong>-f</strong>|<strong>--imginfo</strong> <em>formatstring</em></a></strong><br />
+<dt><strong><a name="item__2df_7c_2d_2dimginfo_formatstring"><strong>-f</strong>|<strong>--imginfo</strong> <em>formatstring</em></a></strong><br />
</dt>
<dd>
After the image has been created, the graph function uses printf
@@ -309,14 +309,14 @@
Allows you to produce PNG or GD output from RRDTool.
</dd>
<p></p>
-<dt><strong><a name="item_%2db%7c%2d%2dbackground_value"><strong>-B</strong>|<strong>--background</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2db_7c_2d_2dbackground_value"><strong>-B</strong>|<strong>--background</strong> <em>value</em></a></strong><br />
</dt>
<dd>
You could use image in (currently only) GD format for background. It is
used as background at the very beginning of graph creation.
</dd>
<p></p>
-<dt><strong><a name="item_%2do%7c%2d%2doverlay_value"><strong>-O</strong>|<strong>--overlay</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2do_7c_2d_2doverlay_value"><strong>-O</strong>|<strong>--overlay</strong> <em>value</em></a></strong><br />
</dt>
<dd>
You could use image in (currently only) GD format as overlay. It is
@@ -324,7 +324,7 @@
considered transparent, all other is replacing corresponding pixel in created graph.
</dd>
<p></p>
-<dt><strong><a name="item_%2du%7c%2d%2dunit_value"><strong>-U</strong>|<strong>--unit</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2du_7c_2d_2dunit_value"><strong>-U</strong>|<strong>--unit</strong> <em>value</em></a></strong><br />
</dt>
<dd>
You could use unit to be displayed on y axis. It is wise to use only short
@@ -359,7 +359,7 @@
keyword to expand graphs down.
</dd>
<p></p>
-<dt><strong><a name="item_%2dr%7c%2d%2drigid"><strong>-r</strong>|<strong>--rigid</strong></a></strong><br />
+<dt><strong><a name="item__2dr_7c_2d_2drigid"><strong>-r</strong>|<strong>--rigid</strong></a></strong><br />
</dt>
<dd>
rigid boundaries mode. Normally <strong>rrdgraph</strong> will automatically expand the
@@ -367,7 +367,7 @@
range. With the r option you can disable this behavior
</dd>
<p></p>
-<dt><strong><a name="item_%2db%7c%2d%2dbase_value"><strong>-b</strong>|<strong>--base</strong> <em>value</em></a></strong><br />
+<dt><strong><a name="item__2db_7c_2d_2dbase_value"><strong>-b</strong>|<strong>--base</strong> <em>value</em></a></strong><br />
</dt>
<dd>
if you are graphing memory (and NOT network traffic) this switch
@@ -375,7 +375,7 @@
measurement, 1 kb/s is 1000 b/s.
</dd>
<p></p>
-<dt><strong><a name="item_%2do%7c%2d%2dlogarithmic"><strong>-o</strong>|<strong>--logarithmic</strong></a></strong><br />
+<dt><strong><a name="item__2do_7c_2d_2dlogarithmic"><strong>-o</strong>|<strong>--logarithmic</strong></a></strong><br />
</dt>
<dd>
logarithmic y-axis scaling
@@ -391,12 +391,24 @@
can be called multiple times to set several colors.
</dd>
<p></p>
-<dt><strong><a name="item_%2dg%7c%2d%2dno%2dlegend"><strong>-g</strong>|<strong>--no-legend</strong></a></strong><br />
+<dt><strong><a name="item__2dg_7c_2d_2dno_2dlegend"><strong>-g</strong>|<strong>--no-legend</strong></a></strong><br />
</dt>
<dd>
Suppress generation of legend; only render the graph.
</dd>
<p></p>
+<dt><strong><a name="item__2dj_7c_2d_2donly_2dgraph"><strong>-j</strong>|<strong>--only-graph</strong></a></strong><br />
+</dt>
+<dd>
+Suppress anything but the graph, works only for height < 64.
+</dd>
+<p></p>
+<dt><strong><a name="item__2df_7c_2d_2dforce_2drules_2dlegend"><strong>-F</strong>|<strong>--force-rules-legend</strong></a></strong><br />
+</dt>
+<dd>
+Force the generation of HRULE and VRULE legend even if those HRULE or VRULE will not be drawn because out of graph boundaries (mimics behaviour of pre 1.0.42 versions).
+</dd>
+<p></p>
<dt><strong><a name="item_text"><strong>-t</strong>|<strong>--title</strong> <em>text</em> (default no title)</a></strong><br />
</dt>
<dd>
@@ -413,7 +425,7 @@
that a step smaller than 1 pixel will be silently ignored.
</dd>
<p></p>
-<dt><strong><a name="item_def%3avname%3drrd%3ads%2dname%3acf"><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrd</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em></a></strong><br />
+<dt><strong><a name="item_def_3avname_3drrd_3ads_2dname_3acf"><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrd</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em></a></strong><br />
</dt>
<dd>
Define virtual name for a data source. This name can then be used
@@ -426,7 +438,7 @@
consolidated according to the consolidation function (<em>CF</em>) chosen.
</dd>
<p></p>
-<dt><strong><a name="item_cdef%3avname%3drpn%2dexpression"><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>rpn-expression</em></a></strong><br />
+<dt><strong><a name="item_cdef_3avname_3drpn_2dexpression"><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>rpn-expression</em></a></strong><br />
</dt>
<dd>
Create a new virtual data source by evaluating a mathematical expression,
@@ -456,7 +468,7 @@
values:</p>
</dd>
<dl>
-<dt><strong><a name="item_%2b%2c_%2d%2c_%2a%2c_%2f%2c_%25">+, -, *, /, %</a></strong><br />
+<dt><strong><a name="item__2b_2c__2d_2c__2a_2c__2f_2c__25">+, -, *, /, %</a></strong><br />
</dt>
<dd>
pops two values from the stack applies the selected operator and pushes
@@ -464,14 +476,14 @@
operation.
</dd>
<p></p>
-<dt><strong><a name="item_sin%2c_cos%2c_log%2c_exp%2c_floor%2c_ceil">SIN, COS, LOG, EXP, FLOOR, CEIL</a></strong><br />
+<dt><strong><a name="item_sin_2c_cos_2c_log_2c_exp_2c_floor_2c_ceil">SIN, COS, LOG, EXP, FLOOR, CEIL</a></strong><br />
</dt>
<dd>
pops one value from the stack, applies the selected function and pushes
the result back onto the stack.
</dd>
<p></p>
-<dt><strong><a name="item_lt%2c_le%2c_gt%2c_ge%2c_eq">LT, LE, GT, GE, EQ</a></strong><br />
+<dt><strong><a name="item_lt_2c_le_2c_gt_2c_ge_2c_eq">LT, LE, GT, GE, EQ</a></strong><br />
</dt>
<dd>
pops two values from the stack, compares them according to the selected
@@ -493,7 +505,7 @@
E will be sent back to the stack.</p>
</dd>
<p></p>
-<dt><strong><a name="item_min%2c_max">MIN, MAX</a></strong><br />
+<dt><strong><a name="item_min_2c_max">MIN, MAX</a></strong><br />
</dt>
<dd>
selects the lesser or larger of the two top stack values respectively
@@ -510,7 +522,7 @@
CDEF:a=alpha,0,100,LIMIT</pre>
</dd>
<p></p>
-<dt><strong><a name="item_dup%2c_exc%2c_pop">DUP, EXC, POP</a></strong><br />
+<dt><strong><a name="item_dup_2c_exc_2c_pop">DUP, EXC, POP</a></strong><br />
</dt>
<dd>
These manipulate the stack directly. DUP will duplicate the top of the
@@ -549,7 +561,7 @@
This allows you to perform complex calculations across the data.
</dd>
<p></p>
-<dt><strong><a name="item_inf%2c_neginf">INF, NEGINF</a></strong><br />
+<dt><strong><a name="item_inf_2c_neginf">INF, NEGINF</a></strong><br />
</dt>
<dd>
Push a positive or negative infinite (oo) value onto the stack. When
@@ -590,7 +602,7 @@
this writing (version 0.99.25), you must use at least one <em>vname</em>
per expression, that is ``CDEF:fourtytwo=2,40,+'' will yield an error
message but not a <em>vname</em> fourtytwo that's always equal to 42.</p>
-<dt><strong><a name="item_print%3avname%3acf%3aformat"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
+<dt><strong><a name="item_print_3avname_3acf_3aformat"><strong>PRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
</dt>
<dd>
Calculate the chosen consolidation function <em>CF</em> over the data-source
@@ -617,7 +629,7 @@
<p>If you want to put a '%' into your PRINT string, use '%%' instead.</p>
</dd>
<p></p>
-<dt><strong><a name="item_gprint%3avname%3acf%3aformat"><strong>GPRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
+<dt><strong><a name="item_gprint_3avname_3acf_3aformat"><strong>GPRINT:</strong><em>vname</em><strong>:</strong><em>CF</em><strong>:</strong><em>format</em></a></strong><br />
</dt>
<dd>
Same as <strong>PRINT</strong> but the result is printed into the graph below the legend.
@@ -631,25 +643,25 @@
function. In order to avoid this, make sure that your end time is at
least one heartbeat prior to the current time.</p>
<dl>
-<dt><strong><a name="item_comment%3atext"><strong>COMMENT:</strong><em>text</em></a></strong><br />
+<dt><strong><a name="item_comment_3atext"><strong>COMMENT:</strong><em>text</em></a></strong><br />
</dt>
<dd>
Like <strong>GPRINT</strong> but the <em>text</em> is simply printed into the graph.
</dd>
<p></p>
-<dt><strong><a name="item_hrule%3avalue%23rrggbb%5b%3alegend%5d"><strong>HRULE:</strong><em>value</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
+<dt><strong><a name="item_hrule_3avalue_23rrggbb_5b_3alegend_5d"><strong>HRULE:</strong><em>value</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
</dt>
<dd>
Draw a horizontal rule into the graph and optionally add a legend
</dd>
<p></p>
-<dt><strong><a name="item_vrule%3atime%23rrggbb%5b%3alegend%5d"><strong>VRULE:</strong><em>time</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
+<dt><strong><a name="item_vrule_3atime_23rrggbb_5b_3alegend_5d"><strong>VRULE:</strong><em>time</em><strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]</a></strong><br />
</dt>
<dd>
Draw a vertical rule into the graph and optionally add a legend
</dd>
<p></p>
-<dt><strong><a name="item_line%7b1%7c2%7c3%7d%3avname%5b%23rrggbb%5b%3alegen"><strong>LINE</strong>{<strong>1</strong>|<strong>2</strong>|<strong>3</strong>}<strong>:</strong><em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
+<dt><strong><a name="item_line_7b1_7c2_7c3_7d_3avname_5b_23rrggbb_5b_3alegen"><strong>LINE</strong>{<strong>1</strong>|<strong>2</strong>|<strong>3</strong>}<strong>:</strong><em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
</dt>
<dd>
Plot for the requested data, using the color specified. Write a legend
@@ -660,14 +672,14 @@
data-sources without showing it in the graph.
</dd>
<p></p>
-<dt><strong><a name="item_area%3avname%5b%23rrggbb%5b%3alegend%5d%5d"><strong>AREA</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
+<dt><strong><a name="item_area_3avname_5b_23rrggbb_5b_3alegend_5d_5d"><strong>AREA</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
</dt>
<dd>
Does the same as <strong>LINE?</strong>, but the area between 0 and
the graph will be filled with the color specified.
</dd>
<p></p>
-<dt><strong><a name="item_stack%3avname%5b%23rrggbb%5b%3alegend%5d%5d"><strong>STACK</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
+<dt><strong><a name="item_stack_3avname_5b_23rrggbb_5b_3alegend_5d_5d"><strong>STACK</strong>:<em>vname</em>[<strong>#</strong><em>rrggbb</em>[<strong>:</strong><em>legend</em>]]</a></strong><br />
</dt>
<dd>
Does the same as <strong>LINE?</strong>, but the graph gets stacked on top of the previous
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdgraph.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool graph - Create a graph based on data from one or several RRD
+rrdgraph - Create a graph based on data from one or several RRD
=for html <div align="right"><a href="rrdgraph.pdf">PDF</a> version.</div>
@@ -32,6 +32,8 @@
S<[B<-u>|B<--upper-limit> I<value>]>
S<[B<-l>|B<--lower-limit> I<value>]>
S<[B<-g>|B<--no-legend>]>
+S<[B<-j>|B<--only-graph>]>
+S<[B<-F>|B<--force-rules-legend>]>
S<[B<-r>|B<--rigid>]>
S<[B<-S>|B<--step> I<value>]>
S<[B<-b>|B<--base> I<value>]>
@@ -194,13 +196,11 @@
=item B<-w>|B<--width> I<pixels> (default 400 pixel)
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Width of the drawing area within the graph. This affects the size of the gif.
=item B<-h>|B<--height> I<pixels> (default 100 pixel)
-Width of the drawing area within the graph. This affects the size of the
-gif.
+Height of the drawing area within the graph. This affects the size of the gif.
=item B<-i>|B<--interlaced> (default: false)
@@ -291,6 +291,14 @@
Suppress generation of legend; only render the graph.
+=item B<-j>|B<--only-graph>
+
+Suppress anything but the graph, works only for height < 64.
+
+=item B<-F>|B<--force-rules-legend>
+
+Force the generation of HRULE and VRULE legend even if those HRULE or VRULE will not be drawn because out of graph boundaries (mimics behaviour of pre 1.0.42 versions).
+
=item B<-t>|B<--title> I<text> (default no title)
Define a title to be written into the graph
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdgraph.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdgraph.txt Sat Aug 21 11:59:00 2004
@@ -1,10 +1,10 @@
-RRDGRAPH(1) rrdtool RRDGRAPH(1)
+RRDGRAPH(1) RRDtool RRDGRAPH(1)
NNAAMMEE
- rrdtool graph - Create a graph based on data from one or
- several RRD
+ rrdgraph - Create a graph based on data from one or sev-
+ eral RRD
SSYYNNOOPPSSIISS
rrrrddttooooll ggrraapphh _f_i_l_e_n_a_m_e [--ss|----ssttaarrtt _s_e_c_o_n_d_s] [--ee|----eenndd _s_e_c_-
@@ -18,12 +18,13 @@
ffoorrmmaatt GGIIFF|PPNNGG|GGDD] [--BB|----bbaacckkggrroouunndd _v_a_l_u_e] [--OO|----oovveerr--
llaayy _v_a_l_u_e] [--UU|----uunniitt _v_a_l_u_e] [--zz|----llaazzyy] [--oo|----llooggaarriitthh--
mmiicc] [--uu|----uuppppeerr--lliimmiitt _v_a_l_u_e] [--ll|----lloowweerr--lliimmiitt _v_a_l_u_e]
- [--gg|----nnoo--lleeggeenndd] [--rr|----rriiggiidd] [--SS|----sstteepp _v_a_l_u_e]
- [--bb|----bbaassee _v_a_l_u_e] [--cc|----ccoolloorr _C_O_L_O_R_T_A_G##_r_r_g_g_b_b]
- [--tt|----ttiittllee _t_i_t_l_e] [DDEEFF::_v_n_a_m_e==_r_r_d::_d_s_-_n_a_m_e::_C_F]
- [CCDDEEFF::_v_n_a_m_e==_r_p_n_-_e_x_p_r_e_s_s_i_o_n] [PPRRIINNTT::_v_n_a_m_e::_C_F::_f_o_r_m_a_t]
- [GGPPRRIINNTT::_v_n_a_m_e::_C_F::_f_o_r_m_a_t] [CCOOMMMMEENNTT::_t_e_x_t]
- [HHRRUULLEE::_v_a_l_u_e##_r_r_g_g_b_b[::_l_e_g_e_n_d]] [VVRRUULLEE::_t_i_m_e##_r_r_g_g_b_b[::_l_e_g_e_n_d]]
+ [--gg|----nnoo--lleeggeenndd] [--jj|----oonnllyy--ggrraapphh] [--FF|----ffoorrccee--rruulleess--lleegg--
+ eenndd] [--rr|----rriiggiidd] [--SS|----sstteepp _v_a_l_u_e] [--bb|----bbaassee _v_a_l_u_e]
+ [--cc|----ccoolloorr _C_O_L_O_R_T_A_G##_r_r_g_g_b_b] [--tt|----ttiittllee _t_i_t_l_e]
+ [DDEEFF::_v_n_a_m_e==_r_r_d::_d_s_-_n_a_m_e::_C_F] [CCDDEEFF::_v_n_a_m_e==_r_p_n_-_e_x_p_r_e_s_s_i_o_n]
+ [PPRRIINNTT::_v_n_a_m_e::_C_F::_f_o_r_m_a_t] [GGPPRRIINNTT::_v_n_a_m_e::_C_F::_f_o_r_m_a_t] [CCOOMM--
+ MMEENNTT::_t_e_x_t] [HHRRUULLEE::_v_a_l_u_e##_r_r_g_g_b_b[::_l_e_g_e_n_d]]
+ [VVRRUULLEE::_t_i_m_e##_r_r_g_g_b_b[::_l_e_g_e_n_d]]
[LLIINNEE{11|22|33}::_v_n_a_m_e[##_r_r_g_g_b_b[::_l_e_g_e_n_d]]]
[AARREEAA::_v_n_a_m_e[##_r_r_g_g_b_b[::_l_e_g_e_n_d]]] [SSTTAACCKK::_v_n_a_m_e[##_r_r_g_g_b_b[::_l_e_g_-
_e_n_d]]]
@@ -184,7 +185,7 @@
affects the size of the gif.
--hh|----hheeiigghhtt _p_i_x_e_l_s (default 100 pixel)
- Width of the drawing area within the graph. This
+ Height of the drawing area within the graph. This
affects the size of the gif.
--ii|----iinntteerrllaacceedd (default: false)
@@ -274,6 +275,16 @@
--gg|----nnoo--lleeggeenndd
Suppress generation of legend; only render the graph.
+ --jj|----oonnllyy--ggrraapphh
+ Suppress anything but the graph, works only for height
+ < 64.
+
+ --FF|----ffoorrccee--rruulleess--lleeggeenndd
+ Force the generation of HRULE and VRULE legend even if
+ those HRULE or VRULE will not be drawn because out of
+ graph boundaries (mimics behaviour of pre 1.0.42 ver-
+ sions).
+
--tt|----ttiittllee _t_e_x_t (default no title)
Define a title to be written into the graph
@@ -448,12 +459,12 @@
value, the previously calculated SI magnitude unit
will be used. This is useful if you want all the val-
ues in a PRINT statement to have the same SI magnitude
- unit. If there was no previous SI magnitude calcula-
- tion made, then '%S' behaves like a '%s', unless the
- value is 0, in which case it does not remember a SI
- magnitude unit and a SI magnitude unit will only be
- calculated when the next '%s' is seen or the next '%S'
- for a non-zero value.
+ unit. If there was no previous SI magnitude
+ calculation made, then '%S' behaves like a '%s',
+ unless the value is 0, in which case it does not
+ remember a SI magnitude unit and a SI magnitude unit
+ will only be calculated when the next '%s' is seen or
+ the next '%S' for a non-zero value.
If you want to put a '%' into your PRINT string, use
'%%' instead.
@@ -512,6 +523,10 @@
*UNKNOWN* into zero ...
NNOOTTEESS oonn lleeggeenndd aarrgguummeennttss
+
+
+
+
EEssccaappiinngg tthhee ccoolloonn
In a ':' in a _l_e_g_e_n_d argument will mark the end of the
@@ -571,6 +586,12 @@
you are aggregating interface data where the start dates
of the data sets doesn't match.
+
+
+
+
+
+
rrdtool graph demo.gif --title="Demo Graph" \
DEF:idat1=interface1.rrd:ds0:AVERAGE \
DEF:idat2=interface2.rrd:ds0:AVERAGE \
@@ -643,4 +664,4 @@
-1.0.46 2003-10-09 RRDGRAPH(1)
+1.0.49 2004-04-06 RRDGRAPH(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdinfo.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.html Sat Aug 21 11:59:00 2004
@@ -25,7 +25,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool info - extract header information from an RRD</p>
+<p>rrdinfo - extract header information from an RRD</p>
<div align="right"><a href="rrdinfo.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -75,7 +75,7 @@
rra[0].cdp_prep[1].value = nan
rra[0].cdp_prep[1].unknown_datapoints = 0</pre>
<dl>
-<dt><strong><a name="item_filename%2errd"><em>filename.rrd</em></a></strong><br />
+<dt><strong><a name="item_filename_2errd"><em>filename.rrd</em></a></strong><br />
</dt>
<dd>
The name of the <strong>RRD</strong> you want to dump.
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdinfo.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool info - extract header information from an RRD
+rrdinfo - extract header information from an RRD
=for html <div align="right"><a href="rrdinfo.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdinfo.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdinfo.txt Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDINFO(1) rrdtool RRDINFO(1)
+RRDINFO(1) RRDtool RRDINFO(1)
NNAAMMEE
- rrdtool info - extract header information from an RRD
+ rrdinfo - extract header information from an RRD
SSYYNNOOPPSSIISS
rrrrddttooooll iinnffoo _f_i_l_e_n_a_m_e_._r_r_d
@@ -56,4 +56,4 @@
-1.0.46 2003-09-14 RRDINFO(1)
+1.0.49 2004-01-17 RRDINFO(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdlast.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.html Sat Aug 21 11:59:00 2004
@@ -24,7 +24,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool last - Return the date of the last data sample in an <strong>RRD</strong></p>
+<p>rrdlast - Return the date of the last data sample in an <strong>RRD</strong></p>
<div align="right"><a href="rrdlast.pdf">PDF</a> version.</div><p>
</p>
<hr />
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdlast.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool last - Return the date of the last data sample in an B<RRD>
+rrdlast - Return the date of the last data sample in an B<RRD>
=for html <div align="right"><a href="rrdlast.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdlast.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdlast.txt Sat Aug 21 11:59:00 2004
@@ -1,10 +1,10 @@
-RRDLAST(1) rrdtool RRDLAST(1)
+RRDLAST(1) RRDtool RRDLAST(1)
NNAAMMEE
- rrdtool last - Return the date of the last data sample in
- an RRRRDD
+ rrdlast - Return the date of the last data sample in an
+ RRRRDD
SSYYNNOOPPSSIISS
rrrrddttooooll llaasstt _f_i_l_e_n_a_m_e
@@ -21,4 +21,4 @@
-1.0.46 2002-02-26 RRDLAST(1)
+1.0.49 2004-01-17 RRDLAST(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdresize.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.html Sat Aug 21 11:59:00 2004
@@ -25,7 +25,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool resize - alters the size of an RRA and creates new .rrd file</p>
+<p>rrdresize - alters the size of an RRA and creates new .rrd file</p>
<div align="right"><a href="rrdresize.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -44,7 +44,7 @@
the name of the <strong>RRD</strong> you want to alter.
</dd>
<p></p>
-<dt><strong><a name="item_rra%2dnum"><em>rra-num</em></a></strong><br />
+<dt><strong><a name="item_rra_2dnum"><em>rra-num</em></a></strong><br />
</dt>
<dd>
the <strong>RRA</strong> you want to alter. You can find the number using <strong>rrdtool info</strong>.
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdresize.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool resize - alters the size of an RRA and creates new .rrd file
+rrdresize - alters the size of an RRA and creates new .rrd file
=for html <div align="right"><a href="rrdresize.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdresize.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdresize.txt Sat Aug 21 11:59:00 2004
@@ -1,10 +1,10 @@
-RRDRESIZE(1) rrdtool RRDRESIZE(1)
+RRDRESIZE(1) RRDtool RRDRESIZE(1)
NNAAMMEE
- rrdtool resize - alters the size of an RRA and creates new
- .rrd file
+ rrdresize - alters the size of an RRA and creates new .rrd
+ file
SSYYNNOOPPSSIISS
rrrrddttooooll rreessiizzee _f_i_l_e_n_a_m_e _r_r_a_-_n_u_m GGRROOWW_|SSHHRRIINNKK _r_o_w_s
@@ -44,4 +44,4 @@
-1.0.46 2003-09-14 RRDRESIZE(1)
+1.0.49 2004-01-17 RRDRESIZE(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdrestore.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.html Sat Aug 21 11:59:00 2004
@@ -24,7 +24,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool restore - restore the contents of an <strong>RRD</strong> from its XML dump format</p>
+<p>rrdrestore - restore the contents of an <strong>RRD</strong> from its XML dump format</p>
<div align="right"><a href="rrdrestore.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -38,19 +38,19 @@
<p>The <strong>restore</strong> function reads the XML representation of an RRD and converts
it into the native <strong>RRD</strong> format.</p>
<dl>
-<dt><strong><a name="item_filename%2exml"><em>filename.xml</em></a></strong><br />
+<dt><strong><a name="item_filename_2exml"><em>filename.xml</em></a></strong><br />
</dt>
<dd>
The name of the <strong>XML</strong> you want to restore.
</dd>
<p></p>
-<dt><strong><a name="item_filename%2errd"><em>filename.rrd</em></a></strong><br />
+<dt><strong><a name="item_filename_2errd"><em>filename.rrd</em></a></strong><br />
</dt>
<dd>
The name of the <strong>RRD</strong> to restore.
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2drange%2dcheck%7c%2dr"><strong>--range-check</strong>|<strong>-r</strong></a></strong><br />
+<dt><strong><a name="item__2d_2drange_2dcheck_7c_2dr"><strong>--range-check</strong>|<strong>-r</strong></a></strong><br />
</dt>
<dd>
Make sure the values in the RRAs do not exceed the limits defined for
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdrestore.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool restore - restore the contents of an B<RRD> from its XML dump format
+rrdrestore - restore the contents of an B<RRD> from its XML dump format
=for html <div align="right"><a href="rrdrestore.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdrestore.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdrestore.txt Sat Aug 21 11:59:00 2004
@@ -1,10 +1,10 @@
-RRDRESTORE(1) rrdtool RRDRESTORE(1)
+RRDRESTORE(1) RRDtool RRDRESTORE(1)
NNAAMMEE
- rrdtool restore - restore the contents of an RRRRDD from its
- XML dump format
+ rrdrestore - restore the contents of an RRRRDD from its XML
+ dump format
SSYYNNOOPPSSIISS
rrrrddttooooll rreessttoorree _f_i_l_e_n_a_m_e_._x_m_l _f_i_l_e_n_a_m_e_._r_r_d
@@ -29,4 +29,4 @@
-1.0.46 2002-02-26 RRDRESTORE(1)
+1.0.49 2004-01-17 RRDRESTORE(1)
Added: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-dump.dtd
==============================================================================
--- (empty file)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-dump.dtd Sat Aug 21 11:59:00 2004
@@ -0,0 +1,39 @@
+<!-- rrdtool-dump.dtd -->
+<!-- wolfgang{dot}schrimm{at}urz{dot}uni-heidelberg{dot}de -->
+
+<!-- root element -->
+<!ELEMENT rrd (version, step, lastupdate, ds+, rra+)>
+
+<!-- rrd's children -->
+<!ELEMENT version (#PCDATA)>
+<!ELEMENT step (#PCDATA)>
+<!ELEMENT lastupdate (#PCDATA)>
+<!-- There are two different elements with the same name -->
+<!-- /rrd/ds and /rrd/rra/cdp_prep/ds -->
+<!ELEMENT ds ((name, type, minimal_heartbeat, min, max, last_ds, value,
+unknown_sec)|(value, unknown_datapoints))>
+<!ELEMENT rra (cf, pdp_per_row, xff, cdp_prep, database)>
+
+<!-- ds's children -->
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT type (#PCDATA)>
+<!ELEMENT minimal_heartbeat (#PCDATA)>
+<!ELEMENT min (#PCDATA)>
+<!ELEMENT max (#PCDATA)>
+<!ELEMENT last_ds (#PCDATA)>
+<!ELEMENT unknown_sec (#PCDATA)>
+<!ELEMENT unknown_datapoints (#PCDATA)>
+<!-- There are two different elements with the same name -->
+<!-- /rrd/ds/value and /rrd/rra/cdp_prep/ds/value -->
+<!ELEMENT value (#PCDATA)>
+
+<!-- rra's children -->
+<!ELEMENT cf (#PCDATA)>
+<!ELEMENT pdp_per_row (#PCDATA)>
+<!ELEMENT xff (#PCDATA)>
+<!ELEMENT cdp_prep (ds+)>
+<!ELEMENT database (row+)>
+
+<!-- database's children -->
+<!ELEMENT row (v+)>
+<!ELEMENT v (#PCDATA)>
Added: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-xport.dtd
==============================================================================
--- (empty file)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool-xport.dtd Sat Aug 21 11:59:00 2004
@@ -0,0 +1,32 @@
+<!-- rrdtool-xport.dtd -->
+<!-- the attributes of the row and the t elements are used -->
+<!-- in the examples/shared-demo.pl, but not in the output -->
+<!-- of the native xport command. -->
+<!-- wolfgang{dot}schrimm{at}urz{dot}uni-heidelberg{dot}de -->
+
+<!-- root element -->
+<!ELEMENT xport (meta, data)>
+
+<!-- root's children -->
+<!ELEMENT meta (start, step, end, rows, columns, legend)>
+<!ELEMENT data (row+)>
+
+<!-- meta's children -->
+<!ELEMENT start (#PCDATA)>
+<!ELEMENT step (#PCDATA)>
+<!ELEMENT end (#PCDATA)>
+<!ELEMENT rows (#PCDATA)>
+<!ELEMENT columns (#PCDATA)>
+<!ELEMENT legend (entry+)>
+
+<!-- legend's children -->
+<!ELEMENT entry (#PCDATA)>
+
+<!-- data's children -->
+<!ELEMENT row (t, v+)>
+<!ATTLIST row id CDATA #IMPLIED>
+
+<!-- row's children -->
+<!ELEMENT t (#PCDATA)>
+<!ATTLIST t is CDATA #IMPLIED>
+<!ELEMENT v (#PCDATA)>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtool.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtool.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDTOOL(1) rrdtool RRDTOOL(1)
+RRDTOOL(1) RRDtool RRDTOOL(1)
@@ -202,4 +202,4 @@
-1.0.46 2003-09-14 RRDTOOL(1)
+1.0.49 2004-01-17 RRDTOOL(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtune.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.html Sat Aug 21 11:59:00 2004
@@ -25,7 +25,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool tune - Modify some basic properties of a Round Robin Database</p>
+<p>rrdtune - Modify some basic properties of a Round Robin Database</p>
<div align="right"><a href="rrdtune.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -56,34 +56,34 @@
The name of the <strong>RRD</strong> you want to tune.
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2dheartbeat%7c%2dh_ds%2dname%3aheartbeat"><strong>--heartbeat</strong>|<strong>-h</strong> <em>ds-name</em>:<em>heartbeat</em></a></strong><br />
+<dt><strong><a name="item__2d_2dheartbeat_7c_2dh_ds_2dname_3aheartbeat"><strong>--heartbeat</strong>|<strong>-h</strong> <em>ds-name</em>:<em>heartbeat</em></a></strong><br />
</dt>
<dd>
modify the <em>heartbeat</em> of a data source. By setting this to a high
value the RRD will accept things like one value per day ...
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2dminimum%7c%2di_ds%2dname%3amin"><strong>--minimum</strong>|<strong>-i</strong> <em>ds-name</em>:<em>min</em></a></strong><br />
+<dt><strong><a name="item__2d_2dminimum_7c_2di_ds_2dname_3amin"><strong>--minimum</strong>|<strong>-i</strong> <em>ds-name</em>:<em>min</em></a></strong><br />
</dt>
<dd>
alter the minimum value acceptable as input from the data source.
Setting <em>min</em> to 'U' will disable this limit.
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2dmaximum%7c%2da_ds%2dname%3amax"><strong>--maximum</strong>|<strong>-a</strong> <em>ds-name</em>:<em>max</em></a></strong><br />
+<dt><strong><a name="item__2d_2dmaximum_7c_2da_ds_2dname_3amax"><strong>--maximum</strong>|<strong>-a</strong> <em>ds-name</em>:<em>max</em></a></strong><br />
</dt>
<dd>
alter the maximum value acceptable as input from the data source.
Setting <em>max</em> to 'U' will disable this limit.
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2ddata%2dsource%2dtype%7c%2dd_ds%2dname%3adst"><strong>--data-source-type</strong>|<strong>-d</strong> <em>ds-name</em>:<em>DST</em></a></strong><br />
+<dt><strong><a name="item__2d_2ddata_2dsource_2dtype_7c_2dd_ds_2dname_3adst"><strong>--data-source-type</strong>|<strong>-d</strong> <em>ds-name</em>:<em>DST</em></a></strong><br />
</dt>
<dd>
alter the type <strong>DST</strong> of a data source.
</dd>
<p></p>
-<dt><strong><a name="item_%5b%2d%2ddata%2dsource%2drename%7c%2dr_old%2dname%">[<strong>--data-source-rename</strong>|<strong>-r</strong> <em>old-name</em>:<em>new-name</em>]</a></strong><br />
+<dt><strong><a name="item__5b_2d_2ddata_2dsource_2drename_7c_2dr_old_2dname_">[<strong>--data-source-rename</strong>|<strong>-r</strong> <em>old-name</em>:<em>new-name</em>]</a></strong><br />
</dt>
<dd>
rename a data source
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtune.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool tune - Modify some basic properties of a Round Robin Database
+rrdtune - Modify some basic properties of a Round Robin Database
=for html <div align="right"><a href="rrdtune.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtune.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtune.txt Sat Aug 21 11:59:00 2004
@@ -1,10 +1,10 @@
-RRDTUNE(1) rrdtool RRDTUNE(1)
+RRDTUNE(1) RRDtool RRDTUNE(1)
NNAAMMEE
- rrdtool tune - Modify some basic properties of a Round
- Robin Database
+ rrdtune - Modify some basic properties of a Round Robin
+ Database
SSYYNNOOPPSSIISS
rrrrddttooooll ttuunnee _f_i_l_e_n_a_m_e [----hheeaarrttbbeeaatt|--hh _d_s_-_n_a_m_e:_h_e_a_r_t_b_e_a_t]
@@ -64,4 +64,4 @@
-1.0.46 2003-09-14 RRDTUNE(1)
+1.0.49 2004-01-17 RRDTUNE(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtutorial.es.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.html Sat Aug 21 11:59:00 2004
@@ -19,30 +19,30 @@
<ul>
<li><a href="#importante">Importante</a></li>
- <li><a href="#¿qué_es_rrdtool">¿Qué es RRDtool?</a></li>
- <li><a href="#¿qué_datos_pueden_guardarse_en_una_rrd">¿Qué datos pueden guardarse en una RRD?</a></li>
- <li><a href="#¿qué_puedo_hacer_con_esta_herramienta">¿Qué puedo hacer con esta herramienta?</a></li>
- <li><a href="#¿y_si_aún_tengo_problemas_después_de_leer_este_documento">¿Y si aún tengo problemas después de leer este documento?</a></li>
- <li><a href="#¿cómo_me_vas_a_ayudar">¿Cómo me vas a ayudar?</a></li>
+ <li><a href="#_qu__es_rrdtool">¿Qué es RRDtool?</a></li>
+ <li><a href="#_qu__datos_pueden_guardarse_en_una_rrd">¿Qué datos pueden guardarse en una RRD?</a></li>
+ <li><a href="#_qu__puedo_hacer_con_esta_herramienta">¿Qué puedo hacer con esta herramienta?</a></li>
+ <li><a href="#_y_si_a_n_tengo_problemas_despu_s_de_leer_este_documento">¿Y si aún tengo problemas después de leer este documento?</a></li>
+ <li><a href="#_c_mo_me_vas_a_ayudar">¿Cómo me vas a ayudar?</a></li>
<li><a href="#tu_primera_base_de_datos_en_roundrobin">Tu primera base de datos en round-robin</a></li>
- <li><a href="#¿qué_hemos_creado">¿Qué hemos creado?</a></li>
- <li><a href="#hora_de_hacer_algunos_gráficos">Hora de hacer algunos gráficos</a></li>
- <li><a href="#gráficos_con_un_poco_de_matemática">Gráficos con un poco de matemática</a></li>
- <li><a href="#magia_gráfica">Magia gráfica</a></li>
+ <li><a href="#_qu__hemos_creado">¿Qué hemos creado?</a></li>
+ <li><a href="#hora_de_hacer_algunos_gr_ficos">Hora de hacer algunos gráficos</a></li>
+ <li><a href="#gr_ficos_con_un_poco_de_matem_tica">Gráficos con un poco de matemática</a></li>
+ <li><a href="#magia_gr_fica">Magia gráfica</a></li>
<li><a href="#actualizaciones_de_verdad">Actualizaciones de verdad</a></li>
<li><a href="#unas_palabras_sobre_snmp">Unas palabras sobre SNMP</a></li>
<li><a href="#un_ejemplo_real">Un ejemplo real</a></li>
- <li><a href="#funciones_de_consolidación">Funciones de consolidación</a></li>
+ <li><a href="#funciones_de_consolidaci_n">Funciones de consolidación</a></li>
<li><a href="#repasemos_lo_que_sabemos">Repasemos lo que sabemos</a></li>
<li><a href="#tipos_de_fuentes_de_datos">Tipos de fuentes de datos</a></li>
<li><a href="#rrdtool_bajo_el_microscopio">RRDtool bajo el microscopio</a></li>
- <li><a href="#reinicialización_de_los_contadores">Reinicialización de los contadores</a></li>
+ <li><a href="#reinicializaci_n_de_los_contadores">Reinicialización de los contadores</a></li>
<li><a href="#remuestreo_de_los_datos">Remuestreo de los datos</a></li>
</ul>
<li><a href="#resumen">RESUMEN</a></li>
<li><a href="#lista_de_correo">LISTA DE CORREO</a></li>
- <li><a href="#ver_tambiÉn">VER TAMBIÉN</a></li>
+ <li><a href="#ver_tambi_n">VER TAMBIÉN</a></li>
<li><a href="#autor">AUTOR</a></li>
</ul>
-->
@@ -79,7 +79,7 @@
mucho sentido.</p>
<p>
</p>
-<h2><a name="¿qué_es_rrdtool">¿Qué es RRDtool?</a></h2>
+<h2><a name="_qu__es_rrdtool">¿Qué es RRDtool?</a></h2>
<p>RRDtool significa ``herramienta de bases de datos en round robin''.
``Round robin'' es una técnica que implica un número fijo de datos, y un
apuntador al elemento más reciente. Piensa en un circulo con unos
@@ -96,7 +96,7 @@
recuperando datos de ellas.</p>
<p>
</p>
-<h2><a name="¿qué_datos_pueden_guardarse_en_una_rrd">¿Qué datos pueden guardarse en una RRD?</a></h2>
+<h2><a name="_qu__datos_pueden_guardarse_en_una_rrd">¿Qué datos pueden guardarse en una RRD?</a></h2>
<p>Lo que se te ocurra. Debes poder medir algún valor dado en distintos
momentos en el tiempo y proveer a RRDtool de estos valores. Si puedes
hacer esto, RRDtool puede guardar los datos. Los valores tienen que
@@ -113,7 +113,7 @@
de estos contadores los que vamos a almacenar en la RRD.</p>
<p>
</p>
-<h2><a name="¿qué_puedo_hacer_con_esta_herramienta">¿Qué puedo hacer con esta herramienta?</a></h2>
+<h2><a name="_qu__puedo_hacer_con_esta_herramienta">¿Qué puedo hacer con esta herramienta?</a></h2>
<p>RRDtool se deriva de MRTG (Multi Router
Traffic Grapher, Graficador De Tráfico de Múltiples Enrutadores).
MRTG empezó como un pequeño script para poder
@@ -137,7 +137,7 @@
pasarle los números a RRDtool.</p>
<p>
</p>
-<h2><a name="¿y_si_aún_tengo_problemas_después_de_leer_este_documento">¿Y si aún tengo problemas después de leer este documento?</a></h2>
+<h2><a name="_y_si_a_n_tengo_problemas_despu_s_de_leer_este_documento">¿Y si aún tengo problemas después de leer este documento?</a></h2>
<p>Lo primero, ¡léelo otra vez!. Puede que te hayas perdido de algo.
Si no puedes compilar el código fuente y usas un sistema operativo
bastante común, casi seguro que no es la culpa de RRDtool.
@@ -158,7 +158,7 @@
envía otro correo a la misma dirección, con título <code>unsubscribe</code>.</p>
<p>
</p>
-<h2><a name="¿cómo_me_vas_a_ayudar">¿Cómo me vas a ayudar?</a></h2>
+<h2><a name="_c_mo_me_vas_a_ayudar">¿Cómo me vas a ayudar?</a></h2>
<p>Dándote descripciones y ejemplos detallados. Asumimos que el seguir
las instrucciones en el orden en que se presentan aquí te dará
suficiente conocimiento de RRDtool como para que experimentes por tu
@@ -256,7 +256,7 @@
<p>(o sea, escribe: <code>rrdtool create test.rrd --start 920804400 DS ...</code>)</p>
<p>
</p>
-<h2><a name="¿qué_hemos_creado">¿Qué hemos creado?</a></h2>
+<h2><a name="_qu__hemos_creado">¿Qué hemos creado?</a></h2>
<p>Hemos creado una base de datos en round robin llamada test
(test.rrd), que empieza desde el mediodía del día en que empecé a
escribir este documento (7 de marzo de 1999). En ella se guarda una
@@ -346,7 +346,7 @@
<p>Lo que representa exactamente esta salida lo vamos más adelante en el tutorial.</p>
<p>
</p>
-<h2><a name="hora_de_hacer_algunos_gráficos">Hora de hacer algunos gráficos</a></h2>
+<h2><a name="hora_de_hacer_algunos_gr_ficos">Hora de hacer algunos gráficos</a></h2>
<p>Prueba este comando:</p>
<pre>
rrdtool graph speed.gif \
@@ -379,7 +379,7 @@
``file://el/camino/de/directorios/hasta/speed.gif''</p>
<p>
</p>
-<h2><a name="gráficos_con_un_poco_de_matemática">Gráficos con un poco de matemática</a></h2>
+<h2><a name="gr_ficos_con_un_poco_de_matem_tica">Gráficos con un poco de matemática</a></h2>
<p>Cuando veas la imagen, notarás que el eje horizontal tiene unas
etiquetas marcando las 12:10, 12:20, 12:30, 12:40 y 12:50. Los otros
dos momentos (12:00 y 13:00) no se pueden mostrar bien por falta de datos, así que
@@ -449,7 +449,7 @@
Si es así, retorna la velocidad, si no, retorna 0 ((( kmh,100) GT ), kmh, 0) IF</pre>
<p>
</p>
-<h2><a name="magia_gráfica">Magia gráfica</a></h2>
+<h2><a name="magia_gr_fica">Magia gráfica</a></h2>
<p>Me gusta creer que virtualmente no hay limites para lo que RRDtool puede
hacer con los datos. No voy a explicarlo en detalle, pero mira este GIF:</p>
<pre>
@@ -700,7 +700,7 @@
cuatro megabits por segundo.</p>
<p>
</p>
-<h2><a name="funciones_de_consolidación">Funciones de consolidación</a></h2>
+<h2><a name="funciones_de_consolidaci_n">Funciones de consolidación</a></h2>
<p>Unos cuantos párrafos atrás hablábamos sobre la posibilidad de
guardar el valor máximo en vez del promedio. Profundicemos un poco en
este tema.</p>
@@ -915,7 +915,7 @@
<p></p></ul>
<p>
</p>
-<h2><a name="reinicialización_de_los_contadores">Reinicialización de los contadores</a></h2>
+<h2><a name="reinicializaci_n_de_los_contadores">Reinicialización de los contadores</a></h2>
<p>Todavía nos quedan algunas cosas por ver. Nos quedan algunas
opciones importantes por cubrir, y aun no hemos hablado de la
reinicialización de contadores. Empecemos por ahí: Estamos en nuestro
@@ -1104,7 +1104,7 @@
<p>
</p>
<hr />
-<h1><a name="ver_tambiÉn">VER TAMBIÉN</a></h1>
+<h1><a name="ver_tambi_n">VER TAMBIÉN</a></h1>
<p>Las páginas del manual de RRDtool</p>
<p>
</p>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtutorial.es.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.es.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDTUTORIAL.ES(1) rrdtool RRDTUTORIAL.ES(1)
+RRDTUTORIAL.ES(1) RRDtool RRDTUTORIAL.ES(1)
@@ -1262,4 +1262,4 @@
-1.0.46 2003-01-20 RRDTUTORIAL.ES(1)
+1.0.49 2004-01-17 RRDTUTORIAL.ES(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtutorial.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.html Sat Aug 21 11:59:00 2004
@@ -33,7 +33,7 @@
<li><a href="#some_words_on_snmp">Some words on SNMP</a></li>
<li><a href="#a_real_world_example">A Real World Example</a></li>
<li><a href="#consolidation_functions">Consolidation Functions</a></li>
- <li><a href="#let's_review_what_you_now_should_know.">Let's review what you now should know.</a></li>
+ <li><a href="#let_s_review_what_you_now_should_know_">Let's review what you now should know.</a></li>
<li><a href="#data_source_types">Data Source Types</a></li>
<li><a href="#rrdtool_under_the_microscope">RRDTool under the Microscope</a></li>
<li><a href="#counter_wraps">Counter Wraps</a></li>
@@ -52,7 +52,7 @@
</p>
<h1><a name="name">NAME</a></h1>
<p>rrdtutorial - Alex van den Bogaerdt's RRDTool tutorial</p>
-<div align="right">Go <a href="rrdtutorial.es.html">Spanish</a></div><div align="right"><a href="rrdtutorial.pdf">PDF</a> version.</div><p>
+<div align="right"><a href="rrdtutorial.pdf">PDF</a> version.</div><p>
</p>
<hr />
<h1><a name="description">DESCRIPTION</a></h1>
@@ -716,7 +716,7 @@
you would not have the graphics at all in that case.</p>
<p>
</p>
-<h2><a name="let's_review_what_you_now_should_know.">Let's review what you now should know.</a></h2>
+<h2><a name="let_s_review_what_you_now_should_know_">Let's review what you now should know.</a></h2>
<p>You now know how to create a database. You can put the numbers in it,
get them out again by creating an image, do math on the data from the
database and view the outcome instead of the raw data.
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtutorial.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.pod Sat Aug 21 11:59:00 2004
@@ -2,8 +2,6 @@
rrdtutorial - Alex van den Bogaerdt's RRDTool tutorial
-=for html <div align="right">Go <a href="rrdtutorial.es.html">Spanish</a></div>
-
=for html <div align="right"><a href="rrdtutorial.pdf">PDF</a> version.</div>
=head1 DESCRIPTION
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdtutorial.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdtutorial.txt Sat Aug 21 11:59:00 2004
@@ -1,4 +1,4 @@
-RRDTUTORIAL(1) rrdtool RRDTUTORIAL(1)
+RRDTUTORIAL(1) RRDtool RRDTUTORIAL(1)
@@ -1241,4 +1241,4 @@
-1.0.46 2003-09-14 RRDTUTORIAL(1)
+1.0.49 2004-04-24 RRDTUTORIAL(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdupdate.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.html Sat Aug 21 11:59:00 2004
@@ -25,7 +25,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool update - Store a new set of values into the RRD</p>
+<p>rrdupdate - Store a new set of values into the RRD</p>
<div align="right"><a href="rrdupdate.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -48,7 +48,7 @@
The name of the <strong>RRD</strong> you want to update.
</dd>
<p></p>
-<dt><strong><a name="item_%2d%2dtemplate%7c%2dt_ds%2dname%5b%3ads%2dname%5d%"><strong>--template</strong>|<strong>-t</strong> <em>ds-name</em>[<strong>:</strong><em>ds-name</em>]...</a></strong><br />
+<dt><strong><a name="item__2d_2dtemplate_7c_2dt_ds_2dname_5b_3ads_2dname_5d_"><strong>--template</strong>|<strong>-t</strong> <em>ds-name</em>[<strong>:</strong><em>ds-name</em>]...</a></strong><br />
</dt>
<dd>
by default, the update function expects the data input in the order,
@@ -62,7 +62,7 @@
will abort with an error message.</p>
</dd>
<p></p>
-<dt><strong><a name="item_n%7ctimestamp%3avalue%5b%3avalue%2e%2e%2e%5d"><strong>N</strong>|<em>timestamp</em><strong>:</strong><em>value</em>[<strong>:</strong><em>value</em>...]</a></strong><br />
+<dt><strong><a name="item_n_7ctimestamp_3avalue_5b_3avalue_2e_2e_2e_5d"><strong>N</strong>|<em>timestamp</em><strong>:</strong><em>value</em>[<strong>:</strong><em>value</em>...]</a></strong><br />
</dt>
<dd>
The data used for updating the RRD was acquired at a certain time. This
@@ -93,7 +93,7 @@
<p><code>rrdtool update demo1.rrd N:3.44:3.15:U:23</code></p>
<p>Update the database file demo1.rrd with 3 known and one <em>*UNKNOWN*</em>
value. Use the current time as the update time.</p>
-<p><code>rrdtool update demo2.rrd 887457267:U 887457521:22 88745790:2.7</code></p>
+<p><code>rrdtool update demo2.rrd 887457267:U 887457521:22 887457903:2.7</code></p>
<p>Update the database file demo2.rrd which expects data from a single
data-source, three times. First with an <em>*UNKNOWN*</em> value then with two
normal readings. The update interval seems to be around 300 seconds.</p>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdupdate.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool update - Store a new set of values into the RRD
+rrdupdate - Store a new set of values into the RRD
=for html <div align="right"><a href="rrdupdate.pdf">PDF</a> version.</div>
@@ -63,7 +63,7 @@
Update the database file demo1.rrd with 3 known and one I<*UNKNOWN*>
value. Use the current time as the update time.
-C<rrdtool update demo2.rrd 887457267:U 887457521:22 88745790:2.7>
+C<rrdtool update demo2.rrd 887457267:U 887457521:22 887457903:2.7>
Update the database file demo2.rrd which expects data from a single
data-source, three times. First with an I<*UNKNOWN*> value then with two
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdupdate.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdupdate.txt Sat Aug 21 11:59:00 2004
@@ -1,9 +1,9 @@
-RRDUPDATE(1) rrdtool RRDUPDATE(1)
+RRDUPDATE(1) RRDtool RRDUPDATE(1)
NNAAMMEE
- rrdtool update - Store a new set of values into the RRD
+ rrdupdate - Store a new set of values into the RRD
SSYYNNOOPPSSIISS
rrrrddttooooll uuppddaattee _f_i_l_e_n_a_m_e [----tteemmppllaattee|--tt _d_s_-_n_a_m_e[::_d_s_-
@@ -60,7 +60,7 @@
_*_U_N_K_N_O_W_N_* value. Use the current time as the update time.
"rrdtool update demo2.rrd 887457267:U 887457521:22
- 88745790:2.7"
+ 887457903:2.7"
Update the database file demo2.rrd which expects data from
a single data-source, three times. First with an _*_U_N_K_N_O_W_N_*
@@ -72,4 +72,4 @@
-1.0.46 2003-09-14 RRDUPDATE(1)
+1.0.49 2004-03-01 RRDUPDATE(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdxport.html (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.html Sat Aug 21 11:59:00 2004
@@ -31,7 +31,7 @@
<p>
</p>
<h1><a name="name">NAME</a></h1>
-<p>rrdtool xport - Export data in XML format based on data from one or several RRD</p>
+<p>rrdxport - Export data in XML format based on data from one or several RRD</p>
<div align="right"><a href="rrdxport.pdf">PDF</a> version.</div><p>
</p>
<hr />
@@ -86,19 +86,19 @@
See <em>rrdgraph</em> documentation.
</dd>
<p></p>
-<dt><strong><a name="item_def%3avname%3drrd%3ads%2dname%3acf"><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrd</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em></a></strong><br />
+<dt><strong><a name="item_def_3avname_3drrd_3ads_2dname_3acf"><strong>DEF:</strong><em>vname</em><strong>=</strong><em>rrd</em><strong>:</strong><em>ds-name</em><strong>:</strong><em>CF</em></a></strong><br />
</dt>
<dd>
See <em>rrdgraph</em> documentation.
</dd>
<p></p>
-<dt><strong><a name="item_cdef%3avname%3drpn%2dexpression"><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>rpn-expression</em></a></strong><br />
+<dt><strong><a name="item_cdef_3avname_3drpn_2dexpression"><strong>CDEF:</strong><em>vname</em><strong>=</strong><em>rpn-expression</em></a></strong><br />
</dt>
<dd>
See <em>rrdgraph</em> documentation.
</dd>
<p></p>
-<dt><strong><a name="item_xport%3avname%3a%3alegend"><strong>XPORT:</strong><em>vname</em><strong>:</strong><strong>:</strong><em>legend</em></a></strong><br />
+<dt><strong><a name="item_xport_3avname_3a_3alegend"><strong>XPORT:</strong><em>vname</em><strong>:</strong><strong>:</strong><em>legend</em></a></strong><br />
</dt>
<dd>
At least one <em>XPORT</em> statement should be present. The values
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdxport.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.pod Sat Aug 21 11:59:00 2004
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtool xport - Export data in XML format based on data from one or several RRD
+rrdxport - Export data in XML format based on data from one or several RRD
=for html <div align="right"><a href="rrdxport.pdf">PDF</a> version.</div>
Modified: trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/doc/rrdxport.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.49/doc/rrdxport.txt Sat Aug 21 11:59:00 2004
@@ -1,10 +1,10 @@
-RRDXPORT(1) rrdtool RRDXPORT(1)
+RRDXPORT(1) RRDtool RRDXPORT(1)
NNAAMMEE
- rrdtool xport - Export data in XML format based on data
- from one or several RRD
+ rrdxport - Export data in XML format based on data from
+ one or several RRD
SSYYNNOOPPSSIISS
rrrrddttooooll xxppoorrtt [--ss|----ssttaarrtt _s_e_c_o_n_d_s] [--ee|----eenndd _s_e_c_o_n_d_s]
@@ -125,4 +125,4 @@
-1.0.46 2002-05-29 RRDXPORT(1)
+1.0.49 2004-01-17 RRDXPORT(1)
Modified: trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/gd1.3/gdlucidab12l2.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.c Sat Aug 21 11:59:00 2004
@@ -3,8 +3,8 @@
This is a header file for gd font, generated using
bdftogd version 0.60 by Jan Pazdziora, adelton at fi.muni.cz
from bdf font
- -B&H-LucidaTypewriter-Medium-R-Normal-Sans-12-120-75-75-M-70-iso8859-2
- at Wed Apr 2 23:46:21 2003.
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-12-120-75-75-M-70-iso8859-2
+ at Thu Jul 15 22:48:11 2004.
The original bdf was holding following copyright:
"Copyright Bigelow & Holmes 1986, 1985."
*/
@@ -14,4356 +14,4356 @@
char gdLucidaBold12l2Data[] = {
/* Char 0 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,1,0,1,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,1,0,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 1 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 2 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 3 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 4 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 5 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 6 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 7 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 8 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 9 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 10 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 11 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 12 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 13 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 14 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 15 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 16 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 17 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 18 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 19 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 20 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 21 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 22 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 23 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 24 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 25 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 26 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 27 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 28 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 29 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 30 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 31 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 32 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 33 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 34 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 35 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+1,1,1,1,1,1,1,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+1,1,1,1,1,1,1,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 36 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,1,0,1,0,
-0,1,0,1,0,0,0,
-0,0,1,1,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,0,1,0,
-0,0,0,1,0,1,0,
-0,1,0,1,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
/* Char 37 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,
-1,0,0,1,0,0,1,
-1,0,0,1,0,1,0,
-0,1,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,1,0,
-0,1,0,1,0,0,1,
-1,0,0,1,0,0,1,
-0,0,0,0,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+1,0,1,1,0,1,1,0,
+1,0,1,1,0,1,0,0,
+0,1,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,1,0,1,0,1,1,0,
+1,1,0,1,0,1,1,0,
+1,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 38 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,1,1,0,0,1,
-0,1,0,0,1,0,1,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,0,0,0,
+0,0,1,1,0,0,1,0,
+0,1,1,1,1,0,1,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 39 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 40 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
/* Char 41 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 42 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,0,1,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,0,1,0,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 43 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 44 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
/* Char 45 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 46 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 47 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 48 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 49 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,1,0,0,0,
-0,1,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 50 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 51 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 52 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,1,0,0,
-0,1,0,0,1,0,0,
-1,0,0,0,1,0,0,
-1,1,1,1,1,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,0,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 53 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 54 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 55 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 56 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 57 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 58 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 59 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
-0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
/* Char 60 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 61 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 62 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 63 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 64 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-1,0,0,1,1,1,0,
-1,0,1,0,0,1,0,
-1,0,1,0,0,1,0,
-1,0,1,0,1,1,0,
-1,0,0,1,0,0,1,
-0,1,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+1,1,0,0,0,1,1,0,
+1,0,0,1,1,1,1,0,
+1,0,1,1,0,1,1,0,
+1,0,1,1,0,1,1,0,
+1,0,1,1,0,1,1,0,
+1,0,0,1,1,0,1,0,
+1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 65 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 66 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 67 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 68 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,0,0,
-0,1,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 69 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 70 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 71 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 72 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 73 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 74 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-1,1,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 75 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,1,0,
-0,1,0,0,1,0,0,
-0,1,0,1,0,0,0,
-0,1,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,0,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 76 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 77 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,1,
-0,1,1,0,0,1,1,
-0,1,1,0,0,1,1,
-0,1,0,1,1,0,1,
-0,1,0,1,1,0,1,
-0,1,0,1,1,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,1,0,1,1,0,
+0,1,0,1,0,1,1,0,
+0,1,0,1,0,1,1,0,
+0,1,0,1,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 78 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,1,0,0,1,0,
-0,1,1,0,0,1,0,
-0,1,0,1,0,1,0,
-0,1,0,1,0,1,0,
-0,1,0,0,1,1,0,
-0,1,0,0,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,1,0,0,1,0,
+0,1,1,1,1,0,1,0,
+0,1,0,1,1,0,1,0,
+0,1,0,1,1,1,1,0,
+0,1,0,0,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 79 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 80 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 81 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,
/* Char 82 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 83 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 84 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 85 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 86 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 87 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,0,0,0,0,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-1,0,1,0,1,0,1,
-0,1,1,0,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 88 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 89 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 90 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 91 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
/* Char 92 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
/* Char 93 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
/* Char 94 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,0,1,0,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,0,0,0,1,0,0,
+1,1,0,0,0,1,1,0,
+1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 95 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
/* Char 96 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 97 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 98 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,1,1,0,0,
-0,1,1,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 99 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 100 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 101 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 102 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 103 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
/* Char 104 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,1,1,0,0,
-0,1,1,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 105 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 106 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
/* Char 107 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,0,0,
-0,1,0,1,0,0,0,
-0,1,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,0,1,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 108 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 109 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,0,1,0,0,1,0,
-1,1,0,1,1,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 110 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,1,1,0,0,
-0,1,1,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 111 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 112 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,1,1,0,0,
-0,1,1,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
/* Char 113 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
/* Char 114 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,1,0,
-0,0,1,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 115 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 116 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 117 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 118 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 119 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,0,0,0,0,0,1,
-1,0,0,1,0,0,1,
-1,0,0,1,0,0,1,
-1,0,1,0,1,0,1,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,1,1,0,1,0,1,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 120 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 121 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 122 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 123 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
/* Char 124 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 125 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 126 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,1,
-1,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,1,0,
+0,1,0,1,1,0,1,0,
+0,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 127 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 128 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 129 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 130 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 131 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 132 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 133 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 134 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 135 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 136 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 137 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 138 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 139 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 140 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 141 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 142 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 143 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 144 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 145 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 146 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 147 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 148 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 149 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 150 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 151 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 152 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 153 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 154 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 155 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 156 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 157 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 158 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 159 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 160 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 161 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,1,0,0,0,
-0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,1,0,
/* Char 162 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 163 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,1,1,0,0,
-1,1,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+1,1,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 164 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,0,0,0,0,0,1,
-0,1,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-1,0,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,1,1,0,0,
+0,1,0,0,1,1,0,0,
+0,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,
+1,1,0,0,0,1,1,0,
+1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 165 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 166 */
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 167 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,0,0,
-0,1,0,1,0,0,0,
-0,1,0,0,1,0,0,
-0,0,1,0,0,1,0,
-0,0,0,1,0,1,0,
-0,0,0,0,1,0,0,
-0,1,0,0,1,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
/* Char 168 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 169 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,1,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 170 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,1,0,0,
-0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 171 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 172 */
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 173 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 174 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 175 */
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 176 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 177 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,1,0,0,0,
-0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
/* Char 178 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
/* Char 179 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,1,1,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,1,1,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 180 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 181 */
-0,1,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,1,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 182 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 183 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 184 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 185 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 186 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,0,0,1,0,0,0,
-0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 187 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 188 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 189 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 190 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 191 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 192 */
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 193 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 194 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 195 */
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 196 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,1,1,1,1,1,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,0,1,0,1,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 197 */
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 198 */
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 199 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,1,0,0,
-0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 200 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 201 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 202 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
/* Char 203 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,
+0,0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 204 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 205 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 206 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 207 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,0,0,
-0,1,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 208 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-1,1,1,1,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,0,0,
-0,1,1,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+1,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 209 */
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,1,0,0,1,0,
-0,1,1,0,0,1,0,
-0,1,0,1,0,1,0,
-0,1,0,1,0,1,0,
-0,1,0,0,1,1,0,
-0,1,0,0,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,1,0,0,1,0,
+0,1,1,1,1,0,1,0,
+0,1,0,1,1,0,1,0,
+0,1,0,1,1,1,1,0,
+0,1,0,0,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 210 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,1,0,0,1,0,
-0,1,1,0,0,1,0,
-0,1,0,1,0,1,0,
-0,1,0,1,0,1,0,
-0,1,0,0,1,1,0,
-0,1,0,0,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,1,0,0,1,0,
+0,1,1,1,1,0,1,0,
+0,1,0,1,1,0,1,0,
+0,1,0,1,1,1,1,0,
+0,1,0,0,1,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 211 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 212 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 213 */
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 214 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,1,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,1,0,0,0,0,1,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 215 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,0,
+0,1,1,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,1,0,0,0,1,1,0,
+1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 216 */
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 217 */
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 218 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 219 */
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 220 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 221 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 222 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 223 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,1,0,0,
-0,1,0,1,0,0,0,
-0,1,0,1,0,0,0,
-0,1,0,0,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,0,0,
+0,1,1,0,0,1,0,0,
+0,1,1,0,1,0,0,0,
+0,1,1,0,0,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 224 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,1,0,
-0,0,1,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 225 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 226 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 227 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 228 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,1,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 229 */
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 230 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 231 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,1,0,0,
-0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
/* Char 232 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,1,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 233 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 234 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
/* Char 235 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 236 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,1,1,1,1,0,
-0,1,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 237 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 238 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 239 */
-0,0,0,1,0,1,0,
-0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,1,0,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 240 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,1,
-0,0,0,0,0,1,0,
-0,0,1,1,1,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,
+0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 241 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,1,1,0,0,
-0,1,1,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 242 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,1,1,0,0,
-0,1,1,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,
+0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 243 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 244 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 245 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 246 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 247 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 248 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,1,0,
-0,0,1,1,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 249 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,1,0,0,1,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 250 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 251 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,1,0,
-0,1,0,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 252 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,1,1,0,
-0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,1,1,1,0,
+0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
/* Char 253 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,0,0,0,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,1,0,0,0,1,0,
-0,0,1,0,1,0,0,
-0,0,1,0,1,0,0,
-0,0,0,1,0,0,0,
-0,0,0,1,0,0,0,
-0,0,1,0,0,0,0,
-0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,0,0,
+0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 254 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,1,1,1,1,1,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,
-0,0,0,1,1,1,0,
-0,0,0,1,0,0,0,
-0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
/* Char 255 */
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,
-0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
};
@@ -4371,7 +4371,7 @@
gdFont gdLucidaBold12l2Rep = {
256,
0,
- 7,
+ 8,
15,
gdLucidaBold12l2Data
};
Modified: trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/gd1.3/gdlucidab12l2.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/gd1.3/gdlucidab12l2.h Sat Aug 21 11:59:00 2004
@@ -6,8 +6,8 @@
This is a header file for gd font, generated using
bdftogd version 0.60 by Jan Pazdziora, adelton at fi.muni.cz
from bdf font
- -B&H-LucidaTypewriter-Medium-R-Normal-Sans-12-120-75-75-M-70-iso8859-2
- at Wed Apr 2 23:46:21 2003.
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-12-120-75-75-M-70-iso8859-2
+ at Thu Jul 15 22:48:11 2004.
The original bdf was holding following copyright:
"Copyright Bigelow & Holmes 1986, 1985."
*/
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/png.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/png.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/png.h Sat Aug 21 11:59:00 2004
@@ -764,7 +764,11 @@
typedef png_info FAR * FAR * png_infopp;
/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_MAX_UINT ((png_uint_32)0x7fffffffL)
+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
+#define PNG_UINT_32_MAX (~((png_uint_32)0))
+#define PNG_SIZE_MAX (~((png_size_t)0))
+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
+#define PNG_MAX_UINT PNG_UINT_31_MAX
/* These describe the color_type field in png_info. */
/* color type masks */
@@ -2455,6 +2459,8 @@
PNG_EXTERN png_uint_32 png_get_uint_32 PNGARG((png_bytep buf));
PNG_EXTERN png_uint_16 png_get_uint_16 PNGARG((png_bytep buf));
#endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
+PNG_EXTERN png_uint_32 png_get_uint_31 PNGARG((png_structp png_ptr,
+ png_bytep buf));
/* Initialize png_ptr struct for reading, and allocate any other memory.
* (old interface - DEPRECATED - use png_create_read_struct instead).
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngconf.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngconf.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngconf.h Sat Aug 21 11:59:00 2004
@@ -602,6 +602,13 @@
# endif
#endif
+#ifndef PNG_USER_WIDTH_MAX
+# define PNG_USER_WIDTH_MAX 1000000L
+#endif
+#ifndef PNG_USER_HEIGHT_MAX
+# define PNG_USER_HEIGHT_MAX 1000000L
+#endif
+
/* These are currently experimental features, define them if you want */
/* very little testing */
@@ -1198,6 +1205,7 @@
# define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
# define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
# define png_strcpy _fstrcpy
+# define png_strncpy _fstrncpy /* Added to v 1.2.6 */
# define png_strlen _fstrlen
# define png_memcmp _fmemcmp /* SJT: added */
# define png_memcpy _fmemcpy
@@ -1206,6 +1214,7 @@
# define CVT_PTR(ptr) (ptr)
# define CVT_PTR_NOCHECK(ptr) (ptr)
# define png_strcpy strcpy
+# define png_strncpy strncpy /* Added to v 1.2.6 */
# define png_strlen strlen
# define png_memcmp memcmp /* SJT: added */
# define png_memcpy memcpy
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngerror.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngerror.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngerror.c Sat Aug 21 11:59:00 2004
@@ -91,7 +91,7 @@
{
buffer[iout++] = ':';
buffer[iout++] = ' ';
- png_memcpy(buffer+iout, message, 64);
+ png_strncpy(buffer+iout, message, 63);
buffer[iout+63] = 0;
}
}
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngpread.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngpread.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngpread.c Sat Aug 21 11:59:00 2004
@@ -208,7 +208,7 @@
}
png_push_fill_buffer(png_ptr, chunk_length, 4);
- png_ptr->push_length = png_get_uint_32(chunk_length);
+ png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
@@ -581,6 +581,11 @@
png_size_t new_max;
png_bytep old_buffer;
+ if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
+ (png_ptr->current_buffer_size + 256))
+ {
+ png_error(png_ptr, "Potential overflow of save_buffer");
+ }
new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
old_buffer = png_ptr->save_buffer;
png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
@@ -627,8 +632,7 @@
}
png_push_fill_buffer(png_ptr, chunk_length, 4);
- png_ptr->push_length = png_get_uint_32(chunk_length);
-
+ png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngread.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngread.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngread.c Sat Aug 21 11:59:00 2004
@@ -313,7 +313,7 @@
png_uint_32 length;
png_read_data(png_ptr, chunk_length, 4);
- length = png_get_uint_32(chunk_length);
+ length = png_get_uint_31(png_ptr,chunk_length);
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
@@ -602,7 +602,7 @@
png_crc_finish(png_ptr, 0);
png_read_data(png_ptr, chunk_length, 4);
- png_ptr->idat_size = png_get_uint_32(chunk_length);
+ png_ptr->idat_size = png_get_uint_31(png_ptr,chunk_length);
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
@@ -875,7 +875,7 @@
#endif /* PNG_GLOBAL_ARRAYS */
png_read_data(png_ptr, chunk_length, 4);
- length = png_get_uint_32(chunk_length);
+ length = png_get_uint_31(png_ptr,chunk_length);
png_reset_crc(png_ptr);
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
@@ -1216,6 +1216,9 @@
*/
png_read_info(png_ptr, info_ptr);
+ if (info_ptr->height > PNG_UINT_32_MAX/sizeof(png_bytep))
+ png_error(png_ptr,"Image is too high to process with png_read_png()");
+
/* -------------- image transformations start here ------------------- */
#if defined(PNG_READ_16_TO_8_SUPPORTED)
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrtran.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngrtran.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrtran.c Sat Aug 21 11:59:00 2004
@@ -1848,8 +1848,8 @@
/* This changes the data from GG to GGXX */
if (flags & PNG_FLAG_FILLER_AFTER)
{
- png_bytep sp = row + (png_size_t)row_width;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 2;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 1; i < row_width; i++)
{
*(--dp) = hi_filler;
@@ -1866,8 +1866,8 @@
/* This changes the data from GG to XXGG */
else
{
- png_bytep sp = row + (png_size_t)row_width;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 2;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 0; i < row_width; i++)
{
*(--dp) = *(--sp);
@@ -1924,8 +1924,8 @@
/* This changes the data from RRGGBB to RRGGBBXX */
if (flags & PNG_FLAG_FILLER_AFTER)
{
- png_bytep sp = row + (png_size_t)row_width * 3;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 6;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 1; i < row_width; i++)
{
*(--dp) = hi_filler;
@@ -1946,8 +1946,8 @@
/* This changes the data from RRGGBB to XXRRGGBB */
else
{
- png_bytep sp = row + (png_size_t)row_width * 3;
- png_bytep dp = sp + (png_size_t)row_width;
+ png_bytep sp = row + (png_size_t)row_width * 6;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
for (i = 0; i < row_width; i++)
{
*(--dp) = *(--sp);
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrutil.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngrutil.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngrutil.c Sat Aug 21 11:59:00 2004
@@ -38,6 +38,14 @@
# endif
#endif
+png_uint_32 /* PRIVATE */
+png_get_uint_31(png_structp png_ptr, png_bytep buf)
+{
+ png_uint_32 i = png_get_uint_32(buf);
+ if (i > PNG_UINT_31_MAX)
+ png_error(png_ptr, "PNG unsigned integer out of range.\n");
+ return (i);
+}
#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
png_uint_32 /* PRIVATE */
@@ -603,7 +611,7 @@
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Out of place gAMA chunk");
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
#if defined(PNG_READ_sRGB_SUPPORTED)
&& !(info_ptr->valid & PNG_INFO_sRGB)
#endif
@@ -680,7 +688,7 @@
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Out of place sBIT chunk");
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
{
png_warning(png_ptr, "Duplicate sBIT chunk");
png_crc_finish(png_ptr, length);
@@ -747,7 +755,7 @@
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Missing PLTE before cHRM");
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
#if defined(PNG_READ_sRGB_SUPPORTED)
&& !(info_ptr->valid & PNG_INFO_sRGB)
#endif
@@ -900,7 +908,7 @@
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Out of place sRGB chunk");
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
{
png_warning(png_ptr, "Duplicate sRGB chunk");
png_crc_finish(png_ptr, length);
@@ -996,8 +1004,7 @@
png_byte compression_type;
png_charp profile;
png_uint_32 skip = 0;
- png_uint_32 profile_size = 0;
- png_uint_32 profile_length = 0;
+ png_uint_32 profile_size, profile_length;
png_size_t slength, prefix_length, data_length;
png_debug(1, "in png_handle_iCCP\n");
@@ -1014,7 +1021,7 @@
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Out of place iCCP chunk");
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
{
png_warning(png_ptr, "Duplicate iCCP chunk");
png_crc_finish(png_ptr, length);
@@ -1163,8 +1170,18 @@
}
new_palette.nentries = data_length / entry_size;
+ if (new_palette.nentries > PNG_SIZE_MAX / sizeof(png_sPLT_entry))
+ {
+ png_warning(png_ptr, "sPLT chunk too long");
+ return;
+ }
new_palette.entries = (png_sPLT_entryp)png_malloc(
png_ptr, new_palette.nentries * sizeof(png_sPLT_entry));
+ if (new_palette.entries == NULL)
+ {
+ png_warning(png_ptr, "sPLT chunk requires too much memory");
+ return;
+ }
#ifndef PNG_NO_POINTER_INDEXING
for (i = 0; i < new_palette.nentries; i++)
@@ -1250,7 +1267,8 @@
/* Should be an error, but we can cope with it */
png_warning(png_ptr, "Missing PLTE before tRNS");
}
- else if (length > (png_uint_32)png_ptr->num_palette)
+ if (length > (png_uint_32)png_ptr->num_palette ||
+ length > PNG_MAX_PALETTE_LENGTH)
{
png_warning(png_ptr, "Incorrect tRNS chunk length");
png_crc_finish(png_ptr, length);
Modified: trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngset.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/libpng-1.0.9/pngset.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/libpng-1.0.9/pngset.c Sat Aug 21 11:59:00 2004
@@ -172,6 +172,9 @@
if (png_ptr == NULL || info_ptr == NULL)
return;
+ if (width > PNG_USER_WIDTH_MAX || height > PNG_USER_HEIGHT_MAX)
+ png_error(png_ptr, "image size exceeds user limits in IHDR");
+
info_ptr->width = width;
info_ptr->height = height;
info_ptr->bit_depth = (png_byte)bit_depth;
Modified: trunk/orca/packages/rrdtool-1.0.49/perl-piped/RRDp.pm
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/perl-piped/RRDp.pm (original)
+++ trunk/orca/packages/rrdtool-1.0.49/perl-piped/RRDp.pm Sat Aug 21 11:59:00 2004
@@ -110,7 +110,7 @@
sub end ();
sub read ();
-$VERSION = 1.000461 ;
+$VERSION = 1.000491 ;
sub start ($){
croak "rrdtool is already running"
Modified: trunk/orca/packages/rrdtool-1.0.49/perl-shared/Makefile.PL.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/perl-shared/Makefile.PL.in (original)
+++ trunk/orca/packages/rrdtool-1.0.49/perl-shared/Makefile.PL.in Sat Aug 21 11:59:00 2004
@@ -10,10 +10,11 @@
'NAME' => 'RRDs',
'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I at top_srcdir@/src -I at top_srcdir@/gd1.3',
+ 'INC' => '-I at top_srcdir@ -I at top_srcdir@/src -I at top_srcdir@/gd1.3',
+ 'CCFLAGS' => "$Config{ccflags} -DHAVE_CONFIG_H",
# where to look for the necessary libraries
# Perl will figure out which one is valid
- 'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},
+ 'depend' => {'RRDs.c' => "@top_srcdir@/src/.libs/librrd_private.a"},
'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' }
);
Modified: trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.pm
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/perl-shared/RRDs.pm (original)
+++ trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.pm Sat Aug 21 11:59:00 2004
@@ -7,7 +7,7 @@
require DynaLoader;
-$VERSION = 1.000461;
+$VERSION = 1.000491;
bootstrap RRDs $VERSION;
@@ -29,6 +29,7 @@
RRDs::graph ...
RRDs::fetch ...
RRDs::tune ...
+ RRDs::times(start, end)
=head1 DESCRIPTION
@@ -51,6 +52,11 @@
is also valid.
+The RRDs::times function takes two parameters: a "start" and "end" time.
+These should be specified in the B<AT-STYLE TIME SPECIFICATION> format
+used by rrdtool. See the B<rrdfetch> documentation for a detailed
+explanation on how to specify time.
+
=head2 Error Handling
The RRD functions will not abort your program even when they can not make
@@ -67,8 +73,8 @@
=head2 Return Values
-The functions RRDs::last, RRDs::graph, RRDs::info and RRDs::fetch return their
-findings.
+The functions RRDs::last, RRDs::graph, RRDs::info, RRDs::fetch and RRDs::times
+return their findings.
B<RRDs::last> returns a single INTEGER representing the last update time.
@@ -109,6 +115,9 @@
print "\n";
}
+B<RRDs::times> returns two integers which are the number of seconds since
+epoch (1970-01-01) for the supplied "start" and "end" arguments, respectively.
+
See the examples directory for more ways to use this extension.
=head1 NOTE
Modified: trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.xs
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/perl-shared/RRDs.xs (original)
+++ trunk/orca/packages/rrdtool-1.0.49/perl-shared/RRDs.xs Sat Aug 21 11:59:00 2004
@@ -338,4 +338,52 @@
OUTPUT:
RETVAL
+void
+rrd_times(start, end)
+ char *start
+ char *end
+ PREINIT:
+ struct rrd_time_value start_tv, end_tv;
+ char *parsetime_error = NULL;
+ time_t start_tmp, end_tmp;
+ PPCODE:
+ rrd_clear_error();
+ if( (parsetime_error = parsetime( start, &start_tv))) {
+ rrd_set_error( "start time: %s", parsetime_error);
+ XSRETURN_UNDEF;
+ }
+ if( (parsetime_error = parsetime( end, &end_tv))) {
+ rrd_set_error( "end time: %s", parsetime_error);
+ XSRETURN_UNDEF;
+ }
+ if( proc_start_end( &start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
+ XSRETURN_UNDEF;
+ }
+ EXTEND(sp,2);
+ PUSHs(sv_2mortal(newSViv(start_tmp)));
+ PUSHs(sv_2mortal(newSViv(end_tmp)));
+
+int
+rrd_dump(...)
+ PROTOTYPE: @
+ PREINIT:
+ int i;
+ char **argv;
+ CODE:
+ rrdcode(rrd_dump);
+ RETVAL = 1;
+ OUTPUT:
+ RETVAL
+
+int
+rrd_restore(...)
+ PROTOTYPE: @
+ PREINIT:
+ int i;
+ char **argv;
+ CODE:
+ rrdcode(rrd_restore);
+ RETVAL = 1;
+ OUTPUT:
+ RETVAL
Copied: trunk/orca/packages/rrdtool-1.0.49/rrdtool.spec (from r380, trunk/orca/packages/rrdtool-1.0.46/rrdtool.spec)
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/rrdtool.spec (original)
+++ trunk/orca/packages/rrdtool-1.0.49/rrdtool.spec Sat Aug 21 11:59:00 2004
@@ -5,7 +5,7 @@
Summary: RRDtool - round robin database
Name: rrdtool
-Version: 1.0.46
+Version: 1.0.49
Release: 1.%{DISTRO_REL}
Copyright: GPL
Group: Applications/Databases
Modified: trunk/orca/packages/rrdtool-1.0.49/src/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/Makefile.am Sat Aug 21 11:59:00 2004
@@ -110,5 +110,5 @@
rrdtool_SOURCES = rrd_tool.c
rrdtool_LDADD = librrd.la
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw rrd.vcproj rrd_cgi.vcproj rrdtool.vcproj
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw rrd.vcproj rrd_cgi.vcproj rrdtool.vcproj
Modified: trunk/orca/packages/rrdtool-1.0.49/src/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/Makefile.in Sat Aug 21 11:59:00 2004
@@ -253,7 +253,7 @@
rrdtool_SOURCES = rrd_tool.c
rrdtool_LDADD = librrd.la
-EXTRA_DIST = rrdtool.dsp rrdtool.dsw rrd.vcproj rrd_cgi.vcproj rrdtool.vcproj
+EXTRA_DIST = rrdtool.dsp rrdtool.dsw rrd.vcproj rrd_cgi.vcproj rrdtool.vcproj
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
Modified: trunk/orca/packages/rrdtool-1.0.49/src/gdpng.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/gdpng.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/gdpng.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* gdpng.c add PNG output routine to gd library
*****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/src/gifsize.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/gifsize.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/gifsize.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
****************************************************************************
* gifsize.c provides the function gifsize which determines the size of a gif
****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/src/parsetime.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/parsetime.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/parsetime.c Sat Aug 21 11:59:00 2004
@@ -556,6 +556,7 @@
{
int hour, minute = 0;
int tlen;
+
/* save token status in case we must abort */
int scc_sv = scc;
char *sct_sv = sct;
@@ -660,6 +661,7 @@
{
long mday=0, wday, mon, year = ptv->tm.tm_year;
int tlen;
+ time_t montime;
switch (sc_tokid) {
case YESTERDAY:
@@ -713,7 +715,8 @@
tlen = strlen(sc_token);
mon = atol(sc_token);
if (mon > 10*365*24*60*60) {
- ptv->tm=*localtime(&mon);
+ montime = mon;
+ ptv->tm=*localtime(&montime);
token();
break;
}
Modified: trunk/orca/packages/rrdtool-1.0.49/src/pngsize.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/pngsize.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/pngsize.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* pngsize.c determine the size of a PNG image
*****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd.h Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997,1998, 1999
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997,1998, 1999
*****************************************************************************
* rrdlib.h Public header file for librrd
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_cgi.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_cgi.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_cgi.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_cgi.c RRD Web Page Generator
*****************************************************************************/
@@ -10,8 +10,8 @@
#define MEMBLK 1024
-/*#define DEBUG_PARSER
-#define DEBUG_VARS*/
+/* #define DEBUG_PARSER */
+/* #define DEBUG_VARS */
/* global variable for libcgi */
s_cgi **cgiArg;
@@ -220,6 +220,9 @@
parse(&buffer, i, "<RRD::CV::PATH", cgigetqp);
parse(&buffer, i, "<RRD::GETENV", rrdgetenv);
parse(&buffer, i, "<RRD::GETVAR", rrdgetvar);
+ parse(&buffer, i, "<RRD::TIME::LAST", printtimelast);
+ parse(&buffer, i, "<RRD::TIME::NOW", printtimenow);
+ parse(&buffer, i, "<RRD::TIME::STRFTIME", printstrftime);
}
return buffer;
}
@@ -297,10 +300,6 @@
/* make sure we have one extra argument,
if there are others, we do not care Apache gives several */
- /* if ( (optind != argc-2
- && strstr( getenv("SERVER_SOFTWARE"),"Apache/2") != NULL)
- && optind != argc-1) { */
-
if ( optind >= argc ) {
fprintf(stderr, "ERROR: expected a filename\n");
exit(1);
@@ -316,6 +315,11 @@
/* initialize variable heap */
initvar();
+#ifdef DEBUG_PARSER
+ /* some fake header for testing */
+ printf ("Content-Type: text/html\nContent-Length: 10000000\n\n\n");
+#endif
+
/* expand rrd directives in buffer recursivly */
for (i=0; buffer[i]; i++) {
if (buffer[i] != '<')
@@ -433,7 +437,11 @@
if (envvar) {
return stralloc(envvar);
} else {
+#ifdef WIN32
+ _snprintf(buf, sizeof(buf), "[ERROR:_getenv_'%s'_failed", args[0]);
+#else
snprintf(buf, sizeof(buf), "[ERROR:_getenv_'%s'_failed", args[0]);
+#endif
return stralloc(buf);
}
}
@@ -449,7 +457,11 @@
if (value) {
return stralloc(value);
} else {
+#ifdef WIN32
+ _snprintf(buf, sizeof(buf), "[ERROR:_getvar_'%s'_failed", args[0]);
+#else
snprintf(buf, sizeof(buf), "[ERROR:_getvar_'%s'_failed", args[0]);
+#endif
return stralloc(buf);
}
}
@@ -603,57 +615,60 @@
/* remove occurrences of .. this is a general measure to make
paths which came in via cgi do not go UP ... */
+char* cgigetqp(long argc, char **args)
+{
+ char* buf;
+ char* buf2;
+ char* p;
+ char* d;
-char* cgigetqp(long argc, char **args){
- if (argc>= 1) {
- char *buf = rrdstrip(cgiGetValue(cgiArg,args[0]));
- char *buf2;
- char *c,*d;
- int qc=0;
+ if (argc < 1)
+ {
+ return stralloc("[ERROR: not enough arguments for RRD::CV::PATH]");
+ }
- if (buf==NULL)
+ buf = rrdstrip(cgiGetValue(cgiArg, args[0]));
+ if (!buf)
+ {
return NULL;
-
- for(c=buf;*c != '\0';c++) {
- if (*c == '"') {
- qc++;
- }
}
- if ((buf2 = malloc((strlen(buf) + 4 * qc + 4))) == NULL) {
- perror("Malloc Buffer");
+ buf2 = malloc(strlen(buf)+1);
+ if (!buf2)
+ {
+ perror("cgigetqp(): Malloc Path Buffer");
exit(1);
};
- c=buf;
- d=buf2;
+ p = buf;
+ d = buf2;
- *(d++) = '"';
- while (*c != '\0') {
- if (*c == '"') {
- *(d++) = '"';
- *(d++) = '\'';
- *(d++) = '"';
- *(d++) = '\'';
+ while (*p)
+ {
+ /* prevent mallicious paths from entering the system */
+ if (p[0] == '.' && p[1] == '.')
+ {
+ p += 2;
+ *d++ = '_';
+ *d++ = '_';
}
- if(*c == '/') {
- *(d++) = '_';
- c++;
- } else {
- if (*c=='.' && *(c+1) == '.') {
- c += 2;
- *(d++) = '_'; *(d++) ='_';
- } else {
- *(d++) = *(c++);
- }
+ else
+ {
+ *d++ = *p++;
}
}
- *(d++) = '"';
- *(d) = '\0';
+
+ *d = 0;
free(buf);
+
+ /* Make sure the path is relative, e.g. does not start with '/' */
+ p = buf2;
+ while ('/' == *p)
+ {
+ *p++ = '_';
+ }
+
return buf2;
- }
- return stralloc("[ERROR: not enough arguments for RRD::CV::PATH]");
}
@@ -817,7 +832,7 @@
{
case ' ':
if (Quote || tagcount) {
- /* copy quoted/tagged string */
+ /* copy quoted/tagged (=RRD expanded) strings */
*putP++ = c;
}
else if (in_arg)
@@ -843,7 +858,7 @@
}
} else {
if (!in_arg) {
- /* reference argument string in argument array */
+ /* reference start of argument string in argument array */
argv[argc++] = putP;
in_arg=1;
}
@@ -852,22 +867,20 @@
break;
default:
- if (!Quote) {
- if (!in_arg) {
- /* start new argument */
- argv[argc++] = putP;
- in_arg = 1;
- }
- if (c == '>') {
- if (tagcount) {
- tagcount--;
- }
+ if (!in_arg) {
+ /* start new argument */
+ argv[argc++] = putP;
+ in_arg = 1;
+ }
+ if (c == '>') {
+ if (tagcount) {
+ tagcount--;
}
- if (c == '<') {
- tagcount++;
- if (0 == strncmp(getP, "RRD::", strlen("RRD::"))) {
- curarg_contains_rrd_directives = 1;
- }
+ }
+ if (c == '<') {
+ tagcount++;
+ if (0 == strncmp(getP, "RRD::", strlen("RRD::"))) {
+ curarg_contains_rrd_directives = 1;
}
}
*putP++ = c;
@@ -932,7 +945,7 @@
char *(*func)(long argc, char **args) /* function to call for 'tag' */
)
{
- /* the name of the vairable ... */
+ /* the name of the variable ... */
char *val;
long valln;
char **args;
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_create.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_create.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_create.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_create.c creates new RRDs
*****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_diff.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_diff.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_diff.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1999
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1999
* This code is stolen from rateup (mrtg-2.x) by Dave Rand
*****************************************************************************
* diff calculate the difference between two very long integers available as
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_dump.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_dump.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_dump.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_error.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_error.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_error.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_error.c Common Header File
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_fetch.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_fetch.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_fetch.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_format.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1999
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1999
*****************************************************************************
* rrd_format.c RRD Database Format helper functions
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_format.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_format.h Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_format.h RRD Database Format header
*****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_graph.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.c Sat Aug 21 11:59:00 2004
@@ -1,11 +1,16 @@
/****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
****************************************************************************
* rrd__graph.c make creates ne rrds
****************************************************************************/
#include "rrd_tool.h"
+
+#ifdef WIN32
+#include <locale.h>
+#endif
+
#include "rrd_graph.h"
#include <gd.h>
@@ -39,15 +44,6 @@
#define LargeFont gdLucidaBold12
#endif
-/* #define DEBUG */
-
-#ifdef DEBUG
-# define DPRINT(x) (void)(printf x, printf("\n"))
-#else
-# define DPRINT(x)
-#endif
-
-
xlab_t xlab[] = {
{0, TMT_SECOND,30, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"},
{2, TMT_MINUTE,1, TMT_MINUTE,5, TMT_MINUTE,5, 0,"%H:%M"},
@@ -56,7 +52,7 @@
{30, TMT_MINUTE,10, TMT_HOUR,1, TMT_HOUR,1, 0,"%H:%M"},
{60, TMT_MINUTE,30, TMT_HOUR,2, TMT_HOUR,2, 0,"%H:%M"},
{180, TMT_HOUR,1, TMT_HOUR,6, TMT_HOUR,6, 0,"%H:%M"},
- /*{300, TMT_HOUR,3, TMT_HOUR,12, TMT_HOUR,12, 12*3600,"%a %p"}, this looks silly*/
+ /* {300, TMT_HOUR,3, TMT_HOUR,12, TMT_HOUR,12, 12*3600,"%a %p"}, this looks silly */
{600, TMT_HOUR,6, TMT_DAY,1, TMT_DAY,1, 24*3600,"%a"},
{1800, TMT_HOUR,12, TMT_DAY,1, TMT_DAY,2, 24*3600,"%a"},
{3600, TMT_DAY,1, TMT_WEEK,1, TMT_WEEK,1, 7*24*3600,"Week %V"},
@@ -353,7 +349,7 @@
im->magfact = pow((double)im->base , digits);
#ifdef DEBUG
- printf("digits %6.3f im->magfact %6.3f\n",digits,im->magfact);
+ fprintf(stderr,"digits %6.3f im->magfact %6.3f\n",digits,im->magfact);
#endif
if ( ((digits+symbcenter) < sizeof(symbol)) &&
@@ -384,16 +380,42 @@
#ifdef DEBUG
- printf("Min: %6.2f Max: %6.2f MagFactor: %6.2f\n",
+ fprintf(stderr,"Min: %6.2f Max: %6.2f MagFactor: %6.2f\n",
im->minval,im->maxval,im->magfact);
#endif
if (isnan(im->ygridstep)){
if(im->extra_flags & ALTYMRTG) { /* mrtg */
- int decimals = ceil(log10(max(fabs(im->maxval),fabs(im->minval))));
- double scaledstep = ceil(25 * pow((double)10,-decimals) * im->maxval) * pow((double)10,decimals - 2);
- im->minval = 0;
- im->maxval = 4 * scaledstep;
+ im->decimals = ceil(log10(max(fabs(im->maxval),fabs(im->minval))));
+ im->quadrant = 0;
+ if (im->minval < 0) {
+ im->quadrant = 2;
+ if (im->maxval <= 0)
+ im->quadrant = 4;
+ }
+ switch (im->quadrant) {
+ case 2:
+ im->scaledstep = ceil(50 * pow((double)10,-(im->decimals)) * max(fabs(im->maxval),fabs(im->minval))) * pow((double)10,im->decimals - 2);
+ scaled_min = -2 * im->scaledstep;
+ scaled_max = 2 * im->scaledstep;
+ break;
+ case 4:
+ im->scaledstep = ceil(25 * pow((double)10,-(im->decimals)) * fabs(im->minval)) * pow((double)10,im->decimals - 2);
+ scaled_min = -4 * im->scaledstep;
+ scaled_max = 0;
+ break;
+ default: /* quadrant 0 */
+ im->scaledstep = ceil(25 * pow((double)10,-(im->decimals)) * im->maxval) * pow((double)10,im->decimals - 2);
+ scaled_min = 0;
+ scaled_max = 4 * im->scaledstep;
+ break;
+ }
+#ifdef DEBUG
+ fprintf(stderr,"[%d] %s Min: %6.2f Max: %6.2f MagFactor: %6.2f, decimals: %d scaledstep: %6.2f -> scaled Min: %6.2f Max %6.2f\n",
+ getpid(),im->graphfile,im->minval,im->maxval,im->magfact,im->decimals,im->scaledstep,scaled_min,scaled_max);
+#endif
+ im->minval = scaled_min;
+ im->maxval = scaled_max;
} else
if(im->extra_flags & ALTAUTOSCALE) {
/* measure the amplitude of the function. Make sure that
@@ -408,7 +430,7 @@
if (delt < fact) {
adj = (fact - delt) * 0.55;
#ifdef DEBUG
- printf("Min: %6.2f Max: %6.2f delt: %6.2f fact: %6.2f adj: %6.2f\n", im->minval, im->maxval, delt, fact, adj);
+ fprintf(stderr,"Min: %6.2f Max: %6.2f delt: %6.2f fact: %6.2f adj: %6.2f\n", im->minval, im->maxval, delt, fact, adj);
#endif
}
im->minval -= adj;
@@ -1578,9 +1600,12 @@
for(ii=im->gdes[vidx].ds+im->gdes[vidx].ds_cnt;
ii < max_ii+im->gdes[vidx].ds_cnt;
ii+=im->gdes[vidx].ds_cnt){
- if (! finite(im->gdes[vidx].data[ii]))
+#ifdef DEBUG
+ fprintf(stderr,"[%d] %s value: %6.2f\n",getpid(),im->graphfile,im->gdes[vidx].data[ii]);
+#endif
+ if (! finite(im->gdes[vidx].data[ii]))
continue;
- if (isnan(printval)){
+ if (isnan(printval)){
printval = im->gdes[vidx].data[ii];
validsteps++;
continue;
@@ -1688,7 +1713,7 @@
char prt_fctn; /*special printfunctions */
int *legspace;
- if( !(im->extra_flags & NOLEGEND) ) {
+ if( !(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH) ) {
if ((legspace = malloc(im->gdes_c*sizeof(int)))==NULL){
rrd_set_error("malloc for legspace");
return -1;
@@ -1697,13 +1722,15 @@
for(i=0;i<im->gdes_c;i++){
fill_last = fill;
- if (im->gdes[i].gf == GF_HRULE &&
- (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval))
- im->gdes[i].legend[0] = '\0';
-
- if (im->gdes[i].gf == GF_VRULE &&
- (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end))
- im->gdes[i].legend[0] = '\0';
+ if( !(im->extra_flags & FORCE_RULES_LEGEND) ) {
+ if (im->gdes[i].gf == GF_HRULE &&
+ (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval))
+ im->gdes[i].legend[0] = '\0';
+
+ if (im->gdes[i].gf == GF_VRULE &&
+ (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end))
+ im->gdes[i].legend[0] = '\0';
+ }
leg_cc = strlen(im->gdes[i].legend);
@@ -1966,10 +1993,8 @@
horizontal_mrtg_grid(gdImagePtr gif, image_desc_t *im)
{
int i, xLeft, xRight, y;
- double scaledstep;
char graph_label[100];
int styleMajor[2];
- int decimals;
char labfmt[64];
/* does the scale of this graph make it impossible to put lines
@@ -1983,21 +2008,25 @@
xLeft = im->xorigin;
xRight = im->xorigin + im->xsize;
- decimals = ceil(log10(max(fabs(im->maxval),fabs(im->minval))));
- scaledstep = ceil(25 * pow((double)10,-decimals) * im->maxval) * pow((double)10,decimals - 2) / im->magfact;
-
- sprintf(labfmt,"%%4.%df",1 - (scaledstep > (double)10 || ceil(scaledstep) == scaledstep));
+ if (im->scaledstep / im->magfact * max(abs(im->quadrant),abs(4 - im->quadrant)) <= (double)1)
+ strcpy(labfmt,"%5.2f");
+ else
+ sprintf(labfmt,"%%4.%df",1 - (im->scaledstep / im->magfact > (double)10 || ceil(im->scaledstep / im->magfact) == im->scaledstep /im->magfact));
if (im->symbol != ' ' || im->unit)
- strcat(labfmt," ");
+ strcat(labfmt," ");
if (im->symbol != ' ')
- sprintf(labfmt + strlen(labfmt),"%c",im->symbol);
+ sprintf(labfmt + strlen(labfmt),"%c",im->symbol);
if (im->unit)
- strcat(labfmt,im->unit);
+ strcat(labfmt,im->unit);
for (i = 0; i <= 4; i++)
{y = im->yorigin - im->ysize * i / 4;
if (y >= im->yorigin-im->ysize && y <= im->yorigin)
- {sprintf(graph_label,labfmt,scaledstep * i);
+ {sprintf(graph_label,labfmt,im->scaledstep / im->magfact * (i - im->quadrant));
+#ifdef DEBUG
+ fprintf(stderr,"[%d] scaledstep * (i - quadrant): %6.2f format '%s' label: '%s'\n",
+ getpid(),im->scaledstep * (i - im->quadrant),labfmt,graph_label);
+#endif
gdImageString(gif,SmallFont,(xLeft - (strlen(graph_label) * SmallFont->w) - 7),
y - SmallFont->h / 2 + 1,
(unsigned char *)graph_label,graph_col[GRC_FONT].i);
@@ -2316,7 +2345,7 @@
(unsigned char *)im->title, graph_col[GRC_FONT].i);
/* graph labels */
- if( !(im->extra_flags & NOLEGEND) ) {
+ if( !(im->extra_flags & NOLEGEND) & !(im->extra_flags & ONLY_GRAPH) ) {
for(i=0;i<im->gdes_c;i++){
if(im->gdes[i].legend[0] =='\0')
continue;
@@ -2515,21 +2544,39 @@
on the cmdline is the graph area. But we need more as we have
draw labels and other things outside the graph area */
+ if( (im->extra_flags & ONLY_GRAPH) ) {
+ if ( im->ysize > 64 ) {
+ rrd_set_error("height over 32 pixels with --only-graph option is not available");
+ return -1;
+ }
+ im->xorigin = 0;
+ } else {
+ im->xorigin = 10 + im->unitslength * SmallFont->w;
+ }
- im->xorigin = 10 + im->unitslength * SmallFont->w;
xtr(im,0);
if(im->ylegend[0] != '\0')
im->xorigin += SmallFont->h;
- im->yorigin = 14 + im->ysize;
+ if( (im->extra_flags & ONLY_GRAPH) ) {
+ im->yorigin = im->ysize;
+ } else {
+ im->yorigin = 14 + im->ysize;
+ }
+
ytr(im,DNAN);
if(im->title[0] != '\0')
im->yorigin += (LargeFont->h+4);
- im->xgif=20+im->xsize + im->xorigin;
- im->ygif= im->yorigin+2*SmallFont->h;
+ if( (im->extra_flags & ONLY_GRAPH) ) {
+ im->xgif= im->xsize;
+ im->ygif= im->yorigin;
+ } else {
+ im->xgif=16+im->xsize + im->xorigin;
+ im->ygif= im->yorigin+2*SmallFont->h;
+ }
/* determine where to place the legends onto the graphics.
and set im->ygif to match space requirements for text */
@@ -2571,7 +2618,7 @@
graph elements and then drawing them */
if (im->bkg_image) /* background image added first */
- copyImage(gif,im->bkg_image,1);
+ copyImage(gif,im->bkg_image,1);
else
{
back[0].x = 0;
@@ -2602,7 +2649,8 @@
if (im->maxval < 0.0)
areazero = im->maxval;
- axis_paint(im,gif);
+ if( !(im->extra_flags & ONLY_GRAPH) )
+ axis_paint(im,gif);
for(i=0;i<im->gdes_c;i++){
@@ -2686,7 +2734,8 @@
}
}
- grid_paint(im,gif);
+ if( !(im->extra_flags & ONLY_GRAPH) )
+ grid_paint(im,gif);
/* the RULES are the last thing to paint ... */
for(i=0;i<im->gdes_c;i++){
@@ -2898,6 +2947,8 @@
{"imgformat", required_argument, 0, 'a'},
{"lazy", no_argument, 0, 'z'},
{"no-legend", no_argument, 0, 'g'},
+ {"only-graph", no_argument, 0, 'j'},
+ {"force-rules-legend",no_argument,0, 'F'},
{"alt-y-grid", no_argument, 0, 'Y'},
{"no-minor", no_argument, 0, 'N'},
{"alt-autoscale", no_argument, 0, 'A'},
@@ -2915,7 +2966,7 @@
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgYAMXL:S:RB:O:U:",
+ "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:",
long_options, &option_index);
if (opt == EOF)
@@ -2934,9 +2985,15 @@
case 'M':
im.extra_flags |= ALTAUTOSCALE_MAX;
break;
+ case 'j':
+ im.extra_flags |= ONLY_GRAPH;
+ break;
case 'g':
im.extra_flags |= NOLEGEND;
break;
+ case 'F':
+ im.extra_flags |= FORCE_RULES_LEGEND;
+ break;
case 'X':
im.unitsexponent = atoi(optarg);
break;
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_graph.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_graph.h Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
****************************************************************************
* rrd__graph.h
****************************************************************************/
@@ -104,12 +104,6 @@
} graph_desc_t;
-#define ALTYGRID 0x01 /* use alternative y grid algorithm */
-#define ALTAUTOSCALE 0x02 /* use alternative algorithm to find lower and upper bounds */
-#define ALTAUTOSCALE_MAX 0x04 /* use alternative algorithm to find upper bounds */
-#define NOLEGEND 0x08 /* use no legend */
-
-
typedef struct image_desc_t {
/* configuration of graph */
@@ -137,11 +131,14 @@
int lazy; /* only update the gif if there is reasonable
probablility that the existing one is out of date */
int logarithmic; /* scale the yaxis logarithmic */
+ int quadrant;
+ double scaledstep;
+ int decimals;
enum if_en imgformat; /* image format */
-
-char* bkg_image; /* background image source */
-char* ovl_image; /* overlay image source */
-char* unit; /* measured value unit */
+
+ char* bkg_image; /* background image source */
+ char* ovl_image; /* overlay image source */
+ char* unit; /* measured value unit */
/* status information */
@@ -149,7 +146,7 @@
long xgif,ygif; /* total size of the gif */
int interlaced; /* will the graph be interlaced? */
double magfact; /* numerical magnitude*/
- long base; /* 1000 or 1024 depending on what we graph */
+ long base; /* 1000 or 1024 depending on what we graph */
char symbol; /* magnitude symbol for y-axis */
int unitsexponent; /* 10*exponent for units on y-asis */
int unitslength; /* character length for units on y-asis */
@@ -200,7 +197,7 @@
int rrd_graph(int, char **, char ***, int *, int *);
int bad_format(char *);
rpnp_t * str2rpn(image_desc_t *,char *);
-
+int color_allocate(gdImagePtr, int, int, int);
#define ALTYGRID 0x01 /* use alternative y grid algorithm */
#define ALTAUTOSCALE 0x02 /* use alternative algorithm to find lower and upper bounds */
@@ -208,7 +205,8 @@
#define NOLEGEND 0x08 /* use no legend */
#define ALTYMRTG 0x10 /* simulate mrtg's scaling */
#define NOMINOR 0x20 /* Turn off minor gridlines */
-
+#define FORCE_RULES_LEGEND 0x40 /* force printing of HRULE and VRULE legend */
+#define ONLY_GRAPH 0x80 /* use only graph*/
#endif
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_info.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_info.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_info.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_last.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_last.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_last.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_last.c
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_open.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_open.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_open.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_open.c Open an RRD File
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_resize.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_resize.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_resize.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_resize.c Alters size of an RRA
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_restore.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_restore.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_restore.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_restore.c creates new rrd from data dumped by rrd_dump.c
*****************************************************************************/
@@ -280,7 +280,14 @@
if (strcmp("-",file_name)==0){
rrd_file= stdout;
} else {
- int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL,0666);
+ int fd = open(file_name,
+#ifdef WIN32
+ O_RDWR|O_BINARY|O_CREAT|O_EXCL
+#else
+ O_RDWR|O_CREAT|O_EXCL
+#endif
+ ,0666);
+
if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
rrd_set_error("creating '%s': %s",file_name,strerror(errno));
if (fd != -1)
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_tool.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2001
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2004
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
@@ -20,7 +20,7 @@
{
char help_main[] =
- "RRDtool 1.0.46 Copyright 1997-2001 by Tobias Oetiker <tobi at oetiker.ch>\n\n"
+ "RRDtool 1.0.49 Copyright 1997-2004 by Tobias Oetiker <tobi at oetiker.ch>\n\n"
"Usage: rrdtool [options] command command_options\n\n";
char help_list[] =
@@ -73,6 +73,8 @@
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
"\t\t[-g|--no-legend]\n"
+ "\t\t[-j|--only-graph]\n"
+ "\t\t[-F|--force-rules-legend]\n"
"\t\t[--alt-autoscale]\n"
"\t\t[--alt-autoscale-max]\n"
"\t\t[--units-exponent value]\n"
@@ -320,7 +322,7 @@
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
- printf("RRDtool 1.0.46 Copyright (C) 1997-2001 by Tobias Oetiker <tobi at oetiker.ch>\n");
+ printf("RRDtool 1.0.49 Copyright (C) 1997-2004 by Tobias Oetiker <tobi at oetiker.ch>\n");
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
@@ -336,14 +338,14 @@
char **ds_namv;
if (rrd_fetch(argc-1, &argv[1],&start,&end,&step,&ds_cnt,&ds_namv,&data) != -1) {
datai=data;
- printf(" ");
- for (i = 0; i<ds_cnt;i++)
- printf("%20s",ds_namv[i]);
- printf ("\n\n");
+ printf("timestamp ");
+ for (i = 0; i<ds_cnt-1;i++)
+ printf("%-18s",ds_namv[i]);
+ printf("%s\n\n",ds_namv[i]);
for (i = start; i <= end; i += step){
printf("%10lu:", i);
for (ii = 0; ii < ds_cnt; ii++)
- printf(" %0.10e", *(datai++));
+ printf(" %0.10e", *(datai++));
printf("\n");
}
for (i=0;i<ds_cnt;i++)
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_tool.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_tool.h Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_tune.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_tune.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_tune.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* change header parameters of an rrd
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_update.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_update.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_update.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
@@ -32,7 +32,7 @@
main(int argc, char **argv){
rrd_update(argc,argv);
if (rrd_test_error()) {
- printf("RRDtool 1.0.46 Copyright 1997-2000 by Tobias Oetiker <tobi at oetiker.ch>\n\n"
+ printf("RRDtool 1.0.49 Copyright 1997-2000 by Tobias Oetiker <tobi at oetiker.ch>\n\n"
"Usage: rrdupdate filename\n"
"\t\t\t[--template|-t ds-name:ds-name:...]\n"
"\t\t\ttime|N:value[:value...]\n\n"
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_xport.c (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.c Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
@@ -298,20 +298,23 @@
int i = 0, j = 0;
unsigned long *ds_cnt; /* number of data sources in file */
- unsigned long col, dst_row, row_cnt;
+ unsigned long col, row_cnt;
rrd_value_t *srcptr, *dstptr;
unsigned long nof_xports = 0;
unsigned long xport_counter = 0;
unsigned long *ref_list;
- rrd_value_t **srcptr_list;
char **legend_list;
int ii = 0;
time_t start_tmp = 0;
time_t end_tmp = 0;
+ time_t curr_ts;
unsigned long step_tmp = 1;
+ int dataIndex;
+ int dataMemOffset;
+
/* pull the data from the rrd files ... */
if(data_fetch(im)==-1)
return -1;
@@ -341,18 +344,10 @@
if(ref_list == NULL)
return -1;
- /* a list to save pointers into each gdes data */
- srcptr_list = malloc(sizeof(srcptr) * nof_xports);
- if(srcptr_list == NULL) {
- free(ref_list);
- return -1;
- }
-
/* a list to save pointers to the column's legend entry */
/* this is a return value! */
legend_list = malloc(sizeof(char *) * nof_xports);
if(legend_list == NULL) {
- free(srcptr_list);
free(ref_list);
return -1;
}
@@ -365,12 +360,10 @@
ii = im->gdes[i].vidx;
if(xport_counter > nof_xports) {
rrd_set_error( "too many xports: should not happen. Hmmm");
- free(srcptr_list);
free(ref_list);
free(legend_list);
return -1;
}
- srcptr_list[xport_counter] = im->gdes[ii].data;
ref_list[xport_counter++] = i;
break;
default:
@@ -382,6 +375,23 @@
end_tmp = im->gdes[0].end;
step_tmp = im->gdes[0].step;
+ /*
+ * Choose the minimum step of all the xports
+ * Also, use the start and end times from the xport
+ * with the smallest step. These are the data items
+ * we will export. If we try to use the largest interval,
+ * then we won't have data for each row in the xport.
+ */
+
+ for(i = 0; i < nof_xports; i++) {
+ ii = im->gdes[ref_list[i]].vidx;
+ if (step_tmp > im->gdes[ii].step) {
+ step_tmp = im->gdes[ii].step;
+ start_tmp = im->gdes[ii].start;
+ end_tmp = im->gdes[ii].end;
+ }
+ }
+
*col_cnt = nof_xports;
*start = start_tmp;
*end = end_tmp;
@@ -392,7 +402,6 @@
/* room for rearranged data */
/* this is a return value! */
if (((*data) = malloc((*col_cnt) * row_cnt * sizeof(rrd_value_t)))==NULL){
- free(srcptr_list);
free(ref_list);
free(legend_list);
rrd_set_error("malloc xport data area");
@@ -407,7 +416,6 @@
/* reserve room for one legend entry */
/* is FMT_LEG_LEN + 5 the correct size? */
if ((legend_list[j] = malloc(sizeof(char) * (FMT_LEG_LEN+5)))==NULL) {
- free(srcptr_list);
free(ref_list);
free(legend_list);
rrd_set_error("malloc xprint legend entry");
@@ -427,14 +435,24 @@
}
/* fill data structure */
- for(dst_row = 0; dst_row < row_cnt; dst_row++) {
+ for(curr_ts = start_tmp; curr_ts <= end_tmp; curr_ts += step_tmp) {
for(i = 0; i < nof_xports; i++) {
j = ref_list[i];
ii = im->gdes[j].vidx;
ds_cnt = &im->gdes[ii].ds_cnt;
- col = *ds_cnt;
- srcptr = srcptr_list[i];
+ /*
+ * We need to make sure that each data item from each xport
+ * appears in the row with the correct time stamp for that item
+ * Some consolidated data (like Max, Min, Last) will only have
+ * one data point for each n data points for a variable.
+ */
+
+ dataIndex = ceil((double)(curr_ts - im->gdes[ii].start) / im->gdes[ii].step);
+ dataMemOffset = dataIndex*(*ds_cnt);
+
+ srcptr = im->gdes[ii].data + dataMemOffset;
+
for(col = 0; col < (*ds_cnt); col++) {
rrd_value_t newval = DNAN;
newval = srcptr[col];
@@ -447,12 +465,10 @@
}
}
- srcptr_list[i] += (*ds_cnt);
}
}
*legend_v = legend_list;
- free(srcptr_list);
free(ref_list);
return 0;
Modified: trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/src/rrd_xport.h (original)
+++ trunk/orca/packages/rrdtool-1.0.49/src/rrd_xport.h Sat Aug 21 11:59:00 2004
@@ -1,5 +1,5 @@
/****************************************************************************
- * RRDtool 1.0.46 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.0.49 Copyright Tobias Oetiker, 1997 - 2000
****************************************************************************
* rrd_xport.h contains XML related constants
****************************************************************************/
Modified: trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/tcl/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.am Sat Aug 21 11:59:00 2004
@@ -4,7 +4,7 @@
VERSION = @VERSION@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/src
TCL_PREFIX = @TCL_PREFIX@
TCL_SHLIB_LD = @TCL_SHLIB_LD@
TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
@@ -22,10 +22,10 @@
if COMP_TCL
$(TCL_LIB_FILE): tclrrd.o
- $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
+ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
tclrrd.o: tclrrd.c
- $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"
+ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) $(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
all-local: $(TCL_LIB_FILE)
Modified: trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.46/tcl/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.49/tcl/Makefile.in Sat Aug 21 11:59:00 2004
@@ -48,7 +48,7 @@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -I$(top_srcdir)/src
CGI_LIB_DIR = @CGI_LIB_DIR@
COMP_PERL = @COMP_PERL@
COMP_TCL_FALSE = @COMP_TCL_FALSE@
@@ -320,10 +320,10 @@
@COMP_TCL_TRUE@$(TCL_LIB_FILE): tclrrd.o
- at COMP_TCL_TRUE@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
+ at COMP_TCL_TRUE@ $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ @RRD_PRIVATE_LINK@ -lm $(TCL_LIB_SPEC)
@COMP_TCL_TRUE at tclrrd.o: tclrrd.c
- at COMP_TCL_TRUE@ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"
+ at COMP_TCL_TRUE@ $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) $(AM_CPPFLAGS) -c $< -DVERSION=\"$(VERSION)\"
@COMP_TCL_TRUE at all-local: $(TCL_LIB_FILE)
More information about the Orca-checkins
mailing list