Git
Threads by month
- ----- 2025 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
August 2011
- 8 participants
- 476 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14267-ge4bb7fd
by Dieter Adriaenssens 10 Aug '11
by Dieter Adriaenssens 10 Aug '11
10 Aug '11
The branch, master has been updated
via e4bb7fdcdd3a2f214c47444ef621c10403c16c72 (commit)
from fd383934af0e48c7594e7e0629a71ec9ba016d9d (commit)
- Log -----------------------------------------------------------------
commit e4bb7fdcdd3a2f214c47444ef621c10403c16c72
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: Wed Aug 10 21:12:08 2011 +0200
fix description
-----------------------------------------------------------------------
Summary of changes:
libraries/export/htmlword.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 31303cc..b7aa568 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -1,7 +1,7 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * Set of functions used to build HTML dumps of tables
+ * Set of functions used to export a set of queries to a MS Word document
*
* @package phpMyAdmin-Export
* @subpackage HTMLWord
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14264-g45c66c9
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via 45c66c9139fe6762c4b1da0f027161318ebfed12 (commit)
via 1cefd6fa90ffbc6d64af4998ef7f4490d4378909 (commit)
via fcf90b54404099ba8cfa7f64b00740b781242d91 (commit)
via 5d8a2284c01d5ca95560b9c1c5a7c82b7e6b3ced (commit)
via b89184760555ca8a554196c045fd65d1c3def36d (commit)
via 824474ddba30dbb8e75c3dabd865ee1eaf1c3953 (commit)
via ffe9306e9258e729aa6d5746aa6074c2839559b9 (commit)
via 99fe414dc121ab16e72ad5b1f6bb4de405ad5131 (commit)
via a4d306520e13c2d587627fa0b33b346be9b12bbf (commit)
via dc0d28d78fecc424b7f0ca1c0765e65cf135c9fa (commit)
from fc1f74306a4d29e1b7e2866b3fb24b274e290bae (commit)
- Log -----------------------------------------------------------------
commit 45c66c9139fe6762c4b1da0f027161318ebfed12
Merge: fc1f743 1cefd6f
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 16:18:30 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
po/tr.po
commit 1cefd6fa90ffbc6d64af4998ef7f4490d4378909
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:54:33 2011 +0200
Translation update done using Pootle.
commit fcf90b54404099ba8cfa7f64b00740b781242d91
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:54:09 2011 +0200
Translation update done using Pootle.
commit 5d8a2284c01d5ca95560b9c1c5a7c82b7e6b3ced
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:54:06 2011 +0200
Translation update done using Pootle.
commit b89184760555ca8a554196c045fd65d1c3def36d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:53:57 2011 +0200
Translation update done using Pootle.
commit 824474ddba30dbb8e75c3dabd865ee1eaf1c3953
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:53:51 2011 +0200
Translation update done using Pootle.
commit ffe9306e9258e729aa6d5746aa6074c2839559b9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:53:40 2011 +0200
Translation update done using Pootle.
commit 99fe414dc121ab16e72ad5b1f6bb4de405ad5131
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:53:25 2011 +0200
Translation update done using Pootle.
commit a4d306520e13c2d587627fa0b33b346be9b12bbf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:53:17 2011 +0200
Translation update done using Pootle.
commit dc0d28d78fecc424b7f0ca1c0765e65cf135c9fa
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 15:52:53 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/tr.po | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/po/tr.po b/po/tr.po
index bf82087..77b66f2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-10 10:14-0400\n"
-"PO-Revision-Date: 2011-08-08 19:21+0200\n"
+"PO-Revision-Date: 2011-08-10 15:54+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -1704,16 +1704,14 @@ msgstr "güncel"
msgid "Done"
msgstr "Bitti"
-#: js/messages.php:302
-#, fuzzy
-#| msgid "Prev"
+#. l10n: Display text for previous month link in calendar
+#: js/messages.php:296
msgctxt "Previous month"
msgid "Prev"
msgstr "Önceki"
-#: js/messages.php:307
-#, fuzzy
-#| msgid "Next"
+#. l10n: Display text for next month link in calendar
+#: js/messages.php:298
msgctxt "Next month"
msgid "Next"
msgstr "Sonraki"
@@ -2580,16 +2578,14 @@ msgstr "Eksik parametreler:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#, fuzzy
#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
-msgstr "Yukarı"
+msgstr "Başlangıç"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#, fuzzy
#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
@@ -2598,7 +2594,6 @@ msgstr "Önceki"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#, fuzzy
#| msgid "Next"
msgctxt "Next page"
msgid "Next"
@@ -2606,7 +2601,6 @@ msgstr "Sonraki"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#, fuzzy
#| msgid "End"
msgctxt "Last page"
msgid "End"
@@ -7030,18 +7024,16 @@ msgid "Execute every"
msgstr "Çalıştır; her"
#: libraries/rte/rte_events.lib.php:449
-#, fuzzy
#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
msgstr "Başlama"
#: libraries/rte/rte_events.lib.php:457
-#, fuzzy
#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
-msgstr "Son"
+msgstr "Bitiş"
#: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
#: libraries/rte/rte_triggers.lib.php:354
@@ -11093,7 +11085,7 @@ msgstr "Satır boyutu "
#: tbl_printview.php:388 tbl_structure.php:900
msgid "Next autoindex"
-msgstr ""
+msgstr "Sonraki otoindeks"
#: tbl_relation.php:276
#, php-format
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14254-gfc1f743
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via fc1f74306a4d29e1b7e2866b3fb24b274e290bae (commit)
via 64a33bd6bcb31fa96d97f9c35602d529f5db340c (commit)
via b0951818b5c315b84fda9854c05e0dbbb8eb8d75 (commit)
from 81ad258b11b9a74e65113d222d97169efb70d2a6 (commit)
- Log -----------------------------------------------------------------
commit fc1f74306a4d29e1b7e2866b3fb24b274e290bae
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 16:09:44 2011 +0200
Avoid introducing new string to translate, this fits better
commit 64a33bd6bcb31fa96d97f9c35602d529f5db340c
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 16:01:47 2011 +0200
Also do aliases
commit b0951818b5c315b84fda9854c05e0dbbb8eb8d75
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:59:28 2011 +0200
Add class for creating PDF document
-----------------------------------------------------------------------
Summary of changes:
libraries/select_lang.lib.php | 2 +-
test/classes/PMA_PDF_test.php | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletions(-)
create mode 100644 test/classes/PMA_PDF_test.php
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 0842001..f4030ef 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -479,7 +479,7 @@ $GLOBALS['l']['a_meta_dir'] = $GLOBALS['text_dir'];
$GLOBALS['l']['a_meta_language'] = $GLOBALS['lang'];
/* TCPDF translations */
-$GLOBALS['l']['w_page'] = _pgettext('PDF', 'page');
+$GLOBALS['l']['w_page'] = __('Page number:');
// now, that we have loaded the language strings we can send the errors
diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PMA_PDF_test.php
new file mode 100644
index 0000000..1f7931c
--- /dev/null
+++ b/test/classes/PMA_PDF_test.php
@@ -0,0 +1,35 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for PMA_PDF class
+ *
+ * @package phpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/common.lib.php';
+require_once 'libraries/PDF.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+
+if (!defined('PMA_VERSION')) {
+ define('PMA_VERSION', 'TEST');
+}
+
+class PMA_PDF_test extends PHPUnit_Framework_TestCase
+{
+ public function testBasic()
+ {
+ $arr = new PMA_PDF();
+ $this->assertContains('PDF', $arr->getPDFData());
+ }
+
+ public function testAlias()
+ {
+ $arr = new PMA_PDF();
+ $arr->SetAlias('{00}', '32');
+ $this->assertContains('PDF', $arr->getPDFData());
+ }
+}
+?>
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14250-g6756d53
by Marc Delisle 10 Aug '11
by Marc Delisle 10 Aug '11
10 Aug '11
The branch, master has been updated
via 6756d536f37df7cf204fb6005eb8e85a7c3e46f8 (commit)
via 963e909afc567df371219809b60b952e67bfa3ca (commit)
from 61571b8e9a94ff6d254e3170e9b85c6036dec643 (commit)
- Log -----------------------------------------------------------------
commit 6756d536f37df7cf204fb6005eb8e85a7c3e46f8
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Aug 10 10:11:10 2011 -0400
Unused message
commit 963e909afc567df371219809b60b952e67bfa3ca
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Aug 10 10:05:23 2011 -0400
Improve message
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 5f4e12b..c941b1c 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -227,12 +227,13 @@ $js_messages['strImportCSV'] = __('Note: If the file contains multiple tables, t
$js_messages['strHideQueryBox'] = __('Hide query box');
$js_messages['strShowQueryBox'] = __('Show query box');
$js_messages['strEdit'] = __('Edit');
-$js_messages['strSave'] = __('Save');
-$js_messages['strHide'] = __('Hide');
$js_messages['strNoRowSelected'] = __('No rows selected');
$js_messages['strChangeTbl'] = __('Change');
$js_messages['strQueryExecutionTime'] = __('Query execution time');
+/* For server_variables.js */
+$js_messages['strSave'] = __('Save');
+
/* For tbl_select.js */
$js_messages['strHideSearchCriteria'] = __('Hide search criteria');
$js_messages['strShowSearchCriteria'] = __('Show search criteria');
@@ -261,7 +262,7 @@ $js_messages['strSortHint'] = __('Click to sort');
$js_messages['strColMarkHint'] = __('Click to mark/unmark');
$js_messages['strColVisibHint'] = __('Click the drop-down arrow<br />to toggle column\'s visibility');
$js_messages['strShowAllCol'] = __('Show all');
-$js_messages['strAlertNonUnique'] = __('This table contains no unique field. Features related to the grid edit, checkbox, Edit, Copy and Delete links may not work after saving.');
+$js_messages['strAlertNonUnique'] = __('This table does not contain a unique column. Features related to the grid edit, checkbox, Edit, Copy and Delete links may not work after saving.');
/* password generation */
$js_messages['strGeneratePassword'] = __('Generate password');
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14246-g1dc8fb5
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via 1dc8fb51b2dddd558765ee72827e4b53daf2a6e2 (commit)
from 20560bea4949e775940dd653abb01d31782e7517 (commit)
- Log -----------------------------------------------------------------
commit 1dc8fb51b2dddd558765ee72827e4b53daf2a6e2
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:48:25 2011 +0200
Drop not needed font mappings
-----------------------------------------------------------------------
Summary of changes:
libraries/tcpdf/fonts/courier.php | 33 --------------------------------
libraries/tcpdf/fonts/helveticab.php | 33 --------------------------------
libraries/tcpdf/fonts/helveticabi.php | 33 --------------------------------
libraries/tcpdf/fonts/helveticai.php | 33 --------------------------------
libraries/tcpdf/fonts/symbol.php | 32 -------------------------------
libraries/tcpdf/fonts/times.php | 33 --------------------------------
libraries/tcpdf/fonts/timesb.php | 33 --------------------------------
libraries/tcpdf/fonts/timesbi.php | 33 --------------------------------
libraries/tcpdf/fonts/timesi.php | 33 --------------------------------
libraries/tcpdf/fonts/zapfdingbats.php | 32 -------------------------------
10 files changed, 0 insertions(+), 328 deletions(-)
delete mode 100644 libraries/tcpdf/fonts/courier.php
delete mode 100644 libraries/tcpdf/fonts/helveticab.php
delete mode 100644 libraries/tcpdf/fonts/helveticabi.php
delete mode 100644 libraries/tcpdf/fonts/helveticai.php
delete mode 100644 libraries/tcpdf/fonts/symbol.php
delete mode 100644 libraries/tcpdf/fonts/times.php
delete mode 100644 libraries/tcpdf/fonts/timesb.php
delete mode 100644 libraries/tcpdf/fonts/timesbi.php
delete mode 100644 libraries/tcpdf/fonts/timesi.php
delete mode 100644 libraries/tcpdf/fonts/zapfdingbats.php
diff --git a/libraries/tcpdf/fonts/courier.php b/libraries/tcpdf/fonts/courier.php
deleted file mode 100644
index d6ab661..0000000
--- a/libraries/tcpdf/fonts/courier.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=600;
-$cw=array(0=>600,1=>600,2=>600,3=>600,4=>600,5=>600,6=>600,7=>600,8=>600,9=>600,
-10=>600,11=>600,12=>600,13=>600,14=>600,15=>600,16=>600,17=>600,18=>600,19=>600,
-20=>600,21=>600,22=>600,23=>600,24=>600,25=>600,26=>600,27=>600,28=>600,29=>600,
-30=>600,31=>600,32=>600,33=>600,34=>600,35=>600,36=>600,37=>600,38=>600,39=>600,
-40=>600,41=>600,42=>600,43=>600,44=>600,45=>600,46=>600,47=>600,48=>600,49=>600,
-50=>600,51=>600,52=>600,53=>600,54=>600,55=>600,56=>600,57=>600,58=>600,59=>600,
-60=>600,61=>600,62=>600,63=>600,64=>600,65=>600,66=>600,67=>600,68=>600,69=>600,
-70=>600,71=>600,72=>600,73=>600,74=>600,75=>600,76=>600,77=>600,78=>600,79=>600,
-80=>600,81=>600,82=>600,83=>600,84=>600,85=>600,86=>600,87=>600,88=>600,89=>600,
-90=>600,91=>600,92=>600,93=>600,94=>600,95=>600,96=>600,97=>600,98=>600,99=>600,
-100=>600,101=>600,102=>600,103=>600,104=>600,105=>600,106=>600,107=>600,108=>600,
-109=>600,110=>600,111=>600,112=>600,113=>600,114=>600,115=>600,116=>600,117=>600,
-118=>600,119=>600,120=>600,121=>600,122=>600,123=>600,124=>600,125=>600,126=>600,
-127=>600,128=>600,129=>600,130=>600,131=>600,132=>600,133=>600,134=>600,135=>600,
-136=>600,137=>600,138=>600,139=>600,140=>600,141=>600,142=>600,143=>600,144=>600,
-145=>600,146=>600,147=>600,148=>600,149=>600,150=>600,151=>600,152=>600,153=>600,
-154=>600,155=>600,156=>600,157=>600,158=>600,159=>600,160=>600,161=>600,162=>600,
-163=>600,164=>600,165=>600,166=>600,167=>600,168=>600,169=>600,170=>600,171=>600,
-172=>600,173=>600,174=>600,175=>600,176=>600,177=>600,178=>600,179=>600,180=>600,
-181=>600,182=>600,183=>600,184=>600,185=>600,186=>600,187=>600,188=>600,189=>600,
-190=>600,191=>600,192=>600,193=>600,194=>600,195=>600,196=>600,197=>600,198=>600,
-199=>600,200=>600,201=>600,202=>600,203=>600,204=>600,205=>600,206=>600,207=>600,
-208=>600,209=>600,210=>600,211=>600,212=>600,213=>600,214=>600,215=>600,216=>600,
-217=>600,218=>600,219=>600,220=>600,221=>600,222=>600,223=>600,224=>600,225=>600,
-226=>600,227=>600,228=>600,229=>600,230=>600,231=>600,232=>600,233=>600,234=>600,
-235=>600,236=>600,237=>600,238=>600,239=>600,240=>600,241=>600,242=>600,243=>600,
-244=>600,245=>600,246=>600,247=>600,248=>600,249=>600,250=>600,251=>600,252=>600,
-253=>600,254=>600,255=>600);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/helveticab.php b/libraries/tcpdf/fonts/helveticab.php
deleted file mode 100644
index 8635a72..0000000
--- a/libraries/tcpdf/fonts/helveticab.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>333,34=>474,35=>556,36=>556,37=>889,38=>722,39=>238,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>333,59=>333,
-60=>584,61=>584,62=>584,63=>611,64=>975,65=>722,66=>722,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>556,75=>722,76=>611,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>333,92=>278,93=>333,94=>584,95=>556,96=>333,97=>556,98=>611,99=>556,
-100=>611,101=>556,102=>333,103=>611,104=>611,105=>278,106=>278,107=>556,108=>278,
-109=>889,110=>611,111=>611,112=>611,113=>611,114=>389,115=>556,116=>333,117=>611,
-118=>556,119=>778,120=>556,121=>556,122=>500,123=>389,124=>280,125=>389,126=>584,
-127=>350,128=>556,129=>350,130=>278,131=>556,132=>500,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>278,146=>278,147=>500,148=>500,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>556,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>280,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>611,182=>556,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>556,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>611,241=>611,242=>611,243=>611,
-244=>611,245=>611,246=>611,247=>584,248=>611,249=>611,250=>611,251=>611,252=>611,
-253=>556,254=>611,255=>556);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/helveticabi.php b/libraries/tcpdf/fonts/helveticabi.php
deleted file mode 100644
index 8635a72..0000000
--- a/libraries/tcpdf/fonts/helveticabi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>333,34=>474,35=>556,36=>556,37=>889,38=>722,39=>238,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>333,59=>333,
-60=>584,61=>584,62=>584,63=>611,64=>975,65=>722,66=>722,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>556,75=>722,76=>611,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>333,92=>278,93=>333,94=>584,95=>556,96=>333,97=>556,98=>611,99=>556,
-100=>611,101=>556,102=>333,103=>611,104=>611,105=>278,106=>278,107=>556,108=>278,
-109=>889,110=>611,111=>611,112=>611,113=>611,114=>389,115=>556,116=>333,117=>611,
-118=>556,119=>778,120=>556,121=>556,122=>500,123=>389,124=>280,125=>389,126=>584,
-127=>350,128=>556,129=>350,130=>278,131=>556,132=>500,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>278,146=>278,147=>500,148=>500,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>556,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>280,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>611,182=>556,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>556,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>611,241=>611,242=>611,243=>611,
-244=>611,245=>611,246=>611,247=>584,248=>611,249=>611,250=>611,251=>611,252=>611,
-253=>556,254=>611,255=>556);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/helveticai.php b/libraries/tcpdf/fonts/helveticai.php
deleted file mode 100644
index c5eba6d..0000000
--- a/libraries/tcpdf/fonts/helveticai.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,
-60=>584,61=>584,62=>584,63=>556,64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>278,92=>278,93=>278,94=>469,95=>556,96=>333,97=>556,98=>556,99=>500,
-100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,
-109=>833,110=>556,111=>556,112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,
-118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,
-127=>350,128=>556,129=>350,130=>222,131=>556,132=>333,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>222,146=>222,147=>333,148=>333,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>500,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,242=>556,243=>556,
-244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,
-253=>500,254=>556,255=>500);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/symbol.php b/libraries/tcpdf/fonts/symbol.php
deleted file mode 100644
index c45f288..0000000
--- a/libraries/tcpdf/fonts/symbol.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>713,35=>500,36=>549,37=>833,38=>778,39=>439,
-40=>333,41=>333,42=>500,43=>549,44=>250,45=>549,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>278,59=>278,
-60=>549,61=>549,62=>549,63=>444,64=>549,65=>722,66=>667,67=>722,68=>612,69=>611,
-70=>763,71=>603,72=>722,73=>333,74=>631,75=>722,76=>686,77=>889,78=>722,79=>722,
-80=>768,81=>741,82=>556,83=>592,84=>611,85=>690,86=>439,87=>768,88=>645,89=>795,
-90=>611,91=>333,92=>863,93=>333,94=>658,95=>500,96=>500,97=>631,98=>549,99=>549,
-100=>494,101=>439,102=>521,103=>411,104=>603,105=>329,106=>603,107=>549,108=>549,
-109=>576,110=>521,111=>549,112=>549,113=>521,114=>549,115=>603,116=>439,117=>576,
-118=>713,119=>686,120=>493,121=>686,122=>494,123=>480,124=>200,125=>480,126=>549,
-127=>0,128=>0,129=>0,130=>0,131=>0,132=>0,133=>0,134=>0,135=>0,136=>0,137=>0,
-138=>0,139=>0,140=>0,141=>0,142=>0,143=>0,144=>0,145=>0,146=>0,147=>0,148=>0,
-149=>0,150=>0,151=>0,152=>0,153=>0,154=>0,155=>0,156=>0,157=>0,158=>0,159=>0,
-160=>750,161=>620,162=>247,163=>549,164=>167,165=>713,166=>500,167=>753,168=>753,
-169=>753,170=>753,171=>1042,172=>987,173=>603,174=>987,175=>603,176=>400,177=>549,
-178=>411,179=>549,180=>549,181=>713,182=>494,183=>460,184=>549,185=>549,186=>549,
-187=>549,188=>1000,189=>603,190=>1000,191=>658,192=>823,193=>686,194=>795,195=>987,
-196=>768,197=>768,198=>823,199=>768,200=>768,201=>713,202=>713,203=>713,204=>713,
-205=>713,206=>713,207=>713,208=>768,209=>713,210=>790,211=>790,212=>890,213=>823,
-214=>549,215=>250,216=>713,217=>603,218=>603,219=>1042,220=>987,221=>603,222=>987,
-223=>603,224=>494,225=>329,226=>790,227=>790,228=>786,229=>713,230=>384,231=>384,
-232=>384,233=>384,234=>384,235=>384,236=>494,237=>494,238=>494,239=>494,240=>0,
-241=>329,242=>274,243=>686,244=>686,245=>686,246=>384,247=>384,248=>384,249=>384,
-250=>384,251=>384,252=>494,253=>494,254=>494,255=>0);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/times.php b/libraries/tcpdf/fonts/times.php
deleted file mode 100644
index 9914386..0000000
--- a/libraries/tcpdf/fonts/times.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>408,35=>500,36=>500,37=>833,38=>778,39=>180,
-40=>333,41=>333,42=>500,43=>564,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>278,59=>278,
-60=>564,61=>564,62=>564,63=>444,64=>921,65=>722,66=>667,67=>667,68=>722,69=>611,
-70=>556,71=>722,72=>722,73=>333,74=>389,75=>722,76=>611,77=>889,78=>722,79=>722,
-80=>556,81=>722,82=>667,83=>556,84=>611,85=>722,86=>722,87=>944,88=>722,89=>722,
-90=>611,91=>333,92=>278,93=>333,94=>469,95=>500,96=>333,97=>444,98=>500,99=>444,
-100=>500,101=>444,102=>333,103=>500,104=>500,105=>278,106=>278,107=>500,108=>278,
-109=>778,110=>500,111=>500,112=>500,113=>500,114=>333,115=>389,116=>278,117=>500,
-118=>500,119=>722,120=>500,121=>500,122=>444,123=>480,124=>200,125=>480,126=>541,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>444,133=>1000,134=>500,135=>500,
-136=>333,137=>1000,138=>556,139=>333,140=>889,141=>350,142=>611,143=>350,144=>350,
-145=>333,146=>333,147=>444,148=>444,149=>350,150=>500,151=>1000,152=>333,153=>980,
-154=>389,155=>333,156=>722,157=>350,158=>444,159=>722,160=>250,161=>333,162=>500,
-163=>500,164=>500,165=>500,166=>200,167=>500,168=>333,169=>760,170=>276,171=>500,
-172=>564,173=>333,174=>760,175=>333,176=>400,177=>564,178=>300,179=>300,180=>333,
-181=>500,182=>453,183=>250,184=>333,185=>300,186=>310,187=>500,188=>750,189=>750,
-190=>750,191=>444,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>889,
-199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,
-208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>564,216=>722,
-217=>722,218=>722,219=>722,220=>722,221=>722,222=>556,223=>500,224=>444,225=>444,
-226=>444,227=>444,228=>444,229=>444,230=>667,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>500,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>564,248=>500,249=>500,250=>500,251=>500,252=>500,
-253=>500,254=>500,255=>500);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/timesb.php b/libraries/tcpdf/fonts/timesb.php
deleted file mode 100644
index b6625be..0000000
--- a/libraries/tcpdf/fonts/timesb.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>555,35=>500,36=>500,37=>1000,38=>833,39=>278,
-40=>333,41=>333,42=>500,43=>570,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,
-60=>570,61=>570,62=>570,63=>500,64=>930,65=>722,66=>667,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>778,73=>389,74=>500,75=>778,76=>667,77=>944,78=>722,79=>778,
-80=>611,81=>778,82=>722,83=>556,84=>667,85=>722,86=>722,87=>1000,88=>722,89=>722,
-90=>667,91=>333,92=>278,93=>333,94=>581,95=>500,96=>333,97=>500,98=>556,99=>444,
-100=>556,101=>444,102=>333,103=>500,104=>556,105=>278,106=>333,107=>556,108=>278,
-109=>833,110=>556,111=>500,112=>556,113=>556,114=>444,115=>389,116=>333,117=>556,
-118=>500,119=>722,120=>500,121=>500,122=>444,123=>394,124=>220,125=>394,126=>520,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>500,133=>1000,134=>500,135=>500,
-136=>333,137=>1000,138=>556,139=>333,140=>1000,141=>350,142=>667,143=>350,144=>350,
-145=>333,146=>333,147=>500,148=>500,149=>350,150=>500,151=>1000,152=>333,153=>1000,
-154=>389,155=>333,156=>722,157=>350,158=>444,159=>722,160=>250,161=>333,162=>500,
-163=>500,164=>500,165=>500,166=>220,167=>500,168=>333,169=>747,170=>300,171=>500,
-172=>570,173=>333,174=>747,175=>333,176=>400,177=>570,178=>300,179=>300,180=>333,
-181=>556,182=>540,183=>250,184=>333,185=>300,186=>330,187=>500,188=>750,189=>750,
-190=>750,191=>500,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>389,205=>389,206=>389,207=>389,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>570,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>722,222=>611,223=>556,224=>500,225=>500,
-226=>500,227=>500,228=>500,229=>500,230=>722,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>556,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>570,248=>500,249=>556,250=>556,251=>556,252=>556,
-253=>500,254=>556,255=>500);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/timesbi.php b/libraries/tcpdf/fonts/timesbi.php
deleted file mode 100644
index ff18a4b..0000000
--- a/libraries/tcpdf/fonts/timesbi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>389,34=>555,35=>500,36=>500,37=>833,38=>778,39=>278,
-40=>333,41=>333,42=>500,43=>570,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,
-60=>570,61=>570,62=>570,63=>500,64=>832,65=>667,66=>667,67=>667,68=>722,69=>667,
-70=>667,71=>722,72=>778,73=>389,74=>500,75=>667,76=>611,77=>889,78=>722,79=>722,
-80=>611,81=>722,82=>667,83=>556,84=>611,85=>722,86=>667,87=>889,88=>667,89=>611,
-90=>611,91=>333,92=>278,93=>333,94=>570,95=>500,96=>333,97=>500,98=>500,99=>444,
-100=>500,101=>444,102=>333,103=>500,104=>556,105=>278,106=>278,107=>500,108=>278,
-109=>778,110=>556,111=>500,112=>500,113=>500,114=>389,115=>389,116=>278,117=>556,
-118=>444,119=>667,120=>500,121=>444,122=>389,123=>348,124=>220,125=>348,126=>570,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>500,133=>1000,134=>500,135=>500,
-136=>333,137=>1000,138=>556,139=>333,140=>944,141=>350,142=>611,143=>350,144=>350,
-145=>333,146=>333,147=>500,148=>500,149=>350,150=>500,151=>1000,152=>333,153=>1000,
-154=>389,155=>333,156=>722,157=>350,158=>389,159=>611,160=>250,161=>389,162=>500,
-163=>500,164=>500,165=>500,166=>220,167=>500,168=>333,169=>747,170=>266,171=>500,
-172=>606,173=>333,174=>747,175=>333,176=>400,177=>570,178=>300,179=>300,180=>333,
-181=>576,182=>500,183=>250,184=>333,185=>300,186=>300,187=>500,188=>750,189=>750,
-190=>750,191=>500,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,198=>944,
-199=>667,200=>667,201=>667,202=>667,203=>667,204=>389,205=>389,206=>389,207=>389,
-208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>570,216=>722,
-217=>722,218=>722,219=>722,220=>722,221=>611,222=>611,223=>500,224=>500,225=>500,
-226=>500,227=>500,228=>500,229=>500,230=>722,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>556,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>570,248=>500,249=>556,250=>556,251=>556,252=>556,
-253=>444,254=>500,255=>444);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/timesi.php b/libraries/tcpdf/fonts/timesi.php
deleted file mode 100644
index c86d3ab..0000000
--- a/libraries/tcpdf/fonts/timesi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>420,35=>500,36=>500,37=>833,38=>778,39=>214,
-40=>333,41=>333,42=>500,43=>675,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,
-60=>675,61=>675,62=>675,63=>500,64=>920,65=>611,66=>611,67=>667,68=>722,69=>611,
-70=>611,71=>722,72=>722,73=>333,74=>444,75=>667,76=>556,77=>833,78=>667,79=>722,
-80=>611,81=>722,82=>611,83=>500,84=>556,85=>722,86=>611,87=>833,88=>611,89=>556,
-90=>556,91=>389,92=>278,93=>389,94=>422,95=>500,96=>333,97=>500,98=>500,99=>444,
-100=>500,101=>444,102=>278,103=>500,104=>500,105=>278,106=>278,107=>444,108=>278,
-109=>722,110=>500,111=>500,112=>500,113=>500,114=>389,115=>389,116=>278,117=>500,
-118=>444,119=>667,120=>444,121=>444,122=>389,123=>400,124=>275,125=>400,126=>541,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>556,133=>889,134=>500,135=>500,
-136=>333,137=>1000,138=>500,139=>333,140=>944,141=>350,142=>556,143=>350,144=>350,
-145=>333,146=>333,147=>556,148=>556,149=>350,150=>500,151=>889,152=>333,153=>980,
-154=>389,155=>333,156=>667,157=>350,158=>389,159=>556,160=>250,161=>389,162=>500,
-163=>500,164=>500,165=>500,166=>275,167=>500,168=>333,169=>760,170=>276,171=>500,
-172=>675,173=>333,174=>760,175=>333,176=>400,177=>675,178=>300,179=>300,180=>333,
-181=>500,182=>523,183=>250,184=>333,185=>300,186=>310,187=>500,188=>750,189=>750,
-190=>750,191=>500,192=>611,193=>611,194=>611,195=>611,196=>611,197=>611,198=>889,
-199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,
-208=>722,209=>667,210=>722,211=>722,212=>722,213=>722,214=>722,215=>675,216=>722,
-217=>722,218=>722,219=>722,220=>722,221=>556,222=>611,223=>500,224=>500,225=>500,
-226=>500,227=>500,228=>500,229=>500,230=>667,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>500,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>675,248=>500,249=>500,250=>500,251=>500,252=>500,
-253=>444,254=>500,255=>444);
-// --- EOF ---
diff --git a/libraries/tcpdf/fonts/zapfdingbats.php b/libraries/tcpdf/fonts/zapfdingbats.php
deleted file mode 100644
index c1362db..0000000
--- a/libraries/tcpdf/fonts/zapfdingbats.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=788;
-$cw=array(0=>0,1=>0,2=>0,3=>0,4=>0,5=>0,6=>0,7=>0,8=>0,9=>0,10=>0,11=>0,12=>0,
-13=>0,14=>0,15=>0,16=>0,17=>0,18=>0,19=>0,20=>0,21=>0,22=>0,23=>0,24=>0,25=>0,
-26=>0,27=>0,28=>0,29=>0,30=>0,31=>0,32=>278,33=>974,34=>961,35=>974,36=>980,
-37=>719,38=>789,39=>790,40=>791,41=>690,42=>960,43=>939,44=>549,45=>855,46=>911,
-47=>933,48=>911,49=>945,50=>974,51=>755,52=>846,53=>762,54=>761,55=>571,56=>677,
-57=>763,58=>760,59=>759,60=>754,61=>494,62=>552,63=>537,64=>577,65=>692,66=>786,
-67=>788,68=>788,69=>790,70=>793,71=>794,72=>816,73=>823,74=>789,75=>841,76=>823,
-77=>833,78=>816,79=>831,80=>923,81=>744,82=>723,83=>749,84=>790,85=>792,86=>695,
-87=>776,88=>768,89=>792,90=>759,91=>707,92=>708,93=>682,94=>701,95=>826,96=>815,
-97=>789,98=>789,99=>707,100=>687,101=>696,102=>689,103=>786,104=>787,105=>713,
-106=>791,107=>785,108=>791,109=>873,110=>761,111=>762,112=>762,113=>759,114=>759,
-115=>892,116=>892,117=>788,118=>784,119=>438,120=>138,121=>277,122=>415,123=>392,
-124=>392,125=>668,126=>668,127=>0,128=>390,129=>390,130=>317,131=>317,132=>276,
-133=>276,134=>509,135=>509,136=>410,137=>410,138=>234,139=>234,140=>334,141=>334,
-142=>0,143=>0,144=>0,145=>0,146=>0,147=>0,148=>0,149=>0,150=>0,151=>0,152=>0,
-153=>0,154=>0,155=>0,156=>0,157=>0,158=>0,159=>0,160=>0,161=>732,162=>544,163=>544,
-164=>910,165=>667,166=>760,167=>760,168=>776,169=>595,170=>694,171=>626,172=>788,
-173=>788,174=>788,175=>788,176=>788,177=>788,178=>788,179=>788,180=>788,181=>788,
-182=>788,183=>788,184=>788,185=>788,186=>788,187=>788,188=>788,189=>788,190=>788,
-191=>788,192=>788,193=>788,194=>788,195=>788,196=>788,197=>788,198=>788,199=>788,
-200=>788,201=>788,202=>788,203=>788,204=>788,205=>788,206=>788,207=>788,208=>788,
-209=>788,210=>788,211=>788,212=>894,213=>838,214=>1016,215=>458,216=>748,217=>924,
-218=>748,219=>918,220=>927,221=>928,222=>928,223=>834,224=>873,225=>828,226=>924,
-227=>924,228=>917,229=>930,230=>931,231=>463,232=>883,233=>836,234=>836,235=>867,
-236=>867,237=>696,238=>696,239=>874,240=>0,241=>874,242=>760,243=>946,244=>771,
-245=>865,246=>771,247=>888,248=>967,249=>888,250=>831,251=>873,252=>927,253=>970,
-254=>918,255=>0);
-// --- EOF ---
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14245-g20560be
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via 20560bea4949e775940dd653abb01d31782e7517 (commit)
via f71f2ab3256a06ec2dfc506948d3b05413cd2bba (commit)
from 1c0cf460d1dc31700df06fcc7a4dd6451f2d197e (commit)
- Log -----------------------------------------------------------------
commit 20560bea4949e775940dd653abb01d31782e7517
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:41:50 2011 +0200
Remove unused files
commit f71f2ab3256a06ec2dfc506948d3b05413cd2bba
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:41:28 2011 +0200
Do not include DejaVuSerif font as we do not use it
-----------------------------------------------------------------------
Summary of changes:
libraries/PDF.class.php | 2 -
libraries/tcpdf/fonts/dejavuserif.ctg.z | Bin 6354 -> 0 bytes
libraries/tcpdf/fonts/dejavuserif.php | 344 ------------------------------
libraries/tcpdf/fonts/dejavuserif.z | Bin 201287 -> 0 bytes
libraries/tcpdf/fonts/dejavuserifb.ctg.z | Bin 6099 -> 0 bytes
libraries/tcpdf/fonts/dejavuserifb.php | 330 ----------------------------
libraries/tcpdf/fonts/dejavuserifb.z | Bin 187555 -> 0 bytes
7 files changed, 0 insertions(+), 676 deletions(-)
delete mode 100644 libraries/tcpdf/fonts/dejavuserif.ctg.z
delete mode 100644 libraries/tcpdf/fonts/dejavuserif.php
delete mode 100644 libraries/tcpdf/fonts/dejavuserif.z
delete mode 100644 libraries/tcpdf/fonts/dejavuserifb.ctg.z
delete mode 100644 libraries/tcpdf/fonts/dejavuserifb.php
delete mode 100644 libraries/tcpdf/fonts/dejavuserifb.z
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index b5629e0..3f4f2f1 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -26,8 +26,6 @@ class PMA_PDF extends TCPDF
$this->AliasNbPages();
$this->AddFont('DejaVuSans', '', 'dejavusans.php');
$this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
- $this->AddFont('DejaVuSerif', '', 'dejavuserif.php');
- $this->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
$this->SetFont(PMA_PDF_FONT, '', 14);
$this->setFooterFont(array(PMA_PDF_FONT, '', 14));
}
diff --git a/libraries/tcpdf/fonts/dejavuserif.ctg.z b/libraries/tcpdf/fonts/dejavuserif.ctg.z
deleted file mode 100644
index 651b8ab..0000000
Binary files a/libraries/tcpdf/fonts/dejavuserif.ctg.z and /dev/null differ
diff --git a/libraries/tcpdf/fonts/dejavuserif.php b/libraries/tcpdf/fonts/dejavuserif.php
deleted file mode 100644
index b4616ca..0000000
--- a/libraries/tcpdf/fonts/dejavuserif.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>6,'Flags'=>32,'FontBBox'=>'[-770 -347 1679 1109]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>402,34=>460,35=>838,36=>636,37=>950,38=>890,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>338,46=>318,47=>337,48=>636,49=>636,50=>636,
-51=>636,52=>636,53=>636,54=>636,55=>636,56=>636,57=>636,58=>337,59=>337,60=>838,
-61=>838,62=>838,63=>536,64=>1000,65=>722,66=>735,67=>765,68=>802,69=>730,70=>694,
-71=>799,72=>872,73=>395,74=>401,75=>747,76=>664,77=>1024,78=>875,79=>820,80=>673,
-81=>820,82=>753,83=>685,84=>667,85=>843,86=>722,87=>1028,88=>712,89=>660,90=>695,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>596,98=>640,99=>560,100=>640,
-101=>592,102=>370,103=>640,104=>644,105=>320,106=>310,107=>606,108=>320,109=>948,110=>644,
-111=>602,112=>640,113=>640,114=>478,115=>513,116=>402,117=>644,118=>565,119=>856,120=>564,
-121=>565,122=>527,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>370,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1342,352=>685,8249=>400,338=>1137,381=>695,8216=>318,
-8217=>318,8220=>511,8221=>511,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>513,8250=>400,
-339=>989,382=>527,376=>660,160=>318,161=>402,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>475,171=>612,172=>838,173=>338,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>650,182=>636,183=>318,184=>500,185=>401,186=>470,
-187=>612,188=>969,189=>969,190=>969,191=>536,192=>722,193=>722,194=>722,195=>722,196=>722,
-197=>722,198=>1001,199=>765,200=>730,201=>730,202=>730,203=>730,204=>395,205=>395,206=>395,
-207=>395,208=>807,209=>875,210=>820,211=>820,212=>820,213=>820,214=>820,215=>838,216=>820,
-217=>843,218=>843,219=>843,220=>843,221=>660,222=>676,223=>668,224=>596,225=>596,226=>596,
-227=>596,228=>596,229=>596,230=>940,231=>560,232=>592,233=>592,234=>592,235=>592,236=>320,
-237=>320,238=>320,239=>320,240=>602,241=>644,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>838,248=>602,249=>644,250=>644,251=>644,252=>644,253=>565,254=>640,255=>565,256=>722,
-257=>596,258=>722,259=>596,260=>722,261=>596,262=>765,263=>560,264=>765,265=>560,266=>765,
-267=>560,268=>765,269=>560,270=>802,271=>640,272=>807,273=>640,274=>730,275=>592,276=>730,
-277=>592,278=>730,279=>592,280=>730,281=>592,282=>730,283=>592,284=>799,285=>640,286=>799,
-287=>640,288=>799,289=>640,290=>799,291=>640,292=>872,293=>644,294=>872,295=>644,296=>395,
-297=>320,298=>395,299=>320,300=>395,301=>320,302=>395,303=>320,304=>395,305=>320,306=>801,
-307=>533,308=>401,309=>310,310=>747,311=>606,312=>606,313=>664,314=>320,315=>664,316=>320,
-317=>664,318=>320,319=>664,320=>320,321=>669,322=>324,323=>875,324=>644,325=>875,326=>644,
-327=>875,328=>644,329=>866,330=>843,331=>644,332=>820,333=>602,334=>820,335=>602,336=>820,
-337=>602,340=>753,341=>478,342=>753,343=>478,344=>753,345=>478,346=>685,347=>513,348=>685,
-349=>513,350=>685,351=>513,354=>667,355=>402,356=>667,357=>402,358=>667,359=>402,360=>843,
-361=>644,362=>843,363=>644,364=>843,365=>644,366=>843,367=>644,368=>843,369=>644,370=>843,
-371=>644,372=>1028,373=>856,374=>660,375=>565,377=>695,378=>527,379=>695,380=>527,383=>370,
-384=>640,385=>735,386=>735,387=>640,388=>735,389=>640,390=>765,391=>765,392=>560,393=>807,
-394=>802,395=>735,396=>640,397=>602,398=>730,399=>820,400=>623,401=>694,403=>799,404=>712,
-405=>932,406=>395,407=>395,408=>747,409=>606,410=>320,411=>634,412=>948,413=>875,414=>644,
-415=>820,416=>820,417=>602,418=>1040,419=>807,420=>673,421=>640,422=>753,423=>685,424=>513,
-425=>707,426=>324,427=>402,428=>667,429=>402,430=>667,431=>843,432=>644,433=>829,434=>760,
-435=>738,436=>663,437=>695,438=>527,439=>564,440=>564,441=>564,442=>564,443=>636,444=>687,
-445=>564,446=>536,447=>635,448=>295,449=>492,450=>459,451=>295,452=>1497,453=>1329,454=>1167,
-455=>1065,456=>974,457=>630,458=>1276,459=>1185,460=>954,461=>722,462=>596,463=>395,464=>320,
-465=>820,466=>602,467=>843,468=>644,469=>843,470=>644,471=>843,472=>644,473=>843,474=>644,
-475=>843,476=>644,477=>592,478=>722,479=>596,480=>722,481=>596,482=>1001,483=>940,484=>848,
-485=>640,486=>799,487=>640,488=>747,489=>606,490=>820,491=>602,492=>820,493=>602,494=>564,
-495=>564,496=>320,497=>1497,498=>1329,499=>1167,500=>799,501=>640,502=>1154,503=>707,504=>875,
-505=>644,506=>722,507=>596,508=>1001,509=>940,510=>820,511=>602,512=>722,513=>596,514=>722,
-515=>596,516=>730,517=>592,518=>730,519=>592,520=>395,521=>320,522=>395,523=>320,524=>820,
-525=>602,526=>820,527=>602,528=>753,529=>478,530=>753,531=>478,532=>843,533=>644,534=>843,
-535=>644,536=>685,537=>513,538=>667,539=>402,540=>627,541=>521,542=>872,543=>644,544=>843,
-545=>814,546=>572,547=>552,548=>695,549=>527,550=>722,551=>596,552=>730,553=>592,554=>820,
-555=>602,556=>820,557=>602,558=>820,559=>602,560=>820,561=>602,562=>660,563=>565,564=>500,
-565=>832,566=>494,567=>310,568=>960,569=>960,570=>722,571=>765,572=>560,573=>664,574=>667,
-575=>513,576=>527,577=>583,578=>464,579=>735,580=>843,581=>722,582=>730,583=>592,584=>401,
-585=>315,586=>782,587=>640,588=>753,589=>478,590=>660,591=>565,592=>596,593=>640,594=>640,
-595=>640,596=>560,597=>560,598=>647,599=>683,600=>592,601=>592,602=>843,603=>518,604=>509,
-605=>773,606=>613,607=>315,608=>683,609=>640,610=>544,611=>712,612=>564,613=>644,614=>644,
-615=>644,616=>320,617=>392,618=>320,619=>380,620=>454,621=>363,622=>704,623=>948,624=>948,
-625=>948,626=>644,627=>694,628=>646,629=>602,630=>790,631=>647,632=>602,633=>501,634=>501,
-635=>551,636=>478,637=>478,638=>453,639=>453,640=>594,641=>594,642=>513,643=>271,644=>370,
-645=>487,646=>324,647=>402,648=>402,649=>644,650=>620,651=>608,652=>565,653=>856,654=>565,
-655=>655,656=>597,657=>560,658=>564,659=>560,660=>536,661=>536,662=>536,663=>513,664=>820,
-665=>563,666=>613,667=>654,668=>667,669=>366,670=>606,671=>543,672=>683,673=>536,674=>536,
-675=>996,676=>1033,677=>998,678=>809,679=>598,680=>782,681=>894,682=>646,683=>676,684=>598,
-685=>443,686=>781,687=>767,688=>433,689=>430,690=>264,691=>347,692=>347,693=>430,694=>392,
-695=>585,696=>423,697=>278,699=>318,700=>318,701=>318,702=>307,703=>307,704=>280,705=>281,
-711=>500,712=>275,713=>500,716=>275,717=>500,720=>337,721=>337,722=>307,723=>307,726=>329,
-728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>447,737=>243,738=>337,739=>424,
-740=>281,741=>493,742=>493,743=>493,744=>493,745=>493,750=>484,768=>0,769=>0,770=>0,
-771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,
-781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,
-791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,
-801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,
-811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,
-821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,
-831=>0,835=>0,847=>0,856=>0,865=>0,880=>740,881=>531,882=>667,883=>553,884=>278,
-885=>278,886=>875,887=>667,890=>500,891=>560,892=>560,893=>560,894=>337,900=>500,901=>500,
-902=>722,903=>318,904=>900,905=>1039,906=>562,908=>835,910=>897,911=>853,912=>392,913=>722,
-914=>735,915=>694,916=>722,917=>730,918=>695,919=>872,920=>820,921=>395,922=>747,923=>722,
-924=>1024,925=>875,926=>704,927=>820,928=>872,929=>673,931=>707,932=>667,933=>660,934=>820,
-935=>712,936=>877,937=>829,938=>395,939=>660,940=>675,941=>518,942=>599,943=>392,944=>608,
-945=>675,946=>578,947=>598,948=>602,949=>518,950=>542,951=>599,952=>602,953=>392,954=>625,
-955=>634,956=>650,957=>608,958=>551,959=>602,960=>657,961=>588,962=>560,963=>683,964=>553,
-965=>608,966=>700,967=>606,968=>784,969=>815,970=>392,971=>608,972=>602,973=>608,974=>815,
-975=>747,976=>583,977=>715,978=>687,979=>874,980=>687,981=>682,982=>815,983=>624,984=>820,
-985=>602,986=>765,987=>560,988=>694,989=>463,990=>590,991=>660,992=>782,993=>577,1008=>624,
-1009=>588,1010=>560,1011=>310,1012=>820,1013=>560,1014=>560,1015=>676,1016=>640,1017=>765,1018=>1024,
-1019=>708,1020=>588,1021=>765,1022=>765,1023=>765,1024=>730,1025=>730,1026=>799,1027=>662,1028=>765,
-1029=>685,1030=>395,1031=>395,1032=>401,1033=>1084,1034=>1118,1035=>872,1036=>774,1037=>872,1038=>723,
-1039=>872,1040=>757,1041=>735,1042=>735,1043=>662,1044=>813,1045=>730,1046=>1124,1047=>623,1048=>872,
-1049=>872,1050=>774,1051=>834,1052=>1024,1053=>872,1054=>820,1055=>872,1056=>673,1057=>765,1058=>667,
-1059=>723,1060=>830,1061=>712,1062=>872,1063=>773,1064=>1141,1065=>1141,1066=>794,1067=>984,1068=>674,
-1069=>765,1070=>1193,1071=>808,1072=>596,1073=>602,1074=>563,1075=>524,1076=>616,1077=>592,1078=>920,
-1079=>545,1080=>667,1081=>667,1082=>625,1083=>635,1084=>778,1085=>667,1086=>602,1087=>667,1088=>640,
-1089=>560,1090=>553,1091=>588,1092=>783,1093=>564,1094=>643,1095=>661,1096=>930,1097=>930,1098=>636,
-1099=>796,1100=>544,1101=>560,1102=>871,1103=>631,1104=>592,1105=>592,1106=>624,1107=>524,1108=>560,
-1109=>513,1110=>320,1111=>320,1112=>310,1113=>843,1114=>860,1115=>644,1116=>625,1117=>667,1118=>588,
-1119=>656,1122=>762,1123=>603,1124=>1129,1125=>834,1130=>1124,1131=>920,1136=>944,1137=>902,1138=>820,
-1139=>552,1140=>859,1141=>678,1164=>707,1165=>544,1168=>672,1169=>529,1170=>662,1171=>523,1172=>728,
-1173=>614,1174=>1124,1175=>920,1176=>636,1177=>537,1178=>774,1179=>606,1182=>774,1183=>625,1184=>891,
-1185=>717,1186=>872,1187=>641,1188=>1139,1189=>852,1190=>1205,1191=>941,1194=>765,1195=>560,1196=>667,
-1197=>553,1198=>660,1199=>565,1200=>660,1201=>565,1202=>712,1203=>564,1204=>952,1205=>732,1206=>749,
-1207=>690,1210=>749,1211=>644,1216=>395,1217=>1124,1218=>920,1219=>747,1220=>606,1223=>872,1224=>667,
-1227=>749,1228=>667,1231=>320,1232=>757,1233=>596,1234=>757,1235=>596,1236=>1001,1237=>940,1238=>730,
-1239=>592,1240=>820,1241=>592,1242=>820,1243=>592,1244=>1124,1245=>920,1246=>623,1247=>545,1248=>564,
-1249=>564,1250=>872,1251=>667,1252=>872,1253=>667,1254=>820,1255=>602,1256=>820,1257=>602,1258=>820,
-1259=>602,1260=>765,1261=>560,1262=>723,1263=>588,1264=>723,1265=>588,1266=>723,1267=>588,1268=>773,
-1269=>661,1270=>662,1271=>524,1272=>984,1273=>796,1296=>623,1297=>545,1298=>834,1299=>635,1300=>1198,
-1301=>919,1306=>820,1307=>640,1308=>1028,1309=>856,1329=>810,1330=>811,1331=>826,1332=>847,1333=>806,
-1334=>826,1335=>761,1336=>811,1337=>968,1338=>816,1339=>772,1340=>682,1341=>1097,1342=>845,1343=>804,
-1344=>719,1345=>810,1346=>833,1347=>843,1348=>897,1349=>763,1350=>794,1351=>754,1352=>799,1353=>797,
-1354=>875,1355=>830,1356=>884,1357=>799,1358=>802,1359=>731,1360=>774,1361=>749,1362=>633,1363=>845,
-1364=>843,1365=>835,1366=>821,1369=>307,1370=>264,1371=>229,1372=>391,1373=>364,1374=>386,1375=>500,
-1377=>949,1378=>618,1379=>695,1380=>695,1381=>628,1382=>688,1383=>510,1384=>636,1385=>791,1386=>671,
-1387=>635,1388=>305,1389=>973,1390=>614,1391=>628,1392=>636,1393=>630,1394=>636,1395=>654,1396=>644,
-1397=>309,1398=>636,1399=>461,1400=>649,1401=>365,1402=>940,1403=>562,1404=>657,1405=>644,1406=>630,
-1407=>930,1408=>644,1409=>643,1410=>483,1411=>930,1412=>636,1413=>609,1414=>809,1415=>789,1417=>340,
-1418=>334,4256=>723,4257=>850,4258=>828,4259=>859,4260=>733,4261=>981,4262=>916,4263=>1101,4264=>566,
-4265=>750,4266=>962,4267=>941,4268=>743,4269=>1075,4270=>896,4271=>829,4272=>1040,4273=>733,4274=>669,
-4275=>1015,4276=>937,4277=>1020,4278=>731,4279=>733,4280=>732,4281=>733,4282=>879,4283=>937,4284=>714,
-4285=>755,4286=>733,4287=>958,4288=>1000,4289=>702,4290=>864,4291=>734,4292=>837,4293=>951,4304=>541,
-4305=>571,4306=>589,4307=>833,4308=>561,4309=>557,4310=>618,4311=>861,4312=>560,4313=>546,4314=>1066,
-4315=>586,4316=>586,4317=>825,4318=>570,4319=>581,4320=>824,4321=>607,4322=>748,4323=>698,4324=>815,
-4325=>585,4326=>858,4327=>568,4328=>594,4329=>586,4330=>675,4331=>587,4332=>582,4333=>576,4334=>612,
-4335=>683,4336=>572,4337=>603,4338=>571,4339=>572,4340=>570,4341=>649,4342=>886,4343=>626,4344=>582,
-4345=>619,4346=>571,4347=>437,4348=>354,7424=>565,7425=>774,7426=>940,7427=>563,7428=>560,7429=>585,
-7430=>585,7431=>553,7432=>509,7433=>320,7434=>499,7435=>625,7436=>543,7437=>778,7438=>667,7439=>602,
-7440=>560,7441=>647,7442=>647,7443=>647,7444=>989,7445=>512,7446=>602,7447=>602,7448=>553,7449=>594,
-7450=>594,7451=>553,7452=>585,7453=>664,7454=>923,7455=>655,7456=>565,7457=>856,7458=>527,7459=>527,
-7460=>531,7461=>743,7462=>524,7463=>565,7464=>657,7465=>553,7466=>703,7467=>635,7468=>455,7469=>630,
-7470=>463,7471=>463,7472=>505,7473=>459,7474=>459,7475=>503,7476=>549,7477=>249,7478=>252,7479=>470,
-7480=>418,7481=>645,7482=>551,7483=>551,7484=>516,7485=>369,7486=>424,7487=>474,7488=>420,7489=>531,
-7490=>647,7491=>386,7492=>386,7493=>400,7494=>618,7495=>400,7496=>400,7497=>387,7498=>387,7499=>340,
-7500=>340,7501=>400,7502=>175,7503=>365,7504=>613,7505=>399,7506=>385,7507=>346,7508=>385,7509=>385,
-7510=>400,7511=>247,7512=>399,7513=>418,7514=>613,7515=>373,7516=>468,7517=>364,7518=>376,7519=>379,
-7520=>441,7521=>381,7522=>201,7523=>347,7524=>399,7525=>373,7526=>364,7527=>376,7528=>370,7529=>441,
-7530=>381,7531=>974,7543=>640,7544=>549,7547=>372,7557=>320,7579=>400,7580=>346,7581=>346,7582=>385,
-7583=>340,7584=>222,7585=>229,7586=>400,7587=>399,7588=>234,7589=>244,7590=>234,7591=>234,7592=>230,
-7593=>175,7594=>175,7595=>367,7596=>613,7597=>613,7598=>407,7599=>404,7600=>399,7601=>385,7602=>385,
-7603=>328,7604=>211,7605=>247,7606=>399,7607=>389,7608=>368,7609=>376,7610=>373,7611=>331,7612=>331,
-7613=>331,7614=>364,7615=>385,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>722,
-7681=>596,7682=>735,7683=>640,7684=>735,7685=>640,7686=>735,7687=>640,7688=>765,7689=>560,7690=>802,
-7691=>640,7692=>802,7693=>640,7694=>802,7695=>640,7696=>802,7697=>640,7698=>802,7699=>640,7700=>730,
-7701=>592,7702=>730,7703=>592,7704=>730,7705=>592,7706=>730,7707=>592,7708=>730,7709=>592,7710=>694,
-7711=>370,7712=>799,7713=>640,7714=>872,7715=>644,7716=>872,7717=>644,7718=>872,7719=>644,7720=>872,
-7721=>644,7722=>872,7723=>644,7724=>395,7725=>320,7726=>395,7727=>320,7728=>747,7729=>606,7730=>747,
-7731=>606,7732=>747,7733=>606,7734=>664,7735=>320,7736=>664,7737=>320,7738=>664,7739=>320,7740=>664,
-7741=>320,7742=>1024,7743=>948,7744=>1024,7745=>948,7746=>1024,7747=>948,7748=>875,7749=>644,7750=>875,
-7751=>644,7752=>875,7753=>644,7754=>875,7755=>644,7756=>820,7757=>602,7758=>820,7759=>602,7760=>820,
-7761=>602,7762=>820,7763=>602,7764=>673,7765=>640,7766=>673,7767=>640,7768=>753,7769=>478,7770=>753,
-7771=>478,7772=>753,7773=>478,7774=>753,7775=>478,7776=>685,7777=>513,7778=>685,7779=>513,7780=>685,
-7781=>513,7782=>685,7783=>521,7784=>685,7785=>513,7786=>667,7787=>402,7788=>667,7789=>402,7790=>667,
-7791=>402,7792=>667,7793=>402,7794=>843,7795=>644,7796=>843,7797=>644,7798=>843,7799=>644,7800=>843,
-7801=>644,7802=>843,7803=>644,7804=>722,7805=>565,7806=>722,7807=>565,7808=>1028,7809=>856,7810=>1028,
-7811=>856,7812=>1028,7813=>856,7814=>1028,7815=>856,7816=>1028,7817=>856,7818=>712,7819=>564,7820=>712,
-7821=>564,7822=>660,7823=>565,7824=>695,7825=>527,7826=>695,7827=>527,7828=>695,7829=>527,7830=>644,
-7831=>402,7832=>856,7833=>565,7834=>903,7835=>370,7836=>370,7837=>370,7838=>829,7839=>602,7840=>722,
-7841=>596,7842=>722,7843=>596,7844=>722,7845=>613,7846=>722,7847=>613,7848=>722,7849=>613,7850=>722,
-7851=>613,7852=>722,7853=>596,7854=>722,7855=>596,7856=>722,7857=>596,7858=>722,7859=>596,7860=>722,
-7861=>596,7862=>722,7863=>596,7864=>730,7865=>592,7866=>730,7867=>592,7868=>730,7869=>592,7870=>730,
-7871=>615,7872=>730,7873=>615,7874=>730,7875=>615,7876=>730,7877=>615,7878=>730,7879=>592,7880=>395,
-7881=>320,7882=>395,7883=>320,7884=>820,7885=>602,7886=>820,7887=>602,7888=>820,7889=>612,7890=>820,
-7891=>612,7892=>820,7893=>612,7894=>820,7895=>612,7896=>820,7897=>602,7898=>820,7899=>602,7900=>820,
-7901=>602,7902=>820,7903=>602,7904=>820,7905=>602,7906=>820,7907=>602,7908=>843,7909=>644,7910=>843,
-7911=>644,7912=>843,7913=>644,7914=>843,7915=>644,7916=>843,7917=>644,7918=>843,7919=>644,7920=>843,
-7921=>644,7922=>660,7923=>565,7924=>660,7925=>565,7926=>660,7927=>565,7928=>660,7929=>565,7930=>949,
-7931=>581,7936=>675,7937=>675,7938=>675,7939=>675,7940=>675,7941=>675,7942=>675,7943=>675,7944=>722,
-7945=>722,7946=>869,7947=>869,7948=>734,7949=>763,7950=>722,7951=>722,7952=>537,7953=>537,7954=>537,
-7955=>537,7956=>537,7957=>537,7960=>853,7961=>841,7962=>1067,7963=>1077,7964=>1008,7965=>1035,7968=>599,
-7969=>599,7970=>599,7971=>599,7972=>599,7973=>599,7974=>599,7975=>599,7976=>998,7977=>992,7978=>1212,
-7979=>1224,7980=>1159,7981=>1183,7982=>1098,7983=>1095,7984=>392,7985=>392,7986=>392,7987=>392,7988=>392,
-7989=>392,7990=>392,7991=>392,7992=>521,7993=>512,7994=>735,7995=>738,7996=>679,7997=>706,7998=>624,
-7999=>615,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>820,8009=>859,8010=>1120,
-8011=>1127,8012=>937,8013=>964,8016=>608,8017=>608,8018=>608,8019=>608,8020=>608,8021=>608,8022=>608,
-8023=>608,8025=>851,8027=>1079,8029=>1044,8031=>953,8032=>815,8033=>815,8034=>815,8035=>815,8036=>815,
-8037=>815,8038=>815,8039=>815,8040=>829,8041=>870,8042=>1131,8043=>1137,8044=>946,8045=>976,8046=>938,
-8047=>970,8048=>675,8049=>675,8050=>537,8051=>537,8052=>599,8053=>599,8054=>392,8055=>392,8056=>602,
-8057=>602,8058=>608,8059=>608,8060=>815,8061=>815,8064=>675,8065=>675,8066=>675,8067=>675,8068=>675,
-8069=>675,8070=>675,8071=>675,8072=>722,8073=>722,8074=>869,8075=>869,8076=>734,8077=>763,8078=>722,
-8079=>722,8080=>599,8081=>599,8082=>599,8083=>599,8084=>599,8085=>599,8086=>599,8087=>599,8088=>998,
-8089=>992,8090=>1212,8091=>1224,8092=>1159,8093=>1183,8094=>1098,8095=>1095,8096=>815,8097=>815,8098=>815,
-8099=>815,8100=>815,8101=>815,8102=>815,8103=>815,8104=>829,8105=>870,8106=>1131,8107=>1137,8108=>946,
-8109=>976,8110=>938,8111=>970,8112=>675,8113=>675,8114=>675,8115=>675,8116=>675,8118=>675,8119=>675,
-8120=>722,8121=>722,8122=>722,8123=>722,8124=>722,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,
-8130=>599,8131=>599,8132=>599,8134=>599,8135=>599,8136=>912,8137=>900,8138=>1063,8139=>1039,8140=>872,
-8141=>500,8142=>500,8143=>500,8144=>392,8145=>392,8146=>392,8147=>392,8150=>392,8151=>392,8152=>395,
-8153=>395,8154=>588,8155=>562,8157=>500,8158=>500,8159=>500,8160=>608,8161=>608,8162=>608,8163=>608,
-8164=>588,8165=>588,8166=>608,8167=>608,8168=>660,8169=>660,8170=>921,8171=>897,8172=>790,8173=>500,
-8174=>500,8175=>500,8178=>815,8179=>815,8180=>815,8182=>815,8183=>815,8184=>961,8185=>835,8186=>984,
-8187=>853,8188=>829,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,
-8198=>167,8199=>636,8200=>318,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>338,8209=>338,8210=>636,8213=>1000,8214=>500,8215=>500,8219=>318,8223=>511,8227=>590,8228=>334,
-8229=>667,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8241=>1734,8242=>227,8243=>374,
-8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,8252=>527,8253=>536,8254=>500,8258=>1000,8260=>167,
-8261=>390,8262=>390,8263=>976,8264=>753,8265=>753,8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,
-8273=>500,8274=>450,8275=>1000,8279=>663,8287=>222,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>401,8305=>201,8308=>401,8309=>401,
-8310=>401,8311=>401,8312=>401,8313=>401,8314=>528,8315=>528,8316=>528,8317=>246,8318=>246,8319=>433,
-8320=>401,8321=>401,8322=>401,8323=>401,8324=>401,8325=>401,8326=>401,8327=>401,8328=>401,8329=>401,
-8330=>528,8331=>528,8332=>528,8333=>246,8334=>246,8336=>386,8337=>387,8338=>385,8339=>424,8340=>387,
-8341=>433,8342=>365,8343=>243,8344=>613,8345=>433,8346=>400,8347=>337,8348=>247,8358=>660,8367=>1057,
-8369=>706,8372=>780,8373=>636,8377=>636,8450=>796,8451=>1119,8457=>1047,8461=>945,8462=>644,8463=>644,
-8469=>914,8470=>946,8473=>752,8474=>871,8477=>831,8484=>730,8486=>829,8487=>829,8490=>747,8491=>722,
-8508=>732,8509=>660,8510=>710,8511=>944,8512=>714,8513=>775,8514=>557,8515=>557,8516=>611,8517=>867,
-8518=>699,8519=>636,8520=>380,8521=>362,8523=>890,8528=>969,8529=>969,8530=>1370,8531=>969,8532=>969,
-8533=>969,8534=>969,8535=>969,8536=>969,8537=>969,8538=>969,8539=>969,8540=>969,8541=>969,8542=>969,
-8543=>568,8544=>395,8545=>590,8546=>786,8547=>966,8548=>722,8549=>981,8550=>1176,8551=>1372,8552=>932,
-8553=>712,8554=>932,8555=>1127,8556=>664,8557=>765,8558=>802,8559=>1024,8560=>320,8561=>640,8562=>959,
-8563=>885,8564=>565,8565=>885,8566=>1205,8567=>1524,8568=>884,8569=>564,8570=>884,8571=>1204,8572=>320,
-8573=>560,8574=>640,8575=>948,8576=>1206,8577=>802,8578=>1206,8579=>765,8580=>560,8581=>765,8585=>969,
-8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,8599=>838,8600=>838,8601=>838,
-8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,8609=>838,8610=>838,8611=>838,
-8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,8619=>838,8620=>838,8621=>838,
-8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,8629=>838,8630=>838,8631=>838,
-8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,8639=>838,8640=>838,8641=>838,
-8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,8649=>838,8650=>838,8651=>838,
-8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,8659=>838,8660=>838,8661=>838,
-8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,8669=>838,8670=>838,8671=>838,
-8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,8679=>838,8680=>838,8681=>838,
-8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,8689=>838,8690=>838,8691=>838,
-8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,8699=>838,8700=>838,8701=>838,
-8702=>838,8703=>838,8704=>604,8706=>517,8707=>542,8708=>542,8710=>698,8711=>698,8712=>740,8713=>740,
-8715=>740,8716=>740,8719=>796,8720=>796,8721=>714,8722=>838,8723=>838,8724=>838,8725=>337,8727=>680,
-8728=>490,8729=>490,8730=>637,8731=>637,8732=>637,8733=>677,8734=>833,8735=>838,8736=>838,8739=>291,
-8740=>479,8741=>462,8742=>634,8743=>732,8744=>732,8745=>838,8746=>838,8747=>521,8748=>852,8749=>1182,
-8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8770=>838,8771=>838,8776=>838,8784=>838,
-8785=>838,8786=>838,8787=>838,8788=>1033,8789=>1033,8800=>838,8801=>838,8804=>838,8805=>838,8834=>838,
-8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8844=>838,8845=>838,8846=>838,8847=>846,8848=>846,
-8849=>846,8850=>846,8851=>838,8852=>838,8853=>838,8854=>838,8855=>838,8856=>838,8857=>838,8858=>838,
-8859=>838,8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,8865=>838,8866=>860,8867=>860,8868=>940,
-8869=>940,8870=>567,8871=>567,8872=>860,8873=>860,8874=>860,8875=>1031,8876=>860,8877=>860,8878=>860,
-8879=>1031,8901=>342,8962=>764,8968=>390,8969=>390,8970=>390,8971=>390,8976=>838,8977=>513,8984=>1000,
-8985=>838,8992=>521,8993=>521,8997=>1000,9000=>1443,9085=>919,9115=>500,9116=>500,9117=>500,9118=>500,
-9119=>500,9120=>500,9121=>500,9122=>500,9123=>500,9124=>500,9125=>500,9126=>500,9127=>750,9128=>750,
-9129=>750,9130=>750,9131=>750,9132=>750,9133=>750,9134=>521,9167=>945,9251=>764,9472=>602,9473=>602,
-9474=>602,9475=>602,9476=>602,9477=>602,9478=>602,9479=>602,9480=>602,9481=>602,9482=>602,9483=>602,
-9484=>602,9485=>602,9486=>602,9487=>602,9488=>602,9489=>602,9490=>602,9491=>602,9492=>602,9493=>602,
-9494=>602,9495=>602,9496=>602,9497=>602,9498=>602,9499=>602,9500=>602,9501=>602,9502=>602,9503=>602,
-9504=>602,9505=>602,9506=>602,9507=>602,9508=>602,9509=>602,9510=>602,9511=>602,9512=>602,9513=>602,
-9514=>602,9515=>602,9516=>602,9517=>602,9518=>602,9519=>602,9520=>602,9521=>602,9522=>602,9523=>602,
-9524=>602,9525=>602,9526=>602,9527=>602,9528=>602,9529=>602,9530=>602,9531=>602,9532=>602,9533=>602,
-9534=>602,9535=>602,9536=>602,9537=>602,9538=>602,9539=>602,9540=>602,9541=>602,9542=>602,9543=>602,
-9544=>602,9545=>602,9546=>602,9547=>602,9548=>602,9549=>602,9550=>602,9551=>602,9552=>602,9553=>602,
-9554=>602,9555=>602,9556=>602,9557=>602,9558=>602,9559=>602,9560=>602,9561=>602,9562=>602,9563=>602,
-9564=>602,9565=>602,9566=>602,9567=>602,9568=>602,9569=>602,9570=>602,9571=>602,9572=>602,9573=>602,
-9574=>602,9575=>602,9576=>602,9577=>602,9578=>602,9579=>602,9580=>602,9581=>602,9582=>602,9583=>602,
-9584=>602,9585=>602,9586=>602,9587=>602,9588=>602,9589=>602,9590=>602,9591=>602,9592=>602,9593=>602,
-9594=>602,9595=>602,9596=>602,9597=>602,9598=>602,9599=>602,9600=>769,9601=>769,9602=>769,9603=>769,
-9604=>769,9605=>769,9606=>769,9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,
-9614=>769,9615=>769,9616=>769,9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,
-9624=>769,9625=>769,9626=>769,9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,
-9634=>945,9635=>945,9636=>945,9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,
-9644=>945,9645=>945,9646=>550,9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,
-9654=>769,9655=>769,9656=>502,9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,
-9664=>769,9665=>769,9666=>502,9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,
-9674=>494,9675=>873,9676=>873,9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,
-9684=>873,9685=>873,9686=>527,9687=>527,9688=>791,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,
-9694=>387,9695=>387,9696=>873,9697=>873,9698=>769,9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,
-9704=>945,9705=>945,9706=>945,9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,
-9714=>945,9715=>945,9716=>873,9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,
-9724=>830,9725=>732,9726=>732,9727=>769,9728=>896,9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,
-9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9824=>896,
-9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9833=>472,9834=>638,9835=>896,
-9836=>896,9837=>472,9838=>357,9839=>484,10145=>838,10181=>390,10182=>390,10208=>494,10216=>390,10217=>390,
-10224=>838,10225=>838,10226=>838,10227=>838,10228=>1033,10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,
-10234=>1434,10235=>1434,10236=>1434,10237=>1434,10238=>1434,10239=>1434,10240=>732,10241=>732,10242=>732,10243=>732,
-10244=>732,10245=>732,10246=>732,10247=>732,10248=>732,10249=>732,10250=>732,10251=>732,10252=>732,10253=>732,
-10254=>732,10255=>732,10256=>732,10257=>732,10258=>732,10259=>732,10260=>732,10261=>732,10262=>732,10263=>732,
-10264=>732,10265=>732,10266=>732,10267=>732,10268=>732,10269=>732,10270=>732,10271=>732,10272=>732,10273=>732,
-10274=>732,10275=>732,10276=>732,10277=>732,10278=>732,10279=>732,10280=>732,10281=>732,10282=>732,10283=>732,
-10284=>732,10285=>732,10286=>732,10287=>732,10288=>732,10289=>732,10290=>732,10291=>732,10292=>732,10293=>732,
-10294=>732,10295=>732,10296=>732,10297=>732,10298=>732,10299=>732,10300=>732,10301=>732,10302=>732,10303=>732,
-10304=>732,10305=>732,10306=>732,10307=>732,10308=>732,10309=>732,10310=>732,10311=>732,10312=>732,10313=>732,
-10314=>732,10315=>732,10316=>732,10317=>732,10318=>732,10319=>732,10320=>732,10321=>732,10322=>732,10323=>732,
-10324=>732,10325=>732,10326=>732,10327=>732,10328=>732,10329=>732,10330=>732,10331=>732,10332=>732,10333=>732,
-10334=>732,10335=>732,10336=>732,10337=>732,10338=>732,10339=>732,10340=>732,10341=>732,10342=>732,10343=>732,
-10344=>732,10345=>732,10346=>732,10347=>732,10348=>732,10349=>732,10350=>732,10351=>732,10352=>732,10353=>732,
-10354=>732,10355=>732,10356=>732,10357=>732,10358=>732,10359=>732,10360=>732,10361=>732,10362=>732,10363=>732,
-10364=>732,10365=>732,10366=>732,10367=>732,10368=>732,10369=>732,10370=>732,10371=>732,10372=>732,10373=>732,
-10374=>732,10375=>732,10376=>732,10377=>732,10378=>732,10379=>732,10380=>732,10381=>732,10382=>732,10383=>732,
-10384=>732,10385=>732,10386=>732,10387=>732,10388=>732,10389=>732,10390=>732,10391=>732,10392=>732,10393=>732,
-10394=>732,10395=>732,10396=>732,10397=>732,10398=>732,10399=>732,10400=>732,10401=>732,10402=>732,10403=>732,
-10404=>732,10405=>732,10406=>732,10407=>732,10408=>732,10409=>732,10410=>732,10411=>732,10412=>732,10413=>732,
-10414=>732,10415=>732,10416=>732,10417=>732,10418=>732,10419=>732,10420=>732,10421=>732,10422=>732,10423=>732,
-10424=>732,10425=>732,10426=>732,10427=>732,10428=>732,10429=>732,10430=>732,10431=>732,10432=>732,10433=>732,
-10434=>732,10435=>732,10436=>732,10437=>732,10438=>732,10439=>732,10440=>732,10441=>732,10442=>732,10443=>732,
-10444=>732,10445=>732,10446=>732,10447=>732,10448=>732,10449=>732,10450=>732,10451=>732,10452=>732,10453=>732,
-10454=>732,10455=>732,10456=>732,10457=>732,10458=>732,10459=>732,10460=>732,10461=>732,10462=>732,10463=>732,
-10464=>732,10465=>732,10466=>732,10467=>732,10468=>732,10469=>732,10470=>732,10471=>732,10472=>732,10473=>732,
-10474=>732,10475=>732,10476=>732,10477=>732,10478=>732,10479=>732,10480=>732,10481=>732,10482=>732,10483=>732,
-10484=>732,10485=>732,10486=>732,10487=>732,10488=>732,10489=>732,10490=>732,10491=>732,10492=>732,10493=>732,
-10494=>732,10495=>732,10496=>838,10497=>838,10498=>838,10499=>838,10500=>838,10501=>838,10502=>838,10503=>838,
-10504=>838,10505=>838,10506=>838,10507=>838,10508=>838,10509=>838,10510=>838,10511=>838,10512=>838,10513=>838,
-10514=>838,10515=>838,10516=>838,10517=>838,10518=>838,10519=>838,10520=>838,10521=>838,10522=>838,10523=>838,
-10524=>838,10525=>838,10526=>838,10527=>838,10528=>838,10529=>838,10530=>838,10531=>838,10532=>838,10533=>838,
-10534=>838,10535=>838,10536=>838,10537=>838,10538=>838,10539=>838,10540=>838,10541=>838,10542=>838,10543=>838,
-10544=>838,10545=>838,10546=>838,10547=>838,10548=>838,10549=>838,10550=>838,10551=>838,10552=>838,10553=>838,
-10554=>838,10555=>838,10556=>838,10557=>838,10558=>838,10559=>838,10560=>838,10561=>838,10562=>838,10563=>838,
-10564=>838,10565=>838,10566=>838,10567=>838,10568=>838,10569=>838,10570=>838,10571=>838,10572=>838,10573=>838,
-10574=>838,10575=>838,10576=>838,10577=>838,10578=>838,10579=>838,10580=>838,10581=>838,10582=>838,10583=>838,
-10584=>838,10585=>838,10586=>838,10587=>838,10588=>838,10589=>838,10590=>838,10591=>838,10592=>838,10593=>838,
-10594=>838,10595=>838,10596=>838,10597=>838,10598=>838,10599=>838,10600=>838,10601=>838,10602=>838,10603=>838,
-10604=>838,10605=>838,10606=>838,10607=>838,10608=>838,10609=>838,10610=>838,10611=>838,10612=>838,10613=>838,
-10614=>838,10615=>981,10616=>838,10617=>838,10618=>984,10619=>838,10620=>838,10621=>838,10622=>838,10623=>838,
-10731=>494,10764=>1513,10765=>521,10766=>521,10799=>838,11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,
-11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,
-11023=>838,11024=>838,11025=>838,11026=>945,11027=>945,11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,
-11033=>769,11034=>945,11360=>664,11361=>320,11363=>673,11364=>753,11367=>872,11368=>644,11369=>747,11370=>606,
-11371=>695,11372=>527,11373=>782,11374=>1024,11375=>722,11376=>782,11377=>663,11378=>1130,11379=>939,11381=>740,
-11382=>556,11383=>700,11385=>501,11386=>602,11388=>264,11389=>455,11390=>685,11391=>695,11520=>773,11521=>635,
-11522=>633,11523=>658,11524=>631,11525=>962,11526=>756,11527=>960,11528=>617,11529=>646,11530=>962,11531=>632,
-11532=>646,11533=>962,11534=>645,11535=>866,11536=>961,11537=>645,11538=>645,11539=>959,11540=>945,11541=>863,
-11542=>644,11543=>646,11544=>645,11545=>649,11546=>688,11547=>634,11548=>982,11549=>681,11550=>676,11551=>852,
-11552=>957,11553=>632,11554=>645,11555=>646,11556=>749,11557=>914,11800=>536,11810=>390,11811=>390,11812=>390,
-11813=>390,11822=>536,42564=>685,42565=>513,42566=>395,42567=>392,42576=>1104,42577=>888,42580=>1193,42581=>871,
-42582=>1140,42583=>899,42760=>493,42761=>493,42762=>493,42763=>493,42764=>493,42765=>493,42766=>493,42767=>493,
-42768=>493,42769=>493,42770=>493,42771=>493,42772=>493,42773=>493,42774=>493,42779=>369,42780=>369,42781=>253,
-42782=>253,42783=>253,42790=>872,42791=>634,42792=>843,42793=>754,42794=>612,42795=>560,42796=>548,42797=>531,
-42798=>629,42799=>610,42800=>514,42801=>513,42802=>1195,42803=>944,42804=>1226,42805=>950,42806=>1149,42807=>934,
-42808=>968,42809=>784,42810=>968,42811=>784,42812=>962,42813=>824,42814=>765,42815=>560,42822=>787,42823=>434,
-42826=>932,42827=>711,42830=>1416,42831=>999,42856=>707,42857=>610,42875=>612,42876=>478,42880=>664,42881=>320,
-42882=>843,42883=>644,42884=>612,42885=>478,42886=>765,42887=>560,42891=>402,42892=>275,42893=>773,42896=>875,
-42897=>644,43002=>957,43003=>694,43004=>673,43005=>1024,43006=>395,43007=>1201,62464=>654,62465=>665,62466=>714,
-62467=>947,62468=>665,62469=>659,62470=>725,62471=>986,62472=>665,62473=>665,62474=>1257,62475=>683,62476=>682,
-62477=>953,62478=>665,62479=>682,62480=>999,62481=>746,62482=>798,62483=>748,62484=>944,62485=>681,62486=>936,
-62487=>680,62488=>688,62489=>682,62490=>729,62491=>682,62492=>688,62493=>666,62494=>729,62495=>884,62496=>665,
-62497=>706,62498=>666,62499=>665,62500=>665,62501=>722,62502=>961,62504=>904,63173=>602,63185=>500,63188=>500,
-64256=>710,64257=>667,64258=>667,64259=>1028,64260=>1030,64261=>771,64262=>933,65024=>0,65025=>0,65026=>0,
-65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,
-65037=>0,65038=>0,65039=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavuserif.z';
-$ctg='dejavuserif.ctg.z';
-$originalsize=363200;
-// --- EOF ---
\ No newline at end of file
diff --git a/libraries/tcpdf/fonts/dejavuserif.z b/libraries/tcpdf/fonts/dejavuserif.z
deleted file mode 100644
index d35ac36..0000000
Binary files a/libraries/tcpdf/fonts/dejavuserif.z and /dev/null differ
diff --git a/libraries/tcpdf/fonts/dejavuserifb.ctg.z b/libraries/tcpdf/fonts/dejavuserifb.ctg.z
deleted file mode 100644
index 6806efc..0000000
Binary files a/libraries/tcpdf/fonts/dejavuserifb.ctg.z and /dev/null differ
diff --git a/libraries/tcpdf/fonts/dejavuserifb.php b/libraries/tcpdf/fonts/dejavuserifb.php
deleted file mode 100644
index 942c680..0000000
--- a/libraries/tcpdf/fonts/dejavuserifb.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-Bold';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>5,'Flags'=>32,'FontBBox'=>'[-836 -389 1796 1145]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>439,34=>521,35=>838,36=>696,37=>950,38=>903,39=>306,40=>473,
-41=>473,42=>523,43=>838,44=>348,45=>415,46=>348,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>369,59=>369,60=>838,
-61=>838,62=>838,63=>586,64=>1000,65=>776,66=>845,67=>796,68=>867,69=>762,70=>710,
-71=>854,72=>945,73=>468,74=>473,75=>869,76=>703,77=>1107,78=>914,79=>871,80=>752,
-81=>871,82=>831,83=>722,84=>744,85=>872,86=>776,87=>1123,88=>776,89=>714,90=>730,
-91=>473,92=>365,93=>473,94=>838,95=>500,96=>500,97=>648,98=>699,99=>609,100=>699,
-101=>636,102=>430,103=>699,104=>727,105=>380,106=>362,107=>693,108=>380,109=>1058,110=>727,
-111=>667,112=>699,113=>699,114=>527,115=>563,116=>462,117=>727,118=>581,119=>861,120=>596,
-121=>581,122=>568,123=>643,124=>364,125=>643,126=>838,8364=>696,8218=>348,402=>430,8222=>575,
-8230=>1000,8224=>523,8225=>523,710=>500,8240=>1385,352=>722,8249=>400,338=>1180,381=>730,8216=>348,
-8217=>348,8220=>575,8221=>575,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>563,8250=>400,
-339=>1028,382=>568,376=>714,160=>348,161=>439,162=>696,163=>696,164=>636,165=>696,166=>364,
-167=>523,168=>500,169=>1000,170=>487,171=>625,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>732,182=>636,183=>348,184=>500,185=>438,186=>500,
-187=>625,188=>1043,189=>1043,190=>1043,191=>586,192=>776,193=>776,194=>776,195=>776,196=>776,
-197=>776,198=>1034,199=>796,200=>762,201=>762,202=>762,203=>762,204=>468,205=>468,206=>468,
-207=>468,208=>874,209=>914,210=>871,211=>871,212=>871,213=>871,214=>871,215=>838,216=>871,
-217=>872,218=>872,219=>872,220=>872,221=>714,222=>757,223=>760,224=>648,225=>648,226=>648,
-227=>648,228=>648,229=>648,230=>975,231=>609,232=>636,233=>636,234=>636,235=>636,236=>380,
-237=>380,238=>380,239=>380,240=>667,241=>727,242=>667,243=>667,244=>667,245=>667,246=>667,
-247=>838,248=>667,249=>727,250=>727,251=>727,252=>727,253=>581,254=>699,255=>581,256=>776,
-257=>648,258=>776,259=>648,260=>776,261=>648,262=>796,263=>609,264=>796,265=>609,266=>796,
-267=>609,268=>796,269=>609,270=>867,271=>699,272=>874,273=>699,274=>762,275=>636,276=>762,
-277=>636,278=>762,279=>636,280=>762,281=>636,282=>762,283=>636,284=>854,285=>699,286=>854,
-287=>699,288=>854,289=>699,290=>854,291=>699,292=>945,293=>727,294=>945,295=>727,296=>468,
-297=>380,298=>468,299=>380,300=>468,301=>380,302=>468,303=>380,304=>468,305=>380,306=>942,
-307=>751,308=>473,309=>362,310=>869,311=>693,312=>693,313=>703,314=>380,315=>703,316=>380,
-317=>703,318=>380,319=>703,320=>380,321=>710,322=>385,323=>914,324=>727,325=>914,326=>727,
-327=>914,328=>727,329=>1008,330=>872,331=>727,332=>871,333=>667,334=>871,335=>667,336=>871,
-337=>667,340=>831,341=>527,342=>831,343=>527,344=>831,345=>527,346=>722,347=>563,348=>722,
-349=>563,350=>722,351=>563,354=>744,355=>462,356=>744,357=>462,358=>744,359=>462,360=>872,
-361=>727,362=>872,363=>727,364=>872,365=>727,366=>872,367=>727,368=>872,369=>727,370=>872,
-371=>727,372=>1123,373=>861,374=>714,375=>581,377=>730,378=>568,379=>730,380=>568,383=>430,
-384=>699,385=>845,386=>854,387=>699,388=>854,389=>699,390=>796,391=>796,392=>609,393=>874,
-394=>867,395=>854,396=>699,397=>667,398=>762,399=>871,400=>721,401=>710,403=>854,404=>771,
-405=>1043,406=>468,407=>468,408=>869,409=>693,410=>380,411=>701,412=>1058,413=>914,414=>727,
-415=>871,416=>871,417=>667,418=>1200,419=>943,420=>752,421=>699,422=>831,423=>722,424=>563,
-425=>707,426=>331,427=>462,428=>744,429=>462,430=>744,431=>872,432=>727,433=>890,434=>890,
-435=>714,436=>708,437=>730,438=>568,439=>657,440=>657,441=>657,442=>657,443=>696,444=>754,
-445=>568,446=>536,447=>716,448=>295,449=>492,450=>459,451=>295,452=>1597,453=>1435,454=>1267,
-455=>1176,456=>1065,457=>742,458=>1387,459=>1276,460=>1089,461=>776,462=>648,463=>468,464=>380,
-465=>871,466=>667,467=>872,468=>727,469=>872,470=>727,471=>872,472=>727,473=>872,474=>727,
-475=>872,476=>727,477=>636,478=>776,479=>648,480=>776,481=>648,482=>1034,483=>975,484=>896,
-485=>699,486=>854,487=>699,488=>869,489=>693,490=>871,491=>667,492=>871,493=>667,494=>657,
-495=>568,496=>380,497=>1597,498=>1435,499=>1267,500=>854,501=>699,502=>1221,503=>787,504=>914,
-505=>727,506=>776,507=>648,508=>1034,509=>975,510=>871,511=>667,512=>776,513=>648,514=>776,
-515=>648,516=>762,517=>636,518=>762,519=>636,520=>468,521=>380,522=>468,523=>380,524=>871,
-525=>667,526=>871,527=>667,528=>831,529=>527,530=>831,531=>527,532=>872,533=>727,534=>872,
-535=>727,536=>722,537=>563,538=>744,539=>462,540=>690,541=>607,542=>945,543=>727,544=>872,
-545=>791,546=>703,547=>616,548=>730,549=>568,550=>776,551=>648,552=>762,553=>636,554=>871,
-555=>667,556=>871,557=>667,558=>871,559=>667,560=>871,561=>667,562=>714,563=>581,564=>573,
-565=>922,566=>564,567=>362,568=>1031,569=>1031,570=>776,571=>796,572=>609,573=>703,574=>744,
-575=>563,576=>568,577=>660,578=>547,579=>845,580=>872,581=>776,582=>762,583=>636,584=>473,
-585=>387,586=>848,587=>699,588=>831,589=>527,590=>714,591=>581,592=>648,593=>699,594=>699,
-595=>699,596=>609,597=>609,598=>699,599=>730,600=>636,601=>636,602=>907,603=>608,604=>562,
-605=>907,606=>720,607=>387,608=>699,609=>699,610=>626,611=>712,612=>627,613=>727,614=>727,
-615=>727,616=>380,617=>380,618=>380,619=>409,620=>514,621=>380,622=>795,623=>1058,624=>1058,
-625=>1058,626=>727,627=>727,628=>712,629=>667,630=>1061,631=>749,632=>667,633=>571,634=>571,
-635=>571,636=>527,637=>527,638=>452,639=>487,640=>801,641=>801,642=>563,643=>331,644=>430,
-645=>540,646=>331,647=>492,648=>462,649=>727,650=>679,651=>694,652=>641,653=>907,654=>635,
-655=>727,656=>568,657=>568,658=>568,659=>568,660=>536,661=>536,662=>536,663=>545,664=>871,
-665=>695,666=>720,667=>626,668=>732,669=>384,670=>740,671=>646,672=>699,673=>536,674=>536,
-675=>1117,676=>1179,677=>1117,678=>911,679=>715,680=>909,681=>1039,682=>790,683=>795,684=>662,
-685=>443,686=>613,687=>717,688=>521,689=>519,690=>313,691=>414,692=>414,693=>480,694=>527,
-695=>662,696=>485,697=>302,699=>348,700=>348,701=>348,702=>366,703=>366,704=>313,705=>313,
-711=>500,712=>282,713=>500,716=>282,717=>500,720=>369,721=>369,722=>366,723=>366,726=>392,
-728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>458,737=>292,738=>395,739=>475,
-740=>313,741=>500,742=>500,743=>500,744=>500,745=>500,750=>553,768=>0,769=>0,770=>0,
-771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,
-781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,
-791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,
-801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,
-811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,
-821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,
-831=>0,835=>0,847=>0,856=>0,865=>0,880=>779,881=>576,882=>803,883=>777,884=>302,
-885=>302,886=>963,887=>737,890=>500,891=>609,892=>609,893=>609,894=>369,900=>500,901=>500,
-902=>776,903=>348,904=>947,905=>1118,906=>662,908=>887,910=>953,911=>911,912=>484,913=>776,
-914=>845,915=>710,916=>776,917=>762,918=>730,919=>945,920=>871,921=>468,922=>869,923=>776,
-924=>1107,925=>914,926=>704,927=>871,928=>944,929=>752,931=>707,932=>744,933=>714,934=>871,
-935=>776,936=>913,937=>890,938=>468,939=>714,940=>770,941=>608,942=>727,943=>484,944=>694,
-945=>770,946=>664,947=>660,948=>667,949=>608,950=>592,951=>727,952=>667,953=>484,954=>750,
-955=>701,956=>732,957=>694,958=>592,959=>667,960=>732,961=>665,962=>609,963=>737,964=>673,
-965=>694,966=>905,967=>658,968=>941,969=>952,970=>484,971=>694,972=>667,973=>694,974=>952,
-975=>869,976=>667,977=>849,978=>764,979=>969,980=>764,981=>941,982=>952,983=>655,984=>871,
-985=>667,986=>796,987=>609,988=>710,989=>527,990=>590,991=>660,992=>796,993=>667,1008=>655,
-1009=>665,1010=>609,1011=>362,1012=>871,1013=>609,1014=>609,1015=>757,1016=>699,1017=>796,1018=>1107,
-1019=>860,1020=>692,1021=>796,1022=>796,1023=>796,1024=>762,1025=>762,1026=>901,1027=>690,1028=>795,
-1029=>722,1030=>468,1031=>468,1032=>473,1033=>1202,1034=>1262,1035=>963,1036=>910,1037=>945,1038=>812,
-1039=>945,1040=>814,1041=>854,1042=>845,1043=>690,1044=>889,1045=>762,1046=>1312,1047=>721,1048=>945,
-1049=>945,1050=>910,1051=>884,1052=>1107,1053=>945,1054=>871,1055=>944,1056=>752,1057=>796,1058=>744,
-1059=>812,1060=>949,1061=>776,1062=>966,1063=>913,1064=>1268,1065=>1293,1066=>957,1067=>1202,1068=>825,
-1069=>795,1070=>1287,1071=>882,1072=>648,1073=>667,1074=>695,1075=>613,1076=>667,1077=>636,1078=>1010,
-1079=>638,1080=>742,1081=>742,1082=>722,1083=>705,1084=>869,1085=>732,1086=>667,1087=>732,1088=>699,
-1089=>609,1090=>620,1091=>640,1092=>902,1093=>596,1094=>739,1095=>732,1096=>1075,1097=>1082,1098=>767,
-1099=>1002,1100=>679,1101=>609,1102=>1025,1103=>739,1104=>636,1105=>636,1106=>719,1107=>613,1108=>609,
-1109=>563,1110=>380,1111=>380,1112=>362,1113=>988,1114=>1015,1115=>727,1116=>722,1117=>742,1118=>640,
-1119=>732,1122=>880,1123=>703,1124=>1195,1125=>963,1130=>1312,1131=>1010,1136=>1096,1137=>1105,1138=>871,
-1139=>652,1140=>916,1141=>749,1164=>846,1165=>673,1168=>700,1169=>618,1170=>690,1171=>613,1172=>868,
-1173=>716,1174=>1312,1175=>1010,1176=>721,1177=>638,1178=>947,1179=>744,1182=>910,1183=>722,1184=>1041,
-1185=>827,1186=>966,1187=>739,1188=>1167,1189=>956,1190=>1345,1191=>1059,1194=>796,1195=>609,1196=>744,
-1197=>620,1198=>714,1199=>581,1200=>714,1201=>581,1202=>866,1203=>649,1204=>1022,1205=>807,1206=>928,
-1207=>739,1210=>910,1211=>727,1216=>468,1217=>1312,1218=>1010,1219=>869,1220=>693,1223=>945,1224=>732,
-1227=>913,1228=>732,1231=>380,1232=>814,1233=>648,1234=>814,1235=>648,1236=>1034,1237=>975,1238=>762,
-1239=>636,1240=>871,1241=>636,1242=>871,1243=>636,1244=>1312,1245=>1010,1246=>721,1247=>638,1248=>657,
-1249=>568,1250=>945,1251=>742,1252=>945,1253=>742,1254=>871,1255=>667,1256=>871,1257=>667,1258=>871,
-1259=>667,1260=>795,1261=>609,1262=>812,1263=>640,1264=>812,1265=>640,1266=>812,1267=>640,1268=>913,
-1269=>732,1270=>690,1271=>613,1272=>1202,1273=>1002,1296=>721,1297=>638,1298=>884,1299=>705,1300=>1248,
-1301=>945,1306=>820,1307=>640,1308=>1028,1309=>856,1329=>942,1330=>832,1331=>894,1332=>909,1333=>822,
-1334=>821,1335=>747,1336=>832,1337=>1125,1338=>894,1339=>803,1340=>722,1341=>1188,1342=>887,1343=>842,
-1344=>737,1345=>863,1346=>918,1347=>851,1348=>977,1349=>833,1350=>914,1351=>843,1352=>871,1353=>818,
-1354=>1034,1355=>846,1356=>964,1357=>871,1358=>914,1359=>808,1360=>808,1361=>836,1362=>710,1363=>955,
-1364=>891,1365=>871,1366=>963,1369=>307,1370=>264,1371=>293,1372=>391,1373=>323,1374=>439,1375=>500,
-1377=>1055,1378=>695,1379=>776,1380=>801,1381=>729,1382=>742,1383=>599,1384=>733,1385=>909,1386=>768,
-1387=>724,1388=>398,1389=>1087,1390=>695,1391=>719,1392=>737,1393=>684,1394=>738,1395=>703,1396=>724,
-1397=>359,1398=>719,1399=>496,1400=>738,1401=>428,1402=>1059,1403=>668,1404=>744,1405=>724,1406=>724,
-1407=>1040,1408=>724,1409=>713,1410=>493,1411=>1040,1412=>734,1413=>693,1414=>956,1415=>833,1417=>340,
-1418=>388,4256=>755,4257=>936,4258=>866,4259=>874,4260=>781,4261=>1078,4262=>1014,4263=>1213,4264=>643,
-4265=>818,4266=>1051,4267=>1051,4268=>796,4269=>1135,4270=>969,4271=>902,4272=>1109,4273=>792,4274=>756,
-4275=>1076,4276=>976,4277=>1066,4278=>811,4279=>833,4280=>821,4281=>833,4282=>908,4283=>1077,4284=>769,
-4285=>822,4286=>813,4287=>1111,4288=>1123,4289=>802,4290=>892,4291=>802,4292=>880,4293=>1063,4304=>594,
-4305=>625,4306=>643,4307=>887,4308=>615,4309=>611,4310=>667,4311=>915,4312=>613,4313=>600,4314=>1120,
-4315=>640,4316=>640,4317=>879,4318=>624,4319=>634,4320=>877,4321=>666,4322=>780,4323=>751,4324=>869,
-4325=>639,4326=>912,4327=>622,4328=>647,4329=>640,4330=>729,4331=>641,4332=>630,4333=>629,4334=>670,
-4335=>753,4336=>625,4337=>657,4338=>625,4339=>625,4340=>624,4341=>670,4342=>940,4343=>680,4344=>636,
-4345=>672,4346=>625,4347=>588,4348=>354,7424=>641,7425=>892,7426=>940,7427=>695,7428=>609,7429=>675,
-7430=>675,7431=>617,7432=>509,7433=>320,7434=>561,7435=>722,7436=>617,7437=>869,7438=>737,7439=>667,
-7440=>609,7441=>628,7442=>628,7443=>667,7444=>989,7445=>598,7446=>667,7447=>667,7448=>586,7449=>801,
-7450=>801,7451=>620,7452=>647,7453=>664,7454=>923,7455=>655,7456=>581,7457=>861,7458=>568,7459=>568,
-7460=>588,7461=>802,7462=>586,7463=>641,7464=>732,7465=>586,7466=>854,7467=>705,7468=>489,7469=>651,
-7470=>532,7471=>532,7472=>546,7473=>480,7474=>480,7475=>538,7476=>595,7477=>294,7478=>298,7479=>547,
-7480=>443,7481=>697,7482=>576,7483=>606,7484=>548,7485=>442,7486=>474,7487=>523,7488=>455,7489=>469,
-7490=>549,7491=>466,7492=>466,7493=>498,7494=>657,7495=>499,7496=>498,7497=>444,7498=>444,7499=>412,
-7500=>412,7501=>498,7502=>300,7503=>523,7504=>729,7505=>473,7506=>467,7507=>427,7508=>467,7509=>467,
-7510=>499,7511=>371,7512=>520,7513=>418,7514=>729,7515=>491,7516=>505,7517=>418,7518=>416,7519=>420,
-7520=>570,7521=>414,7522=>239,7523=>414,7524=>520,7525=>491,7526=>418,7527=>416,7528=>419,7529=>570,
-7530=>414,7531=>1041,7543=>640,7544=>595,7547=>380,7557=>380,7579=>498,7580=>427,7581=>427,7582=>467,
-7583=>412,7584=>383,7585=>373,7586=>498,7587=>522,7588=>300,7589=>307,7590=>300,7591=>300,7592=>370,
-7593=>368,7594=>321,7595=>430,7596=>682,7597=>729,7598=>588,7599=>587,7600=>472,7601=>467,7602=>522,
-7603=>400,7604=>387,7605=>371,7606=>520,7607=>475,7608=>408,7609=>489,7610=>491,7611=>412,7612=>527,
-7613=>412,7614=>452,7615=>467,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>776,
-7681=>648,7682=>845,7683=>699,7684=>845,7685=>699,7686=>845,7687=>699,7688=>796,7689=>609,7690=>867,
-7691=>699,7692=>867,7693=>699,7694=>867,7695=>699,7696=>867,7697=>699,7698=>867,7699=>699,7700=>762,
-7701=>636,7702=>762,7703=>636,7704=>762,7705=>636,7706=>762,7707=>636,7708=>762,7709=>636,7710=>710,
-7711=>430,7712=>854,7713=>699,7714=>945,7715=>727,7716=>945,7717=>727,7718=>945,7719=>727,7720=>945,
-7721=>727,7722=>945,7723=>727,7724=>468,7725=>380,7726=>468,7727=>380,7728=>869,7729=>693,7730=>869,
-7731=>693,7732=>869,7733=>693,7734=>703,7735=>380,7736=>703,7737=>380,7738=>703,7739=>380,7740=>703,
-7741=>380,7742=>1107,7743=>1058,7744=>1107,7745=>1058,7746=>1107,7747=>1058,7748=>914,7749=>727,7750=>914,
-7751=>727,7752=>914,7753=>727,7754=>914,7755=>727,7756=>871,7757=>667,7758=>871,7759=>667,7760=>871,
-7761=>667,7762=>871,7763=>667,7764=>752,7765=>699,7766=>752,7767=>699,7768=>831,7769=>527,7770=>831,
-7771=>527,7772=>831,7773=>527,7774=>831,7775=>527,7776=>722,7777=>563,7778=>722,7779=>563,7780=>722,
-7781=>563,7782=>722,7783=>563,7784=>722,7785=>563,7786=>744,7787=>462,7788=>744,7789=>462,7790=>744,
-7791=>462,7792=>744,7793=>462,7794=>872,7795=>727,7796=>872,7797=>727,7798=>872,7799=>727,7800=>872,
-7801=>727,7802=>872,7803=>727,7804=>776,7805=>581,7806=>776,7807=>581,7808=>1123,7809=>861,7810=>1123,
-7811=>861,7812=>1123,7813=>861,7814=>1123,7815=>861,7816=>1123,7817=>861,7818=>776,7819=>596,7820=>776,
-7821=>596,7822=>714,7823=>581,7824=>730,7825=>568,7826=>730,7827=>568,7828=>730,7829=>568,7830=>727,
-7831=>462,7832=>861,7833=>581,7834=>1014,7835=>430,7836=>430,7837=>430,7838=>947,7839=>667,7840=>776,
-7841=>648,7842=>776,7843=>648,7844=>776,7845=>648,7846=>776,7847=>648,7848=>776,7849=>648,7850=>776,
-7851=>648,7852=>776,7853=>648,7854=>776,7855=>648,7856=>776,7857=>648,7858=>776,7859=>648,7860=>776,
-7861=>648,7862=>776,7863=>648,7864=>762,7865=>636,7866=>762,7867=>636,7868=>762,7869=>636,7870=>762,
-7871=>636,7872=>762,7873=>636,7874=>762,7875=>636,7876=>762,7877=>636,7878=>762,7879=>636,7880=>468,
-7881=>380,7882=>468,7883=>380,7884=>871,7885=>667,7886=>871,7887=>667,7888=>871,7889=>667,7890=>871,
-7891=>667,7892=>871,7893=>667,7894=>871,7895=>667,7896=>871,7897=>667,7898=>871,7899=>667,7900=>871,
-7901=>667,7902=>871,7903=>667,7904=>871,7905=>667,7906=>871,7907=>667,7908=>872,7909=>727,7910=>872,
-7911=>727,7912=>872,7913=>727,7914=>872,7915=>727,7916=>872,7917=>727,7918=>872,7919=>727,7920=>872,
-7921=>727,7922=>714,7923=>581,7924=>714,7925=>581,7926=>714,7927=>581,7928=>714,7929=>581,7930=>1078,
-7931=>701,7936=>770,7937=>770,7938=>770,7939=>770,7940=>770,7941=>770,7942=>770,7943=>770,7944=>776,
-7945=>776,7946=>978,7947=>978,7948=>832,7949=>849,7950=>776,7951=>776,7952=>608,7953=>608,7954=>608,
-7955=>608,7956=>608,7957=>608,7960=>917,7961=>909,7962=>1169,7963=>1169,7964=>1093,7965=>1120,7968=>727,
-7969=>727,7970=>727,7971=>727,7972=>727,7973=>727,7974=>727,7975=>727,7976=>1100,7977=>1094,7978=>1358,
-7979=>1361,7980=>1279,7981=>1308,7982=>1197,7983=>1194,7984=>484,7985=>484,7986=>484,7987=>484,7988=>484,
-7989=>484,7990=>484,7991=>484,7992=>629,7993=>617,7994=>878,7995=>881,7996=>799,7997=>831,7998=>723,
-7999=>714,8000=>667,8001=>667,8002=>667,8003=>667,8004=>667,8005=>667,8008=>900,8009=>935,8010=>1240,
-8011=>1237,8012=>1035,8013=>1066,8016=>694,8017=>694,8018=>694,8019=>694,8020=>694,8021=>694,8022=>694,
-8023=>694,8025=>922,8027=>1186,8029=>1133,8031=>1019,8032=>952,8033=>952,8034=>952,8035=>952,8036=>952,
-8037=>952,8038=>952,8039=>952,8040=>931,8041=>963,8042=>1268,8043=>1274,8044=>1054,8045=>1088,8046=>1023,
-8047=>1060,8048=>770,8049=>770,8050=>608,8051=>608,8052=>727,8053=>727,8054=>484,8055=>484,8056=>667,
-8057=>667,8058=>694,8059=>694,8060=>952,8061=>952,8064=>770,8065=>770,8066=>770,8067=>770,8068=>770,
-8069=>770,8070=>770,8071=>770,8072=>776,8073=>776,8074=>978,8075=>978,8076=>832,8077=>849,8078=>776,
-8079=>776,8080=>727,8081=>727,8082=>727,8083=>727,8084=>727,8085=>727,8086=>727,8087=>727,8088=>1100,
-8089=>1094,8090=>1358,8091=>1361,8092=>1279,8093=>1308,8094=>1197,8095=>1194,8096=>952,8097=>952,8098=>952,
-8099=>952,8100=>952,8101=>952,8102=>952,8103=>952,8104=>931,8105=>963,8106=>1268,8107=>1274,8108=>1054,
-8109=>1088,8110=>1023,8111=>1060,8112=>770,8113=>770,8114=>770,8115=>770,8116=>770,8118=>770,8119=>770,
-8120=>776,8121=>776,8122=>811,8123=>776,8124=>776,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,
-8130=>727,8131=>727,8132=>727,8134=>727,8135=>727,8136=>1000,8137=>947,8138=>1191,8139=>1118,8140=>945,
-8141=>500,8142=>500,8143=>500,8144=>484,8145=>484,8146=>484,8147=>484,8150=>484,8151=>484,8152=>468,
-8153=>468,8154=>714,8155=>662,8157=>500,8158=>500,8159=>500,8160=>694,8161=>694,8162=>694,8163=>694,
-8164=>665,8165=>665,8166=>694,8167=>694,8168=>714,8169=>714,8170=>1019,8171=>953,8172=>910,8173=>500,
-8174=>500,8175=>500,8178=>952,8179=>952,8180=>952,8182=>952,8183=>952,8184=>1069,8185=>887,8186=>1101,
-8187=>911,8188=>890,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,
-8198=>167,8199=>696,8200=>348,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>415,8209=>415,8210=>696,8213=>1000,8214=>500,8215=>500,8219=>348,8223=>575,8227=>639,8228=>348,
-8229=>674,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8241=>1820,8242=>264,8243=>447,
-8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,8252=>629,8253=>586,8254=>500,8258=>1023,8260=>167,
-8261=>473,8262=>473,8263=>1082,8264=>856,8265=>856,8267=>636,8268=>500,8269=>500,8270=>523,8271=>369,
-8273=>523,8274=>556,8275=>1000,8279=>813,8287=>222,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>438,8305=>239,8308=>438,8309=>438,
-8310=>438,8311=>438,8312=>438,8313=>438,8314=>528,8315=>528,8316=>528,8317=>298,8318=>298,8319=>519,
-8320=>438,8321=>438,8322=>438,8323=>438,8324=>438,8325=>438,8326=>438,8327=>438,8328=>438,8329=>438,
-8330=>528,8331=>528,8332=>528,8333=>298,8334=>298,8336=>466,8337=>444,8338=>467,8339=>475,8340=>444,
-8341=>521,8342=>523,8343=>292,8344=>729,8345=>519,8346=>499,8347=>395,8348=>371,8358=>696,8367=>1155,
-8369=>790,8372=>876,8373=>696,8377=>696,8451=>1198,8457=>1112,8462=>727,8463=>727,8470=>1087,8486=>890,
-8487=>890,8490=>869,8491=>776,8513=>775,8514=>557,8515=>637,8516=>760,8523=>903,8528=>1035,8529=>1035,
-8530=>1473,8531=>1035,8532=>1035,8533=>1035,8534=>1035,8535=>1035,8536=>1035,8537=>1035,8538=>1035,8539=>1035,
-8540=>1035,8541=>1035,8542=>1035,8543=>615,8544=>468,8545=>736,8546=>1005,8547=>1093,8548=>776,8549=>1127,
-8550=>1396,8551=>1664,8552=>1069,8553=>776,8554=>1078,8555=>1347,8556=>703,8557=>796,8558=>867,8559=>1107,
-8560=>380,8561=>760,8562=>1140,8563=>961,8564=>581,8565=>961,8566=>1341,8567=>1721,8568=>976,8569=>596,
-8570=>976,8571=>1356,8572=>380,8573=>609,8574=>699,8575=>1058,8576=>1255,8577=>867,8578=>1268,8579=>796,
-8580=>609,8581=>796,8585=>1035,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,
-8599=>838,8600=>838,8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,
-8609=>838,8610=>838,8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,
-8619=>838,8620=>838,8621=>838,8622=>838,8623=>850,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,
-8629=>838,8630=>838,8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,
-8639=>838,8640=>838,8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,
-8649=>838,8650=>838,8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,
-8659=>838,8660=>838,8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,
-8669=>838,8670=>838,8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,
-8679=>838,8680=>838,8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,
-8689=>838,8690=>838,8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,
-8699=>838,8700=>838,8701=>838,8702=>838,8703=>838,8704=>641,8706=>534,8707=>620,8708=>620,8710=>753,
-8711=>753,8712=>740,8713=>740,8715=>740,8716=>740,8719=>842,8720=>842,8721=>753,8722=>838,8723=>838,
-8724=>838,8725=>365,8727=>691,8728=>519,8729=>519,8730=>657,8731=>657,8732=>657,8733=>672,8734=>833,
-8735=>838,8736=>838,8739=>324,8740=>607,8741=>529,8742=>773,8743=>812,8744=>812,8745=>838,8746=>838,
-8747=>579,8748=>1000,8749=>1391,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8770=>838,
-8771=>838,8776=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1082,8789=>1082,8800=>838,8801=>838,
-8804=>838,8805=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8844=>838,8845=>838,
-8846=>838,8847=>838,8848=>838,8849=>838,8850=>838,8851=>838,8852=>838,8853=>838,8854=>838,8855=>838,
-8856=>838,8857=>838,8858=>838,8859=>838,8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,8865=>838,
-8866=>884,8867=>884,8868=>960,8869=>960,8870=>616,8871=>616,8872=>884,8873=>884,8874=>884,8875=>1080,
-8876=>884,8877=>884,8878=>884,8879=>1080,8901=>398,8962=>834,8968=>473,8969=>473,8970=>473,8971=>473,
-8976=>838,8977=>539,8984=>928,8985=>838,8992=>579,8993=>579,8997=>1000,9000=>1443,9085=>1008,9115=>500,
-9116=>500,9117=>500,9118=>500,9119=>500,9120=>500,9121=>500,9122=>500,9123=>500,9124=>500,9125=>500,
-9126=>500,9127=>750,9128=>750,9129=>750,9130=>750,9131=>750,9132=>750,9133=>750,9134=>579,9167=>945,
-9251=>834,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,9606=>769,9607=>769,9608=>769,
-9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,9616=>769,9617=>769,9618=>769,
-9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,9626=>769,9627=>769,9628=>769,
-9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,9636=>945,9637=>945,9638=>945,
-9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,9646=>550,9647=>550,9648=>769,
-9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,9656=>502,9657=>502,9658=>769,
-9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,9666=>502,9667=>502,9668=>769,
-9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,9676=>873,9677=>873,9678=>873,
-9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,9686=>527,9687=>527,9688=>791,
-9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,9696=>873,9697=>873,9698=>769,
-9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,9704=>945,9705=>945,9706=>945,9707=>945,9708=>769,
-9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,9716=>873,9717=>873,9718=>873,
-9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,9726=>732,9727=>769,9728=>896,
-9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,
-9796=>896,9797=>896,9798=>896,9799=>896,9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,
-9830=>896,9831=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,10145=>838,
-10181=>457,10182=>457,10208=>494,10216=>457,10217=>457,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1033,
-10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,10237=>1434,10238=>1434,
-10239=>1434,10240=>781,10241=>781,10242=>781,10243=>781,10244=>781,10245=>781,10246=>781,10247=>781,10248=>781,
-10249=>781,10250=>781,10251=>781,10252=>781,10253=>781,10254=>781,10255=>781,10256=>781,10257=>781,10258=>781,
-10259=>781,10260=>781,10261=>781,10262=>781,10263=>781,10264=>781,10265=>781,10266=>781,10267=>781,10268=>781,
-10269=>781,10270=>781,10271=>781,10272=>781,10273=>781,10274=>781,10275=>781,10276=>781,10277=>781,10278=>781,
-10279=>781,10280=>781,10281=>781,10282=>781,10283=>781,10284=>781,10285=>781,10286=>781,10287=>781,10288=>781,
-10289=>781,10290=>781,10291=>781,10292=>781,10293=>781,10294=>781,10295=>781,10296=>781,10297=>781,10298=>781,
-10299=>781,10300=>781,10301=>781,10302=>781,10303=>781,10304=>781,10305=>781,10306=>781,10307=>781,10308=>781,
-10309=>781,10310=>781,10311=>781,10312=>781,10313=>781,10314=>781,10315=>781,10316=>781,10317=>781,10318=>781,
-10319=>781,10320=>781,10321=>781,10322=>781,10323=>781,10324=>781,10325=>781,10326=>781,10327=>781,10328=>781,
-10329=>781,10330=>781,10331=>781,10332=>781,10333=>781,10334=>781,10335=>781,10336=>781,10337=>781,10338=>781,
-10339=>781,10340=>781,10341=>781,10342=>781,10343=>781,10344=>781,10345=>781,10346=>781,10347=>781,10348=>781,
-10349=>781,10350=>781,10351=>781,10352=>781,10353=>781,10354=>781,10355=>781,10356=>781,10357=>781,10358=>781,
-10359=>781,10360=>781,10361=>781,10362=>781,10363=>781,10364=>781,10365=>781,10366=>781,10367=>781,10368=>781,
-10369=>781,10370=>781,10371=>781,10372=>781,10373=>781,10374=>781,10375=>781,10376=>781,10377=>781,10378=>781,
-10379=>781,10380=>781,10381=>781,10382=>781,10383=>781,10384=>781,10385=>781,10386=>781,10387=>781,10388=>781,
-10389=>781,10390=>781,10391=>781,10392=>781,10393=>781,10394=>781,10395=>781,10396=>781,10397=>781,10398=>781,
-10399=>781,10400=>781,10401=>781,10402=>781,10403=>781,10404=>781,10405=>781,10406=>781,10407=>781,10408=>781,
-10409=>781,10410=>781,10411=>781,10412=>781,10413=>781,10414=>781,10415=>781,10416=>781,10417=>781,10418=>781,
-10419=>781,10420=>781,10421=>781,10422=>781,10423=>781,10424=>781,10425=>781,10426=>781,10427=>781,10428=>781,
-10429=>781,10430=>781,10431=>781,10432=>781,10433=>781,10434=>781,10435=>781,10436=>781,10437=>781,10438=>781,
-10439=>781,10440=>781,10441=>781,10442=>781,10443=>781,10444=>781,10445=>781,10446=>781,10447=>781,10448=>781,
-10449=>781,10450=>781,10451=>781,10452=>781,10453=>781,10454=>781,10455=>781,10456=>781,10457=>781,10458=>781,
-10459=>781,10460=>781,10461=>781,10462=>781,10463=>781,10464=>781,10465=>781,10466=>781,10467=>781,10468=>781,
-10469=>781,10470=>781,10471=>781,10472=>781,10473=>781,10474=>781,10475=>781,10476=>781,10477=>781,10478=>781,
-10479=>781,10480=>781,10481=>781,10482=>781,10483=>781,10484=>781,10485=>781,10486=>781,10487=>781,10488=>781,
-10489=>781,10490=>781,10491=>781,10492=>781,10493=>781,10494=>781,10495=>781,10496=>838,10497=>838,10498=>838,
-10499=>838,10500=>838,10501=>838,10502=>838,10503=>838,10504=>838,10505=>838,10506=>838,10507=>838,10508=>838,
-10509=>838,10510=>838,10511=>838,10512=>838,10513=>838,10514=>838,10515=>838,10516=>838,10517=>838,10518=>838,
-10519=>838,10520=>838,10521=>838,10522=>838,10523=>838,10524=>838,10525=>838,10526=>838,10527=>838,10528=>838,
-10529=>838,10530=>838,10531=>838,10532=>838,10533=>838,10534=>838,10535=>838,10536=>838,10537=>838,10538=>838,
-10539=>838,10540=>838,10541=>838,10542=>838,10543=>838,10544=>838,10545=>838,10546=>838,10547=>838,10548=>838,
-10549=>838,10550=>838,10551=>838,10552=>838,10553=>838,10554=>838,10555=>838,10556=>838,10557=>838,10558=>838,
-10559=>838,10560=>838,10561=>838,10562=>838,10563=>838,10564=>838,10565=>838,10566=>838,10567=>838,10568=>838,
-10569=>838,10570=>838,10571=>838,10572=>838,10573=>838,10574=>838,10575=>838,10576=>838,10577=>838,10578=>838,
-10579=>838,10580=>838,10581=>838,10582=>838,10583=>838,10584=>838,10585=>838,10586=>838,10587=>838,10588=>838,
-10589=>838,10590=>838,10591=>838,10592=>838,10593=>838,10594=>838,10595=>838,10596=>838,10597=>838,10598=>838,
-10599=>838,10600=>838,10601=>838,10602=>838,10603=>838,10604=>838,10605=>838,10606=>838,10607=>838,10608=>838,
-10609=>838,10610=>838,10611=>838,10612=>838,10613=>838,10614=>838,10615=>1032,10616=>838,10617=>838,10618=>960,
-10619=>838,10620=>838,10621=>838,10622=>838,10623=>838,10731=>494,10764=>1782,10765=>610,10766=>610,10799=>838,
-11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,
-11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,11026=>945,11027=>945,
-11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11360=>703,11361=>380,11363=>752,
-11364=>831,11367=>945,11368=>727,11369=>869,11370=>693,11371=>730,11372=>568,11373=>848,11374=>1107,11375=>776,
-11376=>848,11377=>709,11378=>1221,11379=>984,11381=>779,11382=>601,11383=>905,11385=>571,11386=>667,11388=>313,
-11389=>489,11390=>722,11391=>730,11520=>773,11521=>635,11522=>804,11523=>658,11524=>788,11525=>962,11526=>756,
-11527=>960,11528=>617,11529=>646,11530=>962,11531=>631,11532=>646,11533=>962,11534=>846,11535=>866,11536=>961,
-11537=>645,11538=>645,11539=>959,11540=>945,11541=>863,11542=>644,11543=>646,11544=>645,11545=>649,11546=>688,
-11547=>936,11548=>982,11549=>681,11550=>676,11551=>852,11552=>1113,11553=>632,11554=>645,11555=>646,11556=>749,
-11557=>914,11800=>586,11810=>473,11811=>473,11812=>473,11813=>473,11822=>586,42564=>722,42565=>563,42566=>468,
-42567=>380,42576=>1333,42577=>1092,42580=>1287,42581=>1025,42582=>1287,42583=>1039,42760=>500,42761=>500,42762=>500,
-42763=>500,42764=>500,42765=>500,42766=>500,42767=>500,42768=>500,42769=>500,42770=>500,42771=>500,42772=>500,
-42773=>500,42774=>500,42779=>384,42780=>384,42781=>276,42782=>276,42783=>276,42790=>945,42791=>712,42792=>1003,
-42793=>909,42794=>696,42795=>609,42796=>634,42797=>598,42798=>741,42799=>706,42800=>592,42801=>563,42802=>1301,
-42803=>986,42804=>1261,42805=>1004,42806=>1168,42807=>1008,42808=>1016,42809=>813,42810=>1016,42811=>813,42812=>994,
-42813=>847,42814=>796,42815=>609,42822=>916,42823=>581,42826=>1010,42827=>770,42830=>1448,42831=>1060,42856=>787,
-42857=>716,42875=>694,42876=>527,42880=>703,42881=>380,42882=>872,42883=>727,42884=>694,42885=>527,42886=>796,
-42887=>609,42891=>439,42892=>306,42893=>913,42896=>914,42897=>727,43002=>1069,43003=>710,43004=>752,43005=>1107,
-43006=>468,43007=>1286,62464=>705,62465=>716,62466=>765,62467=>999,62468=>716,62469=>710,62470=>776,62471=>1038,
-62472=>716,62473=>716,62474=>1309,62475=>734,62476=>733,62477=>1004,62478=>716,62479=>733,62480=>1050,62481=>797,
-62482=>850,62483=>799,62484=>996,62485=>732,62486=>987,62487=>731,62488=>739,62489=>733,62490=>780,62491=>733,
-62492=>739,62493=>717,62494=>780,62495=>936,62496=>716,62497=>826,62498=>717,62499=>716,62500=>716,62501=>773,
-62502=>1013,62504=>904,63173=>667,63185=>500,63188=>500,64256=>821,64257=>727,64258=>727,64259=>1120,64260=>1117,
-64261=>871,64262=>971,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,
-65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65529=>0,65530=>0,
-65531=>0,65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavuserifb.z';
-$ctg='dejavuserifb.ctg.z';
-$originalsize=341072;
-// --- EOF ---
\ No newline at end of file
diff --git a/libraries/tcpdf/fonts/dejavuserifb.z b/libraries/tcpdf/fonts/dejavuserifb.z
deleted file mode 100644
index 4fdf505..0000000
Binary files a/libraries/tcpdf/fonts/dejavuserifb.z and /dev/null differ
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14154-g6f22b57
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via 6f22b57eb57966c7fb08e691cfcb072ca57e88af (commit)
via b2f0db338911e21b45f2947ec5a22dcc119c5b52 (commit)
via fb5483e4f288229d17e8bc288d387f03d1896177 (commit)
via b573a0d9035b2bff89e655db8163daa43223ef75 (commit)
from 959abbc89cbd73a4d5f0b73e90738134bba56e40 (commit)
- Log -----------------------------------------------------------------
commit 6f22b57eb57966c7fb08e691cfcb072ca57e88af
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:38:01 2011 +0200
Fix off-by-one and invalid page references
commit b2f0db338911e21b45f2947ec5a22dcc119c5b52
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:37:45 2011 +0200
Fix download
commit fb5483e4f288229d17e8bc288d387f03d1896177
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:32:39 2011 +0200
Do not mess with settings on download
commit b573a0d9035b2bff89e655db8163daa43223ef75
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:31:22 2011 +0200
Factor out Download method
-----------------------------------------------------------------------
Summary of changes:
libraries/PDF.class.php | 10 ++++++++++
libraries/schema/Pdf_Relation_Schema.class.php | 12 +++---------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index 24429e3..b5629e0 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -83,4 +83,14 @@ class PMA_PDF extends TCPDF
PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display();
include('./libraries/footer.inc.php');
}
+
+ /**
+ * Sends file as a download to user.
+ */
+ function Download($filename)
+ {
+ $pdfData = $this->getPDFData();
+ PMA_download_header($filename, 'application/pdf', strlen($pdfData));
+ echo $pdfData;
+ }
}
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index 4f354e6..6e7846a 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -889,9 +889,6 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
{
global $pdf, $db, $cfgRelation;
- $pdf->SetFontSize(14);
- $pdf->SetLineWidth(0.2);
- $pdf->SetDisplayMode('fullpage');
// Get the name of this pdfpage to use as filename
$_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE page_nr = ' . $pageNumber;
@@ -903,10 +900,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
if (empty($filename)) {
$filename = $pageNumber . '.pdf';
}
- // instead of $pdf->Output():
- $pdfData = $pdf->getPDFData();
- PMA_download_header($filename, 'application/pdf', strlen($pdfData));
- echo $pdfData;
+ $pdf->Download($filename);
}
public function dataDictionaryDoc($alltables)
@@ -921,7 +915,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink();
$pdf->SetX(10);
// $pdf->Ln(1);
- $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']);
+ $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']);
$pdf->SetX(10);
$pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']);
// $pdf->Ln(1);
@@ -937,7 +931,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
}
$pdf->PMA_links['RT']['-'] = $pdf->AddLink();
$pdf->SetX(10);
- $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['RT']['-']);
+ $pdf->Cell(0, 6, __('Page number:') . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['RT']['-']);
$pdf->SetX(10);
$pdf->Cell(0, 6, $i . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']);
$z = 0;
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14150-g959abbc
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via 959abbc89cbd73a4d5f0b73e90738134bba56e40 (commit)
from 65faeba99f6a07b87d2a0f62d354c3fe3545c31c (commit)
- Log -----------------------------------------------------------------
commit 959abbc89cbd73a4d5f0b73e90738134bba56e40
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 15:27:40 2011 +0200
Sane handling of PDF rendering errors
Will now display proper error page instead of adding errors to top of
PDF output (if any).
-----------------------------------------------------------------------
Summary of changes:
libraries/PDF.class.php | 12 ++++++++++++
libraries/schema/Pdf_Relation_Schema.class.php | 12 ------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
index d0bb6f5..24429e3 100644
--- a/libraries/PDF.class.php
+++ b/libraries/PDF.class.php
@@ -71,4 +71,16 @@ class PMA_PDF extends TCPDF
}
parent::_putpages();
}
+
+ /**
+ * Displays an error message
+ *
+ * @param string $error_message the error mesage
+ */
+ function Error($error_message = '')
+ {
+ include('./libraries/header.inc.php');
+ PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display();
+ include('./libraries/footer.inc.php');
+ }
}
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index 63e2307..4f354e6 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -154,18 +154,6 @@ class PMA_Schema_PDF extends PMA_PDF
$this->SetLineWidth($width);
}
- /**
- * Displays an error message
- *
- * @param string error_message the error mesage
- * @access public
- * @see PMA_Export_Relation_Schema::dieSchema
- */
- function Error($error_message = '')
- {
- PMA_Export_Relation_Schema::dieSchema($error_message);
- }
-
function Header()
{
// We only show this if we find something in the new pdf_pages table
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14143-gf6f133e
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via f6f133eb09532943976cd38d40d794a008bbccc5 (commit)
via 235e14d41ea6eafd0aa81ea726af5a64346eebb9 (commit)
via 0d7d007995ab59833b4132e8cee7e1093a07960b (commit)
via 17cbe2959294811d8fca81d575dbd20b0efe06d7 (commit)
from e9ea3b59a37239034b9690a16d86acb1d6166d57 (commit)
- Log -----------------------------------------------------------------
commit f6f133eb09532943976cd38d40d794a008bbccc5
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 14:33:03 2011 +0200
Avoid duplicating bookmark code from TCPDF, where it works
commit 235e14d41ea6eafd0aa81ea726af5a64346eebb9
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 14:29:36 2011 +0200
Indentaion
commit 0d7d007995ab59833b4132e8cee7e1093a07960b
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 14:29:22 2011 +0200
Unify code for PDF footer
commit 17cbe2959294811d8fca81d575dbd20b0efe06d7
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 14:24:22 2011 +0200
Start base class for all PDF output
-----------------------------------------------------------------------
Summary of changes:
libraries/PDF.class.php | 51 ++++++++
libraries/export/pdf.php | 36 +-----
libraries/schema/Pdf_Relation_Schema.class.php | 146 +++---------------------
3 files changed, 69 insertions(+), 164 deletions(-)
create mode 100644 libraries/PDF.class.php
diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php
new file mode 100644
index 0000000..719df87
--- /dev/null
+++ b/libraries/PDF.class.php
@@ -0,0 +1,51 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * TCPDF wrapper class.
+ */
+
+require_once './libraries/tcpdf/tcpdf.php';
+
+/**
+ * PDF font to use.
+ */
+define('PMA_PDF_FONT', 'DejaVuSans');
+
+/**
+ * PDF export base class providing basic configuration.
+ */
+class PMA_PDF extends TCPDF
+{
+ var $footerset;
+
+ public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false)
+ {
+ parent::__construct();
+ $this->SetAuthor('phpMyAdmin ' . PMA_VERSION);
+ $this->AliasNbPages();
+ $this->AddFont('DejaVuSans', '', 'dejavusans.php');
+ $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
+ $this->AddFont('DejaVuSerif', '', 'dejavuserif.php');
+ $this->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
+ $this->SetFont(PMA_PDF_FONT, '', 14);
+ $this->setFooterFont(array(PMA_PDF_FONT, '', 14));
+ }
+
+ /**
+ * This function must be named "Footer" to work with the TCPDF library
+ */
+ function Footer()
+ {
+ // Check if footer for this page already exists
+ if (!isset($this->footerset[$this->page])) {
+ $this->SetY(-15);
+ $this->SetFont(PMA_PDF_FONT, '', 14);
+ $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' . $this->getAliasNbPages(), 'T', 0, 'C');
+ $this->Cell(0, 6, PMA_localisedDate(), 0, 1, 'R');
+ $this->SetY(20);
+
+ // set footerset
+ $this->footerset[$this->page] = 1;
+ }
+ }
+}
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 3cc0acf..61c8dce 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -30,24 +30,17 @@ if (isset($plugin_list)) {
);
} else {
- /**
- * Font used in PDF.
- *
- * @todo Make this configuratble (at least Sans/Serif).
- */
- define('PMA_PDF_FONT', 'DejaVuSans');
- require_once './libraries/tcpdf/tcpdf.php';
+ require_once './libraries/PDF.class.php';
/**
* Adapted from a LGPL script by Philip Clarke
* @package phpMyAdmin-Export
* @subpackage PDF
*/
- class PMA_PDF extends TCPDF
+ class PMA_Export_PDF extends PMA_PDF
{
var $tablewidths;
var $headerset;
- var $footerset;
function checkPageBreak($h=0, $y='', $addpage=true) {
if ($this->empty_string($y)) {
@@ -125,20 +118,6 @@ if (isset($plugin_list)) {
$this->dataY = $maxY;
}
- function Footer()
- {
- // Check if footer for this page already exists
- if (!isset($this->footerset[$this->page])) {
- $this->SetY(-15);
- //Page number
- $this->setFooterFont(PMA_PDF_FONT, '', 14);
- $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' . $this->getAliasNbPages(), 'T', 0, 'C');
-
- // set footerset
- $this->footerset[$this->page] = 1;
- }
- }
-
function morepagestable($lineheight=8)
{
// some things to set and 'remember'
@@ -354,9 +333,9 @@ if (isset($plugin_list)) {
} // end of mysql_report function
- } // end of PMA_PDF class
+ } // end of PMA_Export_PDF class
- $pdf = new PMA_PDF('L', 'pt', 'A3');
+ $pdf = new PMA_Export_PDF('L', 'pt', 'A3');
/**
* Finalize the pdf.
@@ -389,13 +368,6 @@ if (isset($plugin_list)) {
global $pdf_report_title;
global $pdf;
- $pdf->AddFont('DejaVuSans', '', 'dejavusans.php');
- $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
- $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php');
- $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
- $pdf->SetFont(PMA_PDF_FONT, '', 11.5);
- $pdf->setFooterFont(array(PMA_PDF_FONT, '', 11.5));
- $pdf->AliasNbPages();
$pdf->Open();
$attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index a4d1260..f65fcc2 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -7,13 +7,7 @@
include_once("Export_Relation_Schema.class.php");
-/**
- * Font used in PDF.
- *
- * @todo Make this configuratble (at least Sans/Serif).
- */
-define('PMA_PDF_FONT', 'DejaVuSans');
-require_once './libraries/tcpdf/tcpdf.php';
+require_once './libraries/PDF.class.php';
/**
* Extends the "TCPDF" class and helps
@@ -22,7 +16,7 @@ require_once './libraries/tcpdf/tcpdf.php';
* @access public
* @see TCPDF
*/
-class PMA_PDF extends TCPDF
+class PMA_Schema_PDF extends PMA_PDF
{
/**
* Defines properties
@@ -242,112 +236,8 @@ class PMA_PDF extends TCPDF
{
global $with_doc;
if ($with_doc) {
- $this->SetY(-15);
- $this->SetFont($this->_ff, '', 14);
- $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' . $this->getAliasNbPages(), 'T', 0, 'C');
- $this->Cell(0, 6, PMA_localisedDate(), 0, 1, 'R');
- $this->SetY(20);
- }
- }
-
- /**
- * Add a bookmark
- */
- function Bookmark($txt, $level = 0, $y = 0, $page = '')
- {
- $this->Outlines[0][] = $level;
- $this->Outlines[1][] = $txt;
- $this->Outlines[2][] = $this->page;
- if ($y == -1) {
- $y = $this->GetY();
+ parent::Footer();
}
- $this->Outlines[3][] = round($this->hPt - $y * $this->k, 2);
- }
-
- function _putbookmarks()
- {
- if (count($this->Outlines) > 0) {
- // Save object number
- $memo_n = $this->n;
- // Take the number of sub elements for an outline
- $nb_outlines = sizeof($this->Outlines[0]);
- $first_level = array();
- $parent = array();
- $parent[0] = 1;
- for ($i = 0; $i < $nb_outlines; $i++) {
- $level = $this->Outlines[0][$i];
- $kids = 0;
- $last = -1;
- $prev = -1;
- $next = -1;
- if ($i > 0) {
- $cursor = $i-1;
- // Take the previous outline in the same level
- while ($this->Outlines[0][$cursor] > $level && $cursor > 0)
- $cursor--;
- if ($this->Outlines[0][$cursor] == $level) {
- $prev = $cursor;
- }
- }
- if ($i < $nb_outlines-1) {
- $cursor = $i + 1;
- while (isset($this->Outlines[0][$cursor]) && $this->Outlines[0][$cursor] > $level) {
- // Take the immediate kid in level + 1
- if ($this->Outlines[0][$cursor] == $level + 1) {
- $kids++;
- $last = $cursor;
- }
- $cursor++;
- }
- $cursor = $i + 1;
- // Take the next outline in the same level
- while ($this->Outlines[0][$cursor] > $level && ($cursor + 1 < sizeof($this->Outlines[0])))
- $cursor++;
- if ($this->Outlines[0][$cursor] == $level) {
- $next = $cursor;
- }
- }
- $this->_newobj();
- $parent[$level + 1] = $this->n;
- if ($level == 0) {
- $first_level[] = $this->n;
- }
- $this->_out('<<');
- $this->_out('/Title (' . $this->Outlines[1][$i] . ')');
- $this->_out('/Parent ' . $parent[$level] . ' 0 R');
- if ($prev != -1) {
- $this->_out('/Prev ' . ($memo_n + $prev + 1) . ' 0 R');
- }
- if ($next != -1) {
- $this->_out('/Next ' . ($this->n + $next - $i) . ' 0 R');
- }
- $this->_out('/Dest [' . (1 + (2 * $this->Outlines[2][$i])) . ' 0 R /XYZ null ' . $this->Outlines[3][$i] . ' null]');
- if ($kids > 0) {
- $this->_out('/First ' . ($this->n + 1) . ' 0 R');
- $this->_out('/Last ' . ($this->n + $last - $i) . ' 0 R');
- $this->_out('/Count -' . $kids);
- }
- $this->_out('>>');
- $this->_out('endobj');
- }
- // First page of outlines
- $this->_newobj();
- $this->def_outlines = $this->n;
- $this->_out('<<');
- $this->_out('/Type');
- $this->_out('/Outlines');
- $this->_out('/First ' . $first_level[0] . ' 0 R');
- $this->_out('/Last ' . $first_level[sizeof($first_level)-1] . ' 0 R');
- $this->_out('/Count ' . sizeof($first_level));
- $this->_out('>>');
- $this->_out('endobj');
- }
- }
-
- function _putresources()
- {
- parent::_putresources();
- $this->_putbookmarks();
}
function SetWidths($w)
@@ -449,7 +339,7 @@ class PMA_PDF extends TCPDF
* and helps in drawing/generating the Tables in PDF document.
*
* @name Table_Stats
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
class Table_Stats
{
@@ -481,7 +371,7 @@ class Table_Stats
* @global object The current PDF document
* @global array The relations settings
* @global string The current db name
- * @see PMA_PDF, Table_Stats::Table_Stats_setWidth,
+ * @see PMA_Schema_PDF, Table_Stats::Table_Stats_setWidth,
Table_Stats::Table_Stats_setHeight
*/
function __construct($tableName, $fontSize, $pageNumber, &$sameWideWidth, $showKeys = false, $showInfo = false)
@@ -565,7 +455,7 @@ class Table_Stats
* @param integer fontSize The font size
* @global object The current PDF document
* @access private
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
function _setWidth($fontSize)
{
@@ -603,7 +493,7 @@ class Table_Stats
* @param boolean setColor Whether to display color
* @global object The current PDF document
* @access public
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
public function tableDraw($fontSize, $withDoc, $setColor = 0)
{
@@ -661,7 +551,7 @@ class Table_Stats
* in PDF document.
*
* @name Relation_Stats
- * @see PMA_PDF::SetDrawColor,PMA_PDF::PMA_PDF_setLineWidthScale,PMA_PDF::PMA_PDF_lineScale
+ * @see PMA_Schema_PDF::SetDrawColor,PMA_Schema_PDF::PMA_PDF_setLineWidthScale,PMA_Schema_PDF::PMA_PDF_lineScale
*/
class Relation_Stats
{
@@ -751,7 +641,7 @@ class Relation_Stats
* @param integer i The id of the link to draw
* @global object The current PDF document
* @access public
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
public function relationDraw($changeColor, $i)
{
@@ -831,7 +721,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
* @global string The current db name
* @global array The relations settings
* @access private
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
function __construct()
{
@@ -849,18 +739,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$this->setExportType($_POST['export_type']);
// Initializes a new document
- $pdf = new PMA_PDF($this->orientation, 'mm', $this->paper);
+ $pdf = new PMA_Schema_PDF($this->orientation, 'mm', $this->paper);
$pdf->SetTitle(sprintf(__('Schema of the %s database - Page %s'), $GLOBALS['db'], $this->pageNumber));
$pdf->setCMargin(0);
$pdf->Open();
- $pdf->SetAuthor('phpMyAdmin ' . PMA_VERSION);
- $pdf->AliasNbPages();
- $pdf->AddFont('DejaVuSans', '', 'dejavusans.php');
- $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
- $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php');
- $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
- $pdf->SetFont($this->_ff, '', 14);
- $pdf->setFooterFont(array($this->_ff, '', 14));
$pdf->SetAutoPageBreak('auto');
$alltables = $this->getAllTables($db,$this->pageNumber);
@@ -978,9 +860,9 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
/**
* Draws the grid
*
- * @global object the current PMA_PDF instance
+ * @global object the current PMA_Schema_PDF instance
* @access private
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
private function _strokeGrid()
{
@@ -1057,7 +939,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
* @global integer The current page number (from the
* $cfg['Servers'][$i]['table_coords'] table)
* @access private
- * @see PMA_PDF
+ * @see PMA_Schema_PDF
*/
private function _showOutput($pageNumber)
{
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14139-ge9ea3b5
by Michal Čihař 10 Aug '11
by Michal Čihař 10 Aug '11
10 Aug '11
The branch, master has been updated
via e9ea3b59a37239034b9690a16d86acb1d6166d57 (commit)
from 033a1b629ffbd20eaa5aa5c9d74ae0c649eda931 (commit)
- Log -----------------------------------------------------------------
commit e9ea3b59a37239034b9690a16d86acb1d6166d57
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Wed Aug 10 14:12:36 2011 +0200
Fix typo
-----------------------------------------------------------------------
Summary of changes:
libraries/select_lang.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 92c9ded..0842001 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -503,5 +503,5 @@ if ($GLOBALS['lang_failed_request']) {
}
unset($line, $fall_back_lang,
- $GLOBALS['lang_failed_cfg'], $GLOBALS['lang_failed_cookie'], $GLOBALS['ang_failed_request']);
+ $GLOBALS['lang_failed_cfg'], $GLOBALS['lang_failed_cookie'], $GLOBALS['lang_failed_request']);
?>
hooks/post-receive
--
phpMyAdmin
1
0